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

[mv3] Revert attempt at fixing rules with entity-based syntax

Browse Source 
This will need more careful analysis to properly address this.
This commit is contained in:
Raymond Hill 2022-10-16 13:20:49 -04:00
parent 985ea24e82
commit d22b4e9f71
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/js/static-net-filtering.js
View File

@ -1743,6 +1743,7 @@ const FilterOriginEntityHit = class extends FilterOriginHit {
static dnrFromCompiled(args, rule) { static dnrFromCompiled(args, rule) {
dnrAddRuleError(rule, `FilterOriginEntityHit: Entity ${args[1]} not supported`); dnrAddRuleError(rule, `FilterOriginEntityHit: Entity ${args[1]} not supported`);
super.dnrFromCompiled(args, rule);
} }
}; };
@ -1761,6 +1762,7 @@ const FilterOriginEntityMiss = class extends FilterOriginMiss {
static dnrFromCompiled(args, rule) { static dnrFromCompiled(args, rule) {
dnrAddRuleError(rule, `FilterOriginEntityMiss: Entity ${args[1]} not supported`); dnrAddRuleError(rule, `FilterOriginEntityMiss: Entity ${args[1]} not supported`);
super.dnrFromCompiled(args, rule);
} }
}; };
@ -4060,34 +4062,6 @@ FilterContainer.prototype.dnrFromCompiled = function(op, context, ...args) {
} }
} }
// Try to recover from errors for when the rule is still useful despite not
// being complete.
for ( const rule of ruleset ) {
if ( rule._error === undefined ) { continue; }
let i = rule._error.length;
while ( i-- ) {
const error = rule._error[i];
if ( error.startsWith('FilterOriginEntityHit:') ) {
if (
Array.isArray(rule.condition.initiatorDomains) &&
rule.condition.initiatorDomains.length > 0
) {
rule._error.splice(i, 1);
}
} else if ( error.startsWith('FilterOriginEntityMiss:') ) {
if (
Array.isArray(rule.condition.excludedInitiatorDomains) &&
rule.condition.excludedInitiatorDomains.length > 0
) {
rule._error.splice(i, 1);
}
}
}
if ( rule._error.length === 0 ) {
delete rule._error;
}
}
// Patch modifier filters // Patch modifier filters
for ( const rule of ruleset ) { for ( const rule of ruleset ) {
if ( rule.__modifierType === undefined ) { continue; } if ( rule.__modifierType === undefined ) { continue; }