Improved startup behavior.

Author: hackademix

src/bg/DNRPolicy.js

@@ -89,11 +89,23 @@
       .join(';')
     }; script-src-elem 'none'; report-to noscript-reports-dnr`; // see /content/content.js securitypolicyviolation handler
 
-  let updatingSemaphore;
+  browser.runtime.onStartup.addListener(async () => {
+    const updatedTabs = autoAllow(await browser.tabs.query({}), true);
+    console.debug("DNRPolicy startup updated tabs", updatedTabs); // DEV_ONLY
+    if (updatedTabs.length) {
+      await Promise.allSettled([
+        ns.saveSession(),
+        RequestGuard.DNRPolicy.update(),
+      ]);
+      for (const tab of updatedTabs) {
+        if (tab.status != "unloaded") {
+          browser.tabs.reload(tab.id);
+        }
+      }
+    }
+  });
 
   async function update() {
-    await updatingSemaphore;
-
     const {policy} = ns;
     if (policy === _lastPolicy) {
       if (!policy || policy.equals(_lastPolicy)) {
@@ -161,12 +173,13 @@
           addRules: Rules[ruleType],
           removeRuleIds,
         });
-        console.debug(`DNRPolicy ${Rules[ruleType].length} ${ruleType} rules updated in ${Date.now() - ts}ms`); // DEV_ONLY
+        const newRules = (await browser.declarativeNetRequest[`get${ruleType}Rules`]()).filter(r => r.priority <= MAX_PRIORITY); // DEV_ONLY
+        debug(`DNRPolicy ${Rules[ruleType].length} ${ruleType} rules updated in ${Date.now() - ts}ms`, newRules); // DEV_ONLY
       } catch (e) {
         console.error(e, `Failed to update DNRPolicy ${ruleType}rules %o - remove %o, add %o`, Rules[ruleType], addRules, removeRuleIds);
       }
     })));
-    console.debug(`All DNRPolicy rules updated in ${Date.now() - ts}ms`); // DEV_ONLY
+    debug(`All DNRPolicy rules updated in ${Date.now() - ts}ms`); // DEV_ONLY
   }
 
   async function addTabRules(rules = []) {
@@ -266,21 +279,45 @@
     }
   }
 
+  function autoAllow(tabs, isStartup = false) {
+    const {policy} = ns;
+    const updated = [];
+    if (policy.autoAllowTop) {
+      for(const tab of tabs) {
+        const {url} = tab;
+        if (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);
+          updated.push(tab);
+        }
+      }
+      updated.length && console.debug("DNRPolicy.autoAllow", updated); // DEV_ONLY
+    }
+    return updated;
+  }
+
+  let updatingSemaphore;
+
   RequestGuard.DNRPolicy = {
     async update() {
       await updatingSemaphore;
-      updatingSemaphore = await update();
+      return await (updatingSemaphore = update());
     },
     async updateTabs() {
       await updatingSemaphore;
-      updatingSemaphore = await updateTabs();
+      return await (updatingSemaphore = updateTabs());
     }
-  }
+  };
 
   browser.tabs.onUpdated.addListener(async (tabId, changeInfo, tab) => {
     if (changeInfo.url) {
       // TODO: see if the update can be made more granular
-      await RequestGuard.DNRPolicy.updateTabs();
+      (await (autoAllow([tab])).length
+        ? Promise.allSettled([RequestGuard.DNRPolicy.update(), ns.saveSession()])
+        : RequestGuard.DNRPolicy.updateTabs()
+      );
     }
   });
 

src/bg/main.js

@@ -111,8 +111,10 @@
     if (!isTorBrowser) {
       await include("/nscl/service/prefetchCSSResources.js");
     }
-    await TabGuard.wakening;
-
+    await Promise.allSettled([
+      TabGuard.wakening,
+      RequestGuard.DNRPolicy?.update(),
+    ]);
     try {
       await Messages.send("started");
     } catch (e) {
@@ -283,8 +285,9 @@
     unrestrictedTabs: new Set(),
     async toggleTabRestrictions(tabId, restrict = ns.unrestrictedTabs.has(tabId)) {
       ns.unrestrictedTabs[restrict ? "delete": "add"](tabId);
-      Promise.allSettled([session.save(),
-        RequestGuard.DNRPolicy?.updateTabs()
+      await Promise.allSettled([
+        session.save(),
+        RequestGuard.DNRPolicy?.updateTabs(),
       ]);
     },
     isEnforced(tabId = -1) {
@@ -342,7 +345,12 @@
         if (isTop) {
           if (policy.autoAllowTop && perms === policy.DEFAULT) {
             policy.set(Sites.optimalKey(url), perms = policy.TRUSTED.tempTwin);
-            await RequestGuard.DNRPolicy?.update();
+            await Promise.allSettled([
+              RequestGuard.DNRPolicy?.update(),
+              session.save(),
+            ]);
+            const dnrRules = (await browser.declarativeNetRequest.getSessionRules()).filter(r => r?.action?.type == "allow"); // DEV_ONLY
+            debug(`Auto-trusted ${Sites.optimalKey(url)}`,  dnrRules); // DEV_ONLY
           }
         } else {
           cascaded = topUrl && ns.sync.cascadeRestrictions;