[Pkg-mozext-commits] [adblock-plus] 30/74: Issue 2390 - Created filter class for CSS property filters
David Prévot
taffit at moszumanska.debian.org
Tue Aug 11 12:07:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit d6466bd91794af2bbf1e110b8850c2f91b3337e4
Author: Thomas Greiner <thomas at adblockplus.org>
Date: Wed Jun 10 19:02:52 2015 +0200
Issue 2390 - Created filter class for CSS property filters
---
chrome/locale/en-US/global.properties | 1 +
lib/filterClasses.js | 149 +++++++++++++++++++++++++++-------
2 files changed, 121 insertions(+), 29 deletions(-)
diff --git a/chrome/locale/en-US/global.properties b/chrome/locale/en-US/global.properties
index 59de9cb..bbec8d2 100644
--- a/chrome/locale/en-US/global.properties
+++ b/chrome/locale/en-US/global.properties
@@ -30,6 +30,7 @@ clearStats_warning=This will reset all filter hit statistics and disable countin
filter_regexp_tooltip=This filter is either a regular expression or too short to be optimized. Too many of these filters might slow down your browsing.
filter_elemhide_duplicate_id=Only one ID of the element to be hidden can be specified
filter_elemhide_nocriteria=No criteria specified to recognize the element to be hidden
+filter_cssproperty_nodomain=No active domain specified for CSS property filter
subscription_invalid_location=Filter list location is neither a valid URL nor a valid file name.
diff --git a/lib/filterClasses.js b/lib/filterClasses.js
index 9f847f8..6bc6f29 100644
--- a/lib/filterClasses.js
+++ b/lib/filterClasses.js
@@ -20,6 +20,7 @@
*/
let {FilterNotifier} = require("filterNotifier");
+let {Utils} = require("utils");
/**
* Abstract base class for filters
@@ -85,6 +86,12 @@ Filter.regexpRegExp = /^(@@)?\/.*\/(?:\$~?[\w\-]+(?:=[^,\s]+)?(?:,~?[\w\-]+(?:=[
* @type RegExp
*/
Filter.optionsRegExp = /\$(~?[\w\-]+(?:=[^,\s]+)?(?:,~?[\w\-]+(?:=[^,\s]+)?)*)$/;
+/**
+ * Regular expression that CSS property filters should match
+ * Properties must not contain " or '
+ * @type RegExp
+ */
+Filter.csspropertyRegExp = /\[\-abp\-properties=(["'])([^"']+)\1\]/;
/**
* Creates a filter of correct type from its text representation - does the basic parsing and
@@ -160,6 +167,27 @@ Filter.normalize = function(/**String*/ text) /**String*/
};
/**
+ * Converts filter text into regular expression string
+ * @param {String} text as in Filter()
+ * @return {String} regular expression representation of filter text
+ */
+Filter.toRegExp = function(text)
+{
+ return text
+ .replace(/\*+/g, "*") // remove multiple wildcards
+ .replace(/\^\|$/, "^") // remove anchors following separator placeholder
+ .replace(/\W/g, "\\$&") // escape special symbols
+ .replace(/\\\*/g, ".*") // replace wildcards by .*
+ // process separator placeholders (all ANSI characters but alphanumeric characters and _%.-)
+ .replace(/\\\^/g, "(?:[\\x00-\\x24\\x26-\\x2C\\x2F\\x3A-\\x40\\x5B-\\x5E\\x60\\x7B-\\x7F]|$)")
+ .replace(/^\\\|\\\|/, "^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?") // process extended anchor at expression start
+ .replace(/^\\\|/, "^") // process anchor at expression start
+ .replace(/\\\|$/, "$") // process anchor at expression end
+ .replace(/^(\.\*)/, "") // remove leading wildcards
+ .replace(/(\.\*)$/, ""); // remove trailing wildcards
+}
+
+/**
* Class for invalid filters
* @param {String} text see Filter()
* @param {String} reason Reason why this filter is invalid
@@ -543,20 +571,7 @@ RegExpFilter.prototype =
if (prop)
return prop.value;
- // Remove multiple wildcards
- let source = this.regexpSource
- .replace(/\*+/g, "*") // remove multiple wildcards
- .replace(/\^\|$/, "^") // remove anchors following separator placeholder
- .replace(/\W/g, "\\$&") // escape special symbols
- .replace(/\\\*/g, ".*") // replace wildcards by .*
- // process separator placeholders (all ANSI characters but alphanumeric characters and _%.-)
- .replace(/\\\^/g, "(?:[\\x00-\\x24\\x26-\\x2C\\x2F\\x3A-\\x40\\x5B-\\x5E\\x60\\x7B-\\x7F]|$)")
- .replace(/^\\\|\\\|/, "^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?") // process extended anchor at expression start
- .replace(/^\\\|/, "^") // process anchor at expression start
- .replace(/\\\|$/, "$") // process anchor at expression end
- .replace(/^(\.\*)/, "") // remove leading wildcards
- .replace(/(\.\*)$/, ""); // remove trailing wildcards
-
+ let source = Filter.toRegExp(this.regexpSource);
let regexp = new RegExp(source, this.matchCase ? "" : "i");
Object.defineProperty(this, "regexp", {value: regexp});
return regexp;
@@ -852,7 +867,7 @@ ElemHideBase.prototype =
* @param {String} tagName tag name part (can be empty)
* @param {String} attrRules attribute matching rules (can be empty)
* @param {String} selector raw CSS selector (can be empty)
- * @return {ElemHideFilter|ElemHideException|InvalidFilter}
+ * @return {ElemHideFilter|ElemHideException|CSSPropertyFilter|InvalidFilter}
*/
ElemHideBase.fromText = function(text, domain, isException, tagName, attrRules, selector)
{
@@ -863,23 +878,24 @@ ElemHideBase.fromText = function(text, domain, isException, tagName, attrRules,
let id = null;
let additional = "";
- if (attrRules) {
+ if (attrRules)
+ {
attrRules = attrRules.match(/\([\w\-]+(?:[$^*]?=[^\(\)"]*)?\)/g);
- for (let rule of attrRules) {
+ for (let rule of attrRules)
+ {
rule = rule.substr(1, rule.length - 2);
let separatorPos = rule.indexOf("=");
- if (separatorPos > 0) {
+ if (separatorPos > 0)
+ {
rule = rule.replace(/=/, '="') + '"';
additional += "[" + rule + "]";
}
- else {
+ else
+ {
if (id)
- {
- let {Utils} = require("utils");
return new InvalidFilter(text, Utils.getString("filter_elemhide_duplicate_id"));
- }
- else
- id = rule;
+
+ id = rule;
}
}
}
@@ -889,15 +905,26 @@ ElemHideBase.fromText = function(text, domain, isException, tagName, attrRules,
else if (tagName || additional)
selector = tagName + additional;
else
- {
- let {Utils} = require("utils");
return new InvalidFilter(text, Utils.getString("filter_elemhide_nocriteria"));
- }
}
+
if (isException)
return new ElemHideException(text, domain, selector);
- else
- return new ElemHideFilter(text, domain, selector);
+
+ let match = Filter.csspropertyRegExp.exec(selector);
+ if (match)
+ {
+ // CSS property filters are inefficient so we need to make sure that
+ // they're only applied if they specify active domains
+ if (!/,[^~][^,.]*\.[^,]/.test("," + domain))
+ return new InvalidFilter(text, Utils.getString("filter_cssproperty_nodomain"));
+
+ return new CSSPropertyFilter(text, domain, selector, match[2],
+ selector.substr(0, match.index),
+ selector.substr(match.index + match[0].length));
+ }
+
+ return new ElemHideFilter(text, domain, selector);
};
/**
@@ -937,3 +964,67 @@ ElemHideException.prototype =
{
__proto__: ElemHideBase.prototype
};
+
+/**
+ * Class for CSS property filters
+ * @param {String} text see Filter()
+ * @param {String} domains see ElemHideBase()
+ * @param {String} selector see ElemHideBase()
+ * @param {String} regexpSource see CSSPropertyFilter.regexpSource
+ * @param {String} selectorPrefix see CSSPropertyFilter.selectorPrefix
+ * @param {String} selectorSuffix see CSSPropertyFilter.selectorSuffix
+ * @constructor
+ * @augments ElemHideBase
+ */
+function CSSPropertyFilter(text, domains, selector, regexpSource,
+ selectorPrefix, selectorSuffix)
+{
+ ElemHideBase.call(this, text, domains, selector);
+
+ this.regexpSource = regexpSource;
+ this.selectorPrefix = selectorPrefix;
+ this.selectorSuffix = selectorSuffix;
+}
+exports.CSSPropertyFilter = CSSPropertyFilter;
+
+CSSPropertyFilter.prototype =
+{
+ __proto__: ElemHideBase.prototype,
+
+ /**
+ * Expression from which a regular expression should be generated for matching
+ * CSS properties - for delayed creation of the regexpString property
+ * @type String
+ */
+ regexpSource: null,
+ /**
+ * Substring of CSS selector before properties for the HTML elements that
+ * should be hidden
+ * @type String
+ */
+ selectorPrefix: null,
+ /**
+ * Substring of CSS selector after properties for the HTML elements that
+ * should be hidden
+ * @type String
+ */
+ selectorSuffix: null,
+
+ /**
+ * Raw regular expression string to be used when testing CSS properties
+ * against this filter
+ * @type String
+ */
+ get regexpString()
+ {
+ // Despite this property being cached, the getter is called
+ // several times on Safari, due to WebKit bug 132872
+ let prop = Object.getOwnPropertyDescriptor(this, "regexpString");
+ if (prop)
+ return prop.value;
+
+ let regexp = Filter.toRegExp(this.regexpSource);
+ Object.defineProperty(this, "regexpString", {value: regexp});
+ return regexp;
+ }
+};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list