code review following feedback: 821e45751a (commitcomment-26587989)

src/css/popup.css

@@ -129,7 +129,7 @@ body .toolbar button.fa {
     stroke: none;
     }
 #mtxSwitches > li.relevant > svg .dot {
-    fill: #888;
+    fill: #aaa;
     }
 #mtxSwitches > li.switchTrue.relevant > svg .dot {
     fill: #eee;

src/js/background.js

@@ -110,7 +110,7 @@ return {
     },
 
     clearBrowserCacheCycle: 0,
-    cspNoInlineScript: "script-src 'unsafe-eval' blob: *; report-uri about:blank",
+    cspNoInlineScript: "script-src 'unsafe-eval' blob: *",
     cspNoWorker: undefined,
     updateAssetsEvery: 11 * oneDay + 1 * oneHour + 1 * oneMinute + 1 * oneSecond,
     firstUpdateAfter: 11 * oneMinute,

src/js/contentscript-start.js

@@ -30,11 +30,9 @@
 
     if ( typeof vAPI !== 'object' ) { return; }
 
-    vAPI.selfScriptSrcReported = vAPI.selfScriptSrcReported || false;
     vAPI.selfWorkerSrcReported = vAPI.selfWorkerSrcReported || false;
 
-    var reBadScriptSrc = /script-src[^;,]+?'(?:unsafe-inline|nonce-[^']+)'/,
+    var reGoodWorkerSrc = /(?:child|worker)-src[^;,]+?'none'/;
-        reGoodWorkerSrc = /(?:child|worker)-src[^;,]+?'none'/;
 
     var handler = function(ev) {
         if (
@@ -44,54 +42,38 @@
             return false;
         }
 
-        // We do not want to report internal resources more than once.
-        // However, we do want to report external resources each time.
-        // TODO: this could eventually lead to duplicated reports for external
-        //       resources if another extension uses the same approach as
-        //       uMatrix. Think about what could be done to avoid duplicate
-        //       reports.
-        var internal = ev.blockedURI.includes('://') === false;
-
         // Firefox and Chromium differs in how they fill the
-        // 'effectiveDirective' property. Need to normalize here.
+        // 'effectiveDirective' property.
-        var directive = ev.effectiveDirective;
+        if (
-        if ( directive.startsWith('script-src') ) {
+            ev.effectiveDirective.startsWith('worker-src') === false &&
-            if ( internal && vAPI.selfScriptSrcReported ) { return true; }
+            ev.effectiveDirective.startsWith('child-src') === false
-            directive = 'script-src';
-        } else if (
-            directive.startsWith('worker-src') ||
-            directive.startsWith('child-src')
         ) {
-            if ( internal && vAPI.selfWorkerSrcReported ) { return true; }
-            directive = 'worker-src';
-        } else {
             return false;
         }
 
         // Further validate that the policy violation is relevant to uMatrix:
         // the event still could have been fired as a result of a CSP header
         // not injected by uMatrix.
-        if ( directive === 'script-src' ) {
+        if ( reGoodWorkerSrc.test(ev.originalPolicy) === false ) {
-            if ( reBadScriptSrc.test(ev.originalPolicy) === true ) {
+            return false;
-                return false;
+        }
-            }
+
-            if ( internal ) {
+        // We do not want to report internal resources more than once.
-                vAPI.selfScriptSrcReported = true;
+        // However, we do want to report external resources each time.
-            }
+        // TODO: this could eventually lead to duplicated reports for external
-        } else /* if ( directive === 'worker-src' ) */ {
+        //       resources if another extension uses the same approach as
-            if ( reGoodWorkerSrc.test(ev.originalPolicy) === false ) {
+        //       uMatrix. Think about what could be done to avoid duplicate
-                return false;
+        //       reports.
-            }
+        if ( ev.blockedURI.includes('://') === false ) {
-            if ( internal ) {
+            if ( vAPI.selfWorkerSrcReported ) { return true; }
-                vAPI.selfWorkerSrcReported = true;
+            vAPI.selfWorkerSrcReported = true;
-            }
         }
 
         vAPI.messaging.send(
             'contentscript.js',
             {
                 what: 'securityPolicyViolation',
-                directive: directive,
+                directive: 'worker-src',
                 blockedURI: ev.blockedURI,
                 documentURI: ev.documentURI,
                 blocked: ev.disposition === 'enforce'

src/js/contentscript.js

@@ -408,15 +408,15 @@ var collapser = (function() {
 
 (function() {
     if (
-        vAPI.selfScriptSrcReported !== true &&
+        document.querySelector('script:not([src])') !== null ||
-        document.querySelector('script:not([src])') !== null
+        document.querySelector('a[href^="javascript:"]') !== null ||
+        document.querySelector('[onabort],[onblur],[oncancel],[oncanplay],[oncanplaythrough],[onchange],[onclick],[onclose],[oncontextmenu],[oncuechange],[ondblclick],[ondrag],[ondragend],[ondragenter],[ondragexit],[ondragleave],[ondragover],[ondragstart],[ondrop],[ondurationchange],[onemptied],[onended],[onerror],[onfocus],[oninput],[oninvalid],[onkeydown],[onkeypress],[onkeyup],[onload],[onloadeddata],[onloadedmetadata],[onloadstart],[onmousedown],[onmouseenter],[onmouseleave],[onmousemove],[onmouseout],[onmouseover],[onmouseup],[onwheel],[onpause],[onplay],[onplaying],[onprogress],[onratechange],[onreset],[onresize],[onscroll],[onseeked],[onseeking],[onselect],[onshow],[onstalled],[onsubmit],[onsuspend],[ontimeupdate],[ontoggle],[onvolumechange],[onwaiting],[onafterprint],[onbeforeprint],[onbeforeunload],[onhashchange],[onlanguagechange],[onmessage],[onoffline],[ononline],[onpagehide],[onpageshow],[onrejectionhandled],[onpopstate],[onstorage],[onunhandledrejection],[onunload],[oncopy],[oncut],[onpaste]') !== null
     ) {
         vAPI.messaging.send('contentscript.js', {
             what: 'securityPolicyViolation',
             directive: 'script-src',
             documentURI: window.location.href
         });
-        vAPI.selfScriptSrcReported = true;
     }
 
     collapser.addMany(document.querySelectorAll('img'));

src/js/traffic.js

@@ -310,8 +310,6 @@ var onHeadersReceived = function(details) {
     // blocked by our request handler.
     if ( µm.mustAllow(rootHostname, requestHostname, 'script' ) !== true ) {
         csp.push(µm.cspNoInlineScript);
-    } else {
-        cspReport.push(µm.cspNoInlineScript);
     }
 
     // TODO: Firefox will eventually support `worker-src`: