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

Fixed external scripts included in HEAD of file:// pages failing (issue #115).

This commit is contained in:
hackademix 2019-11-16 09:55:16 +01:00
parent ae0fdc18e7
commit 10aee8015e
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/content/staticNS.js
View File

@ -67,8 +67,22 @@
let originalState = document.readyState; let originalState = document.readyState;
let blockedScripts = []; let blockedScripts = [];
let localPolicyKey, localPolicy;
if (UA.isMozilla && /^(?:ftp|file):/.test(url)) {
localPolicyKey = `ns.policy.${url}|${browser.runtime.getURL("")}`;
let localPolicy = sessionStorage.getItem(localPolicyKey);
sessionStorage.removeItem(localPolicyKey);
if (localPolicy) {
debug("Falling back to localPolicy", localPolicy);
try {
this.setup(JSON.parse(localPolicy));
return;
} catch(e) {
error(e, "Could not setup local policy", localPolicy);
}
}
if (/^(?:ftp|file):/.test(url)) {
addEventListener("beforescriptexecute", e => { addEventListener("beforescriptexecute", e => {
// safety net for synchronous loads on Firefox // safety net for synchronous loads on Firefox
if (!this.canScript) { if (!this.canScript) {
@ -86,8 +100,14 @@
debug("Fetched %o, readyState %s", policy, document.readyState); // DEV_ONLY debug("Fetched %o, readyState %s", policy, document.readyState); // DEV_ONLY
this.setup(policy); this.setup(policy);
if (this.canScript && blockedScripts.length && originalState === "loading") { if (this.canScript && blockedScripts.length && originalState === "loading") {
log("Running suspended scripts which are permitted by %s policy.", url) log("Running suspended scripts which are permitted by %s policy.", url);
// something went wrong, e.g. with session restore. // something went wrong, e.g. with session restore.
if (url.startsWith("file:") && !localPolicy) {
stop();
sessionStorage.setItem(localPolicyKey, JSON.stringify(policy));
location.reload(false);
return;
}
for (let s of blockedScripts) { for (let s of blockedScripts) {
// reinsert the script: // reinsert the script:
// just s.cloneNode(true) doesn't work, the script wouldn't run, // just s.cloneNode(true) doesn't work, the script wouldn't run,