Issue 491 - Validate custom filters

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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/>.
  */
 
 with(require("filterClasses"))
 {
   this.Filter = Filter;
   this.RegExpFilter = RegExpFilter;
   this.BlockingFilter = BlockingFilter;
   this.WhitelistFilter = WhitelistFilter;
-  this.InvalidFilter = InvalidFilter;
 }
 with(require("subscriptionClasses"))
 {
   this.Subscription = Subscription;
   this.DownloadableSubscription = DownloadableSubscription;
   this.SpecialSubscription = SpecialSubscription;
 }
 with(require("whitelisting"))
 {
   this.isWhitelisted = isWhitelisted;
   this.isFrameWhitelisted = isFrameWhitelisted;
   this.processKey = processKey;
   this.getKey = getKey;
 }
 var FilterStorage = require("filterStorage").FilterStorage;
 var ElemHide = require("elemHide").ElemHide;
 var defaultMatcher = require("matcher").defaultMatcher;
 var Prefs = require("prefs").Prefs;
 var Synchronizer = require("synchronizer").Synchronizer;
 var Utils = require("utils").Utils;
 var Notification = require("notification").Notification;
 var initAntiAdblockNotification = require("antiadblockInit").initAntiAdblockNotification;
+var parseFilters = require("filterValidation").parseFilters;
 
 // Some types cannot be distinguished
 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
 RegExpFilter.typeMap.MEDIA = RegExpFilter.typeMap.FONT = RegExpFilter.typeMap.OTHER;
 
 // Chrome on Linux does not fully support chrome.notifications until version 35
 // https://code.google.com/p/chromium/issues/detail?id=291485
 var canUseChromeNotifications = require("info").platform == "chromium"
   && "notifications" in chrome
   && (navigator.platform.indexOf("Linux") == -1 || parseInt(require("info").applicationVersion, 10) > 34);
@@ skipping 461 matching lines @@
     case "get-domain-enabled-state":
       // Returns whether this domain is in the exclusion list.
       // The browser action popup asks us this.
       if(sender.page)
       {
         sendResponse({enabled: !isWhitelisted(sender.page.url)});
         return;
       }
       break;
     case "add-filters":
-      var filters = [];
-

[kzar, 2014/11/18 16:32:10]

How come you don't check that msg.filters and msg.filters.length are truthy here
any more?

[Sebastian Noack, 2014/11/18 17:42:55]

There was no point in checking it in the first place, since this message is
always send with an array, and whether it is empty or not doesn't matter.

-      for (var i = 0; i < msg.filters.length; i++)
-      {
-        var filter = Filter.fromText(msg.filters[i], true);

[kzar, 2014/11/18 16:32:10]

Instead of having this separate filter variable how about pushing the filter
onto the filters array straight away? Then you could check if filters[i] was an
instance of InvalidFilter before proceeding.

[Sebastian Noack, 2014/11/18 17:42:55]

We have to access the filter object 3 times (or 2 times if directly pushed to
the array). So accessing that object via an array index, is neither more
readable nor efficient.

-        if (filter instanceof InvalidFilter)
-        {
-          sendResponse({status: "invalid", error: filter.reason});
-          return;
-        }
-        filters.push(filter);
+      var filters;
+      try
+      {
+        filters = parseFilters(msg.text);
+      }
+      catch (error)
+      {
+        sendResponse({status: "invalid", error: error});
+        break;
       }
 
       for (var i = 0; i < filters.length; i++)

[kzar, 2014/11/18 16:32:10]

You've re-declared the `i` variable here.

         FilterStorage.addFilter(filters[i]);
 
       sendResponse({status: "ok"});
       break;
     case "add-subscription":
       ext.showOptions(function(page)
       {
         page.sendMessage(msg);
       });
       break;
@@ skipping 25 matching lines @@
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);