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

6569 commits

This branch
This branch
All branches
Author SHA1 Message Date
Miklos Vajna
eedfe0add4 UnitHTTP: make sure function defined in header is inline to avoid ODR violation 
Change-Id: If81ecbe1a73a73c093614f0ad5285558302e13d0
 2018-05-22 09:12:40 +02:00
Pranav Kant
32eff8dd6b lokdialog: Don't show the title bar when no title was provided. 
Change-Id: If08dc81e88d35a924d10695a38b138f6403e58bd
Reviewed-on: https://gerrit.libreoffice.org/51955
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
 2018-05-21 13:27:34 +02:00
Pranav Kant
a35def2f74 loleaflet: No native contextmenu options on dialog canvas 
Dialogs can have their own context menu invoked upon right click. And
they already works (i.e. are tunneled properly); so, let's use them.

Change-Id: I7d504923c272227dca94058995456d89e1079c29
(cherry picked from commit 63e089ec22)
Reviewed-on: https://gerrit.libreoffice.org/48087
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
 2018-05-21 13:27:34 +02:00
Henry Castro
f364c4a604 loleaflet: finally, remove "map" global variable 
Change-Id: I70c2603189e2194b8c9b60f2709f89c7fdf8cbfd
 2018-05-20 12:41:47 -04:00
Henry Castro
3afaa7ca48 loleaflet: avoid unnecessary "map" global variable in Control.Menubar.js 
Change-Id: I7ccea35132e83a594e8ff76693131e259ae41c28
 2018-05-20 12:35:52 -04:00
Henry Castro
6233a9b4b8 loleaflet: avoid unnecessary "map" global variable in Control.Tabs.js 
Change-Id: I699f3e9c99c82e4f7765c2870c956fa1d4b90bef
 2018-05-20 12:05:10 -04:00
Henry Castro
5cd2e2369f loleaflet: avoid unnecessary "map" global variable in Map.Keyboard.js 
Change-Id: I2e566157d468699e901c24ad0c23de501297bf2c
 2018-05-20 11:57:14 -04:00
Henry Castro
6e6b56ad1b loleaflet: avoid unnecessary "map" global variable in Control.ContextMenu.js 
Change-Id: I9c1a7b6f05537d68306bfb6c4275ca096a4c6c6b
 2018-05-20 11:51:59 -04:00
Henry Castro
ca87ac8bd5 loleaflet: avoid unnecessary "map" global variable in LokDialog.js 
Change-Id: I9172bf0ab2aa5178524b7bb5106cc7bb4cdc243d
 2018-05-20 11:30:51 -04:00
Henry Castro
76cc23c86d loleaflet: avoid unnecessary "map" global variable in Toolbar.js 
Change-Id: Ib1da71a67ee7390efda68ff87b998543ca2fde95
 2018-05-20 11:20:54 -04:00
Henry Castro
5fddb0a946 loleaflet: avoid unnecessary "map" global variable in TileLayer.js 
Change-Id: Ib3ee891b47aa742ce4a698875f613d6a500a65af
 2018-05-20 10:59:12 -04:00
Henry Castro
7b17fc3a3f loleaflet: modularize toolbar.js file 
Change-Id: Ic09d97b7f19aebec80a48161ff3f2a8c7db61328
 2018-05-20 10:13:29 -04:00
Henry Castro
a56b49daed loleaflet: add more node paths when bundling admin files 
Change-Id: I73190834b92d9ab32944b09b8bd1abe47797984d
 2018-05-19 10:27:40 -04:00
Henry Castro
58de17e87e gitignore: add more example documents 
Change-Id: I3b6400e02b00559be7cff622ba83cd126f0c30f3
 2018-05-19 09:57:24 -04:00
Michael Meeks
44e065d018 Remove test monitor. 
Change-Id: I55f93ffec68745b194a778b541db1011962f735d
 2018-05-18 18:32:57 +01:00
Michael Meeks
7475120c81 If a monitor is dis-connected, try to re-connect it. 
Change-Id: I04f254acfe823f07e7fb11b277e661c09e146ebd
 2018-05-18 17:35:19 +01:00
Michael Meeks
c5cef26fb6 Shutdown kit process if connection dies. 
Change-Id: I34e627a03a9859ccd3ae9f9925fe6ab080697b72
 2018-05-18 16:06:03 +01:00
Michael Meeks
ac0f61adad Count kits better for crash testing. 
Change-Id: Icf04d4124e2b538886c8568358e94d00baeefeb4
 2018-05-18 15:55:57 +01:00
Jan Holesovsky
06c978f0ef Don't confuse git wwhen the npm-shrinkwrap.json auto-updates. 
Change-Id: I84e4d2b57b2b8db76935e33c28b2e99129b281c6
 2018-05-18 15:49:07 +02:00
Michael Meeks
ed87891d28 Make PNG tile tests more robust. 
Change-Id: Id7afcfe9b29b2d5544e296b13f04c195d35655b5
 2018-05-18 14:32:50 +01:00
Jan Holesovsky
432a1c7d78 Split close(bool) into close() and terminate(). 
The bool flag was causing 2 complete separate code paths anyway.

Also remove stop(), calling stop() followed by close() made no
difference.

Change-Id: Ica4c887b0324390d4e006a26eb4119bd5ab08723
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
088acf5e98 Before we kill the child, check it exists, ie. kill(pid, 0) == 0. 
Also warn when anything was left out.

Without this, we leave abandoned children around.

Change-Id: I293a530ffceeb7f6bdc0cc775335c782945de6e7
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
9c790d1796 Paste: Prefer text/rtf mimetype when present. 
Change-Id: Id4bad2d6b09b3b14e64059a942a50ce61f8f4ea4
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
4e4d9719d4 Paste: Share the code with Drop, to allow rich content pasting. 
Change-Id: I4d80421786369388b8a1a094fe7633d525fa3f08
 2018-05-18 15:16:40 +02:00
Michael Meeks
fde34f6e17 Better debugging of tests. 
Change-Id: If3b3d2ad862526238bee3c092389c8cc266b24e6
 2018-05-18 15:16:40 +02:00
Michael Meeks
071079a6a9 seccomp: allow socket shutdown in kit process. 
Change-Id: Ie11f5eb278bcba8dcf13d6f095de2ffd6d23fcb3
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
6c31b7793c Post the message to the poll thread. 
Change-Id: Ibd28090a420b5396b64fdfe676bef8cf06991116
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
93cc4b4548 Use std::shared_ptr consistently. 
Change-Id: I6bf3ff7de47010fd78fab26a5a318bde21c1f153
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
6996139e5f Use correct path in the client websockets. 
Change-Id: Ie0bf6646ff3f6e6cf99b505143a416c86a3a33b8
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
98ed24257b Move the functionality from connectToMonitor() to SocketPoll. 
Change-Id: Iab2ac09638323f5e59f7a2ea0d880f52989ad64d
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
35ec3649bb Change Kit to use the new client websocket code. 
Change-Id: Ib4e62ea618da5bd8992b51165b0d7ee955c61637
 2018-05-18 15:16:40 +02:00
Jan Holesovsky
82f2f2711b websocketdump: Read the port and ssl support from the config. 
Change-Id: Ifc4566d5e1f2cdba1fd4bd7d53b359d81604083b
 2018-05-18 15:16:40 +02:00
Michael Meeks
5a94614217 Enable SSL in outbound, client websockets ... 
Switch SSL context creation to be generic rather than pure server.

Change-Id: I1b750b4ddc8c607381f5541a4f4412fa16e457d4
 2018-05-18 15:16:39 +02:00
Michael Meeks
9e7dff79f3 re-factor socket factories to take a client parameter. 
Change-Id: I0be98eb583b4f8081dd8ad23e688e93c55220367
 2018-05-18 15:16:39 +02:00
Jan Holesovsky
ca587f4070 The WebSocketHandler::handleClientUpgrade() needs to handle a Response, 
not a request.

This commit includes some fixes from Michael Meeks too.

Change-Id: I25198ded9d354a44d7718071394bcccdcabcdd94
 2018-05-18 15:16:39 +02:00
Michael Meeks
4cf2ee4fab Get ping/pong handling sorted with more isClient conditionality. 
Change-Id: I859ed5b5bcc302304e23ad3554247af920de2421
 2018-05-18 15:16:39 +02:00
Michael Meeks
80a13a1e7b More work on client / Monitor websocket connections. 
Change-Id: Ic70fe522e24f2b1863c2d9d1dd6941785510758a
 2018-05-18 15:16:39 +02:00
Michael Meeks
b483f477dd Allow a 'monitor' to be connected to remotely if configured. 
So far monitors have the access an permissions of an
authenticated admin.

Change-Id: I59dfa8a646a60584a5c113ee0521e9afba4f6b76
 2018-05-18 15:16:39 +02:00
Andras Timar
d66e8d13b7 serve files with old gith hash in their path, that comes from cached discovery.xml 
moreover:
* noCache is always true in debug mode
* when noCache is true we return an explicit "Cache-Control: no-cache" line

Change-Id: I157a410df0a90f9ab151b899e44566b95cbd9929
Reviewed-on: https://gerrit.libreoffice.org/54517
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
 2018-05-18 14:17:23 +02:00
Safir Depo
f6c7df1d0d bugfix for commit:910ae80-'wsd: to filter clientAddress before POST action.' 
Change-Id: I48e6d89fc62c6a656d9e8a74f9f5f8be1d687940
Reviewed-on: https://gerrit.libreoffice.org/54325
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
 2018-05-18 13:01:03 +02:00
Andras Timar
e96bb9e1d3 add loolsocketdump to .gitignore 
Change-Id: I55f0ad084e3929c707ffe36892cc21a6e1dd8f4c
Reviewed-on: https://gerrit.libreoffice.org/54519
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
 2018-05-18 10:48:16 +02:00
Henry Castro
28721cc1cf loleaflet: remove unused js files 
Change-Id: I3474bd9b252cfbfddd14afd2fede9da1fcc19c8d
 2018-05-17 17:27:12 -04:00
Henry Castro
486a525cdf loleaflet: debug: do not bundle the draw plugin files 
Change-Id: I022f121410eb0a3cd59b2b3b1a160ff7d244ad53
 2018-05-17 17:22:25 -04:00
Mike Kaganski
4c8a58db0e loolwsd -> wsd 
Change-Id: I2e5fa1d9729e21dbbfea4853d57c68d9dfa16f8d
Reviewed-on: https://gerrit.libreoffice.org/52920
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
 2018-05-16 06:43:10 +02:00
Michael Meeks
bb49e17e8f Start the admin thread even if it is disabled. 
The admin thread does memory cleanup as well which is required.
This also reduces logging churn.

Change-Id: I1c6cfaf6085b685f230dc24ae1716b0256d892f8
 2018-05-15 10:58:02 +01:00
Andras Timar
a121475839 add man pages to rpm 
Change-Id: I6a63e0b5ecff936d2856dce5a9b08d7bfbb64c8a
 2018-05-14 13:22:08 +02:00
Michael Meeks
41238c5d1a Restrict convert-to to known hosts - not all insert / downloads. 
Change-Id: Ief26c80bf7e9e96f3c5dce0d8739a825f6fac629
 2018-05-14 12:03:17 +01:00
Michael Meeks
98bb6f420b Make slideshow unit test more verbose. 
Change-Id: I8c9764d86962e93155421ce47f48689eb826533a
 2018-05-14 12:03:17 +01:00
Michael Meeks
adb3112820 Use inet_ntop for ipv6 address names. 
Change-Id: Ic52b69eb2dc86b6532a78d770531b2fac928fb28
 2018-05-14 12:03:17 +01:00
Andras Timar
b4209af8f6 loolsocketdump is an internal utility, not for packaging 
Change-Id: Iaab93f1820266d3fcab01fefbdc62149de0472b5
Reviewed-on: https://gerrit.libreoffice.org/54305
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
 2018-05-14 12:05:02 +02:00