security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2025-03-12 03:02:59 +01:00
Code Releases Activity

Ping back after the port opening to the background script now also returns the settings and the persistentRnd data.

Browse Source
This commit is contained in:
kkapsner 2017-09-23 23:37:46 +02:00
parent e5e38e148e
commit a4a92fc2f9
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/frame.js
View File

@ -7,9 +7,11 @@
const {intercept} = require("./intercept.js"); const {intercept} = require("./intercept.js");
const {ask} = require("./askForPermission.js"); const {ask} = require("./askForPermission.js");
const lists = require("./lists.js");
const {check: originalCheck, checkStack: originalCheckStack} = require("./check.js"); const {check: originalCheck, checkStack: originalCheckStack} = require("./check.js");
const {error, warning, message, notice, verbose, setPrefix: setLogPrefix} = require("./logging"); const logging = require("./logging");
const {error, warning, message, notice, verbose, setPrefix: setLogPrefix} = logging;
setLogPrefix("frame script"); setLogPrefix("frame script");
// Variable to "unload" the script // Variable to "unload" the script
@ -49,6 +51,23 @@
notice("my tab id is", data.tabId); notice("my tab id is", data.tabId);
tabId = data.tabId; tabId = data.tabId;
} }
if (data.hasOwnProperty("persistentRnd")){
notice("got persistent random data", data.persistentRnd);
const {persistent: persistentRnd} = require("./randomSupplies.js");
Object.keys(data.persistentRnd).forEach(function(domain){
verbose("random data for", domain, data.persistentRnd[domain]);
persistentRnd.setDomainRnd(domain, data.persistentRnd[domain]);
});
}
if (settings.isStillDefault && data.hasOwnProperty("settings")){
notice("got settings from background script");
Object.keys(data.settings).forEach(function(key){
settings[key] = data.settings[key];
});
settings.isStillDefault = false;
logging.clearQueue();
lists.updateAll();
}
}); });
var notifications = []; var notifications = [];
function notify(data){ function notify(data){

8
lib/main.js
View File

@ -82,7 +82,13 @@
browser.runtime.onConnect.addListener(function(port){ browser.runtime.onConnect.addListener(function(port){
notice("got port", port); notice("got port", port);
verbose("send back the tab id", port.sender.tab.id); verbose("send back the tab id", port.sender.tab.id);
port.postMessage({tabId: port.sender.tab.id}); verbose("send back the persistend random seeds", persistentRnd);
verbose("send back the settings", settings);
port.postMessage({
tabId: port.sender.tab.id,
persistentRnd: persistentRnd,
settings: settings
});
var url = new URL(port.sender.url); var url = new URL(port.sender.url);
port.onMessage.addListener(function(data){ port.onMessage.addListener(function(data){
browser.storage.local.get("showNotifications").then(function(data){ browser.storage.local.get("showNotifications").then(function(data){