a-s-configure-default-search-engines.patch raw
1 diff --git a/components/remote_settings/src/client.rs b/components/remote_settings/src/client.rs
2 index d274ade65..6123c3275 100644
3 --- a/components/remote_settings/src/client.rs
4 +++ b/components/remote_settings/src/client.rs
5 @@ -122,77 +122,17 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
6 "world-buffered",
7 ],
8 ("main", "search-config-icons") => [
9 - "001500a9-1a6c-3f5a-ba15-a5f5a075d256",
10 - "06cf7432-efd7-f244-927b-5e423005e1ea",
11 - "0a57b0cf-34f0-4d09-96e4-dbd6e3355410",
12 - "0d7668a8-c3f4-cfee-cbc8-536511528937",
13 - "0eec5640-6fde-d6fe-322a-c72c6d5bd5a2",
14 - "101ce01d-2691-b729-7f16-9d389803384b",
15 - "177aba42-9bed-4078-e36b-580e8794cd7f",
16 - "25de0352-aabb-d31f-15f7-bf9299fb004c",
17 - "2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335",
18 - "2e835b0e-9709-d1bb-9725-87f59f3445ca",
19 "2ecca3f8-c1ef-43cc-b053-886d1ae46c36",
20 - "32d26d19-aeb0-5c01-32e8-f8970be9246f",
21 - "39d0b17d-c020-4890-932f-83c0f6ed130b",
22 - "41135a88-093d-4077-873b-9de1ae133427",
23 - "41f0d805-3775-4988-8d8c-5ad8ccd86d1c",
24 - "47da97b5-600f-c450-fd15-a52bb2169c11",
25 - "48c72361-cd67-412e-bd7f-f81a43c10791",
26 - "4e271681-3e0f-91ac-9750-03f665efc171",
27 - "50f6171f-8e7a-b41b-862e-f97397038fb2",
28 - "5203dd03-2c55-4b53-9c60-58258d587be1",
29 - "5914932e-66ba-4126-8be5-d37beadd9532",
30 - "5ded611d-44b2-dc46-fd67-fb116888d75d",
31 - "5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41",
32 - "6644f26f-28ea-4222-929d-5d43a02dae05",
33 - "6d10d702-7bd6-1452-90a5-3df665a38f66",
34 "6e36a151-e4f4-4117-9067-1ca82c47d01a",
35 - "6f4da442-d31e-28f8-03af-797d16bbdd27",
36 - "7072564d-a573-4750-bf33-f0a07631c9eb",
37 - "70fdd651-6c50-b7bb-09ec-7e85da259173",
38 - "71f41a0c-5b70-4116-b30f-e62089083522",
39 - "74793ce1-a918-a5eb-d3c0-2aadaff3c88c",
40 - "74f94dc2-caf6-4b90-b3d2-f3e2f7714d88",
41 - "764e3b14-fe16-4feb-8384-124c516a5afa",
42 "7bf4ca37-e2b8-4d31-a1c3-979bc0e85131",
43 - "7c81cf98-7c11-4afd-8279-db89118a6dfb",
44 - "7cb4d88a-d4df-45b2-87e4-f896eaf1bbdb",
45 "7edaf4fe-a8a0-432b-86d2-bf75ebe80851",
46 - "7efbed51-813c-581d-d8d3-f8758434e451",
47 - "84bb4962-e571-227a-9ef6-2ac5f2aac361",
48 - "87ac4cde-f581-398b-1e32-eb4079183b36",
49 - "8831ce10-b1e4-6eb4-4975-83c67457288e",
50 - "890de5c4-0941-a116-473a-5d240e79497a",
51 - "8abb10a7-212f-46b5-a7b4-244f414e3810",
52 - "91a9672d-e945-8e1e-0996-aefdb0190716",
53 - "94a84724-c30f-4767-ba42-01cc37fc31a4",
54 - "96327a73-c433-5eb4-a16d-b090cadfb80b",
55 - "9802e63d-05ec-48ba-93f9-746e0981ad98",
56 - "9d96547d-7575-49ca-8908-1e046b8ea90e",
57 - "a06db97d-1210-ea2e-5474-0e2f7d295bfd",
58 "a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3",
59 - "a2c7d4e9-f770-51e1-0963-3c2c8401631d",
60 - "a83f24e4-602c-47bd-930c-ad0947ee1adf",
61 - "b50c3e3d-7bd0-4118-856f-19b26b21d01f",
62 - "b64f09fd-52d1-c48e-af23-4ce918e7bf3b",
63 - "b882b24d-1776-4ef9-9016-0bdbd935eda3",
64 - "b8ca5a94-8fff-27ad-6e00-96e244a32e21",
65 - "b9424309-f601-4a69-98ca-ca68e65633e6",
66 - "c411adc1-9661-4fb5-a4c1-8cfe74911943",
67 "cbf9e891-d079-2b28-5617-283450d463dd",
68 - "d87f251c-3e12-a8bf-e2d0-afd43d36c5f9",
69 - "db0e1627-ae89-4c25-8944-a9481d8512d9",
70 - "e02f23df-8d48-2b1b-3b5c-6dd27302c61c",
71 - "e718e983-09aa-e8f6-b25f-cd4b395d4785",
72 - "e7547f62-187b-b641-d462-e54a3f813d9a",
73 - "eb62e768-151b-45d1-9fe5-9e1d2a5991c5",
74 - "f312610a-ebfb-a106-ea92-fd643c5d3636",
75 - "f943d7bc-872e-4a81-810f-94d26465da69",
76 - "fa0fc42c-d91d-fca7-34eb-806ff46062dc",
77 - "fca3e3ee-56cd-f474-dc31-307fd24a891d",
78 - "fe75ce3f-1545-400c-b28c-ad771054e69f",
79 - "fed4f021-ff3e-942a-010e-afa43fda2136",
80 + "a64817ca-00ba-497c-8de5-91adba65c44f",
81 + "1cd07f2a-3d0e-44a5-a92b-5e77cf864ed4",
82 + "7cd086c7-43f6-42fe-a240-17deeeef034b",
83 + "be7ba9bc-d68f-4ba3-ad3b-4fc0aaea5f3c",
84 + "eb73f935-25fa-4125-a5a3-3fa884e4fb5d",
85 ],
86 ("main", "translations-wasm") => [
87 "4fd32605-9889-4dd9-9fc7-577ad1136746",
88 @@ -731,11 +671,19 @@ impl Client {
89 ))?,
90 };
91
92 + let collection_name = if config.collection_name == String::from("search-config-icons") || config.collection_name == String::from("search-config-v2") {
93 + Err(Error::ConfigError(
94 + "Download attempt for remote search configuration was blocked.".into(),
95 + ))?
96 + } else {
97 + config.collection_name
98 + };
99 +
100 let bucket_name = config.bucket_name.unwrap_or_else(|| String::from("main"));
101 let endpoints = RemoteSettingsEndpoints::new(
102 &server.get_base_url()?,
103 &bucket_name,
104 - &config.collection_name,
105 + &collection_name,
106 );
107
108 Ok(Self {
109 diff --git a/components/remote_settings/src/service.rs b/components/remote_settings/src/service.rs
110 index 17d986f62..c2be46550 100644
111 --- a/components/remote_settings/src/service.rs
112 +++ b/components/remote_settings/src/service.rs
113 @@ -108,7 +108,7 @@ impl RemoteSettingsService {
114 }
115 }
116 }
117 - if synced_collections.insert(collection_name.to_string()) {
118 + if collection_name != String::from("search-config-icons") && collection_name != String::from("search-config-v2") && synced_collections.insert(collection_name.to_string()) {
119 trace!("syncing collection: {collection_name}");
120 client.sync()?;
121 }
122