Mirrors
/
noscript
mirror of https://github.com/hackademix/noscript.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unrestricted tab support for service workers and their included 3rd party scripts.

This commit is contained in:
hackademix 2020-01-08 15:45:02 +01:00
parent ae8317da00
commit 34746e8be4
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bg/RequestGuard.js
View File

@ -308,7 +308,7 @@ var RequestGuard = (() => {
let {policy} = ns;
let policyType = policyTypesMap[request.type];
if (policyType) {
let {url, originUrl, documentUrl} = request;
let {url, originUrl, documentUrl, tabId} = request;
let isFetch = "fetch" === policyType;
if ((isFetch || "frame" === policyType) &&
@ -329,13 +329,23 @@ var RequestGuard = (() => {
request._dataUrl = url;
request.url = url = documentUrl;
}
let allowed = Sites.isInternal(url) ||
!ns.isEnforced(request.tabId) ||
intersectCapabilities(
let allowed = Sites.isInternal(url);
if (!allowed) {
if (tabId < 0 && documentUrl && documentUrl.startsWith("https://")) {
let origin = Sites.origin(documentUrl);
allowed = [...ns.unrestrictedTabs]
.some(tabId => TabStatus.hasOrigin(tabId, origin));
} else {
allowed = !ns.isEnforced(tabId);
}
if (!allowed) {
allowed = intersectCapabilities(
policy.get(url, documentUrl).perms,
request
).has(policyType);
}
}
Content.reportTo(request, allowed, policyType);
if (!allowed) {
debug(`Blocking ${policyType}`, request);