summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bg/main.js22
-rw-r--r--src/content/staticNS.js33
2 files changed, 47 insertions, 8 deletions
diff --git a/src/bg/main.js b/src/bg/main.js
index 5e1b692..bae534f 100644
--- a/src/bg/main.js
+++ b/src/bg/main.js
@@ -142,9 +142,20 @@
fetchChildPolicy({url, contextUrl}, sender) {
let {tab, frameId} = sender;
+ let policy = ns.policy;
+ if (!policy) {
+ console.log("Policy is null, initializing: %o, sending fallback.", ns.initializing);
+ return {
+ permissions: new Permissions(Permissions.DEFAULT).dry(),
+ unrestricted: false,
+ cascaded: false,
+ fallback: true
+ };
+ }
let topUrl = frameId === 0 ? contextUrl : tab && (tab.url || TabCache.get(tab.id));
- let policy = !Sites.isInternal(url) && ns.isEnforced(tab ? tab.id : -1)
- ? ns.policy : null;
+ if (Sites.isInternal(url) || !ns.isEnforced(tab ? tab.id : -1)) {
+ policy = null;
+ }
let permissions, unrestricted, cascaded;
if (policy) {
@@ -156,7 +167,7 @@
permissions = perms.dry();
} else {
// otherwise either internal URL or unrestricted
- permissions = new Permissions(Permissions.ALL);
+ permissions = new Permissions(Permissions.ALL).dry();
unrestricted = true;
cascaded = false;
}
@@ -198,6 +209,7 @@
policy: null,
local: null,
sync: null,
+ initializing: null,
unrestrictedTabs: new Set(),
isEnforced(tabId = -1) {
return this.policy.enforced && (tabId === -1 || !this.unrestrictedTabs.has(tabId));
@@ -210,10 +222,8 @@
start() {
if (this.running) return;
this.running = true;
-
browser.runtime.onSyncMessage.addListener(onSyncMessage);
-
- deferWebTraffic(init(),
+ deferWebTraffic(this.initalizing = init(),
async () => {
Commands.install();
diff --git a/src/content/staticNS.js b/src/content/staticNS.js
index bf91972..3102756 100644
--- a/src/content/staticNS.js
+++ b/src/content/staticNS.js
@@ -34,18 +34,47 @@
},
fetchPolicy() {
+ debug(`Fetching policy from document %s, readyState %s, content %s`,
+ document.URL, document.readyState, document.documentElement.outerHTML);
+
let url = document.URL;
+
+ if (url.startsWith("file:")) {
+ let cookie = "noscript.startupFileReloaded=true";
+ if (!document.cookie.split(/\s*;\s*/).includes(cookie)) {
+ stop();
+ setTimeout(() => {
+ document.cookie = cookie;
+ location.reload();
+ }, 10)
+ }
+ }
+
let policy = browser.runtime.sendSyncMessage(
- {id: "fetchPolicy", url, contextUrl: document.URL});
+ {id: "fetchPolicy", url, contextUrl: url});
+
+ debug("Fetched %o, readyState %s", policy, document.readyState);
if (!policy) {
- debug(`No answer to fetchPolicy message. This should not be happening.`);
+ debug("Could not fetch policy!");
+ if (url.startsWith("file:") && !sessionStorage.__noScriptFallbackReload__) {
+ sessionStorage.__noScriptFallbackReload__ = "true";
+ location.reload();
+ } else {
+ // let's try asynchronously
+ (async () => {
+ this.setup(await Messages.send("fetchPolicy", {url, contextUrl: url}));
+ })();
+ }
return false;
+ } else if (policy.fallback) {
+ location.reload();
}
this.setup(policy);
return true;
},
setup(policy) {
+ debug("%s, %s, %o", document.URL, document.readyState, policy);
this.policy = policy;
if (!policy.permissions || policy.unrestricted) {