[TabGuard] Avoid infinite redirection loops.

Author: hackademix

src/bg/RequestGuard.js

@@ -556,6 +556,11 @@ var RequestGuard = (() => {
       let lanRes = checkLANRequest(request);
       if (!UA.isMozilla) return lanRes; // Chromium doesn't support async blocking suspension, stop here
       if (lanRes === ABORT) return ABORT;
+      // redirection loop test
+      let pending = pendingRequests.get(request.requestId);
+      if (pending && pending.redirected && pending.redirected.url === request.url) {
+        return lanRes; // don't go on stripping cookies if we're in a redirection loop
+      }
       let chainNext = r => r === ABORT ? r : TabGuard.check(request);
       return lanRes instanceof Promise ? lanRes.then(chainNext) : chainNext(lanRes);
     },

src/bg/TabGuard.js

@@ -44,7 +44,7 @@ var TabGuard = (() => {
     return flat;
   }
 
-  let cutRequestIds = new Set();
+  let scheduledCuts = new Set();
 
   return {
     forget,
@@ -65,11 +65,11 @@ var TabGuard = (() => {
         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);
-          cutRequestIds.add(tabId);
+          scheduledCuts.add(request.requestId);
           return;
         } else {
           debug("[TabGuard] Automatic or cross-site navigation, keeping tab ties.", tabId, request);
-          cutRequestIds.delete(tabId);
+          scheduledCuts.delete(request.requestId);
         }
       }
 
@@ -130,8 +130,8 @@ var TabGuard = (() => {
     },
     postCheck(request) {
       let {requestId, tabId} = request;
-      if (cutRequestIds.has(requestId)) {
-        cutRequestIds.remove(requestId);
+      if (scheduledCuts.has(requestId)) {
+        scheduledCuts.delete(requestId);
         TabTies.cut(tabId);
       }
     },