Issue 1801 - Use URL objects to process URLs in the background page

lib/whitelisting.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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/>.
  */
 
 let {defaultMatcher} = require("matcher");
 let {WhitelistFilter} = require("filterClasses");
-let {stringifyURL, getDecodedHostname, isThirdParty} = require("url");

[Wladimir Palant, 2015/02/09 12:54:29]

Shouldn't this import extractHostFromFrame as well?

[Sebastian Noack, 2015/02/11 10:55:51]

You are right. It works though, since extractHostFromFrame is imported as a
global variable in background.js.

+let {stringifyURL, getDecodedHostname, extractHostFromFrame, isThirdParty} = require("url");
 
 let pagesWithKey = new ext.PageMap();
 
 function isPageWhitelisted(page)
 {
   let url = page.url;
   let filter = defaultMatcher.matchesAny(
     stringifyURL(url), "DOCUMENT",
-    getDecodedHostname(url), false

[Wladimir Palant, 2015/02/09 12:54:29]

Please provide a sitekey parameter (null).

[Sebastian Noack, 2015/02/11 10:55:51]

Done.

+    getDecodedHostname(url), false, null
   );
 
   return (filter instanceof WhitelistFilter ? filter : null);
 }
 exports.isPageWhitelisted = isPageWhitelisted;
 
 function isFrameWhitelisted(page, frame, type)
 {
   while (frame)
   {
@@ skipping 44 matching lines @@
 
   return verifySignature(key, signature, params.join("\0"));
 }
 
 function recordKey(page, url, key)
 {
   let urlsWithKey = pagesWithKey.get(page);
 
   if (!urlsWithKey)
   {
-    urlsWithKey = {__proto__: null};
+    urlsWithKey = Object.create(null);
     pagesWithKey.set(page, urlsWithKey);
   }
 
   urlsWithKey[stringifyURL(url)] = key;
 }
 
 function processKey(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);
 }
 exports.processKey = processKey;