Update utils/merge-rulesets.py (EFForg#17492)

Chan Chak Shing · Hainish · commit 3cc38721c220 · 2019-03-07T15:48:04.000-08:00
[Before]
$ node --expose-gc utils/memusage.js
Initial usage: 42.1 MB
Maximum usage: 79.1 MB

$ du -s rules/default.rulesets
6820	rules/default.rulesets

[After]
$ node --expose-gc utils/memusage.js
Initial usage: 42 MB
Maximum usage: 78.6 MB

$ du -s rules/default.rulesets
6808	rules/default.rulesets
diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py
@@ -48,6 +48,7 @@ def normalize(f):
     root = tree.getroot()
 
     ruleset = {}
+    trivialNameSecureCookie = None
 
     for attr in root.attrib:
         ruleset[attr] = root.attrib[attr]
@@ -70,18 +71,29 @@ def normalize(f):
             ruleset["rule"].append(ru)
 
         elif child.tag == "securecookie":
-            sc = {}
-            sc["host"] = child.attrib["host"]
-            sc["name"] = child.attrib["name"]
+            if child.attrib["name"] == ".+":
+                if not trivialNameSecureCookie:
+                    trivialNameSecureCookie = {}
+                    trivialNameSecureCookie["host"] = child.attrib["host"]
+                    trivialNameSecureCookie["name"] = ".+"
+                else:
+                    trivialNameSecureCookie["host"] = (trivialNameSecureCookie["host"] + "|" + child.attrib["host"])
+            else:
+                sc = {}
+                sc["host"] = child.attrib["host"]
+                sc["name"] = child.attrib["name"]
 
-            ruleset["securecookie"].append(sc)
+                ruleset["securecookie"].append(sc)
 
         elif child.tag == "exclusion":
             if len(ruleset["exclusion"]) == 0:
                 ruleset["exclusion"].append(child.attrib["pattern"])
             else:
                 ruleset["exclusion"][0] = (ruleset["exclusion"][0] + "|" + child.attrib["pattern"])
 
+    if trivialNameSecureCookie:
+        ruleset["securecookie"].insert(0, trivialNameSecureCookie)
+
     library.append(ruleset);
 
 # Write to default.rulesets
