[tor-commits] [tor-browser/tor-browser-81.0b2-10.0-1] Revert "Bug 14970: Don't block our unsigned extensions"

[gk at torproject.org]

commit 6a00c5b729e0d0389f00d39ec89332ab4c76d59b
Author: Alex Catarineu <acat at 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 4ac021546f00..a890f9f7edd3 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -2271,11 +2271,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 at 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 9204aa657b83..5459d0fff050 100644
--- a/toolkit/mozapps/extensions/content/aboutaddonsCommon.js
+++ b/toolkit/mozapps/extensions/content/aboutaddonsCommon.js
@@ -225,15 +225,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 at 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 at 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 3396d43116d2..4e172f89694a 100644
--- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm
@@ -3953,7 +3953,6 @@ var XPIInstall = {
 
     if (
       XPIDatabase.mustSign(addon.type) &&
-      addon.id !== "https-everywhere-eff at eff.org" &&
       addon.signedState <= AddonManager.SIGNEDSTATE_MISSING
     ) {
       throw new Error(