security-and-privacy/CanvasBlocker
security-and-privacy/CanvasBlocker
1
0
Fork 0
mirror of https://github.com/kkapsner/CanvasBlocker synced 2024-12-22 12:50:36 +01:00
Code Releases Activity

Protect exportFunction with defineAs

Browse Source 
For #429
This commit is contained in:
kkapsner 2020-01-19 01:27:26 +01:00
parent 16f88a5daa
commit 363940014d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/extension.js
View File

@ -13,6 +13,7 @@
} }
const browserAvailable = typeof browser !== "undefined"; const browserAvailable = typeof browser !== "undefined";
const logging = require("./logging");
scope.inBackgroundScript = !!( scope.inBackgroundScript = !!(
browserAvailable && browserAvailable &&
@ -60,6 +61,13 @@
defineAs: name defineAs: name
}; };
const oldDescriptor = Object.getOwnPropertyDescriptor(wrappedContext, name); const oldDescriptor = Object.getOwnPropertyDescriptor(wrappedContext, name);
if (oldDescriptor && !oldDescriptor.configurable){
logging.error(
"Unable to export function with the correct name", name,
"instead we have to use", exportedTry.name
);
return exportedTry;
}
const exported = exportFunction(func, context, options); const exported = exportFunction(func, context, options);
if (oldDescriptor){ if (oldDescriptor){
Object.defineProperty(wrappedContext, name, oldDescriptor); Object.defineProperty(wrappedContext, name, oldDescriptor);

4
versions/updates.json
View File

@ -101,6 +101,10 @@
{ {
"version": "1.1Alpha20191801", "version": "1.1Alpha20191801",
"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.1Alpha20191801-an+fx.xpi" "update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.1Alpha20191801-an+fx.xpi"
},
{
"version": "1.1Alpha20191901",
"update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.1Alpha20191901-an+fx.xpi"
} }
] ]
} }