Issue 616 - Add $generichide + $genericblock filter options and enforce them.

lib/contentPolicy.js

Index: lib/contentPolicy.js
diff --git a/lib/contentPolicy.js b/lib/contentPolicy.js
index b0498da6ec3bf66b35e35d8d8114e99ad3477707..fbc5cb74443158bd30b29ee5291921f0c034fd5c 100644
--- a/lib/contentPolicy.js
+++ b/lib/contentPolicy.js
@@ -162,6 +162,7 @@ let Policy = exports.Policy =
     let docDomain = getHostname(wndLocation);
     let match = null;
     let [sitekey, sitekeyWnd] = getSitekey(wnd);
+    let genericblock = null;
     if (!match && Prefs.enabled)
     {
       let testWnd = wnd;
@@ -180,6 +181,20 @@ let Policy = exports.Policy =
           RequestNotifier.addNodeData(testWnd.document, topWnd, Policy.type.DOCUMENT, getHostname(parentWndLocation), false, testWndLocation, match);
           return true;
         }
+        else if (contentType != Policy.type.ELEMHIDE)
+        {
+          let parentDocDomain = getHostname(parentWndLocation);
+          let genericblockMatch = defaultMatcher.matchesAny(testWndLocation, RegExpFilter.typeMap.GENERICBLOCK, parentDocDomain, false);

[Thomas Greiner, 2015/08/20 11:36:06]

You forgot to pass the sitekey as the last parameter for
`defaultMatcher.matchesAny()`. Not passing the sitekey would cause filters of
the form `@@...$genericblock,sitekey=...` not to match on pages that provide a
correct sitekey.

[kzar, 2015/08/25 17:42:07]

Done.

+          if (genericblockMatch instanceof WhitelistFilter)
+          {
+            genericblock = {
+              match: genericblockMatch,
+              parentDocDomain: parentDocDomain,
+              testWnd: testWnd,
+              testWndLocation: testWndLocation
+            };
+          }
+        }
 
         if (testWnd.parent == testWnd)
           break;
@@ -208,7 +223,12 @@ let Policy = exports.Policy =
         let testWndLocation = parentWndLocation;
         parentWndLocation = (testWnd == testWnd.parent ? testWndLocation : getWindowLocation(testWnd.parent));
         let parentDocDomain = getHostname(parentWndLocation);
+
         match = defaultMatcher.matchesAny(testWndLocation, RegExpFilter.typeMap.ELEMHIDE, parentDocDomain, false, sitekey);
+
+        if (!(match instanceof WhitelistFilter) && (!location.domains || location.domains[""]))

[Thomas Greiner, 2015/08/20 11:36:06]

What about filters that don't specify domains but a sitekey instead? This logic
would consider them to be generic even though they aren't.

[Thomas Greiner, 2015/08/20 11:36:06]

I guess you meant to write

(!match.domains || match.domains[""])

because `location` is a `nsIRUI` which doesn't even have a "domains" property.

[kzar, 2015/08/25 17:42:07]

Done.

+          match = defaultMatcher.matchesAny(testWndLocation, RegExpFilter.typeMap.GENERICHIDE, parentDocDomain, false);
+
         if (match instanceof WhitelistFilter)
         {
           FilterStorage.increaseHitCount(match, wnd);
@@ -243,11 +263,27 @@ let Policy = exports.Policy =
     if (!match && Prefs.enabled && contentType in Policy.typeMask)
     {
       match = defaultMatcher.matchesAny(locationText, Policy.typeMask[contentType], docDomain, thirdParty, sitekey);
-      if (match instanceof BlockingFilter && node.ownerDocument && !(contentType in Policy.nonVisual))
+      if (match instanceof BlockingFilter)
       {
-        let prefCollapse = (match.collapse != null ? match.collapse : !Prefs.fastcollapse);
-        if (collapse || prefCollapse)
-          schedulePostProcess(node);
+        if ((!match.domains || match.domains[""]) && genericblock)
+        {
+          FilterStorage.increaseHitCount(genericblock.match, wnd);
+          RequestNotifier.addNodeData(
+            genericblock.testWnd.document,
+            topWnd, contentType,
+            genericblock.parentDocDomain,
+            false, genericblock.testWndLocation,
+            genericblock.match
+          );
+          return true;
+        }
+
+        if (node.ownerDocument && !(contentType in Policy.nonVisual))
+        {
+          let prefCollapse = (match.collapse != null ? match.collapse : !Prefs.fastcollapse);
+          if (collapse || prefCollapse)
+            schedulePostProcess(node);
+        }
       }
 
       // Track mouse events for objects