From 690fb973929d5560fc4546885b5f39330161be9e Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 29 Jan 2020 09:08:00 +0100
Subject: [PATCH] [WebRequest] Remove AddonManagerPermissions leftovers

This was added as part of the WebExtension sec issue CVE-2017-5389.
Since we no longer have this interface, it needed to be removed to
prevent errors in the WebRequest channel callback.
---
 dom/bindings/Bindings.conf            | 5 -----
 toolkit/modules/addons/.eslintrc.js   | 1 -
 toolkit/modules/addons/WebRequest.jsm | 6 +-----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 9428529f48..feee2423a7 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -53,11 +53,6 @@ DOMInterfaces = {
     'concrete': False
 },
 
-'AddonManagerPermissions': {
-    'wrapperCache': False,
-    'concrete': False
-},
-
 'AnimationEffectReadOnly': {
     'concrete': False
 },
diff --git a/toolkit/modules/addons/.eslintrc.js b/toolkit/modules/addons/.eslintrc.js
index 019759c87b..32c92be0ad 100644
--- a/toolkit/modules/addons/.eslintrc.js
+++ b/toolkit/modules/addons/.eslintrc.js
@@ -8,7 +8,6 @@ module.exports = { // eslint-disable-line no-undef
     "addMessageListener": false,
     "removeEventListener": false,
     "sendAsyncMessage": false,
-    "AddonManagerPermissions": false,
 
     "initialProcessData": true,
   },
diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm
index c720dae5da..76114d7bac 100644
--- a/toolkit/modules/addons/WebRequest.jsm
+++ b/toolkit/modules/addons/WebRequest.jsm
@@ -720,11 +720,7 @@ HttpObserverManager = {
         try {
           let result = callback(data);
 
-          if (result && typeof result === "object" && opts.blocking
-              && !AddonManagerPermissions.isHostPermitted(uri.host)
-              && (!loadInfo || !loadInfo.loadingPrincipal
-                  || !loadInfo.loadingPrincipal.URI
-                  || !AddonManagerPermissions.isHostPermitted(loadInfo.loadingPrincipal.URI.host))) {
+          if (result && typeof result === "object" && opts.blocking) {
             handlerResults.push({opts, result});
           }
         } catch (e) {