From 60cd27c347b712c0a3dc78f2b80dbe844f68c69a Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 1 Jan 2018 13:53:20 -0500
Subject: [PATCH] code review for 821e45751a2dff18: simplify

---
 src/js/background.js          |  3 +--
 src/js/contentscript-start.js |  3 +--
 src/js/traffic.js             | 28 +++++++++++-----------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/js/background.js b/src/js/background.js
index 96e82b9..50d18f8 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -110,9 +110,8 @@ return {
     },
 
     clearBrowserCacheCycle: 0,
-    cspNoInlineScript: undefined,
+    cspNoInlineScript: "script-src 'unsafe-eval' blob: *; report-uri about:blank",
     cspNoWorker: undefined,
-    cspReportURI: 'about:blank',
     updateAssetsEvery: 11 * oneDay + 1 * oneHour + 1 * oneMinute + 1 * oneSecond,
     firstUpdateAfter: 11 * oneMinute,
     nextUpdateAfter: 11 * oneHour,
diff --git a/src/js/contentscript-start.js b/src/js/contentscript-start.js
index 3b74e51..ca2a65c 100644
--- a/src/js/contentscript-start.js
+++ b/src/js/contentscript-start.js
@@ -32,13 +32,12 @@
 
     vAPI.reportedViolations = vAPI.reportedViolations || new Set();
 
-    var cspReportURI = 'about:blank';
     var reportedViolations = vAPI.reportedViolations;
 
     var handler = function(ev) {
         if (
             ev.isTrusted !== true ||
-            ev.originalPolicy.includes(cspReportURI) === false
+            ev.originalPolicy.includes('about:blank') === false
         ) {
             return false;
         }
diff --git a/src/js/traffic.js b/src/js/traffic.js
index b88fb35..cbe4f46 100644
--- a/src/js/traffic.js
+++ b/src/js/traffic.js
@@ -300,23 +300,15 @@ var onHeadersReceived = function(details) {
     if ( tabContext === null ) { return; }
 
     var csp = [],
-        cspReport = [];
+        cspReport = [],
+        rootHostname = tabContext.rootHostname,
+        requestHostname = µm.URI.hostnameFromURI(requestURL);
 
     // If javascript is not allowed, say so through a `Content-Security-Policy`
     // directive.
     // We block only inline-script tags, all the external javascript will be
     // blocked by our request handler.
-    if ( µm.cspNoInlineScript === undefined ) {
-        µm.cspNoInlineScript =
-            "script-src 'unsafe-eval' blob: *;report-uri " + µm.cspReportURI;
-    }
-    if (
-        µm.mustAllow(
-            tabContext.rootHostname,
-            µm.URI.hostnameFromURI(requestURL),
-            'script'
-        ) !== true
-    ) {
+    if ( µm.mustAllow(rootHostname, requestHostname, 'script' ) !== true ) {
         csp.push(µm.cspNoInlineScript);
     } else {
         cspReport.push(µm.cspNoInlineScript);
@@ -326,12 +318,11 @@ var onHeadersReceived = function(details) {
     // https://bugzilla.mozilla.org/show_bug.cgi?id=1231788
     if ( µm.cspNoWorker === undefined ) {
         µm.cspNoWorker = vAPI.webextFlavor.startsWith('Mozilla-') ?
-            "child-src 'none'; frame-src data: blob: *;report-uri " :
-            "worker-src 'none';report-uri " ;
-        µm.cspNoWorker += µm.cspReportURI;
+            "child-src 'none'; frame-src data: blob: *; report-uri about:blank" :
+            "worker-src 'none'; report-uri about:blank" ;
     }
 
-    if ( µm.tMatrix.evaluateSwitchZ('no-workers', tabContext.rootHostname) ) {
+    if ( µm.tMatrix.evaluateSwitchZ('no-workers', rootHostname) ) {
         csp.push(µm.cspNoWorker);
     } else {
         cspReport.push(µm.cspNoWorker);
@@ -346,7 +337,10 @@ var onHeadersReceived = function(details) {
         if ( i !== -1 ) {
             headers[i].value += ',' + cspDirectives;
         } else {
-            headers.push({ name: 'Content-Security-Policy', value: cspDirectives });
+            headers.push({
+                name: 'Content-Security-Policy',
+                value: cspDirectives
+            });
         }
         if ( requestType === 'doc' ) {
             µm.logger.writeOne(tabId, 'net', '', cspDirectives, 'CSP', false);