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 pagesWithKey = new ext.PageMap();
 
-function isWhitelisted(url, parentUrl, type, key)
+function isPageWhitelisted(page)
 {
+  let url = page.url;
   let filter = defaultMatcher.matchesAny(
-    stripFragmentFromURL(url),
-    type || "DOCUMENT",
-    extractHostFromURL(parentUrl || url),
-    false,
-    key
+    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.

   );
 
   return (filter instanceof WhitelistFilter ? filter : null);
 }
-exports.isWhitelisted = isWhitelisted;
+exports.isPageWhitelisted = isPageWhitelisted;
 
 function isFrameWhitelisted(page, frame, type)
 {
-  for (; frame != null; frame = frame.parent)
+  while (frame)
   {
-    let key = getKey(page, frame);
-    if (isWhitelisted(frame.url, (frame.parent || {}).url, type, key))
+    let parent = frame.parent;
+    let url = frame.url;
+    let documentHost = extractHostFromFrame(parent) || getDecodedHostname(url);
+
+    let filter = defaultMatcher.matchesAny(
+      stringifyURL(url), type || "DOCUMENT",
+      documentHost, isThirdParty(url, documentHost),
+      getKey(page, frame)
+    );
+
+    if (filter instanceof WhitelistFilter)
       return true;
+
+    frame = parent;
   }
 
   return false;
 }
 exports.isFrameWhitelisted = isFrameWhitelisted;
 
 function getKey(page, frame)
 {
   let urlsWithKey = pagesWithKey.get(page);
   if (!urlsWithKey)
     return null;
 
   for (; frame != null; frame = frame.parent)
   {
-    if (urlsWithKey[frame.url])
-      return urlsWithKey[frame.url];
+    let key = urlsWithKey[stringifyURL(frame.url)];
+    if (key)
+      return key;
   }
 
   return null;
 }
 exports.getKey = getKey;
 
 function verifyKey(key, signature, url)
 {
-  url = new URL(url);
   let params = [
     url.pathname + url.search, // REQUEST_URI
     url.host,                  // HTTP_HOST
     window.navigator.userAgent // HTTP_USER_AGENT
   ];
 
   return verifySignature(key, signature, params.join("\0"));
 }
 
 function recordKey(page, url, key)
 {
   let urlsWithKey = pagesWithKey.get(page);
 
   if (!urlsWithKey)
   {
     urlsWithKey = {__proto__: null};
     pagesWithKey.set(page, urlsWithKey);
   }
 
-  urlsWithKey[url] = key;
+  urlsWithKey[stringifyURL(url)] = key;
 }
 
 function processKey(token, page, frame)
 {
-  let url = stripFragmentFromURL(frame.url);
-
   if (token.indexOf("_") < 0)
     return;
 
   let [key, signature] = token.split("_", 2);
   key = key.replace(/=/g, "");
 
-  if (verifyKey(key, signature, url))
-    recordKey(page, url, key);
+  if (verifyKey(key, signature, frame.url))
+    recordKey(page, frame.url, key);
 }
 exports.processKey = processKey;