Issue 1841 - Replaced URI class with built-in URL objects

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
@@ skipping 44 matching lines @@
   {
     if (urlsWithKey[frame.url])
       return urlsWithKey[frame.url];
   }
 
   return null;
 }
 
 let verifyKey = function(key, signature, url, docDomain)
 {
-  let uri = new URI(url);
+  url = new URL(url);
   let params = [
-    uri.path,                                               // REQUEST_URI
-    uri.asciiHost + (uri.port != -1 ? ":" + uri.port : ""), // HTTP_HOST
-    window.navigator.userAgent                              // HTTP_USER_AGENT
+    url.pathname + url.search, // REQUEST_URI
+    url.host,                  // HTTP_HOST

[Wladimir Palant, 2015/01/21 15:33:44]

I was trying to figure out whether you are using an implementation detail here
(the fact that url.host is always ASCII in Chrome and Safari). However, this
seems to be correct behavior according to https://url.spec.whatwg.org/ (the
logic there is rather complicated but I think I can follow it now). The behavior
implemented in Firefox right now is wrong then
(https://bugzilla.mozilla.org/show_bug.cgi?id=1007125).

+    window.navigator.userAgent // HTTP_USER_AGENT
   ];
 
   return verifySignature(key, signature, params.join("\0"));
 };
 
 let recordKey = function(page, url, key)
 {
   let urlsWithKey = pagesWithKey.get(page);
 
   if (!urlsWithKey)
@@ skipping 11 matching lines @@
   let docDomain = extractHostFromURL((frame.parent || frame).url);
 
   if (token.indexOf("_") < 0)
     return;
 
   let [key, signature] = token.split("_", 2);
   key = key.replace(/=/g, "");
   if (verifyKey(key, signature, url, docDomain))
     recordKey(page, url, key);
 };