summaryrefslogtreecommitdiffstats
path: root/toolkit/modules
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-01-29 09:08:00 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-14 12:17:58 +0200
commitcb06cac81d3730d602c11e554ea3408e9f2b14a7 (patch)
tree5b29bb7089356591ff8bf8c03f97de5fc07bba58 /toolkit/modules
parentc3d92cd33819d6d7463b9ddab2e045f16100e122 (diff)
downloadUXP-cb06cac81d3730d602c11e554ea3408e9f2b14a7.tar
UXP-cb06cac81d3730d602c11e554ea3408e9f2b14a7.tar.gz
UXP-cb06cac81d3730d602c11e554ea3408e9f2b14a7.tar.lz
UXP-cb06cac81d3730d602c11e554ea3408e9f2b14a7.tar.xz
UXP-cb06cac81d3730d602c11e554ea3408e9f2b14a7.zip
[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.
Diffstat (limited to 'toolkit/modules')
-rw-r--r--toolkit/modules/addons/.eslintrc.js1
-rw-r--r--toolkit/modules/addons/WebRequest.jsm6
2 files changed, 1 insertions, 6 deletions
diff --git a/toolkit/modules/addons/.eslintrc.js b/toolkit/modules/addons/.eslintrc.js
index 019759c87..32c92be0a 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 c720dae5d..76114d7ba 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) {