Policy retrieval origin fine tuning.

This commit is contained in:
hackademix 2021-05-03 20:16:46 +02:00
parent a7064df9ea
commit ea7dfabb09
1 changed files with 5 additions and 3 deletions

View File

@ -52,7 +52,7 @@
} }
} }
if (/^(ftp|file):/.test(url)) { // ftp: or file: - no CSP headers yet if (/^(?:ftp|file):/.test(url)) { // ftp: or file: - no CSP headers yet
if (this.syncFetchPolicy) { if (this.syncFetchPolicy) {
this.syncFetchPolicy(); this.syncFetchPolicy();
} else { // additional content scripts not loaded yet } else { // additional content scripts not loaded yet
@ -62,7 +62,9 @@
} }
} else { } else {
// CSP headers have been already provided by webRequest, we are not in a hurry... // CSP headers have been already provided by webRequest, we are not in a hurry...
if (/^(javascript|about):/.test(url)) { if (url.startsWith("blob:")) {
url = location.origin;
} else if (/^(?:javascript|about):/.test(url)) {
url = document.readyState === "loading" url = document.readyState === "loading"
? document.baseURI ? document.baseURI
: `${window.isSecureContext ? "https" : "http"}://${document.domain}`; : `${window.isSecureContext ? "https" : "http"}://${document.domain}`;
@ -119,5 +121,5 @@
}, },
}; };
window.ns = window.ns ? Object.assign(ns, window.ns) : ns; window.ns = window.ns ? Object.assign(ns, window.ns) : ns;
debug("StaticNS", window.domPolicy, Date.now(), JSON.stringify(window.ns)); // DEV_ONLY debug("StaticNS", Date.now(), JSON.stringify(window.ns)); // DEV_ONLY
} }