diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-29 09:08:00 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-29 09:08:00 +0100 |
| commit | e57998f68bfbfdd4408eacd0ba29419771a588bd (patch) | |
| tree | 295679e3f3fac4be3f265124bf0e4b707d5fd30a /toolkit | |
| parent | ed88b99849156004c04e4a0c87ea9b2360ef19b6 (diff) | |
| download | UXP-e57998f68bfbfdd4408eacd0ba29419771a588bd.tar UXP-e57998f68bfbfdd4408eacd0ba29419771a588bd.tar.gz UXP-e57998f68bfbfdd4408eacd0ba29419771a588bd.tar.lz UXP-e57998f68bfbfdd4408eacd0ba29419771a588bd.tar.xz UXP-e57998f68bfbfdd4408eacd0ba29419771a588bd.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')
| -rw-r--r-- | toolkit/modules/addons/.eslintrc.js | 1 | ||||
| -rw-r--r-- | toolkit/modules/addons/WebRequest.jsm | 6 |
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) { |