Commit f46c63ff authored by Georg Koppen's avatar Georg Koppen
Browse files

fixup! Bug 14970: Don't block our unsigned extensions

parent 82cfa7c8

toolkit/mozapps/extensions/internal/XPIProvider.jsm

+5 −3
Original line number Diff line number Diff line
@@ -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);