prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve trusted-replace-argument scriptlet

Browse source
This commit is contained in:
Raymond Hill 2025-10-02 12:27:45 -04:00
parent bf09ec0b99
commit 52bc354bce
No known key found for this signature in database
GPG key ID: F5630CAE62A14316
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/js/resources/replace-argument.js
View file

@ -65,10 +65,19 @@ export function trustedReplaceArgument(
const logPrefix = safe.makeLogPrefix('trusted-replace-argument', propChain, argposRaw, argraw);
const argoffset = parseInt(argposRaw, 10) || 0;
const extraArgs = safe.getExtraArgs(Array.from(arguments), 3);
const replacer = argraw.startsWith('repl:/') &&
parseReplaceFn(argraw.slice(5)) || undefined;
const value = replacer === undefined &&
validateConstantFn(true, argraw, extraArgs);
let replacer;
if ( argraw.startsWith('repl:/') ) {
const parsed = parseReplaceFn(argraw.slice(5));
if ( parsed === undefined ) { return; }
replacer = arg => `${arg}`.replace(replacer.re, replacer.replacement);
} else if ( argraw.startsWith('add:') ) {
const delta = parseFloat(argraw.slice(4));
if ( isNaN(delta) ) { return; }
replacer = arg => Number(arg) + delta;
} else {
const value = validateConstantFn(true, argraw, extraArgs);
replacer = ( ) => value;
}
const reCondition = extraArgs.condition
? safe.patternToRegex(extraArgs.condition)
: /^/;
@ -100,9 +109,7 @@ export function trustedReplaceArgument(
return context.reflect();
}
}
const argAfter = replacer && typeof argBefore === 'string'
? argBefore.replace(replacer.re, replacer.replacement)
: value;
const argAfter = replacer(argBefore);
if ( argAfter !== argBefore ) {
setArg(context, argAfter);
safe.uboLog(logPrefix, `Replaced argument:\nBefore: ${JSON.stringify(argBefore)}\nAfter: ${argAfter}`);