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

Improve prevent-fetch scriptlet

Browse Source 
- Add support for negated matches
- Log caller's arguments when verbose logging is enabled
This commit is contained in:
Raymond Hill 2024-09-04 11:32:26 -04:00
parent 89f02098fd
commit e8202af11d
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assets/resources/scriptlets.js
View File

@ -97,7 +97,7 @@ function safeSelf() {
},
initPattern(pattern, options = {}) {
if ( pattern === '' ) {
return { matchAll: true };
return { matchAll: true, expect: true };
}
const expect = (options.canNegate !== true || pattern.startsWith('!') === false);
if ( expect === false ) {
@ -2151,7 +2151,7 @@ function noFetchIf(
key = 'url';
value = condition;
}
needles.push({ key, re: safe.patternToRegex(value) });
needles.push({ key, pattern: safe.initPattern(value, { canNegate: true }) });
}
const validResponseProps = {
ok: [ false, true ],
@ -2180,6 +2180,9 @@ function noFetchIf(
const details = args[0] instanceof self.Request
? args[0]
: Object.assign({ url: args[0] }, args[1]);
if ( safe.logLevel > 1 ) {
safe.uboLog(logPrefix, `apply:\n\t${Object.entries(details).map(a => `${a[0]}: ${a[1]}`).join('\n\t')}`);
}
let proceed = true;
try {
const props = new Map();
@ -2198,10 +2201,10 @@ function noFetchIf(
return Reflect.apply(target, thisArg, args);
}
proceed = needles.length === 0;
for ( const { key, re } of needles ) {
for ( const { key, pattern } of needles ) {
if (
props.has(key) === false ||
re.test(props.get(key)) === false
pattern.expect && props.has(key) === false ||
safe.testPattern(pattern, props.get(key)) === false
) {
proceed = true;
break;