Issue 6735 - Store domains in lower case

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
@@ skipping 742 matching lines @@
       if (separatorIndex >= 0)
       {
         value = option.substr(separatorIndex + 1);
         option = option.substr(0, separatorIndex);
       }
 
       let inverse = option[0] == "~";
       if (inverse)
         option = option.substr(1);
 
-      option = option.toLowerCase();
-
-      let type = typeMap.get(option);
+      let type = RegExpFilter.typeMap[option.replace(/-/, "_").toUpperCase()];
       if (type)
       {
         if (inverse)
         {
           if (contentType == null)
             ({contentType} = RegExpFilter.prototype);
           contentType &= ~type;
         }
         else
         {
           contentType |= type;
 
           if (type == RegExpFilter.typeMap.CSP && value)

[Manish Jethani, 2018/06/08 14:21:14]

By the way in the case of csp we quietly ignore the option if it has no value,
so we are not being consistent. Anyway we should address these things
separately, not as part of this patch.

[kzar, 2018/06/15 10:44:03]

Yea, agreed. By the way Rosie is reimplementing this stuff in Python ATM, so if
you change the behaviour ping her in IRC.

             csp = value;
         }
       }
       else
       {
-        switch (option)
+        switch (option.toLowerCase())
         {
           case "match-case":
             matchCase = !inverse;
             break;
           case "domain":
-            if (value)
-              domains = value.toLowerCase();
+            if (!value)
+              return new InvalidFilter(origText, "filter_unknown_option");
+            domains = value.toLowerCase();
             break;
           case "third-party":
             thirdParty = !inverse;
             break;
           case "collapse":
             collapse = !inverse;
             break;
           case "sitekey":
-            if (value)
-              sitekeys = value.toUpperCase();
+            if (!value)

[Manish Jethani, 2018/06/08 14:19:42]

There's a bit of code repetition here but I'm OK with it.

[kzar, 2018/06/15 10:44:03]

Yea, I think it's fine.

+              return new InvalidFilter(origText, "filter_unknown_option");
+            sitekeys = value.toUpperCase();
             break;
           case "rewrite":
-            if (value)
-              rewrite = value;
+            if (!value)

[Manish Jethani, 2018/06/08 14:19:42]

Note that this will get updated for the rewrite option in the other patch.

+              return new InvalidFilter(origText, "filter_unknown_option");
+            rewrite = value;
             break;
           default:
             return new InvalidFilter(origText, "filter_unknown_option");
         }
       }
     }
   }
 
   // For security reasons, never match $rewrite filters
   // against requests that might load any code to be executed.
@@ skipping 49 matching lines @@
   FONT: 32768,
 
   BACKGROUND: 4,    // Backwards compat, same as IMAGE
 
   POPUP: 0x10000000,
   GENERICBLOCK: 0x20000000,
   ELEMHIDE: 0x40000000,
   GENERICHIDE: 0x80000000
 };
 
-// Create a Map version of RegExpFilter.typeMap for faster lookups and fewer
-// string transformations in RegExpFilter.fromText
-let typeMap = new Map(
-  Object.keys(RegExpFilter.typeMap).map(
-    key => [key.replace("_", "-").toLowerCase(), RegExpFilter.typeMap[key]]
-  )
-);
-
 // CSP, DOCUMENT, ELEMHIDE, POPUP, GENERICHIDE and GENERICBLOCK options
 // shouldn't be there by default
 RegExpFilter.prototype.contentType &= ~(RegExpFilter.typeMap.CSP |
                                         RegExpFilter.typeMap.DOCUMENT |
                                         RegExpFilter.typeMap.ELEMHIDE |
                                         RegExpFilter.typeMap.POPUP |
                                         RegExpFilter.typeMap.GENERICHIDE |
                                         RegExpFilter.typeMap.GENERICBLOCK);
 
 /**
@@ skipping 214 matching lines @@
  */
 function ElemHideEmulationFilter(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
 }
 exports.ElemHideEmulationFilter = ElemHideEmulationFilter;
 
 ElemHideEmulationFilter.prototype = extend(ElemHideBase, {
   type: "elemhideemulation"
 });