Noissue - Abstract hostname normalization

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 {extend} = require("./coreUtils");
 const {filterToRegExp} = require("./common");
-const {suffixes} = require("./domain");
+const {normalizeHostname, suffixes} = require("./domain");
 const {filterNotifier} = require("./filterNotifier");
 
 const resources = require("../data/resources.json");
 
 /**
  * Map of internal resources for URL rewriting.
  * @type {Map.<string,string>}
  */
 let resourceMap = new Map(
   Object.keys(resources).map(key => [key, resources[key]])
@@ skipping 562 matching lines @@
 
     // If no domains are set the rule matches everywhere
     if (!domains)
       return true;
 
     // If the document has no host name, match only if the filter
     // isn't restricted to specific domains
     if (!docDomain)
       return domains.get("");
 
-    if (docDomain[docDomain.length - 1] == ".")
-      docDomain = docDomain.replace(/\.+$/, "");
-
-    docDomain = docDomain.toLowerCase();
-
-    for (docDomain of suffixes(docDomain))
+    for (docDomain of suffixes(normalizeHostname(docDomain)))
     {
       let isDomainIncluded = domains.get(docDomain);
       if (typeof isDomainIncluded != "undefined")
         return isDomainIncluded;
     }
 
     return domains.get("");
   },
 
   /**
    * Checks whether this filter is active only on a domain and its subdomains.
    * @param {string} docDomain
    * @return {boolean}
    */
   isActiveOnlyOnDomain(docDomain)
   {
     let {domains} = this;
 
     if (!docDomain || !domains || domains.get(""))
       return false;
 
-    if (docDomain[docDomain.length - 1] == ".")
-      docDomain = docDomain.replace(/\.+$/, "");
-
-    docDomain = docDomain.toLowerCase();
+    docDomain = normalizeHostname(docDomain);
 
     for (let [domain, isIncluded] of domains)
     {
       if (isIncluded && domain != docDomain)
       {
         if (domain.length <= docDomain.length)
           return false;
 
         if (!domain.endsWith("." + docDomain))
           return false;
@@ skipping 796 matching lines @@
 
   /**
    * Script that should be executed
    * @type {string}
    */
   get script()
   {
     return this.body;
   }
 });