[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - wsd/LOOLWSD.cpp

[Szymon KÅ‚os (via logerrit)]

 wsd/LOOLWSD.cpp |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 1d9e02ef9b8c62c74bfa8ecc87b656d37a4deb8a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed Sep 16 16:41:09 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 16 20:07:32 2020 +0200

    Decode file name when trying to download file
    
    Simplified download process (ab162b6f9580315700a01c3bc10becd510a2ead4)
    introduced a bug. Trying to download file with eg. space in the name
    become impossible. This patch decodes the string to fix the issue.
    
    Change-Id: I8e5d98010cf098b889eddcce4ba1ce65367b15d5
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102874
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 87aad0a8bbf86502658ffcf3d0ee053af922d474)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102764
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index b1a7da739..d6c0675a0 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2879,7 +2879,10 @@ private:
 
             bool foundDownloadId = !url.empty();
 
-            const Path filePath(LOOLWSD::ChildRoot + jailId + JAILED_DOCUMENT_ROOT + url);
+            std::string decoded;
+            Poco::URI::decode(url, decoded);
+
+            const Path filePath(LOOLWSD::ChildRoot + jailId + JAILED_DOCUMENT_ROOT + decoded);
             const std::string filePathAnonym = LOOLWSD::anonymizeUrl(filePath.toString());
 
             if (foundDownloadId && filePath.isAbsolute() && File(filePath).exists())