Issue 3823 - Split up message responder code

lib/whitelisting.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
  * 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/>.
  */
 
 /** @module whitelisting */
 
 "use strict";
 
 let {defaultMatcher} = require("matcher");
 let {RegExpFilter} = require("filterClasses");
 let {stringifyURL, getDecodedHostname, extractHostFromFrame, isThirdParty} = require("url");
+let {port} = require("messaging");
 let devtools = require("devtools");
 
 let pagesWithKey = new ext.PageMap();
 
 function match(page, url, typeMask, docDomain, sitekey)
 {
   let thirdParty = !!docDomain && isThirdParty(url, docDomain);
   let urlString = stringifyURL(url);
 
   if (!docDomain)
     docDomain = getDecodedHostname(url);
 
   let filter = defaultMatcher.whitelist.matchesAny(
     urlString, typeMask, docDomain, thirdParty, sitekey
   );
 
   if (filter && devtools)
     devtools.logWhitelistedDocument(
       page, urlString, typeMask, docDomain, filter
     );
 
   return filter;
 }
 
+let checkWhitelisted =
 /**
  * Gets the active whitelisting filter for the document associated
  * with the given page/frame, or null if it's not whitelisted.
  *
  * @param {Page}   page
  * @param {Frame}  [frame]
  * @param {number} [typeMask=RegExpFilter.typeMap.DOCUMENT]
  * @return {?WhitelistFilter}
  */
 exports.checkWhitelisted = function(page, frame, typeMask)
@@ skipping 63 matching lines @@
 
   if (!urlsWithKey)
   {
     urlsWithKey = Object.create(null);
     pagesWithKey.set(page, urlsWithKey);
   }
 
   urlsWithKey[stringifyURL(url)] = key;
 }
 
+let processKey =
 /**
  * Validates signatures given by the "X-Adblock-Key" response
  * header or the "data-adblockkey" attribute of the document
  * element. If the signature is valid, the public key will be
  * recorded and considered for the $sitekey filter option.
  *
  * @param {string} token  The base64-encoded public key and
  *                        signature separated by an underscrore.
  * @param {Page}   page
  * @param {Frame}  frame
  */
 exports.processKey = function(token, page, frame)
 {
   if (token.indexOf("_") < 0)
     return;
 
   let [key, signature] = token.split("_", 2);
   key = key.replace(/=/g, "");
 
   if (verifyKey(key, signature, frame.url))
     recordKey(page, frame.url, key);
 };
+
+port.on("filters.addKey", (message, sender) =>
+{
+  processKey(message.token, sender.page, sender.frame);
+});
+
+port.on("filters.isPageWhitelisted", (message, sender) =>
+{
+  return !!checkWhitelisted(sender.page);
+});