Issue 5175 - Reject element hiding filter with empty domain names

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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 let {createSandbox} = require("./_common");
+const {withNAD} = require("./_test-utils");
 
 let Filter = null;
 let InvalidFilter = null;
 let CommentFilter = null;
 let ActiveFilter = null;
 let RegExpFilter = null;
 let BlockingFilter = null;
 let WhitelistFilter = null;
 let ElemHideBase = null;
 let ElemHideFilter = null;
@@ skipping 10 matching lines @@
       BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter,
       ElemHideException, ElemHideEmulationFilter
     } = sandboxedRequire("../lib/filterClasses")
   );
   ({FilterNotifier} = sandboxedRequire("../lib/filterNotifier"));
   callback();
 };
 
 exports.testFromText = function(test)
 {
+  // fields are:
+  // text, type, typeName, collapse (optional, BlockingFilter only)
   let tests = [
     ["!asdf", CommentFilter, "comment"],
-    ["asdf", BlockingFilter, "blocking"],
-    ["asdf$image,~collapse", BlockingFilter, "blocking"],
-    ["/asdf/", BlockingFilter, "blocking"],
+    ["asdf", BlockingFilter, "blocking", 1],
+    ["asdf$image,~collapse", BlockingFilter, "blocking", 0],
+    ["/asdf/", BlockingFilter, "blocking", 1],
     ["/asdf??+/", InvalidFilter, "invalid"],
     ["@@asdf", WhitelistFilter, "whitelist"],
     ["@@asdf$image,~collapse", WhitelistFilter, "whitelist"],
     ["@@/asdf/", WhitelistFilter, "whitelist"],
     ["@@/asdf??+/", InvalidFilter, "invalid"],
     ["##asdf", ElemHideFilter, "elemhide"],
     ["#@#asdf", ElemHideException, "elemhideexception"],
     ["foobar##asdf", ElemHideFilter, "elemhide"],
     ["foobar#@#asdf", ElemHideException, "elemhideexception"],
     ["foobar##a", ElemHideFilter, "elemhide"],
     ["foobar#@#a", ElemHideException, "elemhideexception"],
 
-    ["foobar#asdf", BlockingFilter, "blocking"],
-    ["foobar|foobas##asdf", BlockingFilter, "blocking"],
-    ["foobar##asdf{asdf}", BlockingFilter, "blocking"],
-    ["foobar##", BlockingFilter, "blocking"],
-    ["foobar#@#", BlockingFilter, "blocking"],
+    ["foobar#asdf", BlockingFilter, "blocking", 1],
+    ["foobar|foobas##asdf", BlockingFilter, "blocking", 1],
+    ["foobar##asdf{asdf}", ElemHideFilter, "elemhide"],
+    ["foobar##", BlockingFilter, "blocking", 1],
+    ["foobar#@#", BlockingFilter, "blocking", 1],
     ["asdf$foobar", InvalidFilter, "invalid"],
     ["asdf$image,foobar", InvalidFilter, "invalid"],
-    ["asdf$image=foobar", BlockingFilter, "blocking"],
-    ["asdf$image=foobar=xyz,~collapse", BlockingFilter, "blocking"],
+    ["asdf$image=foobar", BlockingFilter, "blocking", 1],
+    ["asdf$image=foobar=xyz,~collapse", BlockingFilter, "blocking", 0],
 
     ["#?#foo:-abp-properties(something)bar", InvalidFilter, "invalid"],
     ["#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
     ["example.com#?#foo:-abp-properties(something)bar", ElemHideEmulationFilter, "elemhideemulation"],
     ["example.com#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
     ["~example.com#?#foo:-abp-properties(something)bar", InvalidFilter, "invalid"],
     ["~example.com#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
     ["~example.com,~example.info#?#foo:-abp-properties(something)bar", InvalidFilter, "invalid"],
     ["~example.com,~example.info#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
     ["~sub.example.com,example.com#?#foo:-abp-properties(something)bar", ElemHideEmulationFilter, "elemhideemulation"],
     ["~sub.example.com,example.com#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
     ["example.com,~sub.example.com#?#foo:-abp-properties(something)bar", ElemHideEmulationFilter, "elemhideemulation"],
     ["example.com,~sub.example.com#@#foo:-abp-properties(something)bar", ElemHideException, "elemhideexception"],
     ["example.com#?#:-abp-properties(something)", ElemHideEmulationFilter, "elemhideemulation"],
     ["example.com#@#:-abp-properties(something)", ElemHideException, "elemhideexception"],
     ["example.com#?#:-abp-properties((something))", ElemHideEmulationFilter, "elemhideemulation"],
     ["example.com#@#:-abp-properties((something))", ElemHideException, "elemhideexception"]
   ];
-  for (let [text, type, typeName] of tests)
-  {
-    let filter = Filter.fromText(text);
-    test.ok(filter instanceof Filter, "Got filter for " + text);
-    test.equal(filter.text, text, "Correct filter text for " + text);
-    test.ok(filter instanceof type, "Correct filter type for " + text);
-    test.equal(filter.type, typeName, "Type name for " + text + " is " + typeName);
-    if (type == InvalidFilter)
-      test.ok(filter.reason, "Invalid filter " + text + " has a reason set");
-    filter.delete();
-  }
+  for (let [text, type, typeName, collapse] of tests)
+  {
+    withNAD(0, filter =>
+    {
+      test.ok(filter instanceof Filter, "Got filter for " + text);
+      test.equal(filter.text, text, "Correct filter text for " + text);
+      test.ok(filter instanceof type, "Correct filter type for " + text);
+      test.equal(filter.type, typeName, "Type name for " + text + " is " + typeName);
+      if (filter instanceof BlockingFilter)
+        test.equal(filter.collapse, collapse);
+      else
+        test.equal(filter.collapse, undefined);
+      if (type == InvalidFilter)
+        test.ok(filter.reason, "Invalid filter " + text + " has a reason set");
+    })(Filter.fromText(text));
+  }
+
+  // conversion from old syntax.
+  withNAD(0, filter =>
+  {
+    test.equal(filter.text, "example.com#?#:-abp-properties(something)");
+    test.ok(filter instanceof ElemHideEmulationFilter);
+    test.equal(filter.type, "elemhideemulation");
+  })(Filter.fromText("example.com##[-abp-properties='something']"));
+
   test.done();
 };
 
 exports.testClassHierarchy = function(test)
 {
   let allClasses = [
     Filter, InvalidFilter, CommentFilter, ActiveFilter,
     RegExpFilter, BlockingFilter, WhitelistFilter, ElemHideBase,
     ElemHideFilter, ElemHideException, ElemHideEmulationFilter
   ];
@@ skipping 110 matching lines @@
   }
 
   test.done();
 };
 
 exports.testSerialize = function(test)
 {
   // Comment
   let filter = Filter.fromText("! serialize");
   test.equal(filter.serialize(), "[Filter]\ntext=! serialize\n");
+  test.equal(filter.collapse, undefined);
   filter.delete();
 
   // Blocking filter
   filter = Filter.fromText("serialize");
   test.equal(filter.serialize(), "[Filter]\ntext=serialize\n");
   filter.disabled = true;
   test.equal(filter.serialize(), "[Filter]\ntext=serialize\ndisabled=true\n");
   filter.disabled = false;
   filter.hitCount = 10;
   filter.lastHit = 12;
   test.equal(filter.serialize(), "[Filter]\ntext=serialize\nhitCount=10\nlastHit=12\n");
+  test.ok(filter.collapse);
   filter.delete();
 
   // Invalid filter
   filter = Filter.fromText("serialize$foobar");
   test.equal(filter.serialize(), "[Filter]\ntext=serialize$foobar\n");
   filter.delete();
 
   // Element hiding filter
   filter = Filter.fromText("example.com##serialize");
   test.equal(filter.serialize(), "[Filter]\ntext=example.com##serialize\n");
@@ skipping 113 matching lines @@
 
   for (let [text, selector, selectorDomain] of tests)
   {
     doTest(text, selector, selectorDomain);
     doTest(text.replace("##", "#@#"), selector, selectorDomain);
   }
 
   test.done();
 };
 
+exports.testElemHideRulesWithBraces = function(test)
+{
+  withNAD(0, filter =>
+  {
+    test.equal(filter.type, "elemhide");
+    test.equal(filter.selector, "#foo\\7B color: red\\7D ");
+  })(Filter.fromText("###foo{color: red}"));
+
+  // Filter conversion to the new syntax dealing with braces too.
+  withNAD(0, filter =>
+  {
+    test.equal(filter.type, "elemhideemulation");
+    test.equal(filter.selector, ":-abp-properties(/margin: [3-4]\\7B 2\\7D /)");
+  })(Filter.fromText("foo.com##[-abp-properties='/margin: [3-4]{2}/']"));
+
+  test.done();
+};
+
 exports.testNotifications = function(test)
 {
   function checkNotifications(action, expected, message)
   {
     let result = null;
     let listener = (topic, filter) =>
     {
       if (result)
         test.ok(false, "Got more that one notification - " + message);
       else
@@ skipping 40 matching lines @@
   {
     filter.hitCount = 0;
   }, ["filter.hitCount", "foobar"], "Resetting filter hit counts");
 
   filter.delete();
   test.done();
 };
 
 exports.testEmptyElemHideDomains = function(test)
 {
-  let emptyDomainFilters = [
-    ",##selector", ",,,##selector", "~,foo.com##selector", "foo.com,##selector",
-    ",foo.com##selector", "foo.com,~##selector",
-    "foo.com,,bar.com##selector", "foo.com,~,bar.com##selector"
-  ];
-
-  for (let filterText of emptyDomainFilters)
-  {
-    let filter = Filter.fromText(filterText);
-    test.ok(filter instanceof InvalidFilter);
-    test.equal(filter.reason, "filter_invalid_domain");
-    filter.delete();
-  }
-
-  test.done();
-};
+  [",##selector", ",,,##selector", "~,foo.com##selector", "foo.com,##selector",
+   ",foo.com##selector", "foo.com,~##selector",
+   "foo.com,,bar.com##selector", "foo.com,~,bar.com##selector"]
+    .map(filterText => Filter.fromText(filterText))
+    .forEach(withNAD(0, filter =>
+    {
+      test.ok(filter instanceof InvalidFilter);
+      test.equal(filter.reason, "filter_invalid_domain");
+    }));
+
+  test.done();
+};