From 2b2df633f66dc3d1a5eb5f3a1bfa151820bfbaec Mon Sep 17 00:00:00 2001
From: Roy Tam <roytam@gmail.com>
Date: Fri, 31 Jan 2020 08:14:25 +0800
Subject: [PATCH] Revert "[WebRequest] Remove AddonManagerPermissions
 leftovers"

---
 dom/bindings/Bindings.conf            | 5 +++++
 toolkit/modules/addons/.eslintrc.js   | 1 +
 toolkit/modules/addons/WebRequest.jsm | 6 +++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index feee2423a7..9428529f48 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -53,6 +53,11 @@ 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 32c92be0ad..019759c87b 100644
--- a/toolkit/modules/addons/.eslintrc.js
+++ b/toolkit/modules/addons/.eslintrc.js
@@ -8,6 +8,7 @@ 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 76114d7bac..c720dae5da 100644
--- a/toolkit/modules/addons/WebRequest.jsm
+++ b/toolkit/modules/addons/WebRequest.jsm
@@ -720,7 +720,11 @@ HttpObserverManager = {
         try {
           let result = callback(data);
 
-          if (result && typeof result === "object" && opts.blocking) {
+          if (result && typeof result === "object" && opts.blocking
+              && !AddonManagerPermissions.isHostPermitted(uri.host)
+              && (!loadInfo || !loadInfo.loadingPrincipal
+                  || !loadInfo.loadingPrincipal.URI
+                  || !AddonManagerPermissions.isHostPermitted(loadInfo.loadingPrincipal.URI.host))) {
             handlerResults.push({opts, result});
           }
         } catch (e) {