Issue 4327 - Prevent generic document blocking

lib/abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 258 matching lines @@
 
   let included = [];
   let excluded = [];
 
   parseDomains(filter.domains, included, excluded);
 
   if (withResourceTypes)
   {
     trigger["resource-type"] = getResourceTypes(filter);
 
+    // Content Blocking rules can't differentiate between sub-document
+    // requests (iframes) and top-level document requests (redirects). So to
+    // avoid too many false-positives we stop generic rules (no hostname part)
+    // from blocking document requests.
+    if (action == "block" && !parsed.hostname)
+    {
+      let documentIndex = trigger["resource-type"].indexOf("document");
+      if (documentIndex > -1)
+        trigger["resource-type"].splice(documentIndex, 1);
+    }
+
     // Rules with no resource types to match shouldn't match anything and
     // therefore shouldn't be created.
     if (trigger["resource-type"].length == 0)
       return;
   }
 
   if (filter.thirdParty != null)
     trigger["load-type"] = [filter.thirdParty ? "third-party" : "first-party"];
 
   if (included.length > 0)
@@ skipping 180 matching lines @@
 
   for (let filter of this.elemhideExceptions)
     convertFilterAddRules(rules, filter, "ignore-previous-rules", false);
   for (let filter of this.requestFilters)
     convertFilterAddRules(rules, filter, "block", true);
   for (let filter of this.requestExceptions)
     convertFilterAddRules(rules, filter, "ignore-previous-rules", true);
 
   return rules.filter(rule => !hasNonASCI(rule));
 };