Commits:
-
46629939
by Pier Angelo Vendrame at 2025-08-20T18:03:50+02:00
fixup! BB 31740: Remove some unnecessary RemoteSettings instances
BB 43795: Restore the URL classifier XPCOM components.
We are not really interested in removing them.
We're interested in them not calling Mozilla.
However, we have a central patch for RemoteSettings, so we do not need
to patch the single user.
Or, if we did, at least we should patch
UrlClassifierExceptionListService where it creates its RemoteSettings
instance.
-
cc561c52
by Pier Angelo Vendrame at 2025-08-20T18:03:51+02:00
fixup! BB 31740: Remove some unnecessary RemoteSettings instances
BB 43795: Restore the URL classifier XPCOM components.
Remove this page as part of another commit.
This comit should go away automatically at the next rebase.
-
2164237e
by Pier Angelo Vendrame at 2025-08-20T18:03:52+02:00
fixup! BB 42716: Disable unwanted about: pages
BB 43795: Restore the URL classifier XPCOM components.
Move the commit where we disable about:urlclassifier.
-
673df9af
by Pier Angelo Vendrame at 2025-08-20T18:03:52+02:00
fixup! BB 42730: Patch RemoteSettings to use only local dumps as a data source
Make explicit that blanking REMOTE_SETTINGS_SERVER_URL is our change.
4 changed files:
Changes:
docshell/base/nsAboutRedirector.cpp
| ... |
... |
@@ -220,6 +220,8 @@ static const RedirEntry kRedirMap[] = { |
|
220
|
220
|
nsIAboutModule::HIDE_FROM_ABOUTABOUT},
|
|
221
|
221
|
#endif
|
|
222
|
222
|
#ifndef BASE_BROWSER_VERSION
|
|
|
223
|
+ // We disable safe browsing and the data update mechanisms. So this page
|
|
|
224
|
+ // will be non-functional or at least unreliable.
|
|
223
|
225
|
{"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",
|
|
224
|
226
|
nsIAboutModule::ALLOW_SCRIPT},
|
|
225
|
227
|
#endif
|
netwerk/url-classifier/UrlClassifierFeatureBase.cpp
| ... |
... |
@@ -80,7 +80,7 @@ void UrlClassifierFeatureBase::InitializePreferences() { |
|
80
|
80
|
|
|
81
|
81
|
nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService =
|
|
82
|
82
|
do_GetService("@mozilla.org/url-classifier/exception-list-service;1");
|
|
83
|
|
- if (!exceptionListService) {
|
|
|
83
|
+ if (NS_WARN_IF(!exceptionListService)) {
|
|
84
|
84
|
return;
|
|
85
|
85
|
}
|
|
86
|
86
|
|
netwerk/url-classifier/components.conf
| ... |
... |
@@ -13,4 +13,24 @@ Classes = [ |
|
13
|
13
|
'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton',
|
|
14
|
14
|
'headers': ['mozilla/net/ChannelClassifierService.h'],
|
|
15
|
15
|
},
|
|
|
16
|
+ {
|
|
|
17
|
+ 'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',
|
|
|
18
|
+ 'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'],
|
|
|
19
|
+ 'esModule': 'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs',
|
|
|
20
|
+ 'constructor': 'UrlClassifierExceptionListService',
|
|
|
21
|
+ },
|
|
|
22
|
+ {
|
|
|
23
|
+ 'cid': '{8753A413-3ED6-4A61-A1DC-B31A7E69B796}',
|
|
|
24
|
+ 'interfaces': ['nsIUrlClassifierExceptionListEntry'],
|
|
|
25
|
+ 'headers': ['mozilla/net/UrlClassifierExceptionListEntry.h'],
|
|
|
26
|
+ 'type': 'mozilla::net::UrlClassifierExceptionListEntry',
|
|
|
27
|
+ 'contract_ids': ['@mozilla.org/url-classifier/exception-list-entry;1'],
|
|
|
28
|
+ },
|
|
|
29
|
+ {
|
|
|
30
|
+ 'cid': '{807535BF-018E-4300-B8D3-4A6405FB9F65}',
|
|
|
31
|
+ 'interfaces': ['nsIUrlClassifierExceptionList'],
|
|
|
32
|
+ 'headers': ['mozilla/net/UrlClassifierExceptionList.h'],
|
|
|
33
|
+ 'type': 'mozilla::net::UrlClassifierExceptionList',
|
|
|
34
|
+ 'contract_ids': ['@mozilla.org/url-classifier/exception-list;1'],
|
|
|
35
|
+ },
|
|
16
|
36
|
] |
toolkit/modules/AppConstants.sys.mjs
| ... |
... |
@@ -210,10 +210,12 @@ export var AppConstants = Object.freeze({ |
|
210
|
210
|
ENABLE_WEBDRIVER: @ENABLE_WEBDRIVER_BOOL@,
|
|
211
|
211
|
|
|
212
|
212
|
REMOTE_SETTINGS_SERVER_URL:
|
|
213
|
|
-#ifdef MOZ_THUNDERBIRD
|
|
|
213
|
+#if defined(BASE_BROWSER_VERSION)
|
|
|
214
|
+ "",
|
|
|
215
|
+#elif defined(MOZ_THUNDERBIRD)
|
|
214
|
216
|
"https://thunderbird-settings.thunderbird.net/v1",
|
|
215
|
217
|
#else
|
|
216
|
|
- "",
|
|
|
218
|
+ "https://firefox.settings.services.mozilla.com/v1",
|
|
217
|
219
|
#endif
|
|
218
|
220
|
|
|
219
|
221
|
REMOTE_SETTINGS_VERIFY_SIGNATURE:
|
|