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 737 matching lines @@
     text = match.input.substr(0, match.index);
     for (let option of options)
     {
       let value = null;
       let separatorIndex = option.indexOf("=");
       if (separatorIndex >= 0)
       {
         value = option.substr(separatorIndex + 1);
         option = option.substr(0, separatorIndex);
       }
-      let type = (option[0] == "~" ? option.substr(1) : option)
-                 .replace(/-/, "_").toUpperCase();
-      option = option.toLowerCase();
-      if (type in RegExpFilter.typeMap)
+
+      let inverse = option[0] == "~";
+      if (inverse)
+        option = option.substr(1);
+
+      let type = RegExpFilter.typeMap[option.replace(/-/, "_").toUpperCase()];
+      if (type)
       {
-        if (option[0] == "~")
+        if (inverse)
         {
           if (contentType == null)
             ({contentType} = RegExpFilter.prototype);
-          contentType &= ~RegExpFilter.typeMap[type];
+          contentType &= ~type;
         }
         else
         {
-          if (contentType == null)
-            contentType = 0;
-          contentType |= RegExpFilter.typeMap[type];
-
-          if (type == "CSP" && value)
+          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 if (option == "match-case")
-        matchCase = true;
-      else if (option == "~match-case")
-        matchCase = false;
-      else if (option == "domain" && value)
-        domains = value.toLowerCase();
-      else if (option == "third-party")
-        thirdParty = true;
-      else if (option == "~third-party")
-        thirdParty = false;
-      else if (option == "collapse")
-        collapse = true;
-      else if (option == "~collapse")
-        collapse = false;
-      else if (option == "sitekey" && value)
-        sitekeys = value.toUpperCase();
-      else if (option == "rewrite" && value)
-        rewrite = value;
       else
-        return new InvalidFilter(origText, "filter_unknown_option");
+      {
+        switch (option.toLowerCase())
+        {
+          case "match-case":
+            matchCase = !inverse;
+            break;
+          case "domain":
+            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)

[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)

[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.
   if (rewrite != null)
   {
     if (contentType == null)
       ({contentType} = RegExpFilter.prototype);
     contentType &= ~(RegExpFilter.typeMap.SCRIPT |
@@ skipping 278 matching lines @@
  */
 function ElemHideEmulationFilter(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
 }
 exports.ElemHideEmulationFilter = ElemHideEmulationFilter;
 
 ElemHideEmulationFilter.prototype = extend(ElemHideBase, {
   type: "elemhideemulation"
 });