CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-28 02:50:39 +12:00
Code Issues Releases Wiki Activity

code review for deeb211c5d

Browse source
This commit is contained in:
Raymond Hill 2017-12-31 19:25:50 -05:00
parent c96fbb4d5c
commit 2d14874d69
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/js/contentscript-start.js
View file

@ -36,7 +36,8 @@
{
what: 'securityPolicyViolation',
policy: ev.originalPolicy,
url: ev.documentURI
blockedURI: ev.blockedURI,
documentURI: ev.documentURI
}
);
});

21
src/js/messaging.js
View file

@ -514,6 +514,7 @@ var onMessage = function(request, sender, callback) {
var tabId = sender && sender.tab ? sender.tab.id || 0 : 0,
tabContext = µm.tabContextManager.lookup(tabId),
rootHostname = tabContext && tabContext.rootHostname,
pageStore = µm.pageStoreFromTabId(tabId);
// Sync
@ -535,8 +536,8 @@ var onMessage = function(request, sender, callback) {
case 'mustRenderNoscriptTags?':
if ( tabContext === null ) { break; }
response =
µm.tMatrix.mustBlock(tabContext.rootHostname, tabContext.rootHostname, 'script') &&
µm.tMatrix.evaluateSwitchZ('noscript-spoof', tabContext.rootHostname);
µm.tMatrix.mustBlock(rootHostname, rootHostname, 'script') &&
µm.tMatrix.evaluateSwitchZ('noscript-spoof', rootHostname);
if ( pageStore !== null ) {
pageStore.hasNoscriptTags = true;
}
@ -544,25 +545,21 @@ var onMessage = function(request, sender, callback) {
case 'securityPolicyViolation':
if ( request.policy !== µm.cspNoWorkerSrc ) { break; }
var url = µm.URI.hostnameFromURI(request.blockedURI) !== '' ?
request.blockedURI :
request.documentURI;
if ( pageStore !== null ) {
pageStore.hasWebWorkers = true;
pageStore.recordRequest('script', request.url, true);
pageStore.recordRequest('script', url, true);
}
if ( tabContext !== null ) {
µm.logger.writeOne(
tabId,
'net',
tabContext.rootHostname,
request.url,
'worker',
true
);
µm.logger.writeOne(tabId, 'net', rootHostname, url, 'worker', true);
}
break;
case 'shutdown?':
if ( tabContext !== null ) {
response = µm.tMatrix.evaluateSwitchZ('matrix-off', tabContext.rootHostname);
response = µm.tMatrix.evaluateSwitchZ('matrix-off', rootHostname);
}
break;