[Libreoffice-commits] online.git: 3 commits - loolwsd/LOOLWSD.cpp loolwsd/Makefile.am loolwsd/README.vars

[Michael Meeks]

 loolwsd/LOOLWSD.cpp |    6 +++++-
 loolwsd/Makefile.am |    3 +++
 loolwsd/README.vars |   33 +++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

New commits:
commit 0534c511f09a90587a2e0201442f41574b6d4377
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Mar 29 12:24:12 2016 +0100

    First cut documentation on environment variables.

diff --git a/loolwsd/README.vars b/loolwsd/README.vars
new file mode 100644
index 0000000..80bf3b5
--- /dev/null
+++ b/loolwsd/README.vars
@@ -0,0 +1,33 @@
+* Brief description of environment variables *
+
+LOOL_DEBUG              <set/unset>
+	if set handles a fatal signal by printing a message
+	containing the PID and waiting 30 seconds to allow
+	a 'sudo gdb' to be attached.
+
+LOOL_LOGCOLOR           <set/unset>
+        if set generates logging information containing
+	console color codes.
+
+LOOL_LOGLEVEL           <level>
+        set the log level & verbosity to <level> - values of
+	<level> are one of:
+		none (turns off logging), fatal, critical,
+		error, warning, notice, information, debug,
+		trace
+
+LOK_FORK                <set/unset>
+	set this to enable forking instead of execve'ing of LOK
+	instances.
+
+LOK_NO_PREINIT          <set/unset>
+        set this to disable pre-initialization of LOK instances.
+
+SLEEPFORDEBUGGER        <seconds to sleep>
+        sleep <n> seconds while launching processes in order to
+        allow a 'sudo gdb' session to 'attach <pid>' to them.
+
+SLEEPKITFORDEBUGGER      <seconds to sleep>
+        sleep <n> seconds after launching (or forking) each
+        LibreOfficeKit instance, to allow a 'sudo gdb' session
+        to attach and debug that process.
commit c5ef3ec4b1897631030404859ac797982014617f
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Mar 29 12:18:30 2016 +0100

    Don't take loolwsd down with an assert on bad input.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 76e27cb..b113200 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -749,7 +749,11 @@ public:
     void handleRequest(HTTPServerRequest& request, HTTPServerResponse& response) override
     {
         assert(request.serverAddress().port() == MASTER_PORT_NUMBER);
-        assert(request.getURI().find(CHILD_URI) == 0);
+        if (request.getURI().find(CHILD_URI) != 0)
+        {
+            Log::error("Invalid request URI: [" + request.getURI() + "].");
+            return;
+        }
 
         std::string thread_name = "prison_ws_";
         try
commit b4997439323aaf646fdf827b728f734334631554
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Mar 25 18:02:42 2016 +0000

    Print what is done for capabilities.

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 28513ab..98c50b6 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -53,4 +53,7 @@ all-local: loolbroker loolkit
 	if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
 	    sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolbroker; \
 	    sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
+	    echo "Set required capabilities"; \
+	else \
+	    echo "Skipping capability setting"; \
 	fi