Issue 2390 - Created filter class for CSS property filters

lib/filterClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 701 matching lines @@
         collapse = true;
       else if (option == "~COLLAPSE")
         collapse = false;
       else if (option == "SITEKEY" && typeof value != "undefined")
         sitekeys = value;
       else
         return new InvalidFilter(origText, "Unknown option " + option.toLowerCase());
     }
   }
 
-  if (!blocking && (contentType == null || (contentType & RegExpFilter.typeMap.DOCUMENT)) &&
-      (!options || options.indexOf("DOCUMENT") < 0) && !/^\|?[\w\-]+:/.test(text))
-  {
-    // Exception filters shouldn't apply to pages by default unless they start with a protocol name
-    if (contentType == null)
-      contentType = RegExpFilter.prototype.contentType;
-    contentType &= ~RegExpFilter.typeMap.DOCUMENT;
-  }
-
   try
   {
     if (blocking)
       return new BlockingFilter(origText, text, contentType, matchCase, domains, thirdParty, sitekeys, collapse);
     else
       return new WhitelistFilter(origText, text, contentType, matchCase, domains, thirdParty, sitekeys);
   }
   catch (e)
   {
     return new InvalidFilter(origText, e);
@@ skipping 18 matching lines @@
   DTD: 1,
   MEDIA: 16384,
   FONT: 32768,
 
   BACKGROUND: 4,    // Backwards compat, same as IMAGE
 
   POPUP: 0x10000000,
   ELEMHIDE: 0x40000000
 };
 
-// ELEMHIDE, POPUP option shouldn't be there by default
-RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.ELEMHIDE | RegExpFilter.typeMap.POPUP);
+// DOCUMENT, ELEMHIDE, POPUP options shouldn't be there by default
+RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.DOCUMENT | RegExpFilter.typeMap.ELEMHIDE | RegExpFilter.typeMap.POPUP);
 
 /**
  * Class for blocking filters
  * @param {String} text see Filter()
  * @param {String} regexpSource see RegExpFilter()
  * @param {Number} contentType see RegExpFilter()
  * @param {Boolean} matchCase see RegExpFilter()
  * @param {String} domains see RegExpFilter()
  * @param {Boolean} thirdParty see RegExpFilter()
  * @param {String} sitekeys see RegExpFilter()
@@ skipping 115 matching lines @@
         let separatorPos = rule.indexOf("=");
         if (separatorPos > 0)
         {
           rule = rule.replace(/=/, '="') + '"';
           additional += "[" + rule + "]";
         }
         else
         {
           if (id)
             return new InvalidFilter(text, Utils.getString("filter_elemhide_duplicate_id"));
-          else
-            id = rule;
+
+          id = rule;
         }
       }
     }
 
     if (id)
       selector = tagName + "." + id + additional + "," + tagName + "#" + id + additional;
     else if (tagName || additional)
       selector = tagName + additional;
     else
       return new InvalidFilter(text, Utils.getString("filter_elemhide_nocriteria"));
   }
+
   if (isException)
     return new ElemHideException(text, domain, selector);
-  else
-  {
-    if (Filter.csspropertyRegExp.test(selector))
-    {
-      // CSS property filters are inefficient so we need to make sure that
-      // they're only applied if they specify active domains
-      if (!/,[^~][^,.]*\.[^,]/.test("," + domain))

[Sebastian Noack, 2015/05/06 13:07:48]

This regex will allow "foo.." (note that this is equvalent to just "foo") and
"..foo".

[Thomas Greiner, 2015/05/06 15:33:07]

While "foo.." might be equivalent to "foo" when used in the browser, it's
treated separately when matching the filter against a domain. That means that
the filter `adblockplus.org.##body` is only applied on "adblockplus.org." but
not on "adblockplus.org" or "adblockplus.org.."

Therefore I'd consider this regex to be sufficient.

-        return new InvalidFilter(text, Utils.getString("filter_cssproperty_nodomain"));
-
-      return new CSSPropertyFilter(text, domain, selector);
-    }
-
-    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);
 };
 
 /**
  * Class for element hiding filters
  * @param {String} text see Filter()
  * @param {String} domains  see ElemHideBase()
  * @param {String} selector see ElemHideBase()
  * @constructor
  * @augments ElemHideBase
  */
@@ skipping 22 matching lines @@
 }
 exports.ElemHideException = ElemHideException;
 
 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} 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)
+function CSSPropertyFilter(text, domains, selector, regexpSource,
+  selectorPrefix, selectorSuffix)
 {
   ElemHideBase.call(this, text, domains, selector);
 
-  let properties;
-  [properties, , this.regexpSource] = selector.match(Filter.csspropertyRegExp);
-  [this.selectorPrefix, this.selectorSuffix] = selector.split(properties);
+  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
@@ skipping 24 matching lines @@
     // 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;
   }
 };