diff options
author | hackademix | 2018-09-03 19:20:39 +0200 |
---|---|---|
committer | hackademix | 2018-09-04 00:22:39 +0200 |
commit | 81ac052e1d1b0db924c9ef14a90bf22ce1dc4d8b (patch) | |
tree | 8e3f904e4cec2c0c8f6132dc0760994baae9fa65 /src/ui | |
parent | 16cdbbe1cb7402ed795923128a4bc7bfb4415f1e (diff) | |
download | noscript-81ac052e1d1b0db924c9ef14a90bf22ce1dc4d8b.tar.gz noscript-81ac052e1d1b0db924c9ef14a90bf22ce1dc4d8b.tar.xz noscript-81ac052e1d1b0db924c9ef14a90bf22ce1dc4d8b.zip |
Better file: protocol support.
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/popup.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ui/popup.js b/src/ui/popup.js index 8c34beb..c876ed7 100644 --- a/src/ui/popup.js +++ b/src/ui/popup.js @@ -177,15 +177,13 @@ addEventListener("unload", e => { let domains = new Map(); function urlToLabel(url) { - let { - origin - } = url; + let origin = Sites.origin(url); let match = policySites.match(url); if (match) return match; if (domains.has(origin)) { if (justDomains) return domains.get(origin); } else { - let domain = tld.getDomain(url.hostname); + let domain = tld.getDomain(url.hostname) || origin; domain = url.protocol === "https:" ? Sites.secureDomainKey(domain) : domain; domains.set(origin, domain); if (justDomains) return domain; @@ -196,7 +194,8 @@ addEventListener("unload", e => { let parsedSeen = seen.map(thing => Object.assign({ type: thing.policyType }, Sites.parse(thing.request.url))) - .filter(parsed => parsed.url && parsed.url.origin !== "null"); + .filter(parsed => parsed.url && ( + parsed.url.origin !== "null" || parsed.url.protocol === "file:")); let sitesSet = new Set( parsedSeen.map(parsed => parsed.label = urlToLabel(parsed.url)) @@ -206,7 +205,7 @@ addEventListener("unload", e => { } let sites = [...sitesSet]; for (let parsed of parsedSeen) { - sites.filter(s => parsed.label === s || domains.get(parsed.url.origin) === s).forEach(m => { + sites.filter(s => parsed.label === s || domains.get(Sites.origin(parsed.url)) === s).forEach(m => { let siteTypes = typesMap.get(m); if (!siteTypes) typesMap.set(m, siteTypes = new Set()); siteTypes.add(parsed.type); |