[$csp4 adblockpluschrome] Issue 5241 - Add support for Content Security Policy filters

lib/requestBlocker.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
@@ skipping 45 matching lines @@
 exports.filterTypes = new Set(function*()
 {
   // Microsoft Edge does not have webRequest.ResourceType or the devtools panel.
   // Since filterTypes is only used by devtools, we can just bail out here.
   if (!(browser.webRequest.ResourceType))
     return;
 
   for (let type in browser.webRequest.ResourceType)
     yield resourceTypes.get(browser.webRequest.ResourceType[type]) || "OTHER";
 
-  // WEBSOCKET and WEBRTC get addressed through workarounds, even if the
-  // webRequest API is lacking support to block these kind of requests.
-  yield "WEBSOCKET";
+  // WEBRTC gets addressed through a workaround, even if the webRequest API is
+  // lacking support to block this kind of a request.
   yield "WEBRTC";
 
-  // POPUP, CSP and ELEMHIDE filters aren't blocked on the request level but by

[Sebastian Noack, 2018/03/16 23:52:39]

Technically, the CSP filter is implemented on the request level. Perhaps, this
comment would be more acurrate and less confusing with following change, now:

  "blocked on the request level" => "mapped to resource types"

[kzar, 2018/03/19 14:41:30]

Done.

-  // other means. They don't have a corresponding value in
-  // webRequest.ResourceType.
+  // POPUP, CSP and ELEMHIDE filters aren't mapped to resource types.
   yield "POPUP";
   yield "ELEMHIDE";
   yield "CSP";
 }());
 
 function onBeforeRequestAsync(page, url, type, docDomain,
                               thirdParty, sitekey,
                               specificOnly, filter)
 {
   if (filter)
@@ skipping 116 matching lines @@
 
 FilterNotifier.on("subscription.added", onFilterChange);
 FilterNotifier.on("subscription.removed", onFilterChange);
 FilterNotifier.on("subscription.updated", onFilterChange);
 FilterNotifier.on("subscription.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("filter.added", onFilterChange);
 FilterNotifier.on("filter.removed", onFilterChange);
 FilterNotifier.on("filter.disabled", arg => onFilterChange(arg, true));
 FilterNotifier.on("load", onFilterChange);
 
-port.on("request.blockedByWrapper", (msg, sender) =>
-{
-  // Chrome 58 onwards directly supports WebSocket blocking, so we can ignore
-  // messages from the wrapper here (see https://crbug.com/129353). Hopefully
-  // WebRTC will be supported soon too (see https://crbug.com/707683).
-  // Edge supports neither webRequest.ResourceType nor WebSocket blocking yet:
-  // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/
-  if (browser.webRequest.ResourceType &&
-      (msg.requestType.toUpperCase() in browser.webRequest.ResourceType))
-  {
-    return false;
-  }
-
+port.on("request.blockedByRTCWrapper", (msg, sender) =>
+{
   return ext.webRequest.onBeforeRequest._dispatch(
      new URL(msg.url),
-     msg.requestType,
+     "webrtc",
      sender.page,
      sender.frame
   ).includes(false);
 });