[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/FileServer.cpp

Pranav Kant pranavk at collabora.co.uk
Mon Jun 12 10:41:00 UTC 2017


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

New commits:
commit 51196ee92fceebc8a3461eddb7f5b9f9efef5b4c
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Sat Jun 10 19:26:17 2017 +0530

    CSP - Add object-src: , this is required for printing documents
    
    Change-Id: I4a759086f2b503dfa9df4000267d920984cfe422
    (cherry picked from commit 54ea43602604a1d111e35e6efef3d76cc8386e70)
    Reviewed-on: https://gerrit.libreoffice.org/38688
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 7c975d1b..b8609823 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -390,7 +390,8 @@ void FileServerRequestHandler::preprocessFile(const HTTPRequest& request, Poco::
            << "connect-src 'self' " << host << "; "
            << "script-src 'unsafe-inline' 'self'; "
            << "style-src 'self' 'unsafe-inline'; "
-           << "font-src 'self' data:; ";
+           << "font-src 'self' data:; "
+           << "object-src blob:; ";
 
     std::string frameAncestor;
     const auto it = request.find("Referer"); // Referer[sic]


More information about the Libreoffice-commits mailing list