commit d7bb5bbea7b9ee1b7a987fa63e996732a554cf90 Author: Alex Catarineu acat@torproject.org Date: Fri Sep 4 13:48:37 2020 +0200

Revert "Bug 14970: Don't block our unsigned extensions"

This reverts commit c1e58594c9cf2d226279727e0148ebd59ed98c12. --- browser/components/BrowserGlue.jsm | 6 +----- toolkit/mozapps/extensions/content/aboutaddonsCommon.js | 6 ------ toolkit/mozapps/extensions/internal/XPIDatabase.jsm | 5 ----- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 1 - 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 21408e0413e9..f77f3958d4d4 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2256,11 +2256,7 @@ BrowserGlue.prototype = { ); AddonManager.getAddonsByIDs(disabledAddons).then(addons => { for (let addon of addons) { - // We don't need a false notification that our extensions are - // disabled. Even if they lack Mozilla's blessing they are enabled - // nevertheless. - if ((addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) && - (addon.id !== "https-everywhere-eff@eff.org")) { + if (addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) { this._notifyUnsignedAddonsDisabled(); break; } diff --git a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js index a566979bc8c8..9b218c3dae2c 100644 --- a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js +++ b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js @@ -214,15 +214,9 @@ var gBrowser = { }, };

-// This function is the central check point to decide whether to show a warning -// about unsigned extensions or not. We want those warnings but only for -// extensions we don't distribute. function isCorrectlySigned(addon) { // Add-ons without an "isCorrectlySigned" property are correctly signed as // they aren't the correct type for signing. - if (addon.id == "https-everywhere-eff@eff.org") { - return true; - } return addon.isCorrectlySigned !== false; }

diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm index c8407541c2df..0b9bfa34b138 100644 --- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm +++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm @@ -2211,11 +2211,6 @@ this.XPIDatabase = { * True if the add-on should not be appDisabled */ isUsableAddon(aAddon) { - // Ensure that we allow https-everywhere - if (aAddon.id == "https-everywhere-eff@eff.org") { - return true; - } - if (this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) { logger.warn(`Add-on ${aAddon.id} is not correctly signed.`); if (Services.prefs.getBoolPref(PREF_XPI_SIGNATURES_DEV_ROOT, false)) { diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index 4e16f7e7b2da..a7801077531f 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -3917,7 +3917,6 @@ var XPIInstall = {

if ( XPIDatabase.mustSign(addon.type) && - addon.id !== "https-everywhere-eff@eff.org" && addon.signedState <= AddonManager.SIGNEDSTATE_MISSING ) { throw new Error(