Commit a5f8f5b8 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 1849129: Prevent exceptions caused by extensions from interrupting the... 

Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8

Differential Revision: https://phabricator.services.mozilla.com/D186456
parent 298a23c6

toolkit/components/search/SearchService.sys.mjs

+12 −5
Original line number Diff line number Diff line
@@ -1576,11 +1576,18 @@ export class SearchService { 
      "engines reported by AddonManager startup"

    );

    for (let extension of this.#startupExtensions) {

      try {

        await this.#installExtensionEngine(

          extension,

          [lazy.SearchUtils.DEFAULT_TAG],

          true

        );

      } catch (ex) {

        lazy.logConsole.error(

          `#installExtensionEngine failed for ${extension.id}`,

          ex

        );

      }

    }

    this.#startupExtensions.clear();

toolkit/components/search/tests/xpcshell/test_webextensions_startup_duplicate.js

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/* Any copyright is dedicated to the Public Domain.

   http://creativecommons.org/publicdomain/zero/1.0/ */



"use strict";



const lazy = {};



const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils;



ChromeUtils.defineESModuleGetters(lazy, {

  ExtensionTestUtils:

    "resource://testing-common/ExtensionXPCShellUtils.sys.mjs",

});



add_setup(async function () {

  let server = useHttpServer();

  server.registerContentType("sjs", "sjs");

  await SearchTestUtils.useTestEngines("test-extensions");

  await promiseStartupManager();



  registerCleanupFunction(async () => {

    await promiseShutdownManager();

  });

});



add_task(async function test_install_duplicate_engine_startup() {

  let name = "Plain";

  let id = "plain@tests.mozilla.org";

  consoleAllowList.push(

    `#installExtensionEngine failed for ${id}`,

    `An engine called ${name} already exists`

  );

  // Do not use SearchTestUtils.installSearchExtension, as we need to manually

  // start the search service after installing the extension.

  let extensionInfo = {

    useAddonManager: "permanent",

    files: {},

    manifest: SearchTestUtils.createEngineManifest({

      name,

      search_url: "https://example.com/plain",

    }),

  };



  let extension = lazy.ExtensionTestUtils.loadExtension(extensionInfo);

  await extension.startup();



  await Services.search.init();



  await AddonTestUtils.waitForSearchProviderStartup(extension);

  let engine = await Services.search.getEngineByName(name);

  let submission = engine.getSubmission("foo");

  Assert.equal(

    submission.uri.spec,

    "https://duckduckgo.com/?q=foo&t=ffsb",

    "Should have not changed the app provided engine."

  );



  await extension.unload();

});

toolkit/components/search/tests/xpcshell/xpcshell.ini

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ support-files = data/search_ignorelist.json 
[test_webextensions_migrate_to.js]

support-files = data/search-migration.json

[test_webextensions_normandy_upgrade.js]

[test_webextensions_startup_duplicate.js]

[test_webextensions_startup_remove.js]

[test_webextensions_upgrade.js]

[test_webextensions_valid.js]