Issue 491 - Validate custom filters

options.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
@@ skipping 11 matching lines @@
 {
   this.Filter = Filter;
   this.WhitelistFilter = WhitelistFilter;
 }
 with(require("subscriptionClasses"))
 {
   this.Subscription = Subscription;
   this.SpecialSubscription = SpecialSubscription;
   this.DownloadableSubscription = DownloadableSubscription;
 }
+with(require("filterValidation"))
+{
+  this.parseFilter = parseFilter;
+  this.parseFilters = parseFilters;
+}
 var FilterStorage = require("filterStorage").FilterStorage;
 var FilterNotifier = require("filterNotifier").FilterNotifier;
 var Prefs = require("prefs").Prefs;
 var Synchronizer = require("synchronizer").Synchronizer;
 var Utils = require("utils").Utils;
 
 // Loads options from localStorage and sets UI elements accordingly
 function loadOptions()
 {
   // Set page title to i18n version of "Adblock Plus Options"
@@ skipping 423 matching lines @@
 
   var filterText = "@@||" + domain + "^$document";
   FilterStorage.addFilter(Filter.fromText(filterText));
 }
 
 // Adds filter text that user typed to the selection box
 function addTypedFilter(event)
 {
   event.preventDefault();
 
-  var filterText = Filter.normalize(document.getElementById("newFilter").value);
-  document.getElementById("newFilter").value = "";
-  if (!filterText)
+  var element = document.getElementById("newFilter");
+  var filter;
+
+  try
+  {
+    filter = parseFilter(element.value);
+  }
+  catch (error)
+  {
+    alert(error);
     return;
+  }
 
-  FilterStorage.addFilter(Filter.fromText(filterText));
+  if (filter)
+    FilterStorage.addFilter(filter);
+
+  element.value = "";
 }
 
 // Removes currently selected whitelisted domains
 function removeSelectedExcludedDomain()
 {
   var excludedDomainsBox = document.getElementById("excludedDomainsBox");
   var remove = [];
   for (var i = 0; i < excludedDomainsBox.length; i++)
     if (excludedDomainsBox.options[i].selected)
       remove.push(excludedDomainsBox.options[i].value);
@@ skipping 31 matching lines @@
     var text = "";
     for (var i = 0; i < userFiltersBox.length; i++)
       text += userFiltersBox.options[i].value + "\n";
     document.getElementById("rawFiltersText").value = text;
   }
 }
 
 // Imports filters in the raw text box
 function importRawFiltersText()
 {
-  $("#rawFilters").hide();
-  var filters = document.getElementById("rawFiltersText").value.split("\n");
+  var text = document.getElementById("rawFiltersText").value;
+
+  var add;
+  try
+  {
+    add = parseFilters(text);
+  }
+  catch (error)
+  {
+    alert(error);
+    return;
+  }
+
   var seenFilter = {__proto__: null};
-  for (var i = 0; i < filters.length; i++)
+  for (var i = 0; i < add.length; i++)
   {
-    var text = Filter.normalize(filters[i]);
-    if (!text)
-      continue;
-
-    // Don't import filter list header
-    if (/^\[/.test(text))
-      continue;
-
-    FilterStorage.addFilter(Filter.fromText(text));
-    seenFilter[text] = true;
+    var filter = add[i];
+    FilterStorage.addFilter(filter);
+    seenFilter[filter.text] = null;
   }
 
   var remove = [];
   for (var i = 0; i < FilterStorage.subscriptions.length; i++)
   {
     var subscription = FilterStorage.subscriptions[i];
     if (!(subscription instanceof SpecialSubscription))
       continue;
 
     for (var j = 0; j < subscription.filters.length; j++)
     {
       var filter = subscription.filters[j];
       if (filter instanceof WhitelistFilter && /^@@\|\|([^\/:]+)\^\$document$/.test(filter.text))
         continue;
 
       if (!(filter.text in seenFilter))
         remove.push(filter);
     }
   }
+
   for (var i = 0; i < remove.length; i++)
     FilterStorage.removeFilter(remove[i]);
+
+  $("#rawFilters").hide();
 }
 
 // Called when user explicitly requests filter list updates
 function updateFilterLists()
 {
   for (var i = 0; i < FilterStorage.subscriptions.length; i++)
   {
     var subscription = FilterStorage.subscriptions[i];
     if (subscription instanceof DownloadableSubscription)
       Synchronizer.execute(subscription, true, true);
@@ skipping 47 matching lines @@
       links[i].href = arguments[i + 1];
       links[i].setAttribute("target", "_blank");
     }
     else if (typeof arguments[i + 1] == "function")
     {
       links[i].href = "javascript:void(0);";
       links[i].addEventListener("click", arguments[i + 1], false);
     }
   }
 }