fixup! TB 42891: Set the bundled search engine for Tor Browser. (4cc8a0c6) · Commits · The Tor Project / Applications / Tor Browser

toolkit/components/search/SearchService.sys.mjs

+15 −5

Original line number	Diff line number	Diff line
		@@ -2628,11 +2628,21 @@ export class SearchService {
		// This is prefixed with _ rather than # because it is
		// called in test_remove_engine_notification_box.js
		async _fetchEngineSelectorEngines() {
		// tor-browser#43525: Check this still works.
		const engines = await (
		await fetch("chrome://global/content/search/torBrowserSearchEngines.json")
		).json();
		return { engines, privateDefault: undefined };
		let searchEngineSelectorProperties = {
		locale: "en-US",
		region: lazy.Region.home \|\| "unknown",
		channel: lazy.SearchUtils.MODIFIED_APP_CHANNEL,
		experiment: this._experimentPrefValue,
		distroID: lazy.SearchUtils.distroID ?? "",
		};

		for (let [key, value] of Object.entries(searchEngineSelectorProperties)) {
		this._settings.setMetaDataAttribute(key, value);
		}

		return this.#engineSelector.fetchEngineConfiguration(
		searchEngineSelectorProperties
		);
		}

		#setDefaultFromSelector(refinedConfig) {

toolkit/components/search/content/torBrowserSearchEngines.json

+90 −41

Original line number	Diff line number	Diff line
		[
		{
		"base": {
		"aliases": ["duckduckgo", "ddg"],
		"classification": "general",
		"name": "DuckDuckGo",
		"urls": {
		"search": {
		@@ -8,14 +10,23 @@
		"params": [],
		"searchTermParamName": "q"
		}
		}
		},
		"id": "04e99a38-13ee-47d8-8aa4-64482b3dea99",
		"identifier": "ddg",
		"recordType": "engine",
		"variants": []
		"variants": [
		{
		"environment": {
		"allRegionsAndLocales": true
		}
		}
		]
		},
		{
		"base": {
		"aliases": ["ddgonion"],
		"classification": "general",
		"name": "DuckDuckGo (.onion)",
		"urls": {
		"search": {
		@@ -23,14 +34,23 @@
		"params": [],
		"searchTermParamName": "q"
		}
		}
		},
		"id": "1e431da4-a60c-4411-9251-a95a841d451f",
		"identifier": "ddg-onion",
		"recordType": "engine",
		"variants": []
		"variants": [
		{
		"environment": {
		"allRegionsAndLocales": true
		}
		}
		]
		},
		{
		"base": {
		"aliases": ["startpage"],
		"classification": "general",
		"name": "Startpage",
		"urls": {
		"search": {
		@@ -38,14 +58,23 @@
		"params": [],
		"searchTermParamName": "q"
		}
		}
		},
		"id": "927bbd9f-b2f3-48b4-8974-1c1148028f4d",
		"identifier": "startpage",
		"recordType": "engine",
		"variants": []
		"variants": [
		{
		"environment": {
		"allRegionsAndLocales": true
		}
		}
		]
		},
		{
		"base": {
		"aliases": ["startpage-onion"],
		"classification": "general",
		"name": "Startpage (.onion)",
		"urls": {
		"search": {
		@@ -53,13 +82,21 @@
		"params": [],
		"searchTermParamName": "q"
		}
		}
		},
		"id": "e7eaba8d-6b9e-43fb-a799-b01b096c03ff",
		"identifier": "startpage-onion",
		"recordType": "engine",
		"variants": []
		"variants": [
		{
		"environment": {
		"allRegionsAndLocales": true
		}
		}
		]
		},
		{
		"base": {
		"aliases": ["wikipedia"],
		"classification": "unknown",
		"name": "Wikipedia (en)",
		@@ -69,10 +106,22 @@
		"params": [],
		"searchTermParamName": "search"
		}
		}
		},
		"id": "7f6d23c2-191e-483e-af3a-ce6451e3a8dd",
		"identifier": "wikipedia",
		"recordType": "engine",
		"variants": []
		"variants": [
		{
		"environment": {
		"allRegionsAndLocales": true
		}
		}
		]
		},
		{
		"recordType": "defaultEngines",
		"globalDefault": "ddg",
		"globalDefaultPrivate": "ddg"
		}
		]