Issue 6868 - Enable capturing of surrounding wildcards for rewrite filters

lib/filterClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Definition of Filter class and its subclasses.
  */
 
-const {FilterNotifier} = require("./filterNotifier");
+const {filterNotifier} = require("./filterNotifier");
 const {extend} = require("./coreUtils");
 const {filterToRegExp} = require("./common");
 
 /**
  * All known unique domain sources mapped to their parsed values.
  * @type {Map.<string,Map.<string,boolean>>}
  */
 let knownDomainMaps = new Map();
 
 /**
@@ skipping 81 matching lines @@
  *
  * @param {string} text   as in Filter()
  * @return {Filter}
  */
 Filter.fromText = function(text)
 {
   let filter = Filter.knownFilters.get(text);
   if (filter)
     return filter;
 
-  let match = text.includes("#") ? Filter.contentRegExp.exec(text) : null;
-  if (match)
-  {
-    let propsMatch;
-    if (!match[2] && match[3].includes("[-") &&
-        (propsMatch = /\[-abp-properties=(["'])([^"']+)\1\]/.exec(match[3])))
-    {
-      // This is legacy CSS properties syntax, convert to current syntax
-      let prefix = match[3].substr(0, propsMatch.index);
-      let expression = propsMatch[2];
-      let suffix = match[3].substr(propsMatch.index + propsMatch[0].length);
-      return Filter.fromText(`${match[1]}#?#` +
-          `${prefix}:-abp-properties(${expression})${suffix}`);
-    }
-
-    filter = ContentFilter.fromText(text, match[1], match[2], match[3]);
-  }
-  else if (text[0] == "!")
+  if (text[0] == "!")
+  {
     filter = new CommentFilter(text);
+  }
   else
-    filter = RegExpFilter.fromText(text);
+  {
+    let match = text.includes("#") ? Filter.contentRegExp.exec(text) : null;
+    if (match)
+      filter = ContentFilter.fromText(text, match[1], match[2], match[3]);
+    else
+      filter = RegExpFilter.fromText(text);
+  }
 
   Filter.knownFilters.set(filter.text, filter);
   return filter;
 };
 
 /**
  * Deserializes a filter
  *
  * @param {Object}  obj map of serialized properties and their values
  * @return {Filter} filter or null if the filter couldn't be created
@@ skipping 74 matching lines @@
                    option.substr(cspMatch[0].length).trim().replace(/ +/g, " ");
     }
     else
       options[i] = option.replace(/ +/g, "");
   }
 
   return beforeOptions + "$" + options.join();
 };
 
 /**
- * @see filterToRegExp
- */
-Filter.toRegExp = filterToRegExp;
-
-/**
  * Class for invalid filters
  * @param {string} text see {@link Filter Filter()}
  * @param {string} reason Reason why this filter is invalid
  * @constructor
  * @augments Filter
  */
 function InvalidFilter(text, reason)
 {
   Filter.call(this, text);
 
@@ skipping 70 matching lines @@
   get disabled()
   {
     return this._disabled;
   },
   set disabled(value)
   {
     if (value != this._disabled)
     {
       let oldValue = this._disabled;
       this._disabled = value;
-      FilterNotifier.triggerListeners("filter.disabled", this, value, oldValue);
+      filterNotifier.emit("filter.disabled", this, value, oldValue);
     }
     return this._disabled;
   },
 
   /**
    * Number of hits on the filter since the last reset
    * @type {number}
    */
   get hitCount()
   {
     return this._hitCount;
   },
   set hitCount(value)
   {
     if (value != this._hitCount)
     {
       let oldValue = this._hitCount;
       this._hitCount = value;
-      FilterNotifier.triggerListeners("filter.hitCount", this, value, oldValue);
+      filterNotifier.emit("filter.hitCount", this, value, oldValue);
     }
     return this._hitCount;
   },
 
   /**
    * Last time the filter had a hit (in milliseconds since the beginning of the
    * epoch)
    * @type {number}
    */
   get lastHit()
   {
     return this._lastHit;
   },
   set lastHit(value)
   {
     if (value != this._lastHit)
     {
       let oldValue = this._lastHit;
       this._lastHit = value;
-      FilterNotifier.triggerListeners("filter.lastHit", this, value, oldValue);
+      filterNotifier.emit("filter.lastHit", this, value, oldValue);
     }
     return this._lastHit;
   },
 
   /**
    * String that the domains property should be generated from
    * @type {?string}
    */
   domainSource: null,
 
@@ skipping 269 matching lines @@
    * for delayed creation of the regexp property
    * @type {string}
    */
   regexpSource: null,
   /**
    * Regular expression to be used when testing against this filter
    * @type {RegExp}
    */
   get regexp()
   {
-    let source = Filter.toRegExp(this.regexpSource, this.rewrite == null);
+    let source = filterToRegExp(this.regexpSource, this.rewrite != null);
     let regexp = new RegExp(source, this.matchCase ? "" : "i");
     Object.defineProperty(this, "regexp", {value: regexp});
     this.regexpSource = null;
     return regexp;
   },
   /**
    * Content types the filter applies to, combination of values from
    * RegExpFilter.typeMap
    * @type {number}
    */
@@ skipping 112 matching lines @@
         if (inverse)
         {
           if (contentType == null)
             ({contentType} = RegExpFilter.prototype);
           contentType &= ~type;
         }
         else
         {
           contentType |= type;
 
-          if (type == RegExpFilter.typeMap.CSP && value)
+          if (type == RegExpFilter.typeMap.CSP)
+          {
+            if (!value)
+              return new InvalidFilter(origText, "filter_invalid_csp");
             csp = value;
+          }
         }
       }
       else
       {
         switch (option.toLowerCase())
         {
           case "match-case":
             matchCase = !inverse;
             break;
           case "domain":
@@ skipping 377 matching lines @@
 
   /**
    * Script that should be executed
    * @type {string}
    */
   get script()
   {
     return this.body;
   }
 });