Refactor top-level auto-trust and make it contextual (issue #417).

Author: hackademix

src/bg/DNRPolicy.js

@@ -311,8 +311,7 @@
         if (!url || Sites.isInternal(url)) continue;
         const perms = policy.get(url).perms;
         console.debug("DNRPolicy autoAllow check", tab, perms, perms === policy.DEFAULT);
-        if (perms === policy.DEFAULT || (isStartup && perms.temp)) {
-          policy.set(Sites.optimalKey(url), policy.TRUSTED.tempTwin);
+        if (policy.autoAllow(url, perms, (isStartup && perms.temp))) {
           updated.push(tab);
         }
       }

src/bg/RequestGuard.js

@@ -352,7 +352,7 @@
       let {capabilities} = perms;
       if (!capabilities.has(policyType)) {
         let temp = sender.tab.incognito; // we don't want to store in PBM
-        perms = new Permissions(new Set(capabilities), temp);
+        perms = new Permissions(capabilities, temp);
         perms.capabilities.add(policyType);
         /* TODO: handle contextual permissions
         if (contextUrl) {
@@ -736,8 +736,9 @@
           let policy = ns.policy;
           let {perms} = policy.get(url, ns.policyContext(request));
           if (isMainFrame) {
-            if (policy.autoAllowTop && perms === policy.DEFAULT) {
-              policy.set(Sites.optimalKey(url), perms = policy.TRUSTED.tempTwin);
+            const autoPerms = policy.autoAllow(url, perms);
+            if (autoPerms) {
+              perms = autoPerms;
             }
             capabilities = perms.capabilities;
           } else {

src/bg/main.js

@@ -342,13 +342,14 @@
       if (policy) {
         let perms = policy.get(url, contextUrl).perms;
         if (isTop) {
-          if (policy.autoAllowTop && perms === policy.DEFAULT) {
-            policy.set(Sites.optimalKey(url), perms = policy.TRUSTED.tempTwin);
+          const autoPerms = policy.autoAllow(url, perms);
+          if (autoPerms) {
+            perms = autoPerms;
             await Promise.allSettled([
               RequestGuard.DNRPolicy?.update(),
               session.save(),
             ]);
-            const dnrRules = (await browser.declarativeNetRequest.getSessionRules()).filter(r => r?.action?.type == "allow"); // DEV_ONLY
+            const dnrRules = (await browser.declarativeNetRequest?.getSessionRules())?.filter(r => r?.action?.type == "allow"); // DEV_ONLY
             debug(`Auto-trusted ${Sites.optimalKey(url)}`,  dnrRules); // DEV_ONLY
           }
         } else {