commit 9d1c6f03cad9e6aa023807031b22aba6e9df4909
author Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Wed Jan 09 10:43:55 2019 +0100
committer Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Wed Jan 09 10:45:28 2019 +0100
tree b8ff2b8619bbe0876613b53dc014ff696619d2e7
parent c377ca3fb2d1e28646bf64b38a641bc07ffb6bc4

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@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

wsd/FileServer.cpp

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 10e963d..b1cd9af 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -686,7 +686,7 @@
    std::string frameAncestors = configFrameAncestor;
    Poco::URI uriHost(host);
    if (uriHost.getHost() != configFrameAncestor)
        frameAncestors += " " + uriHost.getHost();
        frameAncestors += " " + uriHost.getHost() + ":*";

    for (const auto& param : params)
    {
@@ -699,7 +699,7 @@
            wopiFrameAncestor = uriWopiFrameAncestor.getHost();
            if (wopiFrameAncestor != uriHost.getHost() && wopiFrameAncestor != configFrameAncestor)
            {
                frameAncestors += " " + wopiFrameAncestor;
                frameAncestors += " " + wopiFrameAncestor + ":*";
                LOG_TRC("Picking frame ancestor from WOPISrc: " << wopiFrameAncestor);
            }
            break;