Issue 7243 - Update adblockpluscore dependency to hg:e26e122e0702

lib/csp.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/>.
  */
 
 "use strict";
 
 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
 const {RegExpFilter, WhitelistFilter} =
   require("../adblockpluscore/lib/filterClasses");
-const {extractHostFromFrame, isThirdParty} = require("./url");
+const {isThirdParty} = require("../adblockpluscore/lib/domain");
+const {extractHostFromFrame} = require("./url");
 const {checkWhitelisted} = require("./whitelisting");
 const {filterNotifier} = require("filterNotifier");
 const {logRequest} = require("./hitLogger");
 
 const {typeMap} = RegExpFilter;
 
 browser.webRequest.onHeadersReceived.addListener(details =>
 {
   let url = new URL(details.url);
   let parentFrame = ext.getFrame(details.tabId, details.parentFrameId);
@@ skipping 17 matching lines @@
     let specificOnly = !!checkWhitelisted(page, frame, null,
                                           typeMap.GENERICBLOCK);
     if (specificOnly && !(cspMatch instanceof WhitelistFilter))
     {
       cspMatch = defaultMatcher.matchesAny(details.url, typeMap.CSP, hostname,
                                            thirdParty, null, specificOnly);
       if (!cspMatch)
         return;
     }
 
-    logRequest([details.tabId], {
-      url: details.url, type: "CSP", docDomain: hostname,
-      thirdParty, specificOnly
-    }, cspMatch);
-    filterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]);
+    if (cspMatch instanceof WhitelistFilter)
+    {
+      logRequest([details.tabId], {
+        url: details.url, type: "CSP", docDomain: hostname,
+        thirdParty, specificOnly
+      }, cspMatch);
+      filterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]);
+      return;
+    }
 
-    if (cspMatch instanceof WhitelistFilter)
-      return;
+    let {blocking} = defaultMatcher.search(details.url, typeMap.CSP, hostname,

[Manish Jethani, 2019/01/29 05:06:30]

If the filter is a blocking filter, we look up all the matching blocking
filters. This is some redundant computation but it kept the implementation
simple and generic (so later we can look up any type of filter for logging
purposes, not just CSP). There are very few CSP filters and they're kept in
their own list. In practice this is fine.

+                                           thirdParty, null, specificOnly,
+                                           "blocking");
+    for (cspMatch of blocking)
+    {
+      logRequest([details.tabId], {
+        url: details.url, type: "CSP", docDomain: hostname,
+        thirdParty, specificOnly
+      }, cspMatch);
+      filterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]);
 
-    details.responseHeaders.push({
-      name: "Content-Security-Policy",
-      value: cspMatch.csp
-    });
+      details.responseHeaders.push({
+        name: "Content-Security-Policy",
+        value: cspMatch.csp
+      });
+    }
 
     return {responseHeaders: details.responseHeaders};
   }
 }, {
   urls: ["http://*/*", "https://*/*"],
   types: ["main_frame", "sub_frame"]
 }, ["blocking", "responseHeaders"]);