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

Fix the handling of pseudoclass-based generic cosmetic filters 

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/464

Regression from:
261ef8c510?diff=unified#diff-3b15596213ed9ba37fb5b8bb1402a6c2R599

Pseudoclass-based generic cosmetic filters were improperly seen
as invalid following the regression.
This commit is contained in:
Raymond Hill 2019-04-21 07:49:44 -04:00
parent 59f4fd1f43
commit f10b100379
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/cosmetic-filtering.js
View File

@ -596,7 +596,14 @@ FilterContainer.prototype.compileGenericHideSelector = function(
// - Bad syntax
// - Procedural filters (can't be generic): the compiled version of
// a procedural selector is NEVER equal to its raw version.
if ( compiled === undefined || compiled !== selector ) {
// https://github.com/uBlockOrigin/uBlock-issues/issues/464
// Pseudoclass-based selectors can be compiled, but are also valid
// plain selectors.
if (
compiled === undefined ||
compiled !== selector &&
µb.staticExtFilteringEngine.compileSelector.pseudoclass !== true
) {
const who = writer.properties.get('assetKey') || '?';
µb.logger.writeOne({
realm: 'message',

38
src/js/static-ext-filtering.js
View File

@ -467,7 +467,7 @@
return µb.cosmeticFilteringEngine.discardedCount +
µb.scriptletFilteringEngine.discardedCount +
µb.htmlFilteringEngine.discardedCount;
}
},
};
//--------------------------------------------------------------------------
@ -664,6 +664,8 @@
};
const entryPoint = function(raw) {
entryPoint.pseudoclass = false;
const extendedSyntax = reExtendedSyntax.test(raw);
if ( isValidCSSSelector(raw) && extendedSyntax === false ) {
return raw;
@ -672,18 +674,18 @@
// We rarely reach this point -- majority of selectors are plain
// CSS selectors.
let matches, operator;
let matches;
// Supported Adguard/ABP advanced selector syntax: will translate into
// uBO's syntax before further processing.
// Supported Adguard/ABP advanced selector syntax: will translate
// into uBO's syntax before further processing.
// Mind unsupported advanced selector syntax, such as ABP's
// `-abp-properties`.
// Note: extended selector syntax has been deprecated in ABP, in favor
// of the procedural one (i.e. `:operator(...)`). See
// https://issues.adblockplus.org/ticket/5287
// Note: extended selector syntax has been deprecated in ABP, in
// favor of the procedural one (i.e. `:operator(...)`).
// See https://issues.adblockplus.org/ticket/5287
if ( extendedSyntax ) {
while ( (matches = reExtendedSyntaxParser.exec(raw)) !== null ) {
operator = normalizedExtendedSyntaxOperators.get(matches[1]);
const operator = normalizedExtendedSyntaxOperators.get(matches[1]);
if ( operator === undefined ) { return; }
raw = raw.slice(0, matches.index) +
operator + '(' + matches[3] + ')' +
@ -692,8 +694,7 @@
return entryPoint(raw);
}
let selector = raw,
pseudoclass, style;
let selector = raw, pseudoclass, style;
// `:style` selector?
if ( (matches = reStyleSelector.exec(selector)) !== null ) {
@ -709,23 +710,16 @@
}
if ( style !== undefined || pseudoclass !== undefined ) {
if ( isValidCSSSelector(selector) === false ) {
return;
}
if ( isValidCSSSelector(selector) === false ) { return; }
if ( pseudoclass !== undefined ) {
selector += pseudoclass;
}
if ( style !== undefined ) {
if ( isValidStyleProperty(style) === false ) { return; }
return JSON.stringify({
raw: raw,
style: [ selector, style ]
});
return JSON.stringify({ raw, style: [ selector, style ] });
}
return JSON.stringify({
raw: raw,
pseudoclass: true
});
entryPoint.pseudoclass = true;
return JSON.stringify({ raw, pseudoclass: true });
}
// Procedural selector?
@ -735,6 +729,8 @@
}
};
entryPoint.pseudoclass = false;
return entryPoint;
})();