Issue 7046 - Defer caching of domain maps

test/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 326 matching lines @@
 
   compareFilter(test, "@@bla$~script,~other,donottrack", ["type=invalid", "text=@@bla$~script,~other,donottrack", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$~script,~other,~donottrack", ["type=invalid", "text=@@bla$~script,~other,~donottrack", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$donottrack", ["type=invalid", "text=@@bla$donottrack", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$foobar", ["type=invalid", "text=@@bla$foobar", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$image,foobar", ["type=invalid", "text=@@bla$image,foobar", "reason=filter_unknown_option"]);
   compareFilter(test, "@@bla$foobar,image", ["type=invalid", "text=@@bla$foobar,image", "reason=filter_unknown_option"]);
 
   compareFilter(test, "bla$csp", ["type=invalid", "text=bla$csp", "reason=filter_invalid_csp"]);
   compareFilter(test, "bla$csp=", ["type=invalid", "text=bla$csp=", "reason=filter_invalid_csp"]);
+
+  // Blank CSP values are allowed for whitelist filters.
+  compareFilter(test, "@@bla$csp", ["type=whitelist", "text=@@bla$csp", "regexp=bla", "contentType=" + t.CSP]);
+  compareFilter(test, "@@bla$csp=", ["type=whitelist", "text=@@bla$csp=", "regexp=bla", "contentType=" + t.CSP]);
+
   compareFilter(test, "bla$csp=report-uri", ["type=invalid", "text=bla$csp=report-uri", "reason=filter_invalid_csp"]);
   compareFilter(test, "bla$csp=foo,csp=report-to", ["type=invalid", "text=bla$csp=foo,csp=report-to", "reason=filter_invalid_csp"]);
   compareFilter(test, "bla$csp=foo,csp=referrer foo", ["type=invalid", "text=bla$csp=foo,csp=referrer foo", "reason=filter_invalid_csp"]);
   compareFilter(test, "bla$csp=foo,csp=base-uri", ["type=invalid", "text=bla$csp=foo,csp=base-uri", "reason=filter_invalid_csp"]);
   compareFilter(test, "bla$csp=foo,csp=upgrade-insecure-requests", ["type=invalid", "text=bla$csp=foo,csp=upgrade-insecure-requests", "reason=filter_invalid_csp"]);
   compareFilter(test, "bla$csp=foo,csp=ReFeRReR", ["type=invalid", "text=bla$csp=foo,csp=ReFeRReR", "reason=filter_invalid_csp"]);
 
   test.done();
 };
 
@@ skipping 241 matching lines @@
   test.equal(
     filterStrip.rewriteUrl("http://example.com/?tag"),
     "http://example.com/?"
   );
 
   test.done();
 };
 
 exports.testDomainMapDeduplication = function(test)
 {
-  // Make sure the generated domain map is cached on first access.

[Manish Jethani, 2018/10/15 15:36:59]

We need to set this in order to test our deduplication logic.

-  ActiveFilter.prototype._domainsAccessCacheThreshold = 0;
-
-  let filter1 = Filter.fromText("example.com##.foo");
-  let filter2 = Filter.fromText("example.com##.bar");
+  let filter1 = Filter.fromText("foo$domain=blocking.example.com");
+  let filter2 = Filter.fromText("bar$domain=blocking.example.com");
+  let filter3 = Filter.fromText("elemhide.example.com##.foo");
+  let filter4 = Filter.fromText("elemhide.example.com##.bar");
 
   // This compares the references to make sure that both refer to the same
   // object (#6815).
   test.equal(filter1.domains, filter2.domains);
 
-  let filter3 = Filter.fromText("www.example.com##.bar");
-
-  test.notEqual(filter2.domains, filter3.domains);
-
-  test.done();
-};
+  // For element hiding filters, the value of the property is cached internally
+  // only on second access.
+  test.notEqual(filter3.domains, filter4.domains);
+  test.equal(filter3.domains, filter4.domains);
+
+  let filter5 = Filter.fromText("bar$domain=www.example.com");
+  let filter6 = Filter.fromText("www.example.com##.bar");
+
+  test.notEqual(filter2.domains, filter5.domains);
+
+  // Check twice for element hiding filters to make sure the internal cached
+  // values are also not equal.
+  test.notEqual(filter4.domains, filter6.domains);
+  test.notEqual(filter4.domains, filter6.domains);
+
+  test.done();
+};