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

[TabGuard] Stricter criteria for cutting tab relations (thanks fatboy for reporting.)

This commit is contained in:
hackademix 2022-08-12 21:40:33 +02:00
parent ae56f78c87
commit d0a2fea73e
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bg/TabGuard.js
View File

@ -60,11 +60,30 @@ var TabGuard = (() => {
let {requestHeaders} = request;
let tab = TabCache.get(tabId);
const mainFrame = type === "main_frame";
if (mainFrame) {
let headers = flattenHeaders(requestHeaders);
if (headers["sec-fetch-user"] === "?1" && /^(?:same-(?:site|origin)|none)$/i.test(headers["sec-fetch-site"])) {
debug("[TabGuard] User-typed, bookmark, reload or user-activated same-site navigation: scheduling tab ties cut.", tabId, request);
let shouldCut = false;
if (headers["sec-fetch-user"] === "?1") {
// user-activated navigation
switch(headers["sec-fetch-site"]) {
case "same-site":
case "same-origin":
// cut only if same site & same tab
shouldCut = tab && originUrl === tab.url && ![...TabTies.get(tabId)]
.filter(tid => tid !== tabId).map(TabCache.get)
.some(t => t && t.url === originUrl);
break;
case "none":
// nav bar or bookmark
shouldCut = true;
break;
}
}
if (shouldCut) {
debug("[TabGuard] User-typed, bookmark or user-activated same-site-same-tab navigation: scheduling tab ties cut.", tabId, request);
scheduledCuts.add(request.requestId);
return;
} else {
@ -76,7 +95,6 @@ var TabGuard = (() => {
let targetDomain = getDomain(url);
if (!targetDomain) return; // no domain, no cookies
let tab = TabCache.get(tabId);
let tabDomain = getDomain(mainFrame ? url : tab && tab.url);
if (!tabDomain) return; // no domain, no cookies