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

[mv3] Fix regression in handling important option

Browse source 
Related issue:
https://github.com/uBlockOrigin/uBOL-home/issues/368
This commit is contained in:
Raymond Hill 2025-06-13 11:10:16 -04:00
parent ff8c527b99
commit 43a883396d
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/js/static-net-filtering.js
View file

@ -4525,6 +4525,7 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar
const realms = new Map([
[ BLOCK_REALM, { type: 'block', priority: 10 } ],
[ ALLOW_REALM, { type: 'allow', priority: 30 } ],
[ BLOCK_REALM | IMPORTANT_REALM, { type: 'block', priority: 10 } ],
[ REDIRECT_REALM, { type: 'redirect', priority: 11 } ],
[ REMOVEPARAM_REALM, { type: 'removeparam', priority: 0 } ],
[ CSP_REALM, { type: 'csp', priority: 0 } ],
@ -4532,7 +4533,7 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar
[ URLTRANSFORM_REALM, { type: 'uritransform', priority: 0 } ],
[ HEADERS_REALM, { type: 'block', priority: 10 } ],
[ HEADERS_REALM | ALLOW_REALM, { type: 'allow', priority: 30 } ],
[ HEADERS_REALM | IMPORTANT_REALM, { type: 'allow', priority: 40 } ],
[ HEADERS_REALM | IMPORTANT_REALM, { type: 'allow', priority: 10 } ],
[ URLSKIP_REALM, { type: 'urlskip', priority: 0 } ],
]);
const partyness = new Map([
@ -4556,6 +4557,7 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar
'other',
]);
const ruleset = [];
const seen = new Set();
for ( const [ realmBits, realmDetails ] of realms ) {
for ( const [ partyBits, partyName ] of partyness ) {
for ( const typeName in typeNameToTypeValue ) {
@ -4579,12 +4581,16 @@ StaticNetFilteringEngine.prototype.dnrFromCompiled = function(op, context, ...ar
rule.condition = rule.condition || {};
rule.condition.resourceTypes = [ typeName ];
}
const hash = JSON.stringify(rule);
if ( seen.has(hash) ) { continue; }
seen.add(hash);
ruleset.push(rule);
}
}
}
}
}
seen.clear();
// Adjust `important` priority
for ( const rule of ruleset ) {