Commit graph

100 commits

Author SHA1 Message Date
Jan Holesovsky
e79f5f7ec6 android: Create the html, js and css and copy it to the right place.
Change-Id: I3efbba0ae369387796e2d08b3003e4f469610dda
2019-02-13 13:22:25 +01:00
Miklos Vajna
d11056deaa test: use the more effective overload accepting a character for find_last_of()
Instead of the one that takes a string literal consisting of a single
character.

Also remove the clang-tidy target, 'run-clang-tidy' does a better job of
doing the same today.

Change-Id: I58f55a0e64af42694d55f9588f25618164275852
2019-01-23 09:06:04 +01:00
Tomaž Vajngerl
73c8fa9d09 Extract Authorization out of Auth and put it into common
This is needed so we can use this inside ChildSession.

Change-Id: I88f2cc767412fd52dbb242938f0f9897d4277639
Reviewed-on: https://gerrit.libreoffice.org/63836
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
2018-11-29 21:47:13 +01:00
Rene Engelhard
f4dc010395 add net/FakeSocket.hpp to Makefile.am, otherwise missing in the tarball 2018-11-21 20:43:10 +01:00
Andras Timar
2bf384cac0 Convert wsd/reference.txt to Markdown format
Change-Id: I393a74337293e376b6458a9cc05ba1d8b748e0d3
2018-11-07 21:25:25 +01:00
Andras Timar
c50cd3b550 take hello-world.ods and hello-world.odp out of version control
Change-Id: I108e1a0e0981a50f35c7637f00fa15f8cf9d33c3
Reviewed-on: https://gerrit.libreoffice.org/62725
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-11-01 11:39:43 +01:00
Tor Lillqvist
03e2c6c54e Avoid automake warning about ETAGS 2018-10-30 12:13:35 +02:00
Andras Timar
c599fcdb66 add webserver config snippets to distribution tarball
Change-Id: Id8b782ab534f9534cde28b4c9a26dcbfddf8f835
2018-10-27 14:47:45 +02:00
Tor Lillqvist
f122e92977 Build the GTK+ testbed app using autofoo
Rename the gtk/gtk.h file to gtk/gtk.hpp to not have it confused with
the actual GTK+ <gtk/gtk.h>.
2018-10-17 11:00:28 +03:00
Tor Lillqvist
cc2bfc9770 Build just loleaflet in the --enable-gtkapp case, too
When I fix the gtk+ testbed app to use autofoo, that subdirectory will
be built, too.
2018-10-17 02:10:14 +03:00
Tor Lillqvist
1ae4a32067 Factor out loleaflet/dist construction for iOS app building
The idea is that on a Linux box you have a tree of online that you
configure with --enable-iosapp. Then running 'make' there will only
create the stuff in loleaflet/dist. That loleaflet/dist can then be
copied to the Mac where you build the iOS app.

(To me, this approach seemed for now simpler than to get all the
PKG_CONFIG etc stuff working that running configure normally requires,
and run all the node, npm, and associated crack, on a Mac.)

Change-Id: Id2e495d0521922d0666fdab5fdcb5fcd460136f1
2018-09-03 17:10:19 +03:00
Ashod Nakashian
184b717cd7 wsd: make loolmount before setcap on it
Change-Id: Ide93a347513d85d0c6349f364b3a28127e3d2882
Reviewed-on: https://gerrit.libreoffice.org/58298
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-08-23 09:51:02 +02:00
Jan Holesovsky
1f5d779ef8 Fix systemplate creation when running make with -j.
Change-Id: Ifcf45b01fdba9b502b1a88190d6a0d4cb316c566
2018-08-03 05:29:27 +02:00
Jan Holesovsky
6ab7acc6d6 wsd: Kill --nocaps, and use --o:security.capabilities="false" instead.
The --nocaps apparently stopped working when the security.capabilities was
introduced.

Change-Id: Ieee173e97b62eb4e254667bd105826486e6bdbcb
2018-08-03 05:20:56 +02:00
Tor Lillqvist
b152e021b3 Drop noise output
Make prints the sudo setcap commands it executes, no need to
additionally echo "Set required capabilities".

Especially as "set" can be misunderstood as being in the imperative
mood, telling the developer to do something, instead of being past
tense telling what was done on the previous line.

Change-Id: I1138fa28a4d08b57d55552d0e012dcfd778b423c
2018-07-12 11:46:56 +03: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
Andras Timar
ecce256f05 Add man pages for installed binaries/scripts
Change-Id: I62c0fd29ab2b8e92522514010f4aa4981edc10cc
Reviewed-on: https://gerrit.libreoffice.org/54306
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-14 12:04:41 +02:00
Andras Timar
bb834b8a86 typo: TILECHACHE_PATH -> TILECACHE_PATH
Change-Id: I740a254d1bc7e4a21f6e48ef5f8f5c933bf7c617
2018-05-09 21:31:26 +02:00
Andras Timar
04feab241f use local tile cache directory for tests
Change-Id: I4c66a45df93bee22131c5950029cffa863d397b0
Reviewed-on: https://gerrit.libreoffice.org/54028
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-09 15:29:28 +02:00
Andras Timar
7c3322e7e0 do not distribute unused or internal dev tool binaries: loolmap, loolmount, loolstress
Change-Id: Ice905d08a695805f594df5731039f747ac88cf28
Reviewed-on: https://gerrit.libreoffice.org/54027
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-09 15:28:19 +02:00
Andras Timar
8481602061 rename looltool to loolconvert
Change-Id: I9e87c4a142bf63a8a7494861457660ab243e0924
Reviewed-on: https://gerrit.libreoffice.org/54025
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2018-05-09 15:25:38 +02:00
Jan Holesovsky
737d0beea4 Targed for running loolwsd under gdb.
Change-Id: Id3e946f90b7e61d67b2cee34276a58501380b96d
Reviewed-on: https://gerrit.libreoffice.org/53447
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2018-04-25 13:50:24 +02:00
Michael Meeks
f68d54e02a Initial websocket test tool for remote admin connections.
Change-Id: I8be2068bf7d77c70720a044556d11f5fc80b2f0c
2018-04-17 16:50:48 +01:00
Michael Meeks
81fd84cf4e Move UnitHTTP code to header to avoid linking trouble.
Change-Id: I430110e840fa8b3862c21c1d4e02288ed704e0a3
2018-04-17 16:50:48 +01:00
Michael Meeks
8f134aa1a9 Allow running without seccomp and capabilities.
There are some significant security trade-offs here which are now
at least configurable.

Change-Id: I1d879d69e91392f4ccf5db250a2277f53df60db7
2018-03-19 20:46:17 +00:00
Andras Timar
04539cc00c Revert "enable make parallelism"
Bad idea, 'make check' does not tolerate parallelism.

This reverts commit 2e4ecfaf44.
2018-03-09 12:49:02 +01:00
Andras Timar
2c95332d66 add JsonUtil.hpp to dist tarball
Change-Id: I41d1e56ff817142670caafb4a260b76f8f0003f9
2018-03-07 12:18:57 +01:00
Andras Timar
2e4ecfaf44 enable make parallelism
Change-Id: Ie16a450bee6d718d8daf58194fbbd7dfd1ac2f38
Reviewed-on: https://gerrit.libreoffice.org/50470
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-02-28 09:35:04 +01:00
Andras Timar
8aa4a5145c wsd: handle request for robots.txt
Change-Id: Ib82db2ee8c878e6a61b62b49ceaeb72e2d05718d
Reviewed-on: https://gerrit.libreoffice.org/49819
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-02-15 15:45:09 +01:00
Christian Glombek
51993b8990 Adds ENABLE_SETCAP build variable to avoid using env in build system.
Change-Id: Id38d2225238f8b3a48481a08e62cfa7544958cc9
Reviewed-on: https://gerrit.libreoffice.org/49097
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-02-04 22:27:09 +01:00
Jan Holesovsky
0039f3c041 Add run-strace target for easy stracing.
Change-Id: I554cfa3965784803430a4cc2c12e61002e2445cd
2018-01-26 20:40:17 +01:00
Andras Timar
a2e25cc7d3 Add PAM support
Possibilities are endless. With a simple /etc/pam.d/loolwsd config below,
the user which runs loolwsd ('lool' in production environment) can login
to admin console with normal linux password.

    auth       required     pam_unix.so
    account    required     pam_unix.so

Change-Id: I354a7e9b4705e8fe346d17d6b6041d1406198b37
Reviewed-on: https://gerrit.libreoffice.org/48307
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2018-01-23 11:03:45 +01:00
Andras Timar
2fc03ffb9e add scripts/unocommands.py to tarball
Change-Id: I548ff5c076a66281497f419574e2a21aaf073e75
(cherry picked from commit ec80b91ca9bc7d4d469a786314f7223a6c329eb6)
2018-01-05 14:14:16 +01:00
Pranav Kant
193cb33afc Use ctags for emacs TAGS file too
So that we can use same arguments for both. `etags` binary is also
supplied on some systems by emacs-common package which doesn't
understand ctag like arguments. Best to use one program for all.

Change-Id: I22b57a43f7688c96c9e138e5783ee4157a34a172
2017-12-15 00:22:15 +05:30
Rene Engelhard
276e7d640f add missing kit/Delta.hpp to kit_header 2017-11-28 01:34:18 +01:00
Jan Holesovsky
783e3552c0 Support key logic in loolws + improvements in loolconfig.
To be able to set the support key directly from the command line, and to show
the option, etc.

Change-Id: Iac93bc47a6f4b9d5a5ad0ac8b06bda978e01b760
Reviewed-on: https://gerrit.libreoffice.org/43098
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
2017-10-06 11:37:18 +02:00
Michael Meeks
79053911fc Support key logic and verification.
Change-Id: Ie55150b99df3e80239236571af185502196ad3e9
Reviewed-on: https://gerrit.libreoffice.org/43097
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 56385cb8ac2a57af4eb70bc8bc7313a9299533c3)
Reviewed-on: https://gerrit.libreoffice.org/43099
2017-10-03 21:52:45 +02:00
Andras Timar
67ebb9a48e add test/WopiTestServer.hpp to Makefile.am
Change-Id: I9a4b10f0d1f12ed85d31f3dbbc1deb747ff35a2d
2017-09-27 16:37:30 +02:00
Miklos Vajna
3f24872971 clang-tidy: invoke this in parallel
The moreutils-parallel package provides this command (at least on
openSUSE).

Change-Id: I53ec59c2e886f651676f6e64a16215793a917b73
2017-08-16 17:02:04 +02:00
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
Henry Castro
c24585741d fix compilation errors with --disable-ssl option
Change-Id: I777f0ebf054db0a5fd2c64e6d56a222826b40045
2017-06-18 14:21:33 -04:00
Andras Timar
865cd4a79d loolnb was killed earlier
Change-Id: Ie4b1f3c890c59a8b9204af5a25842c74929ecad8
Reviewed-on: https://gerrit.libreoffice.org/38314
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2017-06-06 13:11:10 +02:00
László Németh
51840fcb36 wsd: add test.hpp to dist tarball
Change-Id: I378fb4ac6db79f5ef661cfb8ecef2a7e5c10dfc5
2017-06-06 12:14:43 +02:00
Pranav Kant
9bd89e89c3 loolconfig: tool to generate admin password hash with PBKDF2
A normal usage to set the admin password would be like :

loolconfig set-admin-password --config-file ./loolwsd.xml

Other command line options can also be given, like --pwd-salt-length,
--pwd-hash-length, --pwd-iterations.

Change-Id: I2a6f8d25e068b53a3f945426f0779c8410b2c8ba
2017-05-25 01:18:31 +05:30
Michael Meeks
c04e4ffa16 loolnb - kill obsolete test app.
Change-Id: I5943cc0752f16d62d6eedf96351bb6f71a2311e6
2017-05-05 18:53:00 +01:00
Andras Timar
7c637d9b8a add loolwsd documentation to distribution
Change-Id: I18ebfff9eb4a87abd311086d6780514293ce6c7a
2017-05-04 11:54:33 +02:00
Michael Meeks
7f4f752667 Initial seccomp work.
Add a list of unhelpful looking system calls to improve containment.

Change-Id: I2e4bf3e0a6a752d427299728663d17120586bb10
2017-04-28 14:26:21 +01:00
Jan Holesovsky
848145503b Distribute the git hash for easier identification.
Change-Id: I57084231d0878de15b4b0478122f49e94af563bf
2017-04-28 11:54:38 +02:00
Michael Meeks
1c7f94045a Initial DelaySocket goodness. 2017-04-22 18:42:16 +01:00
Andras Timar
d0e6c1115b missing loolwsd.service from deb package
(cherry picked from commit fe62f43eb6622118c4f507b72234757b25d466f4)
2017-04-07 16:39:32 +02:00