diff options
author | hackademix | 2019-10-30 23:37:55 +0100 |
---|---|---|
committer | hackademix | 2019-10-30 23:37:55 +0100 |
commit | adfb29f581ad0d057a4017cd635ea89751e1f4bd (patch) | |
tree | 88796495bea29fa29a278214de8c85974acc1fce /src/content | |
parent | 17ebef5a4893afb0db373246cabf83ccb295c6d5 (diff) | |
download | noscript-adfb29f581ad0d057a4017cd635ea89751e1f4bd.tar.gz noscript-adfb29f581ad0d057a4017cd635ea89751e1f4bd.tar.xz noscript-adfb29f581ad0d057a4017cd635ea89751e1f4bd.zip |
Use semi-synchronous mode to fetch policies.
Diffstat (limited to 'src/content')
-rw-r--r-- | src/content/staticNS.js | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/content/staticNS.js b/src/content/staticNS.js index eea16de..5fc7ac4 100644 --- a/src/content/staticNS.js +++ b/src/content/staticNS.js @@ -1,5 +1,5 @@ -'use strict'; { + 'use strict'; let listenersMap = new Map(); let backlog = new Set(); @@ -37,22 +37,37 @@ debug(`Fetching policy from document %s, readyState %s, content %s`, document.URL, document.readyState, document.documentElement.outerHTML); let originalState = document.readyState; - let scriptsBlocked = false; + let blockedScripts = []; let url = document.URL; addEventListener("beforescriptexecute", e => { // safety net for syncrhonous load on Firefox if (!this.canScript) { e.preventDefault(); - scriptsBlocked = true; - log("Some script managed to be inserted in the DOM while fetching policy, blocking it.\n", e.target.textContent); + let script = e.target; + blockedScripts.push(script) + log("Some script managed to be inserted in the DOM while fetching policy, blocking it.\n", script); } }, true); let policy = null; + + let setup = policy => { + debug("Fetched %o, readyState %s", policy, document.readyState); // DEV_ONLY + this.setup(policy); + if (this.canScript && blockedScripts.length && originalState === "loading") { + log("Blocked some scripts on %s even though they are actually permitted by policy.", url) + // something went wrong, e.g. with session restore. + for (let s of blockedScripts) { + // reinsert the script + s.replace(s.cloneNode(true)); + } + } + } + for (;;) { try { policy = browser.runtime.sendSyncMessage( - {id: "fetchPolicy", url, contextUrl: url}); + {id: "fetchPolicy", url, contextUrl: url}, setup); break; } catch (e) { if (!Messages.isMissingEndpoint(e)) { @@ -62,20 +77,7 @@ error("Background page not ready yet, retrying to fetch policy...") } } - debug("Fetched %o, readyState %s", policy, document.readyState); // DEV_ONLY - this.setup(policy); - if (this.canScript && scriptsBlocked && - originalState === "loading" && document.readyState !== originalState) { - log("Blocked some scripts on %s even though they are actually permitted by policy.", url) - // something went wrong, e.g. with session restore. - if (!url.startsWith("http")) { - log("Not a HTTP page, reloading %s.", url); - window.stop(); - location.reload(false); - } - } - return true; }, setup(policy) { |