Commit graph

5882 commits

Author SHA1 Message Date
Andras Timar
fdec71ad69 build requires /usr/include/linux/seccomp.h
Change-Id: I8277c4af56ac08f09328d3de368deb41f92c6864
2017-06-28 13:19:31 +02:00
Pranav Kant
a03f69a16a Update PostMessageOrigin if SSL termination is on too
Change-Id: I887ab368fec62a5efefde4da3762c47dd0bf66d7
Reviewed-on: https://gerrit.libreoffice.org/39100
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-26 12:32:49 +02:00
Andras Timar
f55d3583be tdf#108753 postinstall script uses setcap, package should depend on libcap2-bin
Change-Id: I60ed36ad83d31925055ff5529da89c5c93f84403
2017-06-26 11:43:23 +02:00
Ashod Nakashian
6591f219ed wsd: use logging macros and const ref where possible
Change-Id: I2f56e1887ea9193083043763d7c876bfb785a7f8
Reviewed-on: https://gerrit.libreoffice.org/39249
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-26 05:19:42 +02:00
Ashod Nakashian
8689d11f5c wsd: don't busy wait when getNewChild fails fast
If Forkit is dead, getNewChild will fail fast.

Try not to busy loop in that case and yield
the CPU for a nominal duration, which currently
is the tenth of the normal getNewChild timeout.

Change-Id: I1a94dfedbf2a4f4fc12e4d33d1307f70c307987a
Reviewed-on: https://gerrit.libreoffice.org/39248
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-26 05:18:14 +02:00
Michael Meeks
294ff36ed2 Re-factor: pass oldWid into encodePNG sub buffer.
Change-Id: I37bce07d64240aba254a0c4cbcc1804f2dd98a13
2017-06-24 13:03:28 +01:00
Pranav Kant
c21de44524 Bin unused parameter, rude
Change-Id: I39f55f55f8a0c5432350625d9720ea2367955a8c
Reviewed-on: https://gerrit.libreoffice.org/39085
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-23 10:42:55 +02:00
Pranav Kant
6c6ddbe425 Remove redundant function call
This is called later after the while loop. Breaking out of while loop
should be enough.

Change-Id: I04979d3af1f475c05b5a43d7afe47770ff69ee25
Reviewed-on: https://gerrit.libreoffice.org/39086
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-23 10:42:44 +02:00
Miklos Vajna
4faa3d5a70 net: remove unused using declarations in clientnb
Change-Id: Ifa7aed29160b49930c41f7cc465c8315bfca9992
2017-06-23 10:29:44 +02:00
Michael Meeks
d43589c343 Replace now un-used locking with thread affinity assertions.
Change-Id: I8c08d1618404740e9dc1d5ff2cb7d9d460ca2be5
2017-06-22 18:41:16 +01:00
Michael Meeks
3f59438f62 Simplify renderid generation, and re-order.
Change-Id: I3f934fdf16b1a9cf4ea00571616d9b5568535707
2017-06-22 18:41:16 +01:00
Pranav Kant
1e6c345715 loleaflet: Detach closebutton from toolbar
This is so because we require this also when document is opened in
readonly mode and we don't have any toolbar in the readonly mode.

Change-Id: I085d1640f52843e01370d528d6eea656b743d908
2017-06-22 19:48:24 +05:30
Pranav Kant
2c9966ed2f Bin unused header
Change-Id: I2067e793fe54e7c713b6d319c1f13b95a09923a3
2017-06-22 18:28:24 +05:30
Pranav Kant
2e42ae8c2f Enable HTTP key pinning when ssl termination is on too
Change-Id: Id2d7a34374236f50e28551ff9c57433d9153e2fd
2017-06-22 18:27:32 +05:30
Pranav Kant
d192fa4944 Obsolete comment
Change-Id: I30b1bcbb5c4bd040ab1205030d16867fa488bdb4
2017-06-22 12:56:23 +05:30
Miklos Vajna
ad8584f5d7 tools: initializer for base class XMLConfiguration is redundant, remove it
Also run the clang static analyzer on net/ by excluding test/, and not
explicitly listing all non-test directories.

Change-Id: Iac203f1cf9161da1c51501de8b0c3cc9dc6e2027
2017-06-22 09:03:54 +02:00
Aditya Dewan
50ea3a50b5 fix js lint error
Change-Id: I42183dc8865a6936de26e18459ab985e2f9bba1f
Reviewed-on: https://gerrit.libreoffice.org/39046
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-21 13:21:01 +02:00
Aditya Dewan
7a69dc1650 disable search as type from the dialog box for calc/impress
Change-Id: I93fa810876c405ea29521ecd90d4cf70affc7994
Reviewed-on: https://gerrit.libreoffice.org/38904
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-21 12:02:05 +02:00
Miklos Vajna
ffbe55adb5 SocketDisposition::setMove(): parameter is passed by value, move it
Change-Id: I2c7facfc4fc5422cef886c6ba28ac60c656a908e
2017-06-21 09:07:27 +02:00
Pranav Kant
202b9974d7 Bin file committed by mistake
Change-Id: I4d22a916ae0775e65f490060164e1aa343787408
2017-06-21 12:15:47 +05:30
Pranav Kant
6e46c760ce Disable Copy from calc cells and formula bar
... of course only when DisableCopy is mentioned.

Change-Id: Ia47c403a437384c673364f500c2137f54c1f4bad
2017-06-21 12:14:09 +05:30
Michael Meeks
73a87493f0 Use WireIds instead of long hashes to identify tiles efficiently.
Changes protocol to use 'wid' instead of 'hash' everywhere. Wire-ids
are monotonically increasing integers that can be mapped to hash
values for all of the hash values and tiles we cache internally.

Change-Id: Ibcb25817bab0f453e93d52a6f99d3ff65059e47d
2017-06-20 21:49:44 +01:00
Michael Meeks
8fb48811ec Protocol - only match complete token names.
Change-Id: I027e29da8cc6c48a0d896fa41516934a3ff71b43
2017-06-20 21:49:44 +01:00
Pranav Kant
b36e79f173 Document custom button API
Change-Id: I67b29052ed9f140d82b8f93289fc9704892517c5
2017-06-20 18:56:30 +05:30
Pranav Kant
483f600f22 Its Host_PostmessageReady, not Host_PostMessageReady according to specs
https://wopi.readthedocs.io/en/latest/scenarios/postmessage.html

Change-Id: Id01b84417dbc8f9226cab05c08e0d566f0305534
2017-06-20 18:56:30 +05:30
Pranav Kant
2abf2421f3 Warn users if they try to use post message API incorrectly
Change-Id: I09ce1a14587f558765e02fc8197030f4a5d2cee0
2017-06-20 18:56:30 +05:30
Pranav Kant
8ca5efb671 Make this custom button's css consistent with other toolbar images
Change-Id: I39158d634eb5fbe0ce54cb4e5f6be3d01982b074
2017-06-20 18:56:30 +05:30
Andras Timar
e212484668 loleaflet: Updated pot file
Change-Id: I779b18d5f7705c88e00cd81bb3848781c579051b
2017-06-20 10:18:56 +02:00
Andras Timar
f06d3ecc4e loleaflet: Find & Replace dialog l10n
Change-Id: Ia81c557f97fa9a3542462169455c555c87599b43
2017-06-20 10:16:46 +02:00
Miklos Vajna
11f5c6759e test: fix clang -Werror,-Winconsistent-missing-override
Change-Id: Id3d8f979502de3e805d75a94da610543d935909a
2017-06-20 09:34:16 +02:00
Ashod Nakashian
bc067c7b29 wsd: always prespawn children when creating forkit
Also, no need for the DocBrokerMutex to be locked
in createForkit.

Change-Id: I651c50c8b5518f7b0ee0d8b15c413fc070e30443
Reviewed-on: https://gerrit.libreoffice.org/38993
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-20 05:16:54 +02:00
Ashod Nakashian
c28992758d wsd: avoid deadlock when restoring forkit
LOOLWSD::checkAndRestoreForKit() eventually takes
NewChildrenLock, which is also taken in getNewChild_Blocks().

Luckily, we can defer that to the Prisoner poll, which we do.

Change-Id: Ib65c0be08870d1c4c68efd72192dac2e73c79f7c
Reviewed-on: https://gerrit.libreoffice.org/38992
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-20 05:16:23 +02:00
Ashod Nakashian
7ae37aff0d wsd: fix access-after-free error
Valgrind spotted one case, and the other is possible but
not common it seems.

Change-Id: Id5e41145f597c3564263adb25b7b765db1c90bf7
Reviewed-on: https://gerrit.libreoffice.org/38991
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-20 05:15:29 +02:00
Michael Meeks
7f08458d95 Make the slideshow SVG validation somewhat less lame.
Change-Id: Ie4853359ba3b43aabe629d0dcabb635d260627b6
2017-06-19 17:27:10 +01:00
Pranav Kant
c88780b2d4 wsd: Don't show dialog if document is unmodified
Change-Id: Ibb9e2122461c577863d1f713070748bdda6129d1
2017-06-19 20:01:31 +05:30
Pranav Kant
a24475f5dd .gitignore tags files
Change-Id: I004e55ed6b2ba94071824c95a6c4d508f9c56ef8
2017-06-19 20:01:31 +05:30
Miklos Vajna
902411e2ec test: make sure own header is self-contained
By including it before anything else.

Change-Id: I0fa37dcee7828a05e3ba7aac4eec3b63d1203468
2017-06-19 14:55:22 +02:00
Ashod Nakashian
323e2789b9 loleaflet: Allow users to repair at all times
Since during an edit conflict the undo/redo
buttons are dissabled (for the user who can't
undo/redo anymore) disabling the repair button
robs them of the ability to repair the document
to an earlier state (i.e. before the conflict).

This enables the repair button as soon as either
the undo or redo is enabled, whereupon it remains
enabled for the duration of the session.

Change-Id: Ibaf257155f721e2cef596e965d8812d381ab3a5b
Reviewed-on: https://gerrit.libreoffice.org/38942
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-19 07:25:27 +02:00
Henry Castro
c24585741d fix compilation errors with --disable-ssl option
Change-Id: I777f0ebf054db0a5fd2c64e6d56a222826b40045
2017-06-18 14:21:33 -04:00
Michael Meeks
7b90179fe8 Check for spare space in the right place.
ie. destination not source of the local file.

Change-Id: I4d4c4e56deb039a44d8c2ab2886b8ca52bdb2ef8
2017-06-16 20:25:23 +01:00
Michael Meeks
7ea5f71a7b Units: allow filtering of user alerts.
Catch things that kill tests like disk-full earlier.

Change-Id: Ib50b516063305f2fc93b662ec3ad9ab6c52c6c92
2017-06-16 20:25:23 +01:00
Pranav Kant
db13014e00 Update modifiedTime for local files unconditionally
Also teach logger to print timestamp object.

Change-Id: Ia13836814c195cef92f5dafd8245c9958600876d
2017-06-16 19:49:37 +05:30
Aditya Dewan
681138ab54 tdf#106451 admin: graph to monitor network activity
Change-Id: Id71ef4e2a9d16e72f4df442fbf646a39213b61d5
Reviewed-on: https://gerrit.libreoffice.org/38621
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-16 09:55:01 +02:00
Miklos Vajna
de785d90b2 test: give the socket the chance to get the error in getErrorCode()
make check fails for me like this:

Test name: HTTPCrashTest::testCrashKit
equality assertion failed
- Expected: 1001
- Actual  : 65535

Failures !!!
Run: 1   Failure total: 1   Failures: 1   Errors: 0

But when I run loolwsd and ./test manually (./test is invoked by gdb) and I
step through the code, then the test passes. So I guess what happens is that we
read from the socket too fast, and the error we're looking for is just not
there yet. Add the same amount of sleep here (0.5s) than what's used in
connectLOKit(), with that the test passes fine.

(The sleep is in test-only code.)

Change-Id: Iff105c45f21c40c2fb0a649fc9fd9a9065e7c952
Reviewed-on: https://gerrit.libreoffice.org/38846
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2017-06-16 07:47:20 +02:00
Ashod Nakashian
67a9300514 Revert "loleaflet: Shorten the docuri in the websocket request."
No WOPI doc can be loaded with this patch as the URL is all wrong
and the access_token missing.

This reverts commit ad8b437360cd0b7a95fd587f7b17d4cf1f385ca1.

Change-Id: Icced96564e61eb137c1620a7fb7e66c5ef8e5a5b
Reviewed-on: https://gerrit.libreoffice.org/38810
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 2fc7d50607b14df8ad8055e6d74a9c7970db1ae0)
Reviewed-on: https://gerrit.libreoffice.org/38822
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-15 11:57:15 +02:00
Jan Holesovsky
3a1aa4cd9c loleaflet: Shorten the docuri in the websocket request.
Change-Id: Ia0eed46930930e013a5eeee1c25161a2745f3188
Reviewed-on: https://gerrit.libreoffice.org/38798
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-14 18:29:57 +02:00
Jan Holesovsky
ca1b3e7ec7 discovery: Add bmp as read-only type too.
Change-Id: I42f21bab6f8d4ba24580f6d6e4a3a1dd5cd57811
Reviewed-on: https://gerrit.libreoffice.org/38782
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-14 14:02:32 +02:00
Jan Holesovsky
4f89ce23b2 wsd: Honor the hosting/discovery read-only setting in LocalStorage too.
To make the debugging easier...

Change-Id: I7c6e748e72a595a6c3a5942a20874339b8456f19
Reviewed-on: https://gerrit.libreoffice.org/38781
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2017-06-14 14:02:23 +02:00
Aditya Dewan
b833f9c935 tdf#97020 follow up | heading/label not selectable now
Change-Id: I49650ee93269709885419f3accba3d95475aed59
Reviewed-on: https://gerrit.libreoffice.org/38586
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: pranavk <pranavk@collabora.co.uk>
2017-06-14 07:31:02 +02:00
Pranav Kant
b4ff02cacd loleaflet: Also show scrollbar on hover
Better to add our own class and then add/remove it instead of messing up
with original CSS rules.

Change-Id: I45cf2a566d51fe8e7d9b009c4c9d86b97354ffd1
2017-06-13 18:13:29 +05:30