Issue 3956 - Convert domain whitelisting filters

lib/abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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/>.
  */
 
 /** @module abp2blocklist */
 
 "use strict";
 
 let filterClasses = require("filterClasses");
 let tldjs = require("tldjs");
 let punycode = require("punycode");
 
 const selectorLimit = 5000;
 const typeMap = filterClasses.RegExpFilter.typeMap;
+const whitelistableRequestTypes = (typeMap.IMAGE
+                                   | typeMap.STYLESHEET
+                                   | typeMap.SCRIPT
+                                   | typeMap.FONT
+                                   | typeMap.MEDIA
+                                   | typeMap.POPUP
+                                   | typeMap.OBJECT
+                                   | typeMap.OBJECT_SUBREQUEST
+                                   | typeMap.XMLHTTPREQUEST
+                                   | typeMap.PING
+                                   | typeMap.SUBDOCUMENT
+                                   | typeMap.OTHER);
 
 function parseDomains(domains, included, excluded)
 {
   for (let domain in domains)
   {
     if (domain != "")
     {
       let enabled = domains[domain];
       domain = punycode.toASCII(domain.toLowerCase());
 
@@ skipping 173 matching lines @@
   {
     result.push(domain);
 
     if (tldjs.getDomain(domain) == domain)
       result.push("www." + domain);
   }
 
   return result;
 }
 
-function convertFilter(filter, action, withResourceTypes)
-{
-  let rules = [];
+function convertFilterAddRules(rules, filter, action, withResourceTypes)
+{
   let parsed = parseFilterRegexpSource(filter.regexpSource);
 
   // For the special case of $document whitelisting filters with just a domain
   // we can generate an equivalent blocking rule exception using if-domain.
   if (filter instanceof filterClasses.WhitelistFilter &&
       filter.contentType & typeMap.DOCUMENT &&
       parsed.justHostname)
   {
     rules.push({
       trigger: {
         "url-filter": ".*",
         "if-domain": addDomainPrefix([parsed.hostname])
       },
       action: {type: "ignore-previous-rules"}
     });
-    // If the filter contains multiple options we'll need to generate further
-    // rules for it, but if not we can simply return now.
-    if (filter.contentType == typeMap.DOCUMENT)
-      return rules;
+    // If the filter contains other supported options we'll need to generate
+    // further rules for it, but if not we can simply return now.
+    if (!(filter.contentType | whitelistableRequestTypes))
+      return;
   }
 
   let trigger = {"url-filter": parsed.regexp};
 
   // Limit rules to HTTP(S) URLs
   if (!/^(\^|http)/i.test(trigger["url-filter"]))
     trigger["url-filter"] = "^https?://.*" + trigger["url-filter"];
 
   // For rules containing only a hostname we know that we're matching against
   // a lowercase string unless the matchCase option was passed.
@@ skipping 12 matching lines @@
     trigger["resource-type"] = getResourceTypes(filter);
   if (filter.thirdParty != null)
     trigger["load-type"] = [filter.thirdParty ? "third-party" : "first-party"];
 
   if (included.length > 0)
     trigger["if-domain"] = addDomainPrefix(included);
   else if (excluded.length > 0)
     trigger["unless-domain"] = addDomainPrefix(excluded);
 
   rules.push({trigger: trigger, action: {type: action}});
-
-  return rules;
 }
 
 function hasNonASCI(obj)
 {
   if (typeof obj == "string")
   {
     if (/[^\x00-\x7F]/.test(obj))
       return true;
   }
 
@@ skipping 90 matching lines @@
     return;
   if (filter instanceof filterClasses.RegExpFilter &&
       filter.regexpSource == null)
     return;
 
   if (filter instanceof filterClasses.BlockingFilter)
     this.requestFilters.push(filter);
 
   if (filter instanceof filterClasses.WhitelistFilter)
   {
-    if (filter.contentType & (typeMap.DOCUMENT
-                              | typeMap.IMAGE
-                              | typeMap.STYLESHEET
-                              | typeMap.SCRIPT
-                              | typeMap.FONT
-                              | typeMap.MEDIA
-                              | typeMap.POPUP
-                              | typeMap.OBJECT
-                              | typeMap.OBJECT_SUBREQUEST
-                              | typeMap.XMLHTTPREQUEST
-                              | typeMap.PING
-                              | typeMap.SUBDOCUMENT
-                              | typeMap.OTHER))
+    if (filter.contentType & (typeMap.DOCUMENT | whitelistableRequestTypes))
       this.requestExceptions.push(filter);
 
       if (filter.contentType & typeMap.ELEMHIDE)
         this.elemhideExceptions.push(filter);
   }
 
   if (filter instanceof filterClasses.ElemHideFilter)
     this.elemhideFilters.push(filter);
 
   if (filter instanceof filterClasses.ElemHideException)
   {
     let domains = this.elemhideSelectorExceptions[filter.selector];
     if (!domains)
       domains = this.elemhideSelectorExceptions[filter.selector] = [];
 
     parseDomains(filter.domains, domains, []);
   }
 };
 
 /**
  * Generate content blocker list for all filters that were added
  *
  * @returns   {Filter}   filter    Filter to convert
  */
 ContentBlockerList.prototype.generateRules = function(filter)
 {
   let rules = [];
 
-  function addRules(newRules)
-  {
-    for (let rule of newRules)
-    if (!hasNonASCI(rule))
-      rules.push(rule);
-  }
-
   let groupedElemhideFilters = new Map();
   for (let filter of this.elemhideFilters)
   {
     let result = convertElemHideFilter(filter, this.elemhideSelectorExceptions);
     if (!result)
       continue;
 
     if (result.matchDomains.length == 0)
       result.matchDomains = ["^https?://"];
 
     for (let matchDomain of result.matchDomains)
     {
       let group = groupedElemhideFilters.get(matchDomain) || [];
       group.push(result.selector);
       groupedElemhideFilters.set(matchDomain, group);
     }
   }
 
   groupedElemhideFilters.forEach((selectors, matchDomain) =>
   {
     while (selectors.length)
     {
       let selector = selectors.splice(0, selectorLimit).join(", ");
 
       // As of Safari 9.0 element IDs are matched as lowercase. We work around
       // this by converting to the attribute format [id="elementID"]
       selector = convertIDSelectorsToAttributeSelectors(selector);
 
-      addRules([{

[Sebastian Noack, 2016/05/17 10:17:54]

We are creating quite a few temporary arrays now. I suppose it will be faster,
and perhaps also simpler, if we pass the "rules" array to convertFilter() rather
than having it return a new array. And then iterate over all generated rules in
the end to remove those that that have non-ascii characters.

[kzar, 2016/05/17 10:38:02]

Done.

+      rules.push({
         trigger: {"url-filter": matchDomain,
                   "url-filter-is-case-sensitive": true},
         action: {type: "css-display-none",
                  selector: selector}
-      }]);
+      });
     }
   });
 
   for (let filter of this.elemhideExceptions)
-    addRules(convertFilter(filter, "ignore-previous-rules", false));
+    convertFilterAddRules(rules, filter, "ignore-previous-rules", false);
   for (let filter of this.requestFilters)
-    addRules(convertFilter(filter, "block", true));
+    convertFilterAddRules(rules, filter, "block", true);
   for (let filter of this.requestExceptions)
-    addRules(convertFilter(filter, "ignore-previous-rules", true));
-
-  return rules;
+    convertFilterAddRules(rules, filter, "ignore-previous-rules", true);
+
+  return rules.filter(rule => !hasNonASCI(rule));
 };