[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - wsd/FileServer.cpp

[Libreoffice Gerrit user]

 wsd/FileServer.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 532bc18a2c7afe5cc224e07a74d593435a29e2f1
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Jan 9 10:43:55 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jan 9 13:48:02 2019 +0100

    tdf#122451 CSP: Allow all ports of known hosts
    
    Change-Id: I9cf628ffc3920c87187bac3d17e5036e3c7278fc
    Reviewed-on: https://gerrit.libreoffice.org/65998
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 9d1c6f03cad9e6aa023807031b22aba6e9df4909)
    Reviewed-on: https://gerrit.libreoffice.org/65999
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 318a9ff98..b3ac2ae2f 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -687,7 +687,7 @@ void FileServerRequestHandler::preprocessFile(const HTTPRequest& request, Poco::
     std::string frameAncestors = configFrameAncestor;
     Poco::URI uriHost(host);
     if (uriHost.getHost() != configFrameAncestor)
-        frameAncestors += " " + uriHost.getHost();
+        frameAncestors += " " + uriHost.getHost() + ":*";
 
     for (const auto& param : params)
     {
@@ -700,7 +700,7 @@ void FileServerRequestHandler::preprocessFile(const HTTPRequest& request, Poco::
             wopiFrameAncestor = uriWopiFrameAncestor.getHost();
             if (wopiFrameAncestor != uriHost.getHost() && wopiFrameAncestor != configFrameAncestor)
             {
-                frameAncestors += " " + wopiFrameAncestor;
+                frameAncestors += " " + wopiFrameAncestor + ":*";
                 LOG_TRC("Picking frame ancestor from WOPISrc: " << wopiFrameAncestor);
             }
             break;