Mirrors
/
noscript
mirror of https://github.com/hackademix/noscript.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More precise and verbose fallbacks for policy retrieval timing issues.

This commit is contained in:
hackademix 2019-10-25 23:11:07 +01:00
parent d84ff782c2
commit afe71bb7a4
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/content/staticNS.js
View File

@ -36,10 +36,16 @@
fetchPolicy() {
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 url = document.URL;
addEventListener("beforescriptexecute", e => {
// safety net for syncrhonous load on Firefox
if (!this.canScript) e.preventDefault();
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);
}
}, true);
let policy = null;
@ -50,13 +56,24 @@
break;
} catch (e) {
if (!Messages.isMissingEndpoint(e)) {
error(e);
break;
}
error("Background page ready yet, retrying to fetch policy...")
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;
},