Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor 
Project / Applications / Tor Browser


Commits:
57dfb0ea by Pier Angelo Vendrame at 2025-08-20T17:59:14+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.

- - - - -
61ec52da by Pier Angelo Vendrame at 2025-08-20T17:59:17+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.

- - - - -
dd621fde by Pier Angelo Vendrame at 2025-08-20T17:59:19+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.

- - - - -
4390c5a4 by Pier Angelo Vendrame at 2025-08-20T17:59:21+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:

- docshell/base/nsAboutRedirector.cpp
- netwerk/url-classifier/UrlClassifierFeatureBase.cpp
- netwerk/url-classifier/components.conf
- toolkit/modules/AppConstants.sys.mjs


Changes:

=====================================
docshell/base/nsAboutRedirector.cpp
=====================================
@@ -223,6 +223,8 @@ static const RedirEntry kRedirMap[] = {
          nsIAboutModule::HIDE_FROM_ABOUTABOUT},
 #endif
 #ifndef BASE_BROWSER_VERSION
+    // We disable safe browsing and the data update mechanisms. So this page
+    // will be non-functional or at least unreliable.
     {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",
      nsIAboutModule::ALLOW_SCRIPT},
 #endif


=====================================
netwerk/url-classifier/UrlClassifierFeatureBase.cpp
=====================================
@@ -80,7 +80,7 @@ void UrlClassifierFeatureBase::InitializePreferences() {
 
   nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService =
       do_GetService("@mozilla.org/url-classifier/exception-list-service;1");
-  if (!exceptionListService) {
+  if (NS_WARN_IF(!exceptionListService)) {
     return;
   }
 


=====================================
netwerk/url-classifier/components.conf
=====================================
@@ -13,4 +13,24 @@ Classes = [
         'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton',
         'headers': ['mozilla/net/ChannelClassifierService.h'],
     },
+    {
+        'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',
+        'contract_ids': 
['@mozilla.org/url-classifier/exception-list-service;1'],
+        'esModule': 
'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs',
+        'constructor': 'UrlClassifierExceptionListService',
+    },
+    {
+        'cid': '{8753A413-3ED6-4A61-A1DC-B31A7E69B796}',
+        'interfaces': ['nsIUrlClassifierExceptionListEntry'],
+        'headers': ['mozilla/net/UrlClassifierExceptionListEntry.h'],
+        'type': 'mozilla::net::UrlClassifierExceptionListEntry',
+        'contract_ids': ['@mozilla.org/url-classifier/exception-list-entry;1'],
+    },
+    {
+        'cid': '{807535BF-018E-4300-B8D3-4A6405FB9F65}',
+        'interfaces': ['nsIUrlClassifierExceptionList'],
+        'headers': ['mozilla/net/UrlClassifierExceptionList.h'],
+        'type': 'mozilla::net::UrlClassifierExceptionList',
+        'contract_ids': ['@mozilla.org/url-classifier/exception-list;1'],
+    },
 ]


=====================================
toolkit/modules/AppConstants.sys.mjs
=====================================
@@ -210,10 +210,12 @@ export var AppConstants = Object.freeze({
   ENABLE_WEBDRIVER: @ENABLE_WEBDRIVER_BOOL@,
 
   REMOTE_SETTINGS_SERVER_URL:
-#ifdef MOZ_THUNDERBIRD
+#if defined(BASE_BROWSER_VERSION)
+    "",
+#elif defined(MOZ_THUNDERBIRD)
     "https://thunderbird-settings.thunderbird.net/v1";,
 #else
-    "",
+    "https://firefox.settings.services.mozilla.com/v1";,
 #endif
 
   REMOTE_SETTINGS_VERIFY_SIGNATURE:



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9691ec2187e928e38604a272e2547a1f6f64599c...4390c5a4fe9219dadf44689a8a3477aa6d1224ca

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9691ec2187e928e38604a272e2547a1f6f64599c...4390c5a4fe9219dadf44689a8a3477aa6d1224ca
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to