Issue 5315 - Add support for Microsoft Edge

lib/requestBlocker.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
@@ skipping 12 matching lines @@
 const {Subscription} = require("subscriptionClasses");
 const {defaultMatcher} = require("matcher");
 const {FilterNotifier} = require("filterNotifier");
 const {Prefs} = require("prefs");
 const {checkWhitelisted, getKey} = require("whitelisting");
 const {stringifyURL, extractHostFromFrame, isThirdParty} = require("url");
 const {port} = require("messaging");
 const devtools = require("devtools");
 
 // Chrome can't distinguish between OBJECT_SUBREQUEST and OBJECT requests.
-if (!("OBJECT_SUBREQUEST" in chrome.webRequest.ResourceType))
+if (chrome.webRequest.ResourceType &&

[Sebastian Noack, 2017/06/23 16:02:01]

Assuming that Microsoft Edge does not report requests as object_subrequest, this
logic is incorrect. In this case the check should rather be:

  if (!chrome.webRequest.ResourceType ||
      !("OBJECT_SUBREQUEST" in chrome.webRequest.ResourceType))

Also the comment above would have to be updated in order to mention Microsoft
Edge along Chrome.

[Oleksandr, 2017/06/26 07:28:08]

Not only does Edge not report object_subrequest, it also does not report
object_request, as it is mentioned in the webRequest section here:
https://docs.microsoft.com/en-us/microsoft-edge/extensions/api-support/suppor....
So as I see it this logic is irrelevant for Edge. This change is merely to avoid
an exception in Edge.

[Sebastian Noack, 2017/06/28 13:51:39]

The question is how likely is it that they start reporting requests as "object"
in the future? And how likely will they distinguish between "object_subrequest"
(before implementing webRequest.RecourseType)? I feel it might be slightly more
robust, to go with the logic I suggested above.

+    !("OBJECT_SUBREQUEST" in chrome.webRequest.ResourceType))
   RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
 
 // Map of content types reported by the browser to the respecitve content types
 // used by Adblock Plus. Other content types are simply mapped to OTHER.
 let resourceTypes = new Map(function*()
 {
   for (let type in RegExpFilter.typeMap)
     yield [type.toLowerCase(), type];
 
   yield ["sub_frame", "SUBDOCUMENT"];
@@ skipping 135 matching lines @@
 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).
-  if (msg.requestType.toUpperCase() in chrome.webRequest.ResourceType)
+  // Edge supports neither webRequest.ResourceType nor WebSocket blocking yet:
+  // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10297376/
+  if (chrome.webRequest.ResourceType &&
+      (msg.requestType.toUpperCase() in chrome.webRequest.ResourceType))
     return false;
 
   return ext.webRequest.onBeforeRequest._dispatch(
      new URL(msg.url),
      msg.requestType,
      sender.page,
      sender.frame
   ).includes(false);
 });