Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve `trusted-replace-outbound-text` scriptlet 

As per filter list maintainers feedback.
This commit is contained in:
Raymond Hill 2024-06-05 08:40:02 -04:00
parent cc417a0cd4
commit fa6740a059
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
assets/resources/scriptlets.js
View File

@ -4782,20 +4782,29 @@ function trustedReplaceOutboundText(
const extraArgs = safe.getExtraArgs(args); const extraArgs = safe.getExtraArgs(args);
const reCondition = safe.patternToRegex(extraArgs.condition || ''); const reCondition = safe.patternToRegex(extraArgs.condition || '');
const reflector = proxyApplyFn(propChain, function(...args) { const reflector = proxyApplyFn(propChain, function(...args) {
const textBefore = reflector(...args); const encodedTextBefore = reflector(...args);
let textBefore = encodedTextBefore;
if ( extraArgs.encoding === 'base64' ) {
try { textBefore = self.atob(encodedTextBefore); }
catch(ex) { return encodedTextBefore; }
}
if ( pattern === '' ) { if ( pattern === '' ) {
safe.uboLog(logPrefix, 'Outbound text:\n', textBefore); safe.uboLog(logPrefix, 'Decoded outbound text:\n', textBefore);
return textBefore; return encodedTextBefore;
} }
reCondition.lastIndex = 0; reCondition.lastIndex = 0;
if ( reCondition.test(textBefore) === false ) { return textBefore; } if ( reCondition.test(textBefore) === false ) { return encodedTextBefore; }
const textAfter = textBefore.replace(rePattern, replacement); const textAfter = textBefore.replace(rePattern, replacement);
if ( textAfter === textBefore ) { return textBefore; } if ( textAfter === textBefore ) { return encodedTextBefore; }
safe.uboLog(logPrefix, 'Matched and replaced'); safe.uboLog(logPrefix, 'Matched and replaced');
if ( safe.logLevel > 1 ) { if ( safe.logLevel > 1 ) {
safe.uboLog(logPrefix, 'Modified outbound text:\n', textAfter); safe.uboLog(logPrefix, 'Modified decoded outbound text:\n', textAfter);
} }
return textAfter; let encodedTextAfter = textAfter;
if ( extraArgs.encoding === 'base64' ) {
encodedTextAfter = self.btoa(textAfter);
}
return encodedTextAfter;
}); });
} }