[Libreoffice-commits] online.git: wsd/FileServer.cpp

[Andras Timar]

 wsd/FileServer.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f59930e7feb15556162e6ab8ece6e2901efd18b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Apr 30 22:10:57 2018 +0200

    do not allow empty admin console user or password
    
    Change-Id: I3dfb74f62c53d8c7ab80094d4831203d065f0b4c
    Reviewed-on: https://gerrit.libreoffice.org/53673
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index b4c66056b..c84859064 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -191,7 +191,7 @@ bool FileServerRequestHandler::isAdminLoggedIn(const HTTPRequest& request,
 
     bool authenticated = false;
 
-    if (userProvidedUsr == user && userProvidedPwd == pass)
+    if (userProvidedUsr == user && userProvidedPwd == pass && !user.empty() && !pass.empty())
     {
         authenticated = true;
     }