Merge pull request #924 from kiwix/pdf-friendly-kiwix-serve

kiwix · Apr 5, 2023 · 453f02c · 453f02c
2 parents e13fed8 + a6659cb
commit 453f02c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/server/response.cpp b/src/server/response.cpp
@@ -412,6 +412,12 @@ ContentResponse::ContentResponse(const std::string& root, bool verbose, const st
   m_mimeType(mimetype)
 {
   add_header(MHD_HTTP_HEADER_CONTENT_TYPE, m_mimeType);
+  if ( !startsWith(m_mimeType, "application/pdf") ) {
+    add_header("Content-Security-Policy",
+               "default-src 'self' data: blob: about: chrome-extension: 'unsafe-inline' 'unsafe-eval'; "
+               "sandbox allow-scripts allow-same-origin allow-modals allow-popups allow-forms allow-downloads;");
+    add_header("Referrer-Policy", "no-referrer");
+  }
 }
 
 std::unique_ptr<ContentResponse> ContentResponse::build(

diff --git a/static/viewer.html b/static/viewer.html
@@ -2,6 +2,10 @@
 <html>
   <head>
     <meta charset="UTF-8">
+    <meta http-equiv="Content-Security-Policy"
+          content="default-src 'self' data: 'unsafe-inline' 'unsafe-eval';
+                   frame-src 'self' moz-extension: chrome-extension:;
+                   object-src 'none';">
     <title>ZIM Viewer</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link type="text/css" href="./skin/taskbar.css?KIWIXCACHEID" rel="Stylesheet" />
@@ -65,8 +69,7 @@
     </div>
 
     <iframe id="content_iframe"
-            referrerpolicy="same-origin"
-            sandbox="allow-same-origin allow-scripts"
+            referrerpolicy="no-referrer"
             onload="on_content_load()"
             src="./skin/blank.html?KIWIXCACHEID" title="ZIM content" width="100%"
             style="border:0px">