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

55 commits

Author SHA1 Message Date
Tor Lillqvist
6af8a9bbc1 Avoid 'short' and 'signed' 2016-02-23 10:22:18 +02:00
Tor Lillqvist
819d5c23c0 Use all tokens 2016-02-22 16:31:24 +02:00
Tor Lillqvist
b4387a535a Bin some superfluous using declarations and includes, and actually use others 
Sorry, could not resist. Obviously not very important.

In retrospect, maybe it would have been better to have as policy to
*not* use any 'using Poco::Foo'. Now there is an inconsistent mix of
writing out the complete type and using a 'using'. Plus copy-pasted
long lists of 'usings'. And of course, one should never have 'using'
in an include file. Oh well.
 2016-02-22 11:37:47 +02:00
Pranav Kant
a2549e3df7 loolwsd: Disconnect the child if there is no client 
Don't let them hanging around, otherwise we would keep sending
messages to a dead peer (ToClient) indefinitely.

Change-Id: I9d4bb6edee351bd31f1faa30deaa4f37c3c7d031
Reviewed-on: https://gerrit.libreoffice.org/22465
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-02-19 21:56:12 +00:00
Pranav Kant
3667bef9a6 loolwsd: Handle password protected documents 
Change-Id: Iceb5bb598ef1517bf640994c27bad4ca36bd72c1
Reviewed-on: https://gerrit.libreoffice.org/21894
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-02-19 21:49:45 +00:00
Pranav Kant
9cf0cbf3a6 loolwsd: Allow sending 'tilecombine' messages with 'timestamp' 
... and revert back with this parameter in 'tile:' response
messages so that client can identify the response.

This is also required to make client-side tile benchmarking tests
work again.

Change-Id: I307aabf622b17f4dce727d1faf3c83eb566ba905
 2016-02-19 00:32:03 +05:30
Henry Castro
72db8ed63a loolwsd: replace the random jail id for lokit process id 2016-02-13 19:01:03 -04:00
Henry Castro
9e3d5c0337 loolwsd: ensure chroot jail every lokit process 2016-02-13 10:15:28 -04:00
Pranav Kant
6a7a014d14 loolwsd: Remove cached 'status' command output on 'setclientpart' 
Otherwise we have a problem when cached information is different than
the actual one maintained by LOKitDocument, keeping the whole
server setup in an inconsistent state.

For example, when client reloads the browser session quickly
after setting the current part (to say 3) of an opened part document.
If the reload occurs soon enough before the 'setclientpart'
message originated from the client is acknowledged by the server,
then the next reload would get the cached 'status' entry asking
the client to set 'currentpart' to something else leading to the
generation of another 'setclientpart' message. This thing would
go on, and we would run into a loop, as I have for the last few
hours.

Change-Id: Ia6260dfb772f2e3f023572aa060fd7da92b196c8
Reviewed-on: https://gerrit.libreoffice.org/22272
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-02-11 05:04:22 +00:00
Miklos Vajna
aa450a0c38 loolwsd: add clientvisiblearea client -> server command 2016-02-02 11:49:22 +01:00
Henry Castro
be33224133 loolwsd: remove unnecessary map ChildProcesses 2016-01-25 21:17:05 -04:00
Henry Castro
eb2675164f loolwsd: remove unnecessary child PID file log 
This is no longer needed due to logging improvements
 2016-01-25 11:51:27 -04:00
Ashod Nakashian
904bf929f1 loolwsd: throttle traffic for inactive sessions 
Sessions that have been inactive for a certain duration,
currently set at 120 seconds, will not receive updates.

A new statistics class tracks the activity of every
session and blocks callback updates from reaching
inactive clients.

Change-Id: I64296488b2c0be0598b218ba89a6d02f057a5f7e
Reviewed-on: https://gerrit.libreoffice.org/21760
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-24 21:14:57 +00:00
Ashod Nakashian
b85b4423b0 loolwsd: break the wait on save-as queue and better failure handling 
Change-Id: Ifee252b3c189ee0b1287bda891b38c5abddb7440
Reviewed-on: https://gerrit.libreoffice.org/21755
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-24 21:09:28 +00:00
Ashod Nakashian
55f2105f00 loolwsd: logging improvements 
Change-Id: I77844a2b549c1f497c2d44f054169bf11d9227d8
Reviewed-on: https://gerrit.libreoffice.org/21752
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-24 21:00:34 +00:00
Ashod Nakashian
41da8f144e loolwsd: unload command added 
Change-Id: I30c42e24aa38c676e4bc6c7e6a2715d9e72430b9
Reviewed-on: https://gerrit.libreoffice.org/21686
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-21 16:07:54 +00:00
Ashod Nakashian
d3fc5ac37b loolwsd: sockets are shutdown on disconnect 
Change-Id: I1c00be4648cff94013ceab87fcb607b9bb921535
Reviewed-on: https://gerrit.libreoffice.org/21684
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-21 16:06:37 +00:00
Ashod Nakashian
dd374d8aec loolwsd: disconnect command to gracefully shutdown a socket 
Change-Id: I8beb4c14fc95bdb2a98c7e5da44408511bce5e28
Reviewed-on: https://gerrit.libreoffice.org/21683
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-21 16:05:55 +00:00
Ashod Nakashian
ad7509d449 loolwsd: writeFIFO overload to take std::string 
Change-Id: Ibfac97d1d4f101a10bd0f696b8b89a22170b1b11
Reviewed-on: https://gerrit.libreoffice.org/21672
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-21 15:43:11 +00:00
Tomaž Vajngerl
21121e2f55 Support returning cached tiles for "tilecombine" 2016-01-20 23:04:41 +01:00
Miklos Vajna
201c9fb590 loolwsd: handle 'nextmessage:' in master -> prisoner traffic 
ToPrisoner already generated 'nextmessage:' when it was necessary, but
the other side did not handle that message type, since previously
(before multi-line paste) only the prisoner -> master direction needed
'nextmessage:' for tile data.
 2016-01-18 11:47:57 +01:00
Miklos Vajna
3cbdd9e3bd MasterProcessSession: capitalize static members 2016-01-18 09:43:49 +01:00
Miklos Vajna
de7823744e loolwsd: fix naming style of LOOLWSD static members 2016-01-15 09:44:07 +01:00
Ashod Nakashian
3d803dd9b0 loolwsd: Document -> DocumentURI 
Change-Id: I7e5989dbee368314a4db7c723439060f1064e844
Reviewed-on: https://gerrit.libreoffice.org/21469
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-14 13:39:43 +00:00
Tomaž Vajngerl
721cbbcbb3 Add "tilecombine" command to render more tiles in one call 
When invalidating we need to rerender more tiles at once.
This change optimizes that with a new command which rerenders a
larger area once and then separates the rendered buffer into more
tiles. This generally decreases the invalidation time by 2-4 times
and in some cases (when invalidating images in document) up to 9
times.
 2016-01-14 13:11:57 +01:00
Jan Holesovsky
d51972c28d loolwsd: Don't cache empty partpagerectangles. 
This is implemented only for Writer, so they are empty for Calc and Impress;
and yet they can confuse loleaflet terribly...
 2016-01-12 14:57:24 +01:00
Ashod Nakashian
6668dca7ac loolwsd: handle I/O error while destroying MasterProcessSession 
Change-Id: I9618fb57bcb3cdb472d03abb6c49d649afbf25a5
Reviewed-on: https://gerrit.libreoffice.org/21379
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-12 04:35:16 +00:00
Ashod Nakashian
f613a5181e loolwsd: better handling of commandvalues 
Change-Id: Ida459b42d9398baac85d1ecc19c19fb7f7ca90f0
Reviewed-on: https://gerrit.libreoffice.org/21322
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-11 04:04:54 +00:00
Miklos Vajna
feb8648f05 loolwsd: adding 'int' to a string does not append to the string 2016-01-07 15:06:16 +01:00
Ashod Nakashian
a7556a7c1e loolwsd: new Document class to manage the lifetime of a document 
Change-Id: I8596d0f2514106e384bc6519ce05028753026678
Reviewed-on: https://gerrit.libreoffice.org/21184
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-07 05:57:25 +00:00
Ashod Nakashian
0cdb8c931f loolwsd: logs 
Change-Id: Ib964578ce84eb3dd4b96d483b0e8b53c6cfac853
Reviewed-on: https://gerrit.libreoffice.org/21180
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-07 05:53:56 +00:00
Ashod Nakashian
900c344a7e loolwsd: refactored JailedDocumentRoot path 
Change-Id: Ibee16e6ebde0ae1945be53903a0b0bad4f3300ed
Reviewed-on: https://gerrit.libreoffice.org/21179
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-07 05:53:39 +00:00
Ashod Nakashian
2d385d697e Protocol versioning added and documented 
Change-Id: I6e1df89c7330052bd2d442a42c0b24c8ae4facf6
Reviewed-on: https://gerrit.libreoffice.org/21168
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-06 17:06:47 +00:00
Ashod Nakashian
75c65af930 loolwsd: childId is now string 
Change-Id: I7037c03d2b40ff88deed0619e8a34ce5434913a3
Reviewed-on: https://gerrit.libreoffice.org/21095
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-05 01:12:42 +00:00
Ashod Nakashian
eeb91f6335 loolwsd: send eof to disconnect 
Change-Id: I02ec901fd75671a3f4bf6be54f08dfdf6d157837
Reviewed-on: https://gerrit.libreoffice.org/21063
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-03 15:23:03 +00:00
Ashod Nakashian
88b76fe9d4 loolwsd: removed dead code 
Variables and options lingering from previous iterations removed.
Standardizing static member names.
Header inclusion cleanups.

Change-Id: I65182ad4d100e0077f1b450be50cf95d7b8f0fc7
Reviewed-on: https://gerrit.libreoffice.org/20997
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-28 23:36:55 +00:00
Henry Castro
7fc04b6e71 loolwsd: stop dispatch child when closed websocket prison 2015-12-28 17:05:01 -04:00
Henry Castro
fdef57cba0 loolwsd: close client websocket when abnormal close prison websocket 2015-12-28 16:40:32 -04:00
Ashod Nakashian
6b997c2abf loolwsd: threadId -> sessionId in logs and identifiers 
Change-Id: Ifbaea2fdded54da0d3528ae449efdbd7fe6d19c0
Reviewed-on: https://gerrit.libreoffice.org/20982
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-28 04:15:02 +00:00
Ashod Nakashian
3811abb40a loolwsd: replaced threadId with globally unique sessionId 
Change-Id: I55b16d4baa1753bc67dcd72de13e7a516da27abe
Reviewed-on: https://gerrit.libreoffice.org/20981
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-28 04:14:15 +00:00
Ashod Nakashian
72a1f18ebc loolwsd: fix detection of unreachable child 
Change-Id: I619613067586ec824d17cacd6059168e9329ec4c
Reviewed-on: https://gerrit.libreoffice.org/20974
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-28 04:07:06 +00:00
Ashod Nakashian
ab8c6e6661 loolwsd: use make_shared and emplace 
Change-Id: I9110a03b69442f0f8a674eda6ab4cf20462557c1
Reviewed-on: https://gerrit.libreoffice.org/20951
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-26 03:59:50 +00:00
Ashod Nakashian
03fa56f9de loolwsd: load document immediately upon handshake 
Change-Id: If750ae0a94258048c99f6dd47f7abb3a59660c6f
Reviewed-on: https://gerrit.libreoffice.org/20950
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-26 03:59:35 +00:00
Ashod Nakashian
d26944b715 loolwsd: safely remove files and directories 
Change-Id: Ie017a9da720a470a6b8ed340bd4ea5ffc279cf4b
Reviewed-on: https://gerrit.libreoffice.org/20949
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-26 03:59:20 +00:00
Ashod Nakashian
8fc1e3c65b loolwsd: better error handling and resilience 
Change-Id: Ic0208ccb72cb35cb8f8b3c1f36b636dd3a467dc1
Reviewed-on: https://gerrit.libreoffice.org/20948
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-26 03:59:05 +00:00
Ashod Nakashian
42d07b2aea loolwsd: refactored LOOLSession::handleInput to handle errors 
Change-Id: I3be929242317f4fafcb62c55d3532b2fbfd6591b
Reviewed-on: https://gerrit.libreoffice.org/20947
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-26 03:58:51 +00:00
Ashod Nakashian
3bd8361c89 loolwsd: more cleanups and logging 
Change-Id: I23859849af2d7a3411bd4df57916b4166a17c3b5
Reviewed-on: https://gerrit.libreoffice.org/20946
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-26 03:57:47 +00:00
Ashod Nakashian
7053091c0e loolwsd: support for views 
Change-Id: I9447d97612589efd0e85e30977b80ab720b81702
Reviewed-on: https://gerrit.libreoffice.org/20945
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-26 03:57:21 +00:00
Ashod Nakashian
8464651655 loolwsd: Better logging 
Color logging in console, tracing and streaming,
and converted cout to proper logging.

Change-Id: I515b8f8a40f8fa6763536b85c7632e3bb36673ee
Reviewed-on: https://gerrit.libreoffice.org/20931
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-25 03:32:33 +00:00
Ashod Nakashian
ea0ddcf738 loolwsd: Nominal logger and fixes 
Nominal logging interface and a fix to using Poco
Application from LOOLKit, which is not a Poco App,
which caused core dump.

Logs now include process name.
Added logs to strategic places and some cleanups.

Change-Id: Ib7dcc4f1033dddf7c87cd2e786a91f5b482fb312
Reviewed-on: https://gerrit.libreoffice.org/20906
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-23 17:23:10 +00:00