Issue 5315 - Add support for Microsoft Edge

lib/csp.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 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";
 
 // Before Chrome 58, the webRequest API did not intercept WebSocket

[kzar, 2017/06/22 11:23:38]

Maybe reword something like this?

The webRequest API doesn't support WebSocket connection blocking in Microsoft
Edge and versions of Chrome before 58. Therefore for those we inject CSP headers
below as a workaround. See https://crbug.com/129353 and
https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/

[Oleksandr, 2017/06/22 13:34:59]

Done.

 // connections (see https://crbug.com/129353). Hence we inject CSP headers,
-// below, as a workaround.
-if (!("WEBSOCKET" in chrome.webRequest.ResourceType))
+// below, as a workaround. Edge does not intercept WebSocket requests either:
+// https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/ 
+if (!chrome.webRequest.ResourceType ||
+    !("WEBSOCKET" in chrome.webRequest.ResourceType))
 {
   const {defaultMatcher} = require("matcher");
   const {BlockingFilter, RegExpFilter} = require("filterClasses");
   const {getDecodedHostname} = require("url");
   const {checkWhitelisted} = require("whitelisting");
 
   chrome.webRequest.onHeadersReceived.addListener(details =>
   {
     let hostname = getDecodedHostname(new URL(details.url));
     let match = defaultMatcher.matchesAny("", RegExpFilter.typeMap.WEBSOCKET,
@@ skipping 24 matching lines @@
     }
   }, {
     urls: ["http://*/*", "https://*/*"],
     // We must also intercept script requests since otherwise Web Workers can
     // be abused to execute scripts for which our Content Security Policy
     // won't be injected.
     // https://github.com/gorhill/uBO-Extra/issues/19
     types: ["main_frame", "sub_frame", "script"]
   }, ["blocking", "responseHeaders"]);
 }