Browse Source

code review for 821e45751a2dff18: simplify

pull/2/head
Raymond Hill 7 years ago
parent
commit
60cd27c347
No known key found for this signature in database GPG Key ID: 25E1490B761470C2
  1. 3
      src/js/background.js
  2. 3
      src/js/contentscript-start.js
  3. 28
      src/js/traffic.js

3
src/js/background.js

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

3
src/js/contentscript-start.js

@ -32,13 +32,12 @@
vAPI.reportedViolations = vAPI.reportedViolations || new Set(); vAPI.reportedViolations = vAPI.reportedViolations || new Set();
var cspReportURI = 'about:blank';
var reportedViolations = vAPI.reportedViolations; var reportedViolations = vAPI.reportedViolations;
var handler = function(ev) { var handler = function(ev) {
if ( if (
ev.isTrusted !== true || ev.isTrusted !== true ||
ev.originalPolicy.includes(cspReportURI) === false
ev.originalPolicy.includes('about:blank') === false
) { ) {
return false; return false;
} }

28
src/js/traffic.js

@ -300,23 +300,15 @@ var onHeadersReceived = function(details) {
if ( tabContext === null ) { return; } if ( tabContext === null ) { return; }
var csp = [], var csp = [],
cspReport = [];
cspReport = [],
rootHostname = tabContext.rootHostname,
requestHostname = µm.URI.hostnameFromURI(requestURL);
// If javascript is not allowed, say so through a `Content-Security-Policy` // If javascript is not allowed, say so through a `Content-Security-Policy`
// directive. // directive.
// We block only inline-script tags, all the external javascript will be // We block only inline-script tags, all the external javascript will be
// blocked by our request handler. // 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); csp.push(µm.cspNoInlineScript);
} else { } else {
cspReport.push(µm.cspNoInlineScript); cspReport.push(µm.cspNoInlineScript);
@ -326,12 +318,11 @@ var onHeadersReceived = function(details) {
// https://bugzilla.mozilla.org/show_bug.cgi?id=1231788 // https://bugzilla.mozilla.org/show_bug.cgi?id=1231788
if ( µm.cspNoWorker === undefined ) { if ( µm.cspNoWorker === undefined ) {
µm.cspNoWorker = vAPI.webextFlavor.startsWith('Mozilla-') ? µ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); csp.push(µm.cspNoWorker);
} else { } else {
cspReport.push(µm.cspNoWorker); cspReport.push(µm.cspNoWorker);
@ -346,7 +337,10 @@ var onHeadersReceived = function(details) {
if ( i !== -1 ) { if ( i !== -1 ) {
headers[i].value += ',' + cspDirectives; headers[i].value += ',' + cspDirectives;
} else { } else {
headers.push({ name: 'Content-Security-Policy', value: cspDirectives });
headers.push({
name: 'Content-Security-Policy',
value: cspDirectives
});
} }
if ( requestType === 'doc' ) { if ( requestType === 'doc' ) {
µm.logger.writeOne(tabId, 'net', '', cspDirectives, 'CSP', false); µm.logger.writeOne(tabId, 'net', '', cspDirectives, 'CSP', false);

Loading…
Cancel
Save