Issue 6091 - Add checks for overly generic antiadblock filters

lib/antiadblockInit.js

Index: lib/antiadblockInit.js
===================================================================
--- a/lib/antiadblockInit.js
+++ b/lib/antiadblockInit.js
@@ -10,16 +10,18 @@
  * 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/>.
  */
 
+/* globals publicSuffixes  */
+
 "use strict";
 
 const {Prefs} = require("prefs");
 const {ActiveFilter} = require("filterClasses");
 const {FilterStorage} = require("filterStorage");
 const {FilterNotifier} = require("filterNotifier");
 const {Subscription} = require("subscriptionClasses");
 const {Notification} = require("notification");
@@ -47,17 +49,20 @@
     for (let filter of subscription.filters)
     {
       if (filter instanceof ActiveFilter && filter.domains)
       {
         for (let [domain, included] of filter.domains)
         {
           let urlFilter = "||" + domain + "^$document";
           if (domain && included && urlFilters.indexOf(urlFilter) == -1)
-            urlFilters.push(urlFilter);
+          {
+            if (domain.match(/\.[^$]/) && !publicSuffixes.hasOwnProperty(domain))

[Thomas Greiner, 2018/05/28 13:09:37]

Detail: We're only interested in whether the string matches so please use
`/\.[^$]/.test(domain)` instead.

See also
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Obje...

[Jon Sonesen, 2018/05/29 20:31:43]

Acknowledged.

+              urlFilters.push(urlFilter);
+          }
         }
       }
     }
     notification.urlFilters = urlFilters;
     Notification.addNotification(notification);
     Notification.addQuestionListener(notification.id, notificationListener);
   }