strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8417 commits 1 branch 0 tags 244 MiB
Commit graph

424 commits

Author SHA1 Message Date
Andras Timar
f4dbe43c3e keep the project buildable with poco 1.7.8 
Change-Id: I87957a0b928f92f02ce72b7e6a2a575f2e5bad8d
Reviewed-on: https://gerrit.libreoffice.org/75231
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
 2019-07-08 21:05:46 +02:00
Jan Holesovsky
546f721699 android: Kill the extremely verbose FakeSocket logging. 
This stuff seems to work fine, no need to spam the logcat this much.

Change-Id: I5e09ffe56f5b545fe755e06c17be1ef1c37ab7a1
 2019-06-20 14:12:26 +02:00
Samuel Mehrbrodt
8f029d972d Fix typo 
Change-Id: Ib960a8b77ba293bbbe16b2ae91ed66d42364d64f
Reviewed-on: https://gerrit.libreoffice.org/74052
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
 2019-06-16 22:35:45 +02:00
Miklos Vajna
58d9b0ebbf net: avoid unnecessary copy in checkAndReThread() 
Change-Id: I7a31ded80de128c46f59db3f0cba497de2f9f96c
 2019-06-12 08:58:22 +02:00
Michael Meeks
579c827363 unipoll: allow LOK's Yield callback to be called from any thread. 
Change-Id: I1ab46135919a1f06f814cc8702991592c84d28a7
Reviewed-on: https://gerrit.libreoffice.org/73752
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
 2019-06-10 12:24:17 +02:00
Michael Meeks
fc6a316dd4 Improve debugging by showing un-masked websocket content. 
Change-Id: I0df0b3cc7b13c36ed8afaaec4ed2fe525458a21c
 2019-05-29 15:40:46 +01:00
Miklos Vajna
4e1ed7205d net: avoid UB in WebSocketHandler::readPayload() 
Seen when closing a Writer document.

/home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_vector.h:798:9: runtime error: reference binding to null pointer of type 'char'
    #0 0x6ff633 in std::vector<char, std::allocator<char> >::operator[](unsigned long) /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_vector.h:798:2
    #1 0x770d0c in WebSocketHandler::readPayload(unsigned char*, unsigned long, unsigned char*, std::vector<char, std::allocator<char> >&) /home/vmiklos/lode/dev/online/./net/WebSocketHandler.hpp:611:29
    #2 0x759324 in WebSocketHandler::handleTCPStream(std::shared_ptr<StreamSocket> const&) /home/vmiklos/lode/dev/online/./net/WebSocketHandler.hpp:251:13
    #3 0x6f820d in WebSocketHandler::handleIncomingMessage(SocketDisposition&) /home/vmiklos/lode/dev/online/./net/WebSocketHandler.hpp:419:20
    #4 0xb2da64 in ClientSession::handleIncomingMessage(SocketDisposition&) /home/vmiklos/lode/dev/online/wsd/ClientSession.cpp:74:14
    #5 0xa70a61 in StreamSocket::handlePoll(SocketDisposition&, std::chrono::time_point<std::chrono::_V2::steady_clock, std::chrono::duration<long, std::ratio<1l, 1000000000l> > >, int) /home/vmiklos/lode/dev/online/./net/Socket.hpp:1037:29
    #6 0x6ec83d in SocketPoll::poll(int) /home/vmiklos/lode/dev/online/./net/Socket.hpp:570:34
    #7 0x830019 in DocumentBroker::pollThread() /home/vmiklos/lode/dev/online/wsd/DocumentBroker.cpp:286:16
    #8 0x8fdb38 in DocumentBroker::DocumentBrokerPoll::pollingThread() /home/vmiklos/lode/dev/online/wsd/DocumentBroker.cpp:165:20
    #9 0xe00e75 in SocketPoll::pollingThreadEntry() /home/vmiklos/lode/dev/online/net/Socket.cpp:184:9
    #10 0xe49cfd in void std::__invoke_impl<void, void (SocketPoll::*)(), SocketPoll*>(std::__invoke_memfun_deref, void (SocketPoll::*&&)(), SocketPoll*&&) /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:73:14
    #11 0xe4980a in std::__invoke_result<void (SocketPoll::*)(), SocketPoll*>::type std::__invoke<void (SocketPoll::*)(), SocketPoll*>(void (SocketPoll::*&&)(), SocketPoll*&&) /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/invoke.h:95:14
    #12 0xe496bd in decltype(std::__invoke(_S_declval<0ul>(), _S_declval<1ul>())) std:🧵:_Invoker<std::tuple<void (SocketPoll::*)(), SocketPoll*> >::_M_invoke<0ul, 1ul>(std::_Index_tuple<0ul, 1ul>) /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/thread:234:13
    #13 0xe494c7 in std:🧵:_Invoker<std::tuple<void (SocketPoll::*)(), SocketPoll*> >::operator()() /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/thread:243:11
    #14 0xe4888a in std:🧵:_State_impl<std:🧵:_Invoker<std::tuple<void (SocketPoll::*)(), SocketPoll*> > >::_M_run() /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/thread:186:13
    #15 0x7f2c5805fe2e in execute_native_thread_routine /home/vmiklos/lode/packages/gccbuild/x86_64-pc-linux-gnu/libstdc++-v3/src/c++11/../../../../../gcc-7.3.0/libstdc++-v3/src/c++11/thread.cc:83
    #16 0x7f2c57a3c558 in start_thread (/lib64/libpthread.so.0+0x7558)
    #17 0x7f2c5715082e in clone (/lib64/libc.so.6+0xf882e)

SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior /home/vmiklos/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_vector.h:798:9 in

Change-Id: Ifaf6b193e9bba480587c2e184df55aa0728bb370
 2019-05-27 09:06:38 +02:00
Miklos Vajna
c452b8d411 LocalServerSocket: can move sockFactory instead of copy 
Change-Id: Ib503fa5987ad2153dee73f9bb1ee03a31278ea63
 2019-05-22 14:09:02 +02:00
Michael Meeks
9d723cb230 Initial chunked transfer encoding. 
Important for convert-to on larger documents and/or with newer curls.

Change-Id: Id18be6d22741a3af7cee39a069c509e4f662977b
 2019-05-22 11:07:42 +01:00
Michael Meeks
4f804a48fe Initial HTTP Expect: 100-continue implementation. 
Change-Id: Ic9aa59cac5103151d91f6eb59d12313e545c7916
 2019-05-22 02:56:11 +01:00
Tor Lillqvist
b5154eaf69 Make the document-specific threads in the iOS app go away more reliably 
After a document is closed, the prisoner_poll, accept_poll,
websrv_poll, docbroker_nnn, and lokit_main threads that served that
document are supposed to go away as quickly and reliably as possible.
This change improves that significantly.

Change-Id: If658bea74f70a77d2d537f0ec6455a6b36f2667e
 2019-05-21 02:40:28 +03:00
Michael Meeks
046ab32e46 Use compile-time rather than run-time string concatenation. 
Saves some time & space.

Change-Id: If1e62056447fb7e8f26e8cf107451876adf3fecb
 2019-05-20 12:30:01 +01:00
Michael Meeks
638fb0316d unipoll: restore missing asserts & some cleanup. 
Change-Id: I4277b5e044ead54d91bc834ea05bec649a608678
 2019-05-10 17:37:59 +01:00
Ashod Nakashian
6b82d245fa Unipoll: integrate with the LOK mainloop in a single thread. 
Unfortunately processing multiple events from the Kit socket
is causing massive document invalidations, for unknown
reasons. As such, for now we have to process one event
at a time, until the source of the invalidations is found
and fixed.

Without the invalidation, the average tile rendering
roundtrip is about 3x faster than with the invalidations
and the maximum roundrip is at least 2x faster.

Change-Id: Iafbf9ccc2b80656cb71c208b598080f72d201ca2
Reviewed-on: https://gerrit.libreoffice.org/70906
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2019-04-23 03:00:07 +02:00
Jan Holesovsky
556b2a57e7 gtkapp: Fix clang's error: private field '...' is not used 
[-Werror,-Wunused-private-field] in the WaE mode.

Change-Id: I38cce5326023939391b661d077bed4616c88c12b
 2019-04-19 11:10:51 +02:00
Michael Meeks
cacaefc287 perftrace: Annotate idleness and render it better as gaps. 
Change-Id: If4d7853d02ca736f8cab12bd9dcc7c4b60ec7d27
 2019-04-04 19:18:45 +01:00
Michael Meeks
5fe3cb0a4d Creds. 
Change-Id: Iee6f567f3046461c8d034192f282ac7e8fd2f468
 2019-04-02 20:18:28 +01:00
Henry Castro
9657e4dfa3 fix build: "sockaddr_un addrunix’ has incomplete type ... 
and cannot be defined"

Change-Id: I2c136fc47c800ec3efd6268b4601100033e22724
 2019-04-02 10:31:08 -04:00
Samuel Mehrbrodt
71b9faca7c Fix -Werror=maybe-uninitialized 
Change-Id: I076fb4b9ef80e4fbf13cdd22cff51ab1e99a2c6c
 2019-04-01 14:18:23 +02:00
Miklos Vajna
150ae4e8db net: fix -Werror,-Winconsistent-missing-override 
Change-Id: I5e7bce35cd9892a3f74d6d57e094c006bd13b991
 2019-04-01 12:00:27 +02:00
Michael Meeks
7b70aab367 peercred: fixup compile issues. 
Change-Id: I87d956f5754e7b353776c538b7bb9dfea7f62883
 2019-04-01 10:56:15 +01:00
Tor Lillqvist
9c02d82f7c Fix build in the MOBILEAPP case 
Did not check how well it works.

Change-Id: I5ca1b349aafcfddaed517e51ca6bd25e9749779d
 2019-03-31 14:34:24 +03:00
Michael Meeks
201bcb0762 Use peercreds to identify processes connecting rather than URL params. 
Change-Id: I241e80962fb8cf2f3fff1bb4be81d9f0ee74c648
 2019-03-30 21:37:05 +00:00
Michael Meeks
81a27e26aa Switch local prisoner sockets to abstract UDS 
Unix Domain Sockets are inaddressable remotely, and more efficient,
as well as allowing future SCM_CREDENTIALS / SCM_RIGHTS.

Change-Id: Ia2472260f75feb43e9022cdfa0fe005ccd489454
 2019-03-30 16:51:06 +00:00
Michael Meeks
d832fb3c9d Crop socket buffer removal to socket buffer size & warn. 
Change-Id: I734b4682941d71eee02a25aab61c8e4353a11718
Reviewed-on: https://gerrit.libreoffice.org/69948
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
 2019-03-30 17:50:59 +01:00
Tor Lillqvist
08da078546 When FAKESOCKET_LOG_ALWAYS_STDERR, output also the thread id 2019-03-20 15:18:43 +02:00
Gabriel Masei
023cbfc32d Added support for defragmentation of incoming websocket fragmented messages and handled some protocol error cases 
Change-Id: I4d11a6527b6b131c65101fd53b71015529645f74
Reviewed-on: https://gerrit.libreoffice.org/68901
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
 2019-03-12 15:19:42 +01:00
Jan Holesovsky
f76b36193d android: #if(n)def MOBILEAPP -> #if (!)MOBILEAPP for better reliability. 
Change-Id: I5f9c9420b6c83601db1c8fdba4ae5a10b17b2107
 2019-02-12 12:20:11 +01:00
Ashod Nakashian
9811b0fc98 wsd: reduce warnings 
Don't stop the polling thread and attempt cleanup
when the thread is no longer alive; just avoid
logging warnings and other noise.

Demote a couple warning logs to info since
they are neither critical nor actionable.

Change-Id: Ibe8e8491723f1beeaea03a6e935d606b01e275f0
 2019-01-22 14:52:40 +01:00
Miklos Vajna
bb2257c2ee net: make members private in clientnb 
None of these were used externally.

Change-Id: I2ac504a1c671dd7d315aa4e1a0a5b5e070bec857
 2019-01-21 09:13:23 +01:00
Miklos Vajna
6d57f0a005 net: make members private in DelaySocket 
Change-Id: I5970d55f0723e46892ed5bea87bb79376c7ea530
 2019-01-17 08:46:11 +01:00
Miklos Vajna
85f24ccb55 CRYPTO_dynlock_value: make members private 
Change-Id: I5328bd272d4aaef1a445b9ddc5dd4c878d803777
 2018-12-03 09:11:22 +01:00
Michael Meeks
d00aa78c9b Don't name parameter after a local method. 
Change-Id: I06929d23009b851cf3fb20da5bfe66d9795dcdd9
 2018-11-07 17:37:25 +00:00
Michael Meeks
738abc1de7 Respond to SSL/TLS over http - when we don't expect it. 
Change-Id: I48c7607cd4e1416fb4ac28c552c2cd96b51d60a6
 2018-11-07 17:36:18 +00:00
Tor Lillqvist
f8a0fb4c32 WaE: -Werror=unused-parameter 
Change-Id: Icadfcb19ce1fff2b5009d42acf33297cda6e36f2
 2018-11-01 21:34:16 +02:00
Tor Lillqvist
9a0decc406 WaE: -Werror=sign-compare 
Change-Id: Iaac48bd91864d44ce9442dd68aa26ec74fb5507a
 2018-11-01 21:30:16 +02:00
Tor Lillqvist
ffe66b3efc Avoid 'Unused variable' warnings in the MOBILEAPP casse 
Change-Id: I30d631559379da4baa5a73712f002435b1a36360
 2018-10-30 22:03:04 +02:00
Tor Lillqvist
4ce96fb8ff Don't access nonexistent vector element in the EOF case 2018-10-30 00:47:26 +02:00
Tor Lillqvist
9fec3b0e27 Handle EOF case (when fakeSocketAvailableDataLength() returns 0) 2018-10-30 00:47:21 +02:00
Miklos Vajna
d1e183f20d SocketPoll: make members private 
All these protected members are unused by child classes, except read
access to a single member.
 2018-10-29 09:06:33 +01:00
Miklos Vajna
5167cf9f58 StreamSocket: make members private 
Only a single member needed a setter, otherwise getters were enough.
 2018-10-26 09:07:30 +02:00
Tor Lillqvist
a4b4f6bf36 Fix fakeSocketAvailableDataLength() when peer socket is closed 
Also bin a few lines of unnecessary code.
 2018-10-25 21:57:44 +03:00
Tor Lillqvist
8bc97c0f9e Adapt after 4724aa0cf7 2018-10-25 21:33:57 +03:00
Miklos Vajna
4724aa0cf7 Socket: do what the TODO says 
Drop the list of friends and just add getters for the relevant
members.
 2018-10-25 16:39:02 +02:00
Miklos Vajna
22fac18fcd WebSocket: make members private 
All of them were protected, but only _socket was used actually. Add a
protected setter/getter for that field.
 2018-10-24 09:36:13 +02:00
Tor Lillqvist
decf78ff2e Buffer an unlimited (eek, scary) number of messages per fake socket 
Matches the behaviour of real sockets in a real Online server better.
Seems to get rid of the occasional hang problem.

I had already some time ago suspected that such a change would fix
that problem, but unfortunately my first attempt missed one crucial
detail, so it didn't, and I spent days looking for other ways to fix
the problem instead, in vain.

Probably I should add some sanity limit on the number of buffered
messages, though... But if such a sanity limit then would be hit, most
likely much else is totally broken already anyway.

Change-Id: Ice43057814ee5abd85b2935ffaa91765845a515a
 2018-10-23 15:23:01 +03:00
Tor Lillqvist
d6d0c3e8a3 As far as I see, no getPollEvents() implementation will ever return negative 
In 1c7f94045a that introduced
DelaySocket, its getPollEvents() could indeed return -1, but that was
removed later.

Change-Id: Ie3a7e01b7b9a7517d97f6ed3cc6d96bdb3313969
Reviewed-on: https://gerrit.libreoffice.org/61990
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
 2018-10-19 13:41:18 +02:00
Tor Lillqvist
c6c6e8cc46 In fakeSocketConnect() log also the fd the corresponding accept returned 2018-10-19 02:03:32 +03:00
Tor Lillqvist
452a0a46c2 More work on the GTK+ testbed app 
Add plumbing to send messages from the Online code to the JavaScript
code, and vice versa. Similar to what is done for iOS.

Sadly, it crashes. Multi-thread issues. Not surprisingly, it crashes
when I call webkit_web_view_run_javascript() in another thread than
the one where the GTK+ and other Webkit calls were done. I need to
come up with some clever way to do everything from the same thread.

(On iOS, I use dispatch_async(dispatch_get_main_queue(),...) to
schedule a block (i.e., a lambda expression) to be run in the main
thread.)
 2018-10-17 22:48:14 +03:00
Tor Lillqvist
05c2782a81 Empty out _newCallbacks when stopping a SocketPoll in the MOBILEAPP case 
The wakeup() call in SocketPoll::stop() doesn't always (or ever?)
actually cause the wakeup code to be invoked and callbacks called
right after, and we don't want to risk the leftover callbacks being
invoked when the same SocketPoll object is started again. (This did
actually happen.)

In a normal Online, this is not a problem, as SocketPolls aren't
reused. One document per kit process, a separate kit process for each
document. Not so in a mobile app, there we have just one process that
handles document after document as the user closes one, opens another
(or the same anew), etc.
 2018-10-17 20:10:52 +03:00