Issue 6402 - Split filter hit / request logging out into own API

lib/whitelisting.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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";
 
 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
 const {Filter, RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
 const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
 const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
-const {stringifyURL, getDecodedHostname,
-       extractHostFromFrame, isThirdParty} = require("./url");
+const {extractHostFromFrame, isThirdParty} = require("./url");
 const {port} = require("./messaging");
 const {logWhitelistedDocument} = require("./hitLogger");
 const {verifySignature} = require("../adblockpluscore/lib/rsa");
 
 let sitekeys = 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);
+    docDomain = url.hostname;
 
   let filter = defaultMatcher.whitelist.matchesAny(
-    urlString, typeMask, docDomain, thirdParty, sitekey
+    url.href, typeMask, docDomain, thirdParty, sitekey
   );
 
   if (filter && page)
-    logWhitelistedDocument(page.id, urlString, typeMask, docDomain, filter);
+    logWhitelistedDocument(page.id, url.href, 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
@@ skipping 28 matching lines @@
 };
 
 port.on("filters.isWhitelisted", message =>
 {
   return !!checkWhitelisted(new ext.Page(message.tab));
 });
 
 port.on("filters.whitelist", message =>
 {
   let page = new ext.Page(message.tab);
-  let host = getDecodedHostname(page.url).replace(/^www\./, "");
+  let host = page.url.hostname.replace(/^www\./, "");
   let filter = Filter.fromText("@@||" + host + "^$document");
   if (filter.subscriptions.length && filter.disabled)
   {
     filter.disabled = false;
   }
   else
   {
     filter.disabled = false;
     FilterStorage.addFilter(filter);
   }
@@ skipping 44 matching lines @@
  */
 exports.getKey = (page, frame, originUrl) =>
 {
   if (page)
   {
     let keys = sitekeys.get(page);
     if (keys)
     {
       for (; frame; frame = frame.parent)
       {
-        let key = keys.get(stringifyURL(frame.url));
+        let key = keys.get(frame.url.href);
         if (key)
           return key;
       }
     }
   }
 
   if (originUrl)
   {
     for (let keys of sitekeys._map.values())
     {
-      let key = keys.get(stringifyURL(originUrl));
+      let key = keys.get(originUrl.href);
       if (key)
         return key;
     }
   }
 
   return null;
 };
 
 function checkKey(token, url)
 {
@@ skipping 13 matching lines @@
 }
 
 function recordKey(key, page, url)
 {
   let keys = sitekeys.get(page);
   if (!keys)
   {
     keys = new Map();
     sitekeys.set(page, keys);
   }
-  keys.set(stringifyURL(url), key);
+  keys.set(url.href, key);
 }
 
 port.on("filters.addKey", (message, sender) =>
 {
   let key = checkKey(message.token, sender.frame.url);
   if (key)
     recordKey(key, sender.page, sender.frame.url);
 });
 
 function onHeadersReceived(details)
@@ skipping 19 matching lines @@
 {
   browser.webRequest.onHeadersReceived.addListener(
     onHeadersReceived,
     {
       urls: ["http://*/*", "https://*/*"],
       types: ["main_frame", "sub_frame"]
     },
     ["responseHeaders"]
   );
 }