Simplify injectPolicyScript

Author: aaronkollasch

src/bg/RequestGuard.js

@@ -339,7 +339,6 @@ var RequestGuard = (() => {
 
   function intersectCapabilities(perms, request) {
     let {frameId, frameAncestors, tabId, cookieStoreId} = request;
-    let policy = ns.getPolicy(cookieStoreId);
     if (frameId !== 0 && ns.sync.cascadeRestrictions) {
       let topUrl = frameAncestors && frameAncestors.length
         && frameAncestors[frameAncestors.length - 1].url;
@@ -348,6 +347,7 @@ var RequestGuard = (() => {
         if (tab) topUrl = tab.url;
       }
       if (topUrl) {
+        let policy = ns.getPolicy(cookieStoreId);
         return policy.cascadeRestrictions(perms, topUrl).capabilities;
       }
     }
@@ -644,10 +644,9 @@ var RequestGuard = (() => {
     return ABORT;
   }
 
-  async function injectPolicyScript(details) {
+  function injectPolicyScript(details) {
     let {url, tabId, frameId} = details;
-    let tab = await browser.tabs.get(tabId);
-    let policy = ns.computeChildPolicy({url}, {tab, frameId});
+    let policy = ns.computeChildPolicy({url}, {tab: {id: tabId}, frameId});
     policy.navigationURL = url;
     let debugStatement = ns.local.debug ? `
       let mark = Date.now() + ":" + Math.random();

src/bg/main.js

@@ -261,18 +261,19 @@
 
     computeChildPolicy({url, contextUrl}, sender) {
       let {tab, frameId} = sender;
-      let cookieStoreId = (tab)? tab.cookieStoreId : "default";
-      var policy = ns.policy;
-      debug("computing policy", cookieStoreId, ns.contextStore);
-      if (
-          cookieStoreId && 
-          !cookieStoreId.toLowerCase().includes("default") &&  //exclude firefox-default
-          ns.contextStore && 
-          ns.contextStore.policies.hasOwnProperty(cookieStoreId)
-      ) {
-        policy = ns.contextStore.policies[cookieStoreId];
+      let tabId = tab ? tab.id : -1;
+      let topUrl;
+      if (frameId === 0) {
+        topUrl = url;
+      } else if (tab) {
+        if (!tab.url) tab = TabCache.get(tabId);
+        if (tab) topUrl = tab.url;
       }
-      debug("chose policy", policy);
+      if (!topUrl) topUrl = url;
+      if (!contextUrl) contextUrl = topUrl;
+
+      let cookieStoreId = (tab)? tab.cookieStoreId : "default";
+      var policy = ns.getPolicy(cookieStoreId);
       let {isTorBrowser} = ns.local;
       if (!policy) {
         console.log("Policy is null, initializing: %o, sending fallback.", ns.initializing);
@@ -285,17 +286,6 @@
         };
       }
 
-      let tabId = tab ? tab.id : -1;
-      let topUrl;
-      if (frameId === 0) {
-        topUrl = url;
-      } else if (tab) {
-        if (!tab.url) tab = TabCache.get(tabId);
-        if (tab) topUrl = tab.url;
-      }
-      if (!topUrl) topUrl = url;
-      if (!contextUrl) contextUrl = topUrl;
-
       if (Sites.isInternal(url) || !ns.isEnforced(tabId)) {
         policy = null;
       }