Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-05 11:37:01 +02:00
Code Issues Releases Wiki Activity

Harden scriptlets which need to serialize function code into string

Browse Source 
Related issue:
https://github.com/uBlockOrigin/uBlock-issues/issues/2907
This commit is contained in:
Raymond Hill 2023-11-06 09:10:21 -05:00
parent 5d1618e1be
commit 7823d98070
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assets/resources/scriptlets.js
View File

@ -49,6 +49,8 @@ function safeSelf() {
const safe = {
'Array_from': Array.from,
'Error': self.Error,
'Function_toStringFn': self.Function.prototype.toString,
'Function_toString': thisArg => safe.Function_toStringFn.call(thisArg),
'Math_floor': Math.floor,
'Math_random': Math.random,
'Object_defineProperty': Object.defineProperty.bind(Object),
@ -1394,7 +1396,9 @@ function addEventListenerDefuser(
let type, handler;
try {
type = String(args[0]);
handler = String(args[1]);
handler = args[1] instanceof Function
? String(safe.Function_toString(args[1]))
: String(args[1]);
} catch(ex) {
}
const matchesType = safe.RegExp_test.call(reType, type);
@ -2004,7 +2008,9 @@ function noRequestAnimationFrameIf(
const reNeedle = safe.patternToRegex(needle);
window.requestAnimationFrame = new Proxy(window.requestAnimationFrame, {
apply: function(target, thisArg, args) {
const a = String(args[0]);
const a = args[0] instanceof Function
? String(safe.Function_toString(args[0]))
: String(args[0]);
let defuse = false;
if ( log !== undefined ) {
log('uBO: requestAnimationFrame("%s")', a);
@ -2072,7 +2078,9 @@ function noSetIntervalIf(
const reNeedle = safe.patternToRegex(needle);
self.setInterval = new Proxy(self.setInterval, {
apply: function(target, thisArg, args) {
const a = String(args[0]);
const a = args[0] instanceof Function
? String(safe.Function_toString(args[0]))
: String(args[0]);
const b = args[1];
if ( log !== undefined ) {
log('uBO: setInterval("%s", %s)', a, b);
@ -2134,7 +2142,9 @@ function noSetTimeoutIf(
const reNeedle = safe.patternToRegex(needle);
self.setTimeout = new Proxy(self.setTimeout, {
apply: function(target, thisArg, args) {
const a = String(args[0]);
const a = args[0] instanceof Function
? String(safe.Function_toString(args[0]))
: String(args[0]);
const b = args[1];
if ( log !== undefined ) {
log('uBO: setTimeout("%s", %s)', a, b);