Commit c963895e authored by Andrew Osmond's avatar Andrew Osmond
Browse files

Bug 1886855 - Add pref to allow disabling fallback for GMP updates. a=RyanVM 

Differential Revision: https://phabricator.services.mozilla.com/D206358
parent 1570fc84

modules/libpref/init/all.js

+6 −0
Original line number Diff line number Diff line
@@ -3639,6 +3639,12 @@ pref("browser.search.removeEngineInfobar.enabled", true); 
// User-settable override to media.gmp-manager.url for testing purposes.

//pref("media.gmp-manager.url.override", "");



// When |media.gmp-manager.allowLocalSources| is true, we will allow falling

// back to using the plugin configurations distributed with Firefox to update

// or install plugins. This fallback is only used when we fail to get an

// acceptable configuration via |media.gmp-manager.url|.

pref("media.gmp-manager.allowLocalSources", true);



// Update service URL for GMP install/updates:

pref("media.gmp-manager.url", "https://aus5.mozilla.org/update/3/GMP/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");

toolkit/modules/GMPInstallManager.sys.mjs

+11 −1
Original line number Diff line number Diff line
@@ -43,6 +43,16 @@ const LOCAL_GMP_SOURCES = [ 
  },

];



function getLocalSources() {

  if (GMPPrefs.getBool(GMPPrefs.KEY_ALLOW_LOCAL_SOURCES, true)) {

    return LOCAL_GMP_SOURCES;

  }



  let log = getScopedLogger("GMPInstallManager.downloadLocalConfig");

  log.info("ignoring local sources");

  return [];

}



function downloadJSON(uri) {

  let log = getScopedLogger("GMPInstallManager.checkForAddons");

  log.info("fetching config from: " + uri);
@@ -70,7 +80,7 @@ function downloadJSON(uri) { 
function downloadLocalConfig() {

  let log = getScopedLogger("GMPInstallManager.downloadLocalConfig");

  return Promise.all(

    LOCAL_GMP_SOURCES.map(conf => {

    getLocalSources().map(conf => {

      return downloadJSON(conf.src).then(addons => {

        let platforms = addons.vendors[conf.id].platforms;

        let target = Services.appinfo.OS + "_" + lazy.UpdateUtils.ABI;

toolkit/modules/GMPUtils.sys.mjs

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ export var GMPPrefs = { 
  KEY_PLUGIN_ABI: "media.{0}.abi",

  KEY_PLUGIN_FORCE_SUPPORTED: "media.{0}.forceSupported",

  KEY_PLUGIN_ALLOW_X64_ON_ARM64: "media.{0}.allow-x64-plugin-on-arm64",

  KEY_ALLOW_LOCAL_SOURCES: "media.gmp-manager.allowLocalSources",

  KEY_URL: "media.gmp-manager.url",

  KEY_URL_OVERRIDE: "media.gmp-manager.url.override",

  KEY_CERT_CHECKATTRS: "media.gmp-manager.cert.checkAttributes",