X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Fcsp.ts;h=404e33b43c503193ce4cea3654dfc5d0e0995663;hb=2c3abc4fa796555eb7d25f416c4f41ab3e3ad8ca;hp=a0ed3710b525e4716c545374ba6111a6548ac1db;hpb=5e755fff9d70a7fd3c4f85bb524f1b774dd85b25;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/middlewares/csp.ts b/server/middlewares/csp.ts
index a0ed3710b..404e33b43 100644
--- a/server/middlewares/csp.ts
+++ b/server/middlewares/csp.ts
@@ -8,33 +8,30 @@ const baseDirectives = Object.assign({},
     mediaSrc: ["'self'", 'https:', 'blob:'],
     fontSrc: ["'self'", 'data:'],
     imgSrc: ["'self'", 'data:'],
-    scriptSrc: ["'self' 'unsafe-inline'"],
+    scriptSrc: ["'self' 'unsafe-inline' 'unsafe-eval'"],
     styleSrc: ["'self' 'unsafe-inline'"],
-    // objectSrc: ["'none'"], // only define to allow plugins, else let defaultSrc 'none' block it
+    objectSrc: ["'none'"], // only define to allow plugins, else let defaultSrc 'none' block it
     formAction: ["'self'"],
     frameAncestors: ["'none'"],
     baseUri: ["'self'"],
-    pluginTypes: ["'none'"],
     manifestSrc: ["'self'"],
     frameSrc: ["'self'"], // instead of deprecated child-src / self because of test-embed
-    workerSrc: ["'self'"], // instead of deprecated child-src
-    upgradeInsecureRequests: true
+    workerSrc: ["'self'", 'blob:'] // instead of deprecated child-src
   },
-  (CONFIG.SERVICES['CSP-LOGGER'] != null) ? { reportUri: CONFIG.SERVICES['CSP-LOGGER'] } : {}
+  CONFIG.CSP.REPORT_URI ? { reportUri: CONFIG.CSP.REPORT_URI } : {},
+  CONFIG.WEBSERVER.SCHEME === 'https' ? { upgradeInsecureRequests: true } : {}
 )
 
 const baseCSP = helmet.contentSecurityPolicy({
   directives: baseDirectives,
   browserSniff: false,
-  reportOnly: true
+  reportOnly: CONFIG.CSP.REPORT_ONLY
 })
 
 const embedCSP = helmet.contentSecurityPolicy({
-  directives: Object.assign(baseDirectives, {
-    frameAncestors: ['*']
-  }),
+  directives: Object.assign({}, baseDirectives, { frameAncestors: ['*'] }),
   browserSniff: false, // assumes a modern browser, but allows CDN in front
-  reportOnly: true
+  reportOnly: CONFIG.CSP.REPORT_ONLY
 })
 
 // ---------------------------------------------------------------------------