external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-13 02:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix #2755

Browse source
This commit is contained in:
gorhill 2017-09-28 12:53:05 -04:00
parent 5a0c7c5383
commit 8559669e89
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/js/cosmetic-filtering.js
View file

@ -220,7 +220,7 @@ var FilterParser = function() {
this.hostnames = []; this.hostnames = [];
this.invalid = false; this.invalid = false;
this.cosmetic = true; this.cosmetic = true;
this.reNeedHostname = /^(?:script:contains|script:inject|.+?:has|.+?:has-text|.+?:if|.+?:if-not|.+?:matches-css(?:-before|-after)?|.*?:xpath)\(.+\)$/; this.reNeedHostname = /^(?:script:contains|script:inject|.+?:-abp-contains|.+?:-abp-has|.+?:contains|.+?:has|.+?:has-text|.+?:if|.+?:if-not|.+?:matches-css(?:-before|-after)?|.*?:xpath)\(.+\)$/;
}; };
/******************************************************************************/ /******************************************************************************/
@ -257,8 +257,8 @@ FilterParser.prototype.parse = function(raw) {
// Coarse-check that the anchor is valid. // Coarse-check that the anchor is valid.
// `##`: l = 1 // `##`: l = 1
// `#@#`, `#$#`, `#%#`: l = 2 // `#@#`, `#$#`, `#%#`, `#?#`: l = 2
// `#@$#`, `#@%#`: l = 3 // `#@$#`, `#@%#`, `#@?#`: l = 3
if ( (rpos - lpos) > 3 ) { if ( (rpos - lpos) > 3 ) {
this.cosmetic = false; this.cosmetic = false;
return this; return this;
@ -276,23 +276,28 @@ FilterParser.prototype.parse = function(raw) {
// supported. // supported.
var cCode = raw.charCodeAt(rpos - 1); var cCode = raw.charCodeAt(rpos - 1);
if ( cCode !== 0x23 /* '#' */ && cCode !== 0x40 /* '@' */ ) { if ( cCode !== 0x23 /* '#' */ && cCode !== 0x40 /* '@' */ ) {
// We have an Adguard cosmetic filter if and only if the character is // We have an Adguard/ABP cosmetic filter if and only if the character
// `$` or `%`, otherwise it's not a cosmetic filter. // is `$`, `%` or `?`, otherwise it's not a cosmetic filter.
// Not a cosmetic filter. if (
if ( cCode !== 0x24 /* '$' */ && cCode !== 0x25 /* '%' */ ) { cCode !== 0x24 /* '$' */ &&
cCode !== 0x25 /* '%' */ &&
cCode !== 0x3F /* '?' */
) {
this.cosmetic = false; this.cosmetic = false;
return this; return this;
} }
// Not supported. // Adguard's scriptlet injection: not supported.
if ( cCode !== 0x24 /* '$' */ ) { if ( cCode === 0x25 /* '%' */ ) {
this.invalid = true; this.invalid = true;
return this; return this;
} }
// CSS injection rule: supported, but translate into uBO's own format. // Adguard's style injection: supported, but translate to uBO's format.
raw = this.translateAdguardCSSInjectionFilter(raw); if ( cCode === 0x24 /* '$' */ ) {
if ( raw === '' ) { raw = this.translateAdguardCSSInjectionFilter(raw);
this.invalid = true; if ( raw === '' ) {
return this; this.invalid = true;
return this;
}
} }
rpos = raw.indexOf('#', lpos + 1); rpos = raw.indexOf('#', lpos + 1);
} }
@ -332,6 +337,9 @@ FilterParser.prototype.parse = function(raw) {
// For some selectors, it is mandatory to have a hostname or entity: // For some selectors, it is mandatory to have a hostname or entity:
// ##script:contains(...) // ##script:contains(...)
// ##script:inject(...) // ##script:inject(...)
// ##.foo:-abp-contains(...)
// ##.foo:-abp-has(...)
// ##.foo:contains(...)
// ##.foo:has(...) // ##.foo:has(...)
// ##.foo:has-text(...) // ##.foo:has-text(...)
// ##.foo:if(...) // ##.foo:if(...)
@ -800,7 +808,10 @@ FilterContainer.prototype.compileSelector = (function() {
return raw; return raw;
} }
// :contains // :contains
if ( reIsRegexLiteral.test(matches[2]) === false || isBadRegex(matches[2].slice(1, -1)) === false ) { if (
reIsRegexLiteral.test(matches[2]) === false ||
isBadRegex(matches[2].slice(1, -1)) === false
) {
return raw; return raw;
} }
} }
@ -823,7 +834,7 @@ FilterContainer.prototype.compileSelector = (function() {
/******************************************************************************/ /******************************************************************************/
FilterContainer.prototype.compileProceduralSelector = (function() { FilterContainer.prototype.compileProceduralSelector = (function() {
var reOperatorParser = /(:(?:has|has-text|if|if-not|matches-css|matches-css-after|matches-css-before|xpath))\(.+\)$/, var reOperatorParser = /(:(?:-abp-contains|-abp-has|contains|has|has-text|if|if-not|matches-css|matches-css-after|matches-css-before|xpath))\(.+\)$/,
reFirstParentheses = /^\(*/, reFirstParentheses = /^\(*/,
reLastParentheses = /\)*$/, reLastParentheses = /\)*$/,
reEscapeRegex = /[.*+?^${}()|[\]\\]/g, reEscapeRegex = /[.*+?^${}()|[\]\\]/g,
@ -887,6 +898,13 @@ FilterContainer.prototype.compileProceduralSelector = (function() {
return s; return s;
}; };
// https://github.com/gorhill/uBlock/issues/2793
var normalizedOperators = new Map([
[ ':-abp-contains', ':has-text' ],
[ ':-abp-has', ':if' ],
[ ':contains', ':has-text' ]
]);
var compileArgument = new Map([ var compileArgument = new Map([
[ ':has', compileCSSSelector ], [ ':has', compileCSSSelector ],
[ ':has-text', compileText ], [ ':has-text', compileText ],
@ -932,6 +950,7 @@ FilterContainer.prototype.compileProceduralSelector = (function() {
if ( depth !== 0 ) { if ( depth !== 0 ) {
currentArgument += nextOperand + nextOperator; currentArgument += nextOperand + nextOperator;
} else { } else {
currentOperator = normalizedOperators.get(currentOperator) || currentOperator;
currentArgument = compileArgument.get(currentOperator)(nextOperand.slice(1, -1)); currentArgument = compileArgument.get(currentOperator)(nextOperand.slice(1, -1));
if ( currentArgument === undefined ) { return; } if ( currentArgument === undefined ) { return; }
tasks.push([ currentOperator, currentArgument ]); tasks.push([ currentOperator, currentArgument ]);