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

Do not intercept when the SOP is in the way.

Browse Source
This commit is contained in:
kkapsner 2017-07-18 16:14:03 +02:00
parent 2a3abbcec7
commit 6c47397d46
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/frame.js
View File

@ -83,6 +83,16 @@
return false; return false;
} }
try {
var href = window.location.href;
}
catch (e){
// we are unable to read the location due to SOP
// therefore we also can not intercept anything.
log("NOT intercepting window du to SOP", window);
return false;
}
log("intercepting window", window); log("intercepting window", window);
intercept( intercept(
{subject: window}, {subject: window},

11
lib/intercept.js
View File

@ -32,7 +32,16 @@
scope.setRandomSupplyByType = setRandomSupplyByType; scope.setRandomSupplyByType = setRandomSupplyByType;
function getURL(window){ function getURL(window){
if (!window.location.href || window.location.href === "about:blank"){ var href;
try {
href = window.location.href;
}
catch (e){
// unable to read location due to SOP
// since we are not able to do anything in that case we can allow everything
return "about:SOP";
}
if (!href || href === "about:blank"){
if (window !== window.parent){ if (window !== window.parent){
return getURL(window.parent); return getURL(window.parent);
} }