[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - 2 commits - loleaflet/src wsd/LOOLWSD.cpp

[Jan Holesovsky (via logerrit)]

 loleaflet/src/control/Toolbar.js |    3 ++-
 wsd/LOOLWSD.cpp                  |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9f830d3f9d96999b83d4a57d9ab03610cf41abde
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Jun 5 21:36:24 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 8 23:49:30 2020 +0200

    One more check that should be overriden with --disable-lool-user-checking.
    
    Change-Id: I3f0170775abad34b2b9de2078410d00d46853ad9
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95619
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 12898f506..457e109b5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -852,7 +852,7 @@ LOOLWSD::~LOOLWSD()
 void LOOLWSD::initialize(Application& self)
 {
 #if !MOBILEAPP
-    if (geteuid() == 0)
+    if (geteuid() == 0 && CheckLoolUser)
     {
         throw std::runtime_error("Do not run as root. Please run as lool user.");
     }
commit d8a7d443b687791fb13ea3abe7a846ffe1170838
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Jun 8 08:00:31 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Jun 8 23:49:21 2020 +0200

    Allow to open word count in readonly mode
    
    Change-Id: I1277dc815c2cee7e133a2c283e1e7bab9bb4a174
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95786
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 11f07f8f6..fdeec58af 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -157,7 +157,8 @@ L.Map.include({
 	},
 
 	sendUnoCommand: function (command, json) {
-		if (this._permission === 'edit') {
+		var isAllowedInReadOnly = command == '.uno:WordCountDialog';
+		if (this._permission === 'edit' || isAllowedInReadOnly) {
 			this._socket.sendMessage('uno ' + command + (json ? ' ' + JSON.stringify(json) : ''));
 		}
 	},