Revisit validation of combinators in `:not()` operator

Related feedback:
- https://www.reddit.com/r/uBlockOrigin/comments/z2ttcx/problem_with_custom_filters_in_1452/iza8nkk/
This commit is contained in:
Raymond Hill 2022-12-09 11:10:39 -05:00
parent 042a56366d
commit b0a0a44c64
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 52 additions and 2 deletions

View File

@ -1579,10 +1579,21 @@ Parser.prototype.SelectorCompiler = class {
data.type = 'Error'; data.type = 'Error';
} }
break; break;
case 'not': case 'not': {
if ( this.astHasType(args, 'Combinator', 0) ) { if ( this.astHasType(args, 'Combinator', 0) === false ) { break; }
const selectors = this.astSelectorsFromSelectorList(args);
if ( Array.isArray(selectors) === false || selectors.length === 0 ) {
data.type = 'Error'; data.type = 'Error';
break;
} }
for ( const selector of selectors ) {
if ( this.astIsValidSelector(selector) ) { continue; }
data.type = 'Error';
break;
}
break;
}
default:
break; break;
} }
} }
@ -1806,6 +1817,45 @@ Parser.prototype.SelectorCompiler = class {
return false; return false;
} }
astSelectorsFromSelectorList(args) {
if ( args.length < 3 ) { return; }
if ( args[0].data instanceof Object === false ) { return; }
if ( args[0].data.type !== 'SelectorList' ) { return; }
if ( args[1].data instanceof Object === false ) { return; }
if ( args[1].data.type !== 'Selector' ) { return; }
const out = [];
let beg = 1, end = 0, i = 2;
for (;;) {
if ( i < args.length ) {
const type = args[i].data instanceof Object && args[i].data.type;
if ( type === 'Selector' ) {
end = i;
}
} else {
end = args.length;
}
if ( end !== 0 ) {
const components = args.slice(beg+1, end);
if ( components.length === 0 ) { return; }
out.push(components);
if ( end === args.length ) { break; }
beg = end; end = 0;
}
if ( i === args.length ) { break; }
i += 1;
}
return out;
}
astIsValidSelector(components) {
const len = components.length;
if ( len === 0 ) { return false; }
if ( components[0].data.type === 'Combinator' ) { return false; }
if ( len === 1 ) { return true; }
if ( components[len-1].data.type === 'Combinator' ) { return false; }
return true;
}
translateAdguardCSSInjectionFilter(suffix) { translateAdguardCSSInjectionFilter(suffix) {
const matches = /^(.*)\s*\{([^}]+)\}\s*$/.exec(suffix); const matches = /^(.*)\s*\{([^}]+)\}\s*$/.exec(suffix);
if ( matches === null ) { return ''; } if ( matches === null ) { return ''; }