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

lib/csp.js

Index: lib/csp.js
diff --git a/lib/csp.js b/lib/csp.js
index 1e9a3670ee8dddb31fea270bb105615a7b881bc4..698d973fc377b6498daee97741c7dae9a706976b 100644
--- a/lib/csp.js
+++ b/lib/csp.js
@@ -24,7 +24,7 @@ const {extractHostFromFrame, getDecodedHostname,
        isThirdParty, stringifyURL} = require("./url");
 const {checkWhitelisted} = require("./whitelisting");
 const {FilterNotifier} = require("filterNotifier");
-const devtools = require("./devtools");
+const {logRequest} = require("./hitLogger");
 
 const {typeMap} = RegExpFilter;
 
@@ -33,10 +33,10 @@ browser.webRequest.onHeadersReceived.addListener(details =>
   let url = new URL(details.url);
   let urlString = stringifyURL(url);
   let parentFrame = ext.getFrame(details.tabId, details.parentFrameId);
-  let hostname = extractHostFromFrame(parentFrame) || getDecodedHostname(url);
-  let thirdParty = isThirdParty(url, hostname);
+  let docDomain = extractHostFromFrame(parentFrame) || getDecodedHostname(url);
+  let thirdParty = isThirdParty(url, docDomain);
 
-  let cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, hostname,
+  let cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, docDomain,
                                            thirdParty, null, false);
   if (cspMatch)
   {
@@ -54,14 +54,17 @@ browser.webRequest.onHeadersReceived.addListener(details =>
                                           typeMap.GENERICBLOCK);
     if (specificOnly)
     {
-      cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, hostname,
+      cspMatch = defaultMatcher.matchesAny(urlString, typeMap.CSP, docDomain,
                                            thirdParty, null, specificOnly);
       if (!cspMatch)
         return;
     }
 
-    devtools.logRequest([details.tabId], urlString, "CSP", hostname,
-                        thirdParty, null, specificOnly, cspMatch);
+    logRequest(
+      [details.tabId],
+      {url: urlString, type: "CSP", docDomain, thirdParty, specificOnly},
+      cspMatch
+    );
     FilterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]);
 
     if (cspMatch instanceof WhitelistFilter)