[Libreoffice-commits] online.git: 2 commits - loleaflet/dist wsd/FileServer.cpp

[Pranav Kant]

 loleaflet/dist/admin/admin.html |    2 +-
 wsd/FileServer.cpp              |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 54ea43602604a1d111e35e6efef3d76cc8386e70
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

diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 076b405c..03e897ed 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -518,7 +518,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]
commit f54a0f6a303396857283e89613d8dc1b2b2c27f5
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Jun 8 16:44:38 2017 +0530

    admin-console: Spread the tabbed view to full width
    
    Change-Id: Id34829d0b4c8220690e1ce47baed4b41b6696e7e

diff --git a/loleaflet/dist/admin/admin.html b/loleaflet/dist/admin/admin.html
index 4bbc063f..62be8e56 100644
--- a/loleaflet/dist/admin/admin.html
+++ b/loleaflet/dist/admin/admin.html
@@ -86,7 +86,7 @@
 	      <h4><script>document.write(l10nstrings.strRecvBytes)</script></h4>
 	    </div>
 	  </div>
-    <div class="container">
+    <div class="container-fluid">
       <ul class="nav nav-tabs">
       <li class="active">
         <a href="#view1" data-toggle="tab">