Remove middle wildcard support in rules.js (EFForg#17715)

Chan Chak Shing · zoracon · commit 7bc12552ff4e · 2019-04-15T23:20:44.000-07:00
* Remove middle wildcard support in rules.js

* Fix regression caused by previous commit and update comments

* Update unit tests to please Travis

* Add unit tests to assert we dropped middle wildcard support

* Update rules.js
diff --git a/chromium/background-scripts/rules.js b/chromium/background-scripts/rules.js
@@ -562,22 +562,23 @@ RuleSets.prototype = {
       return nullIterable;
     }
 
-    // Replace each portion of the domain with a * in turn
+    // Replace www.example.com with www.example.*
+    // eat away from the right for once and only once
     let segmented = host.split(".");
-    for (let i = 0; i < segmented.length; i++) {
-      let tmp = segmented[i];
-      segmented[i] = "*";
+    if (segmented.length > 1) {
+      const tmp = segmented[segmented.length - 1];
+      segmented[segmented.length - 1] = "*";
 
       results = (this.targets.has(segmented.join(".")) ?
         new Set([...results, ...this.targets.get(segmented.join("."))]) :
         results);
 
-      segmented[i] = tmp;
+      segmented[segmented.length - 1] = tmp;
     }
 
     // now eat away from the left, with *, so that for x.y.z.google.com we
-    // check *.z.google.com and *.google.com (we did *.y.z.google.com above)
-    for (let i = 2; i <= segmented.length - 2; i++) {
+    // check *.y.z.google.com, *.z.google.com and *.google.com
+    for (let i = 1; i <= segmented.length - 2; i++) {
       let t = "*." + segmented.slice(i, segmented.length).join(".");
 
       results = (this.targets.has(t) ?
diff --git a/chromium/test/rules_test.js b/chromium/test/rules_test.js
@@ -203,15 +203,23 @@ describe('rules.js', function() {
           assert.deepEqual(res3, new Set(value), 'wildcard matches sub domains');
         });
 
-        it('matches middle wildcards', function() {
-          let target = 'sub.*.' + host;
+        it('matches right wildcards', function() {
+          const target = host + '.*';
           this.rsets.targets.set(target, value);
 
-          let res1 = this.rsets.potentiallyApplicableRulesets('sub.star.' + host);
+          const res1 = this.rsets.potentiallyApplicableRulesets(host + '.tld');
           assert.deepEqual(res1, new Set(value), 'default case');
 
-          let res2 = this.rsets.potentiallyApplicableRulesets('sub.foo.bar.' + host);
-          assert.isEmpty(res2, new Set(value), 'only matches one label');
+          const res2 = this.rsets.potentiallyApplicableRulesets(host + '.tld.com');
+          assert.isEmpty(res2, 'wildcard matches second level domains');
+        });
+
+        it('ignore middle wildcards', function() {
+          const target = 'www.*.' + host;
+          this.rsets.targets.set(target, value);
+
+          const res1 = this.rsets.potentiallyApplicableRulesets('www.cdn.' + host);
+          assert.isEmpty(res1, 'middle wildcards are matched');
         });
       });
     });
