Hack: use top.name to store per-tab content-side configuration (e.g. unrestricted tab status).

This commit is contained in:
hackademix 2018-08-17 09:07:11 +02:00
parent 50d71ca381
commit e959accb70
4 changed files with 67 additions and 9 deletions

View File

@ -1,5 +1,7 @@
"use script";
"use strict";
{
let marker = JSON.stringify(uuid());
let Scripts = {
references: new Set(),
opts: {
@ -54,7 +56,27 @@
let siteKeys2MatchPatterns = keys => keys && flatten(keys.map(siteKey2MatchPattern)).filter(p => !!p) || [];
var ChildPolicies = {
async storeTabInfo(tabId, info) {
try {
await browser.tabs.executeScript(tabId, {
code: `window.name = ${marker} + ${JSON.stringify(JSON.stringify([info]))} + ${marker} + "," + window.name;`,
allFrames: false,
matchAboutBlank: true,
runAt: "document_start",
});
} catch (e) {
error(e);
}
},
async update(policy) {
Scripts.forget();
if (!policy.enforced) {
await Scripts.register(`ns.setup(null, ${marker});`,
["<all_urls>"]);
return;
}
let serialized = policy.dry ? policy.dry(true) : policy;
let permsMap = new Map();
let trusted = JSON.stringify(serialized.TRUSTED);
@ -96,15 +118,11 @@
));
}
Scripts.forget();
// register new content scripts
for (let [perms, keys] of [...permsMap]) {
await Scripts.register(`ns.perms.CURRENT = ${perms};`, siteKeys2MatchPatterns(keys), excludeMap.get(perms));
}
await Scripts.register(
`ns.perms.DEFAULT = ${JSON.stringify(serialized.DEFAULT)};
if(!ns.perms.CURRENT) ns.perms.CURRENT = ns.perms.DEFAULT;
ns.fire("perms");`,
await Scripts.register(`ns.setup(${JSON.stringify(serialized.DEFAULT)}, ${marker});`,
["<all_urls>"]);
}
}

View File

@ -89,7 +89,8 @@ var Settings = {
}
if (typeof unrestrictedTab === "boolean") {
ns.unrestrictedTabs[settings.unrestrictedTab ? "add" : "delete"](tabId);
ns.unrestrictedTabs[unrestrictedTab ? "add" : "delete"](tabId);
ChildPolicies.storeTabInfo(tabId, {unrestricted: unrestrictedTab});
}
if (reloadAffected) {
browser.tabs.reload(tabId);

View File

@ -28,7 +28,6 @@ ns.defaults = (async () => {
// dynamic settings
if (!ns.local.uuid) {
await include("/lib/uuid.js");
ns.local.uuid = uuid();
await ns.save(ns.local);
}

View File

@ -21,7 +21,47 @@
}
}
},
perms: { DEFAULT: null, CURRENT: null },
setup(DEFAULT, MARKER) {
this.perms.DEFAULT = DEFAULT;
if(!this.perms.CURRENT) this.perms.CURRENT = DEFAULT;
// ugly hack: since now we use registerContentScript instead of the
// filterRequest dynamic script injection hack, we use top.name
// to store per-tab information. We don't want web content to
// mess with it, though, so we wrap it around auto-hiding accessors
this.perms.MARKER = MARKER;
let eraseTabInfoRx = new RegExp(`[^]*${MARKER},?`);
if (eraseTabInfoRx.test(top.name)) {
let _name = top.name;
let tabInfoRx = new RegExp(`^${MARKER}\\[([^]*?)\\]${MARKER},`);
if (top === window) { // wrap to hide
Reflect.defineProperty(top.wrappedJSObject, "name", {
get: exportFunction(() => _name.replace(eraseTabInfoRx, ""), top.wrappedJSObject),
set: exportFunction(value => {
let preamble = _name.match(tabInfoRx);
_name = `${preamble && preamble[0] || ""}${value}`;
return value;
}, top.wrappedJSObject)
});
}
let tabInfoMatch = _name.match(tabInfoRx);
if (tabInfoMatch) try {
this.perms.tabInfo = JSON.parse(tabInfoMatch[1]);
} catch (e) {
error(e);
}
}
if (!this.perms.DEFAULT || this.perms.tabInfo.unrestricted) {
this.allows = () => true;
}
ns.fire("perms");
},
storeTabInfo(info) {
let {MARKER} = this.perms;
window.name = `${MARKER}${JSON.stringify([info])}${MARKER},${window.name.split(marker).pop()}`;
},
perms: { DEFAULT: null, CURRENT: null, tabInfo: {} },
allows(cap) {
let perms = this.perms.CURRENT;
return perms && perms.capabilities.includes(cap);