[Libreoffice-commits] online.git: wsd/FileServer.cpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 9 09:45:46 UTC 2019
wsd/FileServer.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9d1c6f03cad9e6aa023807031b22aba6e9df4909
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Wed Jan 9 10:43:55 2019 +0100
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Jan 9 10:45:28 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>
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 10e963dc8..b1cd9af35 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -686,7 +686,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)
{
@@ -699,7 +699,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;
More information about the Libreoffice-commits
mailing list