- tor-commits - lists.torproject.org

[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

[Git][tpo/applications/tor-browser][tor-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 tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 3dd7b20a by Pier Angelo Vendrame at 2023-02-22T09:55:31+01: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 - - - - - e8982629 by Pier Angelo Vendrame at 2023-02-22T09:59:38+01: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/d80384… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d80384… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40794: Make the language list change the build id of firefox-l10n
by Pier Angelo Vendrame (＠pierov) 21 Feb '23

21 Feb '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 237ce1c4 by Pier Angelo Vendrame at 2023-02-21T17:16:26+01:00 Bug 40794: Make the language list change the build id of firefox-l10n - - - - - 1 changed file: - projects/firefox-l10n/config Changes: ===================================== projects/firefox-l10n/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% pc("firefox", "abbrev") %]' -filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-1' +filename: '[% project %]-[% c("var/osname") %]-[% c("version") %]-[% c("var/build_id") %]' link_input_files: 1 steps: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40788: Remove all languages but en-US for privacy-browser build target
by Pier Angelo Vendrame (＠pierov) 21 Feb '23

21 Feb '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 89147beb by Pier Angelo Vendrame at 2023-02-21T09:42:44+01:00 Bug 40788: Remove all languages but en-US for privacy-browser build target - - - - - 3 changed files: - projects/firefox/build - projects/firefox/config - rbm.conf Changes: ===================================== projects/firefox/build ===================================== @@ -106,7 +106,7 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # Create .mozbuild to avoid interactive prompt in configure mkdir "$HOME/.mozbuild" -[% IF !c("var/testbuild") -%] +[% IF c("var/has_l10n") -%] supported_locales="[% tmpl(c('var/locales').join(' ')) %]" l10ncentral="$HOME/.mozbuild/l10n-central" @@ -176,7 +176,7 @@ export LANG=C.UTF-8 [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] ./mach build --verbose -[% IF !c("var/testbuild") %] +[% IF c("var/has_l10n") %] export MOZ_CHROME_MULTILOCALE="$supported_locales" # No quotes on purpose, see https://firefox-source-docs.mozilla.org/build/buildsystem/locales.html#inst… ./mach package-multi-locale --locales en-US $MOZ_CHROME_MULTILOCALE ===================================== projects/firefox/config ===================================== @@ -27,6 +27,7 @@ var: - autoconf2.13 - yasm - pkg-config + has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]' rezip: | rezip_tmpdir=$(mktemp -d) @@ -159,7 +160,7 @@ input_files: name: cbindgen - project: firefox-l10n name: firefox-l10n - enable: '[% !c("var/testbuild") %]' + enable: '[% c("var/has_l10n") %]' - project: wasi-sysroot name: wasi-sysroot enable: '[% c("var/rlbox") %]' @@ -183,15 +184,15 @@ input_files: - project: translation name: translation-base-browser pkg_type: base-browser - enable: '[% !c("var/testbuild") %]' + enable: '[% c("var/has_l10n") %]' - project: translation name: translation-base-browser-fluent pkg_type: base-browser-fluent - enable: '[% !c("var/testbuild") %]' + enable: '[% c("var/has_l10n") %]' - project: translation name: translation-tor-browser pkg_type: tor-browser - enable: '[% c("var/tor-browser") && !c("var/testbuild") %]' + enable: '[% c("var/tor-browser") && c("var/has_l10n") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin ===================================== rbm.conf ===================================== @@ -247,6 +247,7 @@ targets: ProjectName: PrivacyBrowser exe_name: privacybrowser updater_enabled: 0 + locales: [] torbrowser-testbuild: - testbuild View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40789: Broken mirror links for glean: link 404 for version 5.0.1 hosted at...
by Richard Pospesel (＠richard) 20 Feb '23

20 Feb '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: afa4a781 by Richard Pospesel at 2023-02-20T16:18:37+00:00 Bug 40789: Broken mirror links for glean: link 404 for version 5.0.1 hosted at aguestuser's tor people storage (cherry picked from commit 9b485949a8b71291286632da47ac51cee5cb873f) - - - - - 1 changed file: - projects/glean/config Changes: ===================================== projects/glean/config ===================================== @@ -29,7 +29,7 @@ var: 4.0.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-4.0.0.tar… 4.2.0: https://people.torproject.org/~pierov/tbb_files/glean-wheels-4.2.0.tar.xz 4.4.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-4.4.0.tar… - 5.0.1: https://people.torproject.org/~aguestuser/mirrors/sources/glean-wheels-5.0.… + 5.0.1: https://people.torproject.org/~richard/mirrors/sources/glean-wheels-5.0.1.t… steps: create_glean_deps_tarball: 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-build][main] Bug 40789: Broken mirror links for glean: link 404 for version 5.0.1 hosted at...
by Richard Pospesel (＠richard) 20 Feb '23

20 Feb '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 9b485949 by Richard Pospesel at 2023-02-20T15:44:33+00:00 Bug 40789: Broken mirror links for glean: link 404 for version 5.0.1 hosted at aguestuser's tor people storage - - - - - 1 changed file: - projects/glean/config Changes: ===================================== projects/glean/config ===================================== @@ -29,7 +29,7 @@ var: 4.0.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-4.0.0.tar… 4.2.0: https://people.torproject.org/~pierov/tbb_files/glean-wheels-4.2.0.tar.xz 4.4.0: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-4.4.0.tar… - 5.0.1: https://people.torproject.org/~aguestuser/mirrors/sources/glean-wheels-5.0.… + 5.0.1: https://people.torproject.org/~richard/mirrors/sources/glean-wheels-5.0.1.t… steps: create_glean_deps_tarball: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0