From b27771aef037bea51ae3ad43d13051304f927b89 Mon Sep 17 00:00:00 2001
From: hackademix <giorgio@maone.net>
Date: Sun, 13 Feb 2022 00:16:24 +0100
Subject: [PATCH] More robust policy fetching.

---
 src/bg/RequestGuard.js         |  1 +
 src/content/staticNS.js        |  5 +++--
 src/content/syncFetchPolicy.js | 23 ++++++++++++-----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/bg/RequestGuard.js b/src/bg/RequestGuard.js
index 7aec1e7..9d64cf1 100644
--- a/src/bg/RequestGuard.js
+++ b/src/bg/RequestGuard.js
@@ -668,6 +668,7 @@ var RequestGuard = (() => {
         ns.domPolicy = domPolicy;
         if (ns.setup) {
           if (ns.syncSetup) ns.syncSetup(domPolicy);
+          else ns.setup(domPolicy);
         } ;
       } else {
         window.ns = {domPolicy}
diff --git a/src/content/staticNS.js b/src/content/staticNS.js
index 759c403..7974477 100644
--- a/src/content/staticNS.js
+++ b/src/content/staticNS.js
@@ -75,10 +75,11 @@
       if (this.syncFetchPolicy) {
         // extra hops to ensure that scripts don't run when CSP has not been set through HTTP headers
         this.syncFetchPolicy();
-      } else {
-        this.pendingSyncFetchPolicy = true;
+        return;
       }
 
+      this.pendingSyncFetchPolicy = true;
+
       if (!sync) {
         queueMicrotask(() => this.fetchPolicy(true));
         return;
diff --git a/src/content/syncFetchPolicy.js b/src/content/syncFetchPolicy.js
index ade6f40..2830c01 100644
--- a/src/content/syncFetchPolicy.js
+++ b/src/content/syncFetchPolicy.js
@@ -22,6 +22,9 @@
 
 (window.ns || (window.ns = {})).syncFetchPolicy = function() {
 
+  ns.pendingSyncFetchPolicy = false;
+  ns.syncFetchPolicy = () => {};
+
   let url = document.URL;
 
   // Here we've got no CSP header yet (file: or ftp: URL), we need one
@@ -32,18 +35,17 @@
 
   if (window.wrappedJSObject) {
     if (top === window) {
+      let persistentPolicy = null;
       ns.syncSetup = policy => {
-        if (!ns.setup(policy)) return;
-        if (top === window && window.wrappedJSObject) {
-          let persistentPolicy = JSON.stringify(policy);
-          Object.freeze(persistentPolicy);
-          try {
-            Object.defineProperty(window.wrappedJSObject, "_noScriptPolicy", {value: cloneInto(persistentPolicy, window)});
-          } catch(e) {
-            error(e);
-          }
+        if (persistentPolicy) return;
+        ns.setup(policy);
+        persistentPolicy = JSON.stringify(policy);
+        Object.freeze(persistentPolicy);
+        try {
+          Object.defineProperty(window.wrappedJSObject, "_noScriptPolicy", {value: cloneInto(persistentPolicy, window)});
+        } catch(e) {
+          error(e);
         }
-        ns.syncSetup = () => {};
       };
     } else try {
       if (top.wrappedJSObject._noScriptPolicy) {
@@ -239,6 +241,5 @@
 };
 
 if (ns.pendingSyncFetchPolicy) {
-  ns.pendingSyncFetchPolicy = false;
   ns.syncFetchPolicy();
 }
\ No newline at end of file