From cb06cac81d3730d602c11e554ea3408e9f2b14a7 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 29 Jan 2020 09:08:00 +0100 Subject: [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. --- toolkit/modules/addons/.eslintrc.js | 1 - toolkit/modules/addons/WebRequest.jsm | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'toolkit') 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) { -- cgit v1.2.3