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

210 commits

Author SHA1 Message Date
Tor Lillqvist
4087ac8089 With "disconnect" messages gone, no need for a 'reason' to disconnect() 
YAGNI.
 2016-04-13 15:56:23 +03:00
Tor Lillqvist
e5de11113b Don't check for or send "disconnect" frames anywhere and don't document them 
Follow-up to 68b3a2c81e.
 2016-04-13 15:49:10 +03:00
Pranav Kant
9ea4624839 loolwsd: Handle socket exceptions while trying to send frame 
In case of abnormal termination of session from client-side,
we might still have data being processed in the kit process, for
example, during auto-save. Trying to send such data over an
expired socket towards the client would throw exceptions which
need to be handled, otherwise the auto-save process would not be
successful. Further, the unhandled exception can bring the document
broker in an unstable state with dockey still present in the
object.

Also do not send 'editlock: 0' to a websocket session which is
going to be removed because the session might have been
forcefully terminated from the client-side, in which case sending
data would go nowhere.

Change-Id: I10eb9c818bc81d4db26d5a19dc8bd44f6fbdf32c
 2016-04-13 09:56:32 +05:30
Tor Lillqvist
df2048c895 No need for <condition_variable> here 2016-04-10 09:36:36 +03:00
Ashod Nakashian
b6d2edb0e3 loolwsd: moved activity tracking into LOOLSession 
Change-Id: I87d5afc43bea29ede2ad6e2871c594c4746bc3d5
Reviewed-on: https://gerrit.libreoffice.org/23948
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-04-10 03:32:58 +00:00
Tor Lillqvist
acc59a2ea5 Make error messages more consistent and use Log::syserror() in more places 
A call to Log::error() should be enough to indicate that it is an
error. We don't need to prefix the message with the string "Error: "
in some cases but not others. (If we do want such a prefix for all
errors, surely then we should add it in the actual Log::error()
function.)

Also, change some more Log::error() calls to Log::syserror() where
appropriate.
 2016-04-07 11:53:44 +03:00
Ashod Nakashian
ce2fabb733 loolwsd: moved IO utilities into IoUtil file 
Change-Id: I1e8d5562787134cbb490c38b19d83b7514ec9baa
Reviewed-on: https://gerrit.libreoffice.org/23586
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-03-29 14:09:04 +00:00
Ashod Nakashian
7d2d2aab1c loolwsd: message handling cleanups 
Change-Id: I346511819907757bd84895c3751f0cbce4f37084
Reviewed-on: https://gerrit.libreoffice.org/23585
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-03-29 02:48:28 +00:00
Ashod Nakashian
74580df0d6 loolwsd: warn if still communicating while terminating 
Change-Id: Id42bb29e7c5f17772c4251d686e82d4380d2a073
Reviewed-on: https://gerrit.libreoffice.org/23539
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-03-26 17:08:37 +00:00
Tor Lillqvist
e8a5ba1b29 _bShutdown is always false 2016-03-08 09:45:23 +02:00
Tor Lillqvist
e7e1ef58ae Cosmetics: Sort and prune #include and 'using' lines 2016-03-08 09:44:04 +02:00
Tor Lillqvist
7d89cfa6f0 Clean up #includes and usings. 
Include and use 'using' only for what is actually used. Sort the
include and 'using' lines.
 2016-03-07 20:00:35 +02:00
Tor Lillqvist
9947633550 Catch IOException from sendTextFrame() in LOOLSession::disconnect() 
Otherwise the uncaught exception will terminate the loolkit process
unexpectedly, which surely messes things up.
 2016-03-07 20:00:35 +02:00
Tor Lillqvist
9f67eecadd Improve exception logging 
Always try to identify *where* we caught the exception. It is not that
useful to have half a dozen places that all just log "Exception:".
 2016-03-07 18:36:01 +02:00
Tor Lillqvist
72ff491fb2 Cosmetics: avoid trailing space in 'disconnect' message 2016-02-22 16:27:12 +02:00
Tor Lillqvist
ef30af121a Log a bit more information 2016-02-22 13:50:14 +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
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
7ffd4b45db bccu#1468: handle 'nextmessage:' in prisoner -> master text frames 
There are cases when prisoner would send huge text data but
without preceeding 'nextmessage' frames making the master throw
WebSocketException.

Also move the 'nextmessage' frame interpretation logic up in the
'else if' ladder to be able to detect and handle such huge text frames.

Change-Id: Ibe44b69f4ab75c1b8096648c6006316c88366e7c
Reviewed-on: https://gerrit.libreoffice.org/21835
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-02-01 05:09:35 +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
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
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
06c20923c5 loolwsd: Kit is given the jailed path 
Change-Id: I5b475798c7f654aaa3e0032332d5aa97a103a4c8
Reviewed-on: https://gerrit.libreoffice.org/21185
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-07 05:58:08 +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
a5cca41b35 loolwsd: logging improvements in LOOLSession. 
Change-Id: Ia5029bc55be0bf0f1a3282db103515ae22fd90bd
Reviewed-on: https://gerrit.libreoffice.org/21157
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2016-01-06 14:22:13 +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
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
d273057488 loolwsd: moved config values into common header 
Change-Id: Ib88379e453f207a6a5e6223045a393c769082be4
Reviewed-on: https://gerrit.libreoffice.org/20978
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
 2015-12-28 04:09:50 +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
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
Henry Castro
1f43e99ac7 loolwsd: Refactored ChildProcessSession 
ChildProcessSession class now moved to own files.

Change-Id: Ic67c8563ada51f23c83e06631ad913af610d395c
Reviewed-on: https://gerrit.libreoffice.org/20895
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Henry Castro <hcastro@collabora.com>
 2015-12-23 17:03:43 +00:00
Henry Castro
894ab66d8c loolwsd: Refactored MasterProcessSession 
MasterProcessSession class now moved to own files.

Change-Id: Ic1a980295b9bb4b28ec9e205de1544fb98ad98f8
Reviewed-on: https://gerrit.libreoffice.org/20893
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Henry Castro <hcastro@collabora.com>
 2015-12-23 17:02:57 +00:00
Henry Castro
d70280fff8 loolwsd: when no available child sessions, pre spawns more children 2015-12-18 16:51:08 -04:00
Mihai Varga
fe7ae3cc2a fire the commandresult when the saveAs command has finished 2015-12-18 15:40:03 +02:00
Mihai Varga
fbbf364aa9 loolwsd: initialize the tile to transparent 2015-12-14 15:55:34 +02:00
Mihai Varga
803c89a43f loolwsd: only cache font/style command values 
This fixes a bug where row/column headers were cached too
 2015-12-14 14:38:05 +02:00
Henry Castro
f5292a367e loolwsd: rework, remove a jail root child 2015-12-04 17:09:28 -04:00
Henry Castro
4617a93e5c loolwsd: create a child workspace based on process id 2015-12-03 10:50:03 -04:00
Andras Timar
4f2d9b02e5 Revert "loolwsd: add support for postMouseEvent's targetwindow" 
This reverts commit d1b39e39e8.
 2015-12-02 16:46:25 +01:00
Andrzej Hunt
d1b39e39e8 loolwsd: add support for postMouseEvent's targetwindow 
(cherry picked from commit b45e3fa5becf8fcbf106cb6b944c8f4709563d43)
 2015-12-02 16:22:55 +01:00
Mihai Varga
e1b0e3dce9 loolwsd: update renderFont png encoding 2015-11-30 12:58:41 +02:00
Mihai Varga
862cfe29a0 loolwsd: renderfont command handler 
Renders the requested font and sends it back to the client as a png
image
 2015-11-30 11:16:53 +02:00
Henry Castro
c0fbf5ebf9 loolwsd: remove child root folder when it is a gracefull shut down 2015-11-25 23:17:08 -04:00
Henry Castro
d09951091a loolwsd: avoid double child socket shutdown 
It was causing "broke pipe" exception.
 2015-11-25 22:09:06 -04:00
Miklos Vajna
2bb596a256 loolwsd: coding style 
If README says "spaces, not tabs" and "braces go on separate lines",
then be consistent about it before it gets normal to not respect those
rules.
 2015-11-24 09:43:17 +01:00