Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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;
 }
 with(require("subscriptionClasses"))
 {
   this.Subscription = Subscription;
   this.DownloadableSubscription = DownloadableSubscription;
 }
+with(require("whitelisting"))
+{
+  this.isWhitelisted = isWhitelisted;
+  this.isFrameWhitelisted = isFrameWhitelisted;
+  this.processKeyException = processKeyException;
+}
 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;
 
 // Some types cannot be distinguished
 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
@@ skipping 43 matching lines @@
   }
 
   defaultOptionValue("shouldShowBlockElementMenu", "true");
 
   removeDeprecatedOptions();
 }
 
 // Upgrade options before we do anything else.
 setDefaultOptions();
 
-/**
- * Checks whether a page is whitelisted.
- * @param {String} url
- * @param {String} [parentUrl] URL of the parent frame
- * @param {String} [type] content type to be checked, default is "DOCUMENT"
- * @return {Filter} filter that matched the URL or null if not whitelisted
- */
-function isWhitelisted(url, parentUrl, type)
-{
-  // Ignore fragment identifier
-  var index = url.indexOf("#");
-  if (index >= 0)
-    url = url.substring(0, index);
-
-  var result = defaultMatcher.matchesAny(url, type || "DOCUMENT", extractHostFromURL(parentUrl || url), false);
-  return (result instanceof WhitelistFilter ? result : null);
-}
-
 var activeNotification = null;
 
 // Adds or removes browser action icon according to options.
 function refreshIconAndContextMenu(tab)
 {
   if(!/^https?:/.test(tab.url))
     return;
 
   var iconFilename;
   if (require("info").platform == "safari")
@@ skipping 201 matching lines @@
       && typeof webkitNotifications !== "undefined")
   {
     var notification = webkitNotifications.createHTMLNotification("notification.html");
     notification.show();
     notification.addEventListener("close", prepareNotificationIconAndPopup);
   }
   else
     prepareNotificationIconAndPopup();
 }
 
-/**
- * This function is a hack - we only know the tabId and document URL for a
- * message but we need to know the frame ID. Try to find it in webRequest"s
- * frame data.
- */
-function getFrameId(tab, url)
-{
-  for (var frameId in frames.get(tab))
-    if (getFrameUrl(tab, frameId) == url)
-      return frameId;
-  return -1;
-}
-
 ext.onMessage.addListener(function (msg, sender, sendResponse)
 {
   switch (msg.type)
   {
     case "get-selectors":
       var selectors = null;
-      var frameId = sender.tab ? getFrameId(sender.tab, msg.frameUrl) : -1;
 
-      if (!isFrameWhitelisted(sender.tab, frameId, "DOCUMENT") &&
-          !isFrameWhitelisted(sender.tab, frameId, "ELEMHIDE"))
+      if (!isFrameWhitelisted(sender.tab, sender.frame, "DOCUMENT") &&
+          !isFrameWhitelisted(sender.tab, sender.frame, "ELEMHIDE"))
       {
         var noStyleRules = false;
-        var host = extractHostFromURL(msg.frameUrl);
+        var host = extractHostFromURL(sender.frame.url);
         for (var i = 0; i < noStyleRulesHosts.length; i++)
         {
           var noStyleHost = noStyleRulesHosts[i];
           if (host == noStyleHost || (host.length > noStyleHost.length &&
                                       host.substr(host.length - noStyleHost.length - 1) == "." + noStyleHost))
           {
             noStyleRules = true;
           }
         }
         selectors = ElemHide.getSelectorsForDomain(host, false);
         if (noStyleRules)
         {
           selectors = selectors.filter(function(s)
           {
             return !/\[style[\^\$]?=/.test(s);
           });
         }
       }
 
       sendResponse(selectors);
       break;
     case "should-collapse":
-      var frameId = sender.tab ? getFrameId(sender.tab, msg.documentUrl) : -1;
-
-      if (isFrameWhitelisted(sender.tab, frameId, "DOCUMENT"))
+      if (isFrameWhitelisted(sender.tab, sender.frame, "DOCUMENT"))
       {
         sendResponse(false);
         break;
       }
 
       var requestHost = extractHostFromURL(msg.url);
-      var documentHost = extractHostFromURL(msg.documentUrl);
+      var documentHost = extractHostFromURL(sender.frame.url);
       var thirdParty = isThirdParty(requestHost, documentHost);
       var filter = defaultMatcher.matchesAny(msg.url, msg.mediatype, documentHost, thirdParty);
       if (filter instanceof BlockingFilter)
       {
         var collapse = filter.collapse;
         if (collapse == null)
           collapse = (localStorage.hidePlaceholders != "false");
         sendResponse(collapse);
       }
       else
@@ skipping 14 matching lines @@
         for (var i = 0; i < msg.filters.length; i++)
           FilterStorage.addFilter(Filter.fromText(msg.filters[i]));
       }
       break;
     case "add-subscription":
       openOptions(function(tab)
       {
         tab.sendMessage(msg);
       });
       break;
+    case "add-key-exception":
+      processKeyException(msg.token, sender.tab, sender.frame);
+      break;
     case "forward":
       if (sender.tab)
       {
         sender.tab.sendMessage(msg.payload, sendResponse);
         // Return true to indicate that we want to call
         // sendResponse asynchronously
         return true;
       }
       break;
     default:
@@ skipping 20 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);