tbb-commits February 2023

tbb-commits@lists.torproject.org

1 participants
133 discussions

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] fixup! Bug 31575: Disable Firefox Home (Activity Stream)
by Pier Angelo Vendrame (＠pierov) 23 Feb '23

23 Feb '23

Pier Angelo Vendrame pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 24aca1ff by Pier Angelo Vendrame at 2023-02-23T16:22:48+01:00 fixup! Bug 31575: Disable Firefox Home (Activity Stream) Bug 41624: Further more SaveToPocket references deleted - - - - - 2 changed files: - browser/base/content/browser.js - browser/components/BrowserGlue.jsm Changes: ===================================== browser/base/content/browser.js ===================================== @@ -67,7 +67,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { RFPHelper: "resource://gre/modules/RFPHelper.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", - SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm", ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.jsm", SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm", SessionStore: "resource:///modules/sessionstore/SessionStore.jsm", @@ -5442,8 +5441,6 @@ var XULBrowserWindow = { SafeBrowsingNotificationBox.onLocationChange(aLocationURI); - SaveToPocket.onLocationChange(window); - UrlbarProviderSearchTips.onLocationChange( window, aLocationURI, ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -75,7 +75,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { RFPHelper: "resource://gre/modules/RFPHelper.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", - SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm", ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.jsm", SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.jsm", SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm", @@ -1209,8 +1208,6 @@ BrowserGlue.prototype = { Normandy.init(); } - SaveToPocket.init(); - AboutHomeStartupCache.init(); Services.obs.notifyObservers(null, "browser-ui-startup-complete"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/24aca1f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/24aca1f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] Revert "fixup! Bug 31740: Remove some unnecessary RemoteSettings instances"
by Pier Angelo Vendrame (＠pierov) 23 Feb '23

23 Feb '23

Pier Angelo Vendrame pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f0b10df3 by Pier Angelo Vendrame at 2023-02-23T16:21:59+01:00 Revert "fixup! Bug 31740: Remove some unnecessary RemoteSettings instances" This reverts commit 34ed82f6c02a8dc5ed8390fa664e2f63aeadc303. - - - - - 1 changed file: - toolkit/components/moz.build Changes: ===================================== toolkit/components/moz.build ===================================== @@ -122,9 +122,10 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android": "components.conf", ] -# tor-browser#41628: Disable Normandy and Nimbus at compile time if CONFIG["MOZ_BUILD_APP"] == "browser": - DIRS += ["messaging-system"] + DIRS += ["normandy", "messaging-system"] + +DIRS += ["nimbus"] if CONFIG["MOZ_BACKGROUNDTASKS"]: DIRS += ["backgroundtasks"] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f0b10df… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f0b10df… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] 2 commits: fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 23 Feb '23

23 Feb '23

Pier Angelo Vendrame pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d912ca8d by Pier Angelo Vendrame at 2023-02-23T16:15:59+01:00 fixup! Base Browser's .mozconfigs. Bug 41629: Set MOZ_SERVICES_SYNC to False - - - - - f0d123b1 by Pier Angelo Vendrame at 2023-02-23T16:17:30+01:00 Bug 41629: Fix errors with MOZ_SERVICES_SYNC=False MOZ_SERVICES_SYNC should have been removed in Moz Bug 1227361. However, it is still available, so we would like to use it. Since it is a configuration that Mozilla does not test, and using it results in a build error and in a few runtime errors, too. This commit fixes them. We have an upstream bug, too, but its (proposed) fix does not apply to ESR 102 because of ESMification. Should it not be accepted, we could replace this commit with the poposed fix. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1816969 - - - - - 5 changed files: - browser/base/content/browser-sync.js - browser/components/BrowserGlue.jsm - browser/installer/package-manifest.in - browser/moz.configure - toolkit/modules/moz.build Changes: ===================================== browser/base/content/browser-sync.js ===================================== @@ -5,7 +5,11 @@ // This file is loaded into the browser window scope. /* eslint-env mozilla/browser-window */ -const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm"); +ChromeUtils.defineModuleGetter( + this, + "UIState", + "resource://services-sync/UIState.jsm" +); ChromeUtils.defineModuleGetter( this, @@ -342,7 +346,9 @@ var gSync = { // once syncing completes (bug 1239042). _syncStartTime: 0, _syncAnimationTimer: 0, - _obs: ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE], + _obs: AppConstants.MOZ_SERVICES_SYNC + ? ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE] + : [], get log() { if (!this._log) { @@ -458,7 +464,7 @@ var gSync = { this._definePrefGetters(); - if (!this.FXA_ENABLED) { + if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { this.onFxaDisabled(); return; } @@ -1529,7 +1535,7 @@ var gSync = { // can lead to a empty label for 'Send To Device' Menu. this.init(); - if (!this.FXA_ENABLED) { + if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { // These items are hidden in onFxaDisabled(). No need to do anything. return; } @@ -1564,7 +1570,7 @@ var gSync = { // "Send Page to Device" and "Send Link to Device" menu items updateContentContextMenu(contextMenu) { - if (!this.FXA_ENABLED) { + if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { // These items are hidden by default. No need to do anything. return false; } ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -719,10 +719,10 @@ let JSWINDOWACTORS = { }, }; -XPCOMUtils.defineLazyGetter( - this, - "WeaveService", - () => Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject +XPCOMUtils.defineLazyGetter(this, "WeaveService", () => + AppConstants.MOZ_SERVICES_SYNC + ? Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject + : null ); if (AppConstants.MOZ_CRASHREPORTER) { @@ -2693,7 +2693,7 @@ BrowserGlue.prototype = { // Schedule a sync (if enabled) after we've loaded { task: async () => { - if (WeaveService.enabled) { + if (WeaveService?.enabled) { await WeaveService.whenLoaded(); WeaveService.Weave.Service.scheduler.autoConnect(); } ===================================== browser/installer/package-manifest.in ===================================== @@ -179,7 +179,17 @@ @RESPATH@/browser/components/MacTouchBar.manifest @RESPATH@/browser/components/MacTouchBar.js #endif +; TODO: Remove this in ESR-115. +; If everything goes well, this patch will not be necessary in 115, because we +; have also an upstream bug. +; I suspect this is somehow incorrect, and that MOZ_SERVICES_SYNC is actually +; never defined for the makefile (it is not for Firefox 112, which builds +; correctly with MOZ_SERVICES_SYNC == False, even without this ifdef). +; But we are interested in disabling it, so using either this, or #if 0 would be +; fine for us. +#ifdef MOZ_SERVICES_SYNC @RESPATH@/components/SyncComponents.manifest +#endif @RESPATH@/components/servicesComponents.manifest @RESPATH@/components/servicesSettings.manifest @RESPATH@/components/cryptoComponents.manifest ===================================== browser/moz.configure ===================================== @@ -7,7 +7,8 @@ imply_option("MOZ_PLACES", True) # tor-browser#32493 imply_option("MOZ_SERVICES_HEALTHREPORT", False) -imply_option("MOZ_SERVICES_SYNC", True) +# tor-browser#41629 +imply_option("MOZ_SERVICES_SYNC", False) imply_option("MOZ_DEDICATED_PROFILES", True) imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True) # tor-browser#33734 ===================================== toolkit/modules/moz.build ===================================== @@ -291,6 +291,7 @@ for var in ( for var in ( "MOZ_ALLOW_ADDON_SIDELOAD", "MOZ_BACKGROUNDTASKS", + "MOZ_SERVICES_SYNC", "MOZ_SYSTEM_NSS", "MOZ_SYSTEM_POLICIES", "MOZ_UNSIGNED_APP_SCOPE", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1aaacc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1aaacc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 2 commits: fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 23 Feb '23

23 Feb '23

Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9ac0abfd by Pier Angelo Vendrame at 2023-02-23T09:54:29+01:00 fixup! Base Browser's .mozconfigs. Bug 41629: Set MOZ_SERVICES_SYNC to False - - - - - 8f61c9c0 by Pier Angelo Vendrame at 2023-02-23T10:19:37+01:00 Bug 41629: Fix errors with MOZ_SERVICES_SYNC=False MOZ_SERVICES_SYNC should have been removed in Moz Bug 1227361. However, it is still available, so we would like to use it. Since it is a configuration that Mozilla does not test, and using it results in a build error and in a few runtime errors, too. This commit fixes them. We have an upstream bug, too, but its (proposed) fix does not apply to ESR 102 because of ESMification. Should it not be accepted, we could replace this commit with the poposed fix. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1816969 - - - - - 5 changed files: - browser/base/content/browser-sync.js - browser/components/BrowserGlue.jsm - browser/installer/package-manifest.in - browser/moz.configure - toolkit/modules/moz.build Changes: ===================================== browser/base/content/browser-sync.js ===================================== @@ -5,7 +5,11 @@ // This file is loaded into the browser window scope. /* eslint-env mozilla/browser-window */ -const { UIState } = ChromeUtils.import("resource://services-sync/UIState.jsm"); +ChromeUtils.defineModuleGetter( + this, + "UIState", + "resource://services-sync/UIState.jsm" +); ChromeUtils.defineModuleGetter( this, @@ -342,7 +346,9 @@ var gSync = { // once syncing completes (bug 1239042). _syncStartTime: 0, _syncAnimationTimer: 0, - _obs: ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE], + _obs: AppConstants.MOZ_SERVICES_SYNC + ? ["weave:engine:sync:finish", "quit-application", UIState.ON_UPDATE] + : [], get log() { if (!this._log) { @@ -458,7 +464,7 @@ var gSync = { this._definePrefGetters(); - if (!this.FXA_ENABLED) { + if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { this.onFxaDisabled(); return; } @@ -1529,7 +1535,7 @@ var gSync = { // can lead to a empty label for 'Send To Device' Menu. this.init(); - if (!this.FXA_ENABLED) { + if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { // These items are hidden in onFxaDisabled(). No need to do anything. return; } @@ -1564,7 +1570,7 @@ var gSync = { // "Send Page to Device" and "Send Link to Device" menu items updateContentContextMenu(contextMenu) { - if (!this.FXA_ENABLED) { + if (!AppConstants.MOZ_SERVICES_SYNC || !this.FXA_ENABLED) { // These items are hidden by default. No need to do anything. return false; } ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -791,10 +791,10 @@ if (AppConstants.TOR_BROWSER_UPDATE) { }; } -XPCOMUtils.defineLazyGetter( - this, - "WeaveService", - () => Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject +XPCOMUtils.defineLazyGetter(this, "WeaveService", () => + AppConstants.MOZ_SERVICES_SYNC + ? Cc["@mozilla.org/weave/service;1"].getService().wrappedJSObject + : null ); if (AppConstants.MOZ_CRASHREPORTER) { @@ -2795,7 +2795,7 @@ BrowserGlue.prototype = { // Schedule a sync (if enabled) after we've loaded { task: async () => { - if (WeaveService.enabled) { + if (WeaveService?.enabled) { await WeaveService.whenLoaded(); WeaveService.Weave.Service.scheduler.autoConnect(); } ===================================== browser/installer/package-manifest.in ===================================== @@ -181,7 +181,17 @@ @RESPATH@/browser/components/MacTouchBar.manifest @RESPATH@/browser/components/MacTouchBar.js #endif +; TODO: Remove this in ESR-115. +; If everything goes well, this patch will not be necessary in 115, because we +; have also an upstream bug. +; I suspect this is somehow incorrect, and that MOZ_SERVICES_SYNC is actually +; never defined for the makefile (it is not for Firefox 112, which builds +; correctly with MOZ_SERVICES_SYNC == False, even without this ifdef). +; But we are interested in disabling it, so using either this, or #if 0 would be +; fine for us. +#ifdef MOZ_SERVICES_SYNC @RESPATH@/components/SyncComponents.manifest +#endif @RESPATH@/components/servicesComponents.manifest @RESPATH@/components/servicesSettings.manifest @RESPATH@/components/cryptoComponents.manifest ===================================== browser/moz.configure ===================================== @@ -7,7 +7,8 @@ imply_option("MOZ_PLACES", True) # tor-browser#32493 imply_option("MOZ_SERVICES_HEALTHREPORT", False) -imply_option("MOZ_SERVICES_SYNC", True) +# tor-browser#41629 +imply_option("MOZ_SERVICES_SYNC", False) imply_option("MOZ_DEDICATED_PROFILES", False) imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", False) # tor-browser#33734 ===================================== toolkit/modules/moz.build ===================================== @@ -293,6 +293,7 @@ for var in ( for var in ( "MOZ_ALLOW_ADDON_SIDELOAD", "MOZ_BACKGROUNDTASKS", + "MOZ_SERVICES_SYNC", "MOZ_SYSTEM_NSS", "MOZ_SYSTEM_POLICIES", "MOZ_UNSIGNED_APP_SCOPE", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ee46b9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ee46b9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40796: Improve the UX for the changelogs script when using the issue number
by Richard Pospesel (＠richard) 23 Feb '23

23 Feb '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ad6a7516 by Pier Angelo Vendrame at 2023-02-22T18:57:43+01:00 Bug 40796: Improve the UX for the changelogs script when using the issue number - - - - - 1 changed file: - tools/fetch-changelogs.py Changes: ===================================== tools/fetch-changelogs.py ===================================== @@ -102,30 +102,44 @@ with token_file.open() as f: token = f.read().strip() headers = {"PRIVATE-TOKEN": token} -if sys.argv[1][0] != "#": - version = sys.argv[1] - r = requests.get( - f"{API_URL}/projects/{PROJECT_ID}/issues?labels=Release Prep", - headers=headers, - ) - issue = None - for i in r.json(): - if i["title"].find(sys.argv[1]) != -1: - if issue is None: - issue = i - else: - print("More than one matching issue found!") - print("Please use the issue id.") - sys.exit(3) - if not issue: - print( - "Release preparation issue not found. Please make sure it has ~Release Prep." +version = sys.argv[1] +r = requests.get( + f"{API_URL}/projects/{PROJECT_ID}/issues?labels=Release Prep", + headers=headers, +) +if r.status_code == 401: + print("Unauthorized! Has your token expired?") + sys.exit(3) +issue = None +for i in r.json(): + if i["title"].find(sys.argv[1]) != -1: + if issue is None: + issue = i + else: + print("More than one matching issue found!") + print("Please use the issue id.") + sys.exit(4) +if not issue: + iid = version + version = None + if iid[0] == "#": + iid = iid[1:] + try: + int(iid) + r = requests.get( + f"{API_URL}/projects/{PROJECT_ID}/issues?iids={iid}", + headers=headers, ) - sys.exit(4) - iid = issue["iid"] -else: - version = "????" - iid = sys.argv[1][1:] + if r.ok and r.json(): + issue = r.json()[0] + except ValueError: + pass +if not issue: + print( + "Release preparation issue not found. Please make sure it has ~Release Prep." + ) + sys.exit(5) +iid = issue["iid"] linked = {} linked_build = {} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] squash! Bug 31575: Disable Firefox Home (Activity Stream)
by Richard Pospesel (＠richard) 22 Feb '23

22 Feb '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1aaacc15 by Pier Angelo Vendrame at 2023-02-22T11:35:58+00:00 squash! Bug 31575: Disable Firefox Home (Activity Stream) Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 1 changed file: - browser/components/about/AboutRedirector.cpp Changes: ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -77,7 +77,7 @@ static const RedirEntry kRedirMap[] = { #endif {"policies", "chrome://browser/content/policies/aboutPolicies.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.html", + {"privatebrowsing", "about:blank", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS}, @@ -190,7 +190,8 @@ AboutRedirector::NewChannel(nsIURI* aURI, nsILoadInfo* aLoadInfo, // enabled about:newtab. Disabled about:newtab page uses fallback. if (path.EqualsLiteral("home") || (StaticPrefs::browser_newtabpage_enabled() && - path.EqualsLiteral("newtab"))) { + path.EqualsLiteral("newtab")) || + path.EqualsLiteral("privatebrowsing")) { nsCOMPtr<nsIAboutNewTabService> aboutNewTabService = do_GetService("@mozilla.org/browser/aboutnewtab-service;1", &rv); NS_ENSURE_SUCCESS(rv, rv); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1aaacc1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1aaacc1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] squash! Bug 31575: Disable Firefox Home (Activity Stream)
by Richard Pospesel (＠richard) 22 Feb '23

22 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ee46b985 by Pier Angelo Vendrame at 2023-02-22T11:28:42+00:00 squash! Bug 31575: Disable Firefox Home (Activity Stream) Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 1 changed file: - browser/components/about/AboutRedirector.cpp Changes: ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -82,7 +82,7 @@ static const RedirEntry kRedirMap[] = { #endif {"policies", "chrome://browser/content/policies/aboutPolicies.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, - {"privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.html", + {"privatebrowsing", "about:blank", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS}, @@ -263,7 +263,8 @@ AboutRedirector::NewChannel(nsIURI* aURI, nsILoadInfo* aLoadInfo, // enabled about:newtab. Disabled about:newtab page uses fallback. if (path.EqualsLiteral("home") || (StaticPrefs::browser_newtabpage_enabled() && - path.EqualsLiteral("newtab"))) { + path.EqualsLiteral("newtab")) || + path.EqualsLiteral("privatebrowsing")) { nsCOMPtr<nsIAboutNewTabService> aboutNewTabService = do_GetService("@mozilla.org/browser/aboutnewtab-service;1", &rv); NS_ENSURE_SUCCESS(rv, rv); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ee46b98… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ee46b98… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] fixup! Bug 41116: Normalize system fonts.
by Richard Pospesel (＠richard) 22 Feb '23

22 Feb '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ca8d87a9 by Pier Angelo Vendrame at 2023-02-22T11:25:47+00:00 fixup! Bug 41116: Normalize system fonts. Bug 41646: Fixes for the font normalization - - - - - 1 changed file: - layout/base/nsLayoutUtils.cpp Changes: ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -9565,10 +9565,44 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont, gfxFontStyle fontStyle; nsAutoString systemFontName; if (aDocument->ShouldResistFingerprinting()) { -#ifdef XP_MACOSX +#if defined(XP_MACOSX) systemFontName = u"-apple-system"_ns; + // Values taken from a macOS 10.15 system. + switch (aFontID) { + case LookAndFeel::FontID::Caption: + case LookAndFeel::FontID::Menu: + fontStyle.size = 13; + break; + case LookAndFeel::FontID::SmallCaption: + fontStyle.weight = gfxFontStyle::FontWeight(700); + // fall-through + case LookAndFeel::FontID::MessageBox: + case LookAndFeel::FontID::StatusBar: + fontStyle.size = 11; + break; + default: + fontStyle.size = 12; + break; + } +#elif defined(XP_WIN) || defined(MOZ_WIDGET_ANDROID) + // Windows uses Segoe UI for Latin alphabets, but other fonts for some RTL + // languages, so we fallback to sans-serif to fall back to the user's + // default sans-serif. Size is 12px for all system fonts (tried in an en-US + // system). + // Several Android systems reported Roboto 12px, so similar to what Windows + // does. + systemFontName = u"sans-serif"_ns; + fontStyle.size = 12; #else + // On Linux, there is not a default. For example, GNOME on Debian uses + // Cantarell, 14.667px. Ubuntu Mate uses the Ubuntu font, but also 14.667px. + // Fedora with KDE uses Noto Sans, 13.3333px, but it uses Noto Sans on + // GNOME, too. + // In general, Linux uses some sans-serif, but its size can vary between + // 12px and 16px. We chose 15px because it is what Firefox is doing for the + // UI font-size. systemFontName = u"sans-serif"_ns; + fontStyle.size = 15; #endif } else if (!LookAndFeel::GetFont(aFontID, systemFontName, fontStyle)) { return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ca8d87a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ca8d87a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] fixup! Bug 41116: Normalize system fonts.
by Richard Pospesel (＠richard) 22 Feb '23

22 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: e4caa4f8 by Pier Angelo Vendrame at 2023-02-22T12:24:49+01:00 fixup! Bug 41116: Normalize system fonts. Bug 41646: Fixes for the font normalization - - - - - 1 changed file: - layout/base/nsLayoutUtils.cpp Changes: ===================================== layout/base/nsLayoutUtils.cpp ===================================== @@ -9565,10 +9565,44 @@ void nsLayoutUtils::ComputeSystemFont(nsFont* aSystemFont, gfxFontStyle fontStyle; nsAutoString systemFontName; if (aDocument->ShouldResistFingerprinting()) { -#ifdef XP_MACOSX +#if defined(XP_MACOSX) systemFontName = u"-apple-system"_ns; + // Values taken from a macOS 10.15 system. + switch (aFontID) { + case LookAndFeel::FontID::Caption: + case LookAndFeel::FontID::Menu: + fontStyle.size = 13; + break; + case LookAndFeel::FontID::SmallCaption: + fontStyle.weight = gfxFontStyle::FontWeight(700); + // fall-through + case LookAndFeel::FontID::MessageBox: + case LookAndFeel::FontID::StatusBar: + fontStyle.size = 11; + break; + default: + fontStyle.size = 12; + break; + } +#elif defined(XP_WIN) || defined(MOZ_WIDGET_ANDROID) + // Windows uses Segoe UI for Latin alphabets, but other fonts for some RTL + // languages, so we fallback to sans-serif to fall back to the user's + // default sans-serif. Size is 12px for all system fonts (tried in an en-US + // system). + // Several Android systems reported Roboto 12px, so similar to what Windows + // does. + systemFontName = u"sans-serif"_ns; + fontStyle.size = 12; #else + // On Linux, there is not a default. For example, GNOME on Debian uses + // Cantarell, 14.667px. Ubuntu Mate uses the Ubuntu font, but also 14.667px. + // Fedora with KDE uses Noto Sans, 13.3333px, but it uses Noto Sans on + // GNOME, too. + // In general, Linux uses some sans-serif, but its size can vary between + // 12px and 16px. We chose 15px because it is what Firefox is doing for the + // UI font-size. systemFontName = u"sans-serif"_ns; + fontStyle.size = 15; #endif } else if (!LookAndFeel::GetFont(aFontID, systemFontName, fontStyle)) { return; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4caa4f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4caa4f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] 2 commits: Bug 1817756 - Add a seed to the network ID. r=valentin, necko-reviewers
by Richard Pospesel (＠richard) 22 Feb '23

22 Feb '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 391c79ea by Pier Angelo Vendrame at 2023-02-22T11:17:01+00:00 Bug 1817756 - Add a seed to the network ID. r=valentin,necko-reviewers This helps to prevent linkability of users in the same network. Differential Revision: https://phabricator.services.mozilla.com/D170373 - - - - - 56a8b3f0 by Pier Angelo Vendrame at 2023-02-22T11:17:01+00:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 8 changed files: - + netwerk/system/LinkServiceCommon.cpp - + netwerk/system/LinkServiceCommon.h - netwerk/system/android/nsAndroidNetworkLinkService.cpp - netwerk/system/linux/nsNetworkLinkService.cpp - netwerk/system/mac/nsNetworkLinkService.mm - netwerk/system/moz.build - netwerk/system/netlink/NetlinkService.cpp - netwerk/system/win32/nsNotifyAddrListener.cpp Changes: ===================================== netwerk/system/LinkServiceCommon.cpp ===================================== @@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "LinkServiceCommon.h" + +#include "mozilla/Maybe.h" +#include "mozilla/SHA1.h" +#include "mozilla/TimeStamp.h" +#include "nsID.h" + +using namespace mozilla; + +void SeedNetworkId(SHA1Sum& aSha1) { + static Maybe<nsID> seed = ([]() { + Maybe<nsID> uuid(std::in_place); + if (NS_FAILED(nsID::GenerateUUIDInPlace(*uuid))) { + uuid.reset(); + } + return uuid; + })(); + if (seed) { + aSha1.update(seed.ptr(), sizeof(*seed)); + } else { + TimeStamp timestamp = TimeStamp::ProcessCreation(); + aSha1.update(&timestamp, sizeof(timestamp)); + } +} ===================================== netwerk/system/LinkServiceCommon.h ===================================== @@ -0,0 +1,17 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef LINK_SERVICE_COMMON_H_ +#define LINK_SERVICE_COMMON_H_ + +namespace mozilla { +class SHA1Sum; +} + +// Add a seed to the computed network ID to prevent user linkability. +void SeedNetworkId(mozilla::SHA1Sum& aSha1); + +#endif // LINK_SERVICE_COMMON_H_ ===================================== netwerk/system/android/nsAndroidNetworkLinkService.cpp ===================================== @@ -123,11 +123,15 @@ nsAndroidNetworkLinkService::GetLinkType(uint32_t* aLinkType) { NS_IMETHODIMP nsAndroidNetworkLinkService::GetNetworkID(nsACString& aNetworkID) { +#ifdef BASE_BROWSER + aNetworkID.Truncate(); +#else if (!mNetlinkSvc) { return NS_ERROR_NOT_AVAILABLE; } mNetlinkSvc->GetNetworkID(aNetworkID); +#endif return NS_OK; } ===================================== netwerk/system/linux/nsNetworkLinkService.cpp ===================================== @@ -50,11 +50,15 @@ nsNetworkLinkService::GetLinkType(uint32_t* aLinkType) { NS_IMETHODIMP nsNetworkLinkService::GetNetworkID(nsACString& aNetworkID) { +#ifdef BASE_BROWSER + aNetworkID.Truncate(); +#else if (!mNetlinkSvc) { return NS_ERROR_NOT_AVAILABLE; } mNetlinkSvc->GetNetworkID(aNetworkID); +#endif return NS_OK; } ===================================== netwerk/system/mac/nsNetworkLinkService.mm ===================================== @@ -35,6 +35,7 @@ #include "mozilla/Telemetry.h" #include "nsNetworkLinkService.h" #include "../../base/IPv6Utils.h" +#include "../LinkServiceCommon.h" #include "../NetworkLinkServiceDefines.h" #import <Cocoa/Cocoa.h> @@ -122,8 +123,12 @@ nsNetworkLinkService::GetLinkType(uint32_t* aLinkType) { NS_IMETHODIMP nsNetworkLinkService::GetNetworkID(nsACString& aNetworkID) { +#ifdef BASE_BROWSER + aNetworkID.Truncate(); +#else MutexAutoLock lock(mMutex); aNetworkID = mNetworkId; +#endif return NS_OK; } @@ -600,11 +605,8 @@ void nsNetworkLinkService::calculateNetworkIdInternal(void) { bool found6 = IPv6NetworkId(&sha1); if (found4 || found6) { - // This 'addition' could potentially be a fixed number from the - // profile or something. - nsAutoCString addition("local-rubbish"); nsAutoCString output; - sha1.update(addition.get(), addition.Length()); + SeedNetworkId(sha1); uint8_t digest[SHA1Sum::kHashSize]; sha1.finish(digest); nsAutoCString newString(reinterpret_cast<char*>(digest), SHA1Sum::kHashSize); ===================================== netwerk/system/moz.build ===================================== @@ -15,3 +15,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "android": elif CONFIG["OS_ARCH"] == "Linux": DIRS += ["linux", "netlink"] + +SOURCES += [ + "LinkServiceCommon.cpp", +] + +FINAL_LIBRARY = "xul" ===================================== netwerk/system/netlink/NetlinkService.cpp ===================================== @@ -18,6 +18,7 @@ #include "nsPrintfCString.h" #include "mozilla/Logging.h" #include "../../base/IPv6Utils.h" +#include "../LinkServiceCommon.h" #include "../NetworkLinkServiceDefines.h" #include "mozilla/Base64.h" @@ -1812,11 +1813,8 @@ void NetlinkService::CalculateNetworkID() { bool found6 = CalculateIDForFamily(AF_INET6, &sha1); if (found4 || found6) { - // This 'addition' could potentially be a fixed number from the - // profile or something. - nsAutoCString addition("local-rubbish"); nsAutoCString output; - sha1.update(addition.get(), addition.Length()); + SeedNetworkId(sha1); uint8_t digest[SHA1Sum::kHashSize]; sha1.finish(digest); nsAutoCString newString(reinterpret_cast<char*>(digest), @@ -1877,8 +1875,12 @@ void NetlinkService::CalculateNetworkID() { } void NetlinkService::GetNetworkID(nsACString& aNetworkID) { +#ifdef BASE_BROWSER + aNetworkID.Truncate(); +#else MutexAutoLock lock(mMutex); aNetworkID = mNetworkId; +#endif } nsresult NetlinkService::GetDnsSuffixList(nsTArray<nsCString>& aDnsSuffixList) { ===================================== netwerk/system/win32/nsNotifyAddrListener.cpp ===================================== @@ -45,6 +45,7 @@ #include "mozilla/Base64.h" #include "mozilla/ScopeExit.h" #include "mozilla/Telemetry.h" +#include "../LinkServiceCommon.h" #include <iptypes.h> #include <iphlpapi.h> @@ -104,8 +105,12 @@ nsNotifyAddrListener::GetLinkType(uint32_t* aLinkType) { NS_IMETHODIMP nsNotifyAddrListener::GetNetworkID(nsACString& aNetworkID) { +#ifdef BASE_BROWSER + aNetworkID.Truncate(); +#else MutexAutoLock lock(mMutex); aNetworkID = mNetworkId; +#endif return NS_OK; } @@ -248,7 +253,7 @@ void nsNotifyAddrListener::calculateNetworkId(void) { nsAutoCString output; SHA1Sum::Hash digest; HashSortedNetworkIds(nwGUIDS, sha1); - + SeedNetworkId(sha1); sha1.finish(digest); nsCString newString(reinterpret_cast<char*>(digest), SHA1Sum::kHashSize); nsresult rv = Base64Encode(newString, output); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bd243d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bd243d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits February 2023