commit f46c63ff6856251faf39e20a040ee104fa113176 Author: Georg Koppen gk@torproject.org Date: Tue Apr 26 19:55:31 2016 +0000
fixup! Bug 14970: Don't block our unsigned extensions --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 3056201..94c33ea 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -683,12 +683,13 @@ function isUsableAddon(aAddon) { return false; } // Temporary and system add-ons do not require signing. Neither do Torbutton - // nor TorLauncher nor EFF's HTTPS-Everywhere. + // nor TorLauncher nor EFF's HTTPS-Everywhere nor meek. if ((aAddon._installLocation.name != KEY_APP_SYSTEM_DEFAULTS && aAddon._installLocation.name != KEY_APP_TEMPORARY) && aAddon.id != "torbutton@torproject.org" && aAddon.id != "tor-launcher@torproject.org" && aAddon.id != "https-everywhere-eff@eff.org" && + aAddon.id != "meek-http-helper@bamsoftware.com" && mustSign(aAddon.type)) { if (aAddon.signedState <= AddonManager.SIGNEDSTATE_MISSING) return false; @@ -3289,12 +3290,13 @@ this.XPIProvider = { continue; }
- // Make sure Torbutton, TorLauncher and EFF's HTTPS-Everywhere are still - // working after an update. + // Make sure Torbutton, TorLauncher, EFF's HTTPS-Everywhere and meek + // are still working after an update. if (mustSign(addon.type) && addon.id != "torbutton@torproject.org" && addon.id != "tor-launcher@torproject.org" && addon.id != "https-everywhere-eff@eff.org" && + addon.id != "meek-http-helper@bamsoftware.com" && addon.signedState <= AddonManager.SIGNEDSTATE_MISSING) { logger.warn("Refusing to install staged add-on " + id + " with signed state " + addon.signedState); seenFiles.push(stageDirEntry.leafName);
tbb-commits@lists.torproject.org