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

Reject improper use of procedural operator in selector list 

Related feedback:
- https://github.com/uBlockOrigin/uBlock-issues/issues/382#issuecomment-703725346
This commit is contained in:
Raymond Hill 2020-10-06 12:39:05 -04:00
parent 42c0f66c6e
commit 57048d57b2
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/static-filtering-parser.js
View File

@ -1372,9 +1372,9 @@ Parser.prototype.SelectorCompiler = class {
return { name: name, value: regexDetails }; return { name: name, value: regexDetails };
} }
// https://github.com/AdguardTeam/ExtendedCss/issues/31#issuecomment-302391277
// Prepend `:scope ` if needed.
compileConditionalSelector(s) { compileConditionalSelector(s) {
// https://github.com/AdguardTeam/ExtendedCss/issues/31#issuecomment-302391277
// Prepend `:scope ` if needed.
if ( this.reNeedScope.test(s) ) { if ( this.reNeedScope.test(s) ) {
s = `:scope ${s}`; s = `:scope ${s}`;
} }
@ -1388,11 +1388,11 @@ Parser.prototype.SelectorCompiler = class {
return n; return n;
} }
// https://github.com/uBlockOrigin/uBlock-issues/issues/341#issuecomment-447603588
// Reject instances of :not() filters for which the argument is
// a valid CSS selector, otherwise we would be adversely
// changing the behavior of CSS4's :not().
compileNotSelector(s) { compileNotSelector(s) {
// https://github.com/uBlockOrigin/uBlock-issues/issues/341#issuecomment-447603588
// Reject instances of :not() filters for which the argument is
// a valid CSS selector, otherwise we would be adversely
// changing the behavior of CSS4's :not().
if ( this.cssSelectorType(s) === 0 ) { if ( this.cssSelectorType(s) === 0 ) {
return this.compileConditionalSelector(s); return this.compileConditionalSelector(s);
} }
@ -1408,8 +1408,10 @@ Parser.prototype.SelectorCompiler = class {
if ( s === '' ) { return s; } if ( s === '' ) { return s; }
} }
// https://github.com/uBlockOrigin/uBlock-issues/issues/382#issuecomment-703725346
// Prepend `*` only when it can be deemed implicit.
compileSpathExpression(s) { compileSpathExpression(s) {
if ( this.cssSelectorType('*' + s) === 1 ) { if ( this.cssSelectorType(/^\s*[+:>~]/.test(s) ? '*' + s : s) === 1 ) {
return s; return s;
} }
} }