January 2025 - tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.5-1] 2 commits: Revert "BB 42647: Make OS HTTP User-Agent OS spoofing configurable by pref"
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 2bbd4c5b by Pier Angelo Vendrame at 2025-01-27T15:15:26+01:00 Revert "BB 42647: Make OS HTTP User-Agent OS spoofing configurable by pref" This reverts commit 57c94a79410783c564187a9496d7a5403accf15e. - - - - - ba0c37e9 by Pier Angelo Vendrame at 2025-01-27T15:15:28+01:00 Bug 1840385 - Do not spoof the OS in HTTP User Agent. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D234835 - - - - - 6 changed files: - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js - dom/base/Navigator.cpp - netwerk/protocol/http/nsHttpHandler.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator.js ===================================== @@ -107,20 +107,13 @@ const DEFAULT_UA_OS = { other: `X11; Linux ${defaultLinuxCpu}`, }; -const SPOOFED_UA_NAVIGATOR_OS = { +const SPOOFED_UA_OS = { linux: "X11; Linux x86_64", win: "Windows NT 10.0; Win64; x64", macosx: "Macintosh; Intel Mac OS X 10.15", android: "Android 10; Mobile", other: "X11; Linux x86_64", }; -const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0; Win64; x64", - win: "Windows NT 10.0; Win64; x64", - macosx: "Windows NT 10.0; Win64; x64", - android: "Android 10; Mobile", - other: "Windows NT 10.0; Win64; x64", -}; const SPOOFED_HW_CONCURRENCY = 2; const CONST_APPCODENAME = "Mozilla"; @@ -169,7 +162,7 @@ async function testUserAgentHeader() { is( result, - expectedResults.userAgentHeader, + expectedResults.userAgent, `Checking ${expectedResults.testDesc} User Agent HTTP Header.` ); @@ -203,7 +196,7 @@ async function testNavigator() { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} navigator.userAgent.` ); is( @@ -308,7 +301,7 @@ async function testWorkerNavigator() { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} worker navigator.userAgent.` ); is( @@ -364,8 +357,7 @@ add_task(async function setupDefaultUserAgent() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -397,8 +389,7 @@ add_task(async function setupRFPExemptions() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -447,8 +438,7 @@ add_task(async function setupETPToggleExemptions() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -482,12 +472,8 @@ add_task(async function setupResistFingerprinting() { let spoofedGeckoTrail = SPOOFED_UA_GECKO_TRAIL[AppConstants.platform]; - let spoofedUserAgentNavigator = `Mozilla/5.0 (${ - SPOOFED_UA_NAVIGATOR_OS[AppConstants.platform] - }; rv:${appVersion}.0) Gecko/${spoofedGeckoTrail} Firefox/${appVersion}.0`; - - let spoofedUserAgentHeader = `Mozilla/5.0 (${ - SPOOFED_UA_HTTPHEADER_OS[AppConstants.platform] + let spoofedUserAgent = `Mozilla/5.0 (${ + SPOOFED_UA_OS[AppConstants.platform] }; rv:${appVersion}.0) Gecko/${spoofedGeckoTrail} Firefox/${appVersion}.0`; expectedResults = { @@ -498,8 +484,7 @@ add_task(async function setupResistFingerprinting() { oscpu: SPOOFED_OSCPU[AppConstants.platform], platform: SPOOFED_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: spoofedUserAgentNavigator, - userAgentHeader: spoofedUserAgentHeader, + userAgent: spoofedUserAgent, }; await testNavigator(); ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js ===================================== @@ -122,20 +122,13 @@ const DEFAULT_UA_OS = { other: `X11; Linux ${defaultLinuxCpu}`, }; -const SPOOFED_UA_NAVIGATOR_OS = { +const SPOOFED_UA_OS = { linux: "X11; Linux x86_64", win: "Windows NT 10.0; Win64; x64", macosx: "Macintosh; Intel Mac OS X 10.15", android: "Android 10; Mobile", other: "X11; Linux x86_64", }; -const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0; Win64; x64", - win: "Windows NT 10.0; Win64; x64", - macosx: "Windows NT 10.0; Win64; x64", - android: "Android 10; Mobile", - other: "Windows NT 10.0; Win64; x64", -}; const SPOOFED_HW_CONCURRENCY = 2; const CONST_APPCODENAME = "Mozilla"; @@ -186,12 +179,12 @@ async function testNavigator(result, expectedResults, extraData) { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} navigator.userAgent.` ); is( result.userAgentHTTPHeader, - expectedResults.userAgentHTTPHeader, + expectedResults.userAgent, `Checking ${testDesc} userAgentHTTPHeader.` ); is( @@ -268,7 +261,7 @@ async function testNavigator(result, expectedResults, extraData) { ); is( result.worker_userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} worker navigator.userAgent.` ); is( @@ -295,8 +288,7 @@ async function testNavigator(result, expectedResults, extraData) { } let defaultUserAgent; -let spoofedUserAgentNavigator; -let spoofedUserAgentHeader; +let spoofedUserAgent; let allNotSpoofed; let allSpoofed; @@ -308,14 +300,8 @@ add_setup(async () => { DEFAULT_UA_GECKO_TRAIL[AppConstants.platform] } Firefox/${appVersion}.0`; - spoofedUserAgentNavigator = `Mozilla/5.0 (${ - SPOOFED_UA_NAVIGATOR_OS[AppConstants.platform] - }; rv:${appVersion}.0) Gecko/${ - SPOOFED_UA_GECKO_TRAIL[AppConstants.platform] - } Firefox/${appVersion}.0`; - - spoofedUserAgentHeader = `Mozilla/5.0 (${ - SPOOFED_UA_HTTPHEADER_OS[AppConstants.platform] + spoofedUserAgent = `Mozilla/5.0 (${ + SPOOFED_UA_OS[AppConstants.platform] }; rv:${appVersion}.0) Gecko/${ SPOOFED_UA_GECKO_TRAIL[AppConstants.platform] } Firefox/${appVersion}.0`; @@ -331,8 +317,7 @@ add_setup(async () => { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHTTPHeader: defaultUserAgent, + userAgent: defaultUserAgent, framer_crossOrigin_userAgentHTTPHeader: defaultUserAgent, framee_crossOrigin_userAgentHTTPHeader: defaultUserAgent, }; @@ -343,10 +328,9 @@ add_setup(async () => { oscpu: SPOOFED_OSCPU[AppConstants.platform], platform: SPOOFED_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: spoofedUserAgentNavigator, - userAgentHTTPHeader: spoofedUserAgentHeader, - framer_crossOrigin_userAgentHTTPHeader: spoofedUserAgentHeader, - framee_crossOrigin_userAgentHTTPHeader: spoofedUserAgentHeader, + userAgent: spoofedUserAgent, + framer_crossOrigin_userAgentHTTPHeader: spoofedUserAgent, + framee_crossOrigin_userAgentHTTPHeader: spoofedUserAgent, }; }); @@ -385,8 +369,7 @@ add_task(async () => { add_task(async () => { expectedResults = structuredClone(allSpoofed); expectedResults.framer_crossOrigin_userAgentHTTPHeader = defaultUserAgent; - expectedResults.framee_crossOrigin_userAgentHTTPHeader = - spoofedUserAgentHeader; + expectedResults.framee_crossOrigin_userAgentHTTPHeader = spoofedUserAgent; await testC(uri, testNavigator, expectedResults); }); @@ -394,8 +377,7 @@ add_task(async () => { add_task(async () => { expectedResults = structuredClone(allSpoofed); expectedResults.framer_crossOrigin_userAgentHTTPHeader = defaultUserAgent; - expectedResults.framee_crossOrigin_userAgentHTTPHeader = - spoofedUserAgentHeader; + expectedResults.framee_crossOrigin_userAgentHTTPHeader = spoofedUserAgent; await testD(uri, testNavigator, expectedResults); }); ===================================== dom/base/Navigator.cpp ===================================== @@ -2118,7 +2118,7 @@ nsresult Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, // specific OS version, etc. if (shouldResistFingerprinting) { nsAutoCString spoofedUA; - nsRFPService::GetSpoofedUserAgent(spoofedUA, false); + nsRFPService::GetSpoofedUserAgent(spoofedUA); CopyASCIItoUTF16(spoofedUA, aUserAgent); return NS_OK; } ===================================== netwerk/protocol/http/nsHttpHandler.cpp ===================================== @@ -409,7 +409,7 @@ nsresult nsHttpHandler::Init() { mMisc.AssignLiteral("rv:" MOZILLA_UAVERSION); // Generate the spoofed User Agent for fingerprinting resistance. - nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); + nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent); mSessionStartTime = NowInSeconds(); mHandlerActive = true; @@ -482,9 +482,6 @@ nsresult nsHttpHandler::Init() { // obsService->AddObserver(this, "net:failed-to-process-uri-content", true); } - Preferences::AddWeakObserver( - this, "privacy.resistFingerprinting.spoofOsInUserAgentHeader"_ns); - MakeNewRequestTokenBucket(); mWifiTickler = new Tickler(); if (NS_FAILED(mWifiTickler->Init())) mWifiTickler = nullptr; @@ -2143,9 +2140,6 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, // Inform nsIOService that network is tearing down. gIOService->SetHttpHandlerAlreadyShutingDown(); - Preferences::RemoveObserver( - this, "privacy.resistFingerprinting.spoofOsInUserAgentHeader"_ns); - ShutdownConnectionManager(); // need to reset the session start time since cache validation may @@ -2268,11 +2262,6 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, ShutdownConnectionManager(); mConnMgr = nullptr; Unused << InitConnectionMgr(); - } else if (!strcmp(topic, "nsPref:changed") && - !NS_strcmp( - data, - u"privacy.resistFingerprinting.spoofOsInUserAgentHeader")) { - nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); } return NS_OK; ===================================== toolkit/components/resistfingerprinting/nsRFPService.cpp ===================================== @@ -895,8 +895,7 @@ uint32_t nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, // User-Agent/Version Stuff /* static */ -void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent, - bool isForHTTPHeader) { +void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent) { // This function generates the spoofed value of User Agent. // We spoof the values of the platform and Firefox version, which could be // used as fingerprinting sources to identify individuals. @@ -904,38 +903,22 @@ void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent, // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorID/userAgent // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent - const bool spoofOs = - isForHTTPHeader && - Preferences::GetBool( - "privacy.resistFingerprinting.spoofOsInUserAgentHeader", true); - // These magic numbers are the lengths of the UA string literals below. // Assume three-digit Firefox version numbers so we have room to grow. size_t preallocatedLength = - 13 + - (spoofOs ? mozilla::ArrayLength(SPOOFED_HTTP_UA_OS) - : mozilla::ArrayLength(SPOOFED_UA_OS)) - - 1 + 5 + 3 + 10 + mozilla::ArrayLength(LEGACY_UA_GECKO_TRAIL) - 1 + 9 + 3 + - 2; + 13 + mozilla::ArrayLength(SPOOFED_UA_OS) - 1 + 5 + 3 + 10 + + mozilla::ArrayLength(LEGACY_UA_GECKO_TRAIL) - 1 + 9 + 3 + 2; userAgent.SetCapacity(preallocatedLength); // "Mozilla/5.0 (%s; rv:%d.0) Gecko/%d Firefox/%d.0" userAgent.AssignLiteral("Mozilla/5.0 ("); - - if (spoofOs) { - userAgent.AppendLiteral(SPOOFED_HTTP_UA_OS); - } else { - userAgent.AppendLiteral(SPOOFED_UA_OS); - } - + userAgent.AppendLiteral(SPOOFED_UA_OS); userAgent.AppendLiteral("; rv:" MOZILLA_UAVERSION ") Gecko/"); - #if defined(ANDROID) userAgent.AppendLiteral(MOZILLA_UAVERSION); #else userAgent.AppendLiteral(LEGACY_UA_GECKO_TRAIL); #endif - userAgent.AppendLiteral(" Firefox/" MOZILLA_UAVERSION); MOZ_ASSERT(userAgent.Length() <= preallocatedLength); ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -59,14 +59,6 @@ #define SPOOFED_POINTER_INTERFACE MouseEvent_Binding::MOZ_SOURCE_MOUSE -// For the HTTP User-Agent header, we use a simpler set of spoofed values -// that do not reveal the specific desktop platform. -#if defined(MOZ_WIDGET_ANDROID) -# define SPOOFED_HTTP_UA_OS "Android 10; Mobile" -#else -# define SPOOFED_HTTP_UA_OS "Windows NT 10.0; Win64; x64" -#endif - struct JSContext; class nsIChannel; @@ -267,7 +259,7 @@ class nsRFPService final : public nsIObserver, public nsIRFPService { // -------------------------------------------------------------------------- // This method generates the spoofed value of User Agent. - static void GetSpoofedUserAgent(nsACString& userAgent, bool isForHTTPHeader); + static void GetSpoofedUserAgent(nsACString& userAgent); // -------------------------------------------------------------------------- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/69… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/69… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.6.0esr-14.5-1] 2 commits: Revert "BB 42647: Make OS HTTP User-Agent OS spoofing configurable by pref"
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: f9fb6744 by Pier Angelo Vendrame at 2025-01-27T15:15:03+01:00 Revert "BB 42647: Make OS HTTP User-Agent OS spoofing configurable by pref" This reverts commit 57c94a79410783c564187a9496d7a5403accf15e. - - - - - efbb8c60 by Pier Angelo Vendrame at 2025-01-27T15:15:05+01:00 Bug 1840385 - Do not spoof the OS in HTTP User Agent. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D234835 - - - - - 6 changed files: - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js - dom/base/Navigator.cpp - netwerk/protocol/http/nsHttpHandler.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator.js ===================================== @@ -107,20 +107,13 @@ const DEFAULT_UA_OS = { other: `X11; Linux ${defaultLinuxCpu}`, }; -const SPOOFED_UA_NAVIGATOR_OS = { +const SPOOFED_UA_OS = { linux: "X11; Linux x86_64", win: "Windows NT 10.0; Win64; x64", macosx: "Macintosh; Intel Mac OS X 10.15", android: "Android 10; Mobile", other: "X11; Linux x86_64", }; -const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0; Win64; x64", - win: "Windows NT 10.0; Win64; x64", - macosx: "Windows NT 10.0; Win64; x64", - android: "Android 10; Mobile", - other: "Windows NT 10.0; Win64; x64", -}; const SPOOFED_HW_CONCURRENCY = 2; const CONST_APPCODENAME = "Mozilla"; @@ -169,7 +162,7 @@ async function testUserAgentHeader() { is( result, - expectedResults.userAgentHeader, + expectedResults.userAgent, `Checking ${expectedResults.testDesc} User Agent HTTP Header.` ); @@ -203,7 +196,7 @@ async function testNavigator() { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} navigator.userAgent.` ); is( @@ -308,7 +301,7 @@ async function testWorkerNavigator() { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} worker navigator.userAgent.` ); is( @@ -364,8 +357,7 @@ add_task(async function setupDefaultUserAgent() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -397,8 +389,7 @@ add_task(async function setupRFPExemptions() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -447,8 +438,7 @@ add_task(async function setupETPToggleExemptions() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -482,12 +472,8 @@ add_task(async function setupResistFingerprinting() { let spoofedGeckoTrail = SPOOFED_UA_GECKO_TRAIL[AppConstants.platform]; - let spoofedUserAgentNavigator = `Mozilla/5.0 (${ - SPOOFED_UA_NAVIGATOR_OS[AppConstants.platform] - }; rv:${appVersion}.0) Gecko/${spoofedGeckoTrail} Firefox/${appVersion}.0`; - - let spoofedUserAgentHeader = `Mozilla/5.0 (${ - SPOOFED_UA_HTTPHEADER_OS[AppConstants.platform] + let spoofedUserAgent = `Mozilla/5.0 (${ + SPOOFED_UA_OS[AppConstants.platform] }; rv:${appVersion}.0) Gecko/${spoofedGeckoTrail} Firefox/${appVersion}.0`; expectedResults = { @@ -498,8 +484,7 @@ add_task(async function setupResistFingerprinting() { oscpu: SPOOFED_OSCPU[AppConstants.platform], platform: SPOOFED_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: spoofedUserAgentNavigator, - userAgentHeader: spoofedUserAgentHeader, + userAgent: spoofedUserAgent, }; await testNavigator(); ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js ===================================== @@ -122,20 +122,13 @@ const DEFAULT_UA_OS = { other: `X11; Linux ${defaultLinuxCpu}`, }; -const SPOOFED_UA_NAVIGATOR_OS = { +const SPOOFED_UA_OS = { linux: "X11; Linux x86_64", win: "Windows NT 10.0; Win64; x64", macosx: "Macintosh; Intel Mac OS X 10.15", android: "Android 10; Mobile", other: "X11; Linux x86_64", }; -const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0; Win64; x64", - win: "Windows NT 10.0; Win64; x64", - macosx: "Windows NT 10.0; Win64; x64", - android: "Android 10; Mobile", - other: "Windows NT 10.0; Win64; x64", -}; const SPOOFED_HW_CONCURRENCY = 2; const CONST_APPCODENAME = "Mozilla"; @@ -186,12 +179,12 @@ async function testNavigator(result, expectedResults, extraData) { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} navigator.userAgent.` ); is( result.userAgentHTTPHeader, - expectedResults.userAgentHTTPHeader, + expectedResults.userAgent, `Checking ${testDesc} userAgentHTTPHeader.` ); is( @@ -268,7 +261,7 @@ async function testNavigator(result, expectedResults, extraData) { ); is( result.worker_userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} worker navigator.userAgent.` ); is( @@ -295,8 +288,7 @@ async function testNavigator(result, expectedResults, extraData) { } let defaultUserAgent; -let spoofedUserAgentNavigator; -let spoofedUserAgentHeader; +let spoofedUserAgent; let allNotSpoofed; let allSpoofed; @@ -308,14 +300,8 @@ add_setup(async () => { DEFAULT_UA_GECKO_TRAIL[AppConstants.platform] } Firefox/${appVersion}.0`; - spoofedUserAgentNavigator = `Mozilla/5.0 (${ - SPOOFED_UA_NAVIGATOR_OS[AppConstants.platform] - }; rv:${appVersion}.0) Gecko/${ - SPOOFED_UA_GECKO_TRAIL[AppConstants.platform] - } Firefox/${appVersion}.0`; - - spoofedUserAgentHeader = `Mozilla/5.0 (${ - SPOOFED_UA_HTTPHEADER_OS[AppConstants.platform] + spoofedUserAgent = `Mozilla/5.0 (${ + SPOOFED_UA_OS[AppConstants.platform] }; rv:${appVersion}.0) Gecko/${ SPOOFED_UA_GECKO_TRAIL[AppConstants.platform] } Firefox/${appVersion}.0`; @@ -331,8 +317,7 @@ add_setup(async () => { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHTTPHeader: defaultUserAgent, + userAgent: defaultUserAgent, framer_crossOrigin_userAgentHTTPHeader: defaultUserAgent, framee_crossOrigin_userAgentHTTPHeader: defaultUserAgent, }; @@ -343,10 +328,9 @@ add_setup(async () => { oscpu: SPOOFED_OSCPU[AppConstants.platform], platform: SPOOFED_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: spoofedUserAgentNavigator, - userAgentHTTPHeader: spoofedUserAgentHeader, - framer_crossOrigin_userAgentHTTPHeader: spoofedUserAgentHeader, - framee_crossOrigin_userAgentHTTPHeader: spoofedUserAgentHeader, + userAgent: spoofedUserAgent, + framer_crossOrigin_userAgentHTTPHeader: spoofedUserAgent, + framee_crossOrigin_userAgentHTTPHeader: spoofedUserAgent, }; }); @@ -385,8 +369,7 @@ add_task(async () => { add_task(async () => { expectedResults = structuredClone(allSpoofed); expectedResults.framer_crossOrigin_userAgentHTTPHeader = defaultUserAgent; - expectedResults.framee_crossOrigin_userAgentHTTPHeader = - spoofedUserAgentHeader; + expectedResults.framee_crossOrigin_userAgentHTTPHeader = spoofedUserAgent; await testC(uri, testNavigator, expectedResults); }); @@ -394,8 +377,7 @@ add_task(async () => { add_task(async () => { expectedResults = structuredClone(allSpoofed); expectedResults.framer_crossOrigin_userAgentHTTPHeader = defaultUserAgent; - expectedResults.framee_crossOrigin_userAgentHTTPHeader = - spoofedUserAgentHeader; + expectedResults.framee_crossOrigin_userAgentHTTPHeader = spoofedUserAgent; await testD(uri, testNavigator, expectedResults); }); ===================================== dom/base/Navigator.cpp ===================================== @@ -2118,7 +2118,7 @@ nsresult Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, // specific OS version, etc. if (shouldResistFingerprinting) { nsAutoCString spoofedUA; - nsRFPService::GetSpoofedUserAgent(spoofedUA, false); + nsRFPService::GetSpoofedUserAgent(spoofedUA); CopyASCIItoUTF16(spoofedUA, aUserAgent); return NS_OK; } ===================================== netwerk/protocol/http/nsHttpHandler.cpp ===================================== @@ -409,7 +409,7 @@ nsresult nsHttpHandler::Init() { mMisc.AssignLiteral("rv:" MOZILLA_UAVERSION); // Generate the spoofed User Agent for fingerprinting resistance. - nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); + nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent); mSessionStartTime = NowInSeconds(); mHandlerActive = true; @@ -482,9 +482,6 @@ nsresult nsHttpHandler::Init() { // obsService->AddObserver(this, "net:failed-to-process-uri-content", true); } - Preferences::AddWeakObserver( - this, "privacy.resistFingerprinting.spoofOsInUserAgentHeader"_ns); - MakeNewRequestTokenBucket(); mWifiTickler = new Tickler(); if (NS_FAILED(mWifiTickler->Init())) mWifiTickler = nullptr; @@ -2143,9 +2140,6 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, // Inform nsIOService that network is tearing down. gIOService->SetHttpHandlerAlreadyShutingDown(); - Preferences::RemoveObserver( - this, "privacy.resistFingerprinting.spoofOsInUserAgentHeader"_ns); - ShutdownConnectionManager(); // need to reset the session start time since cache validation may @@ -2268,11 +2262,6 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, ShutdownConnectionManager(); mConnMgr = nullptr; Unused << InitConnectionMgr(); - } else if (!strcmp(topic, "nsPref:changed") && - !NS_strcmp( - data, - u"privacy.resistFingerprinting.spoofOsInUserAgentHeader")) { - nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); } return NS_OK; ===================================== toolkit/components/resistfingerprinting/nsRFPService.cpp ===================================== @@ -895,8 +895,7 @@ uint32_t nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, // User-Agent/Version Stuff /* static */ -void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent, - bool isForHTTPHeader) { +void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent) { // This function generates the spoofed value of User Agent. // We spoof the values of the platform and Firefox version, which could be // used as fingerprinting sources to identify individuals. @@ -904,38 +903,22 @@ void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent, // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorID/userAgent // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent - const bool spoofOs = - isForHTTPHeader && - Preferences::GetBool( - "privacy.resistFingerprinting.spoofOsInUserAgentHeader", true); - // These magic numbers are the lengths of the UA string literals below. // Assume three-digit Firefox version numbers so we have room to grow. size_t preallocatedLength = - 13 + - (spoofOs ? mozilla::ArrayLength(SPOOFED_HTTP_UA_OS) - : mozilla::ArrayLength(SPOOFED_UA_OS)) - - 1 + 5 + 3 + 10 + mozilla::ArrayLength(LEGACY_UA_GECKO_TRAIL) - 1 + 9 + 3 + - 2; + 13 + mozilla::ArrayLength(SPOOFED_UA_OS) - 1 + 5 + 3 + 10 + + mozilla::ArrayLength(LEGACY_UA_GECKO_TRAIL) - 1 + 9 + 3 + 2; userAgent.SetCapacity(preallocatedLength); // "Mozilla/5.0 (%s; rv:%d.0) Gecko/%d Firefox/%d.0" userAgent.AssignLiteral("Mozilla/5.0 ("); - - if (spoofOs) { - userAgent.AppendLiteral(SPOOFED_HTTP_UA_OS); - } else { - userAgent.AppendLiteral(SPOOFED_UA_OS); - } - + userAgent.AppendLiteral(SPOOFED_UA_OS); userAgent.AppendLiteral("; rv:" MOZILLA_UAVERSION ") Gecko/"); - #if defined(ANDROID) userAgent.AppendLiteral(MOZILLA_UAVERSION); #else userAgent.AppendLiteral(LEGACY_UA_GECKO_TRAIL); #endif - userAgent.AppendLiteral(" Firefox/" MOZILLA_UAVERSION); MOZ_ASSERT(userAgent.Length() <= preallocatedLength); ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -59,14 +59,6 @@ #define SPOOFED_POINTER_INTERFACE MouseEvent_Binding::MOZ_SOURCE_MOUSE -// For the HTTP User-Agent header, we use a simpler set of spoofed values -// that do not reveal the specific desktop platform. -#if defined(MOZ_WIDGET_ANDROID) -# define SPOOFED_HTTP_UA_OS "Android 10; Mobile" -#else -# define SPOOFED_HTTP_UA_OS "Windows NT 10.0; Win64; x64" -#endif - struct JSContext; class nsIChannel; @@ -267,7 +259,7 @@ class nsRFPService final : public nsIObserver, public nsIRFPService { // -------------------------------------------------------------------------- // This method generates the spoofed value of User Agent. - static void GetSpoofedUserAgent(nsACString& userAgent, bool isForHTTPHeader); + static void GetSpoofedUserAgent(nsACString& userAgent); // -------------------------------------------------------------------------- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f1e706… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f1e706… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] 2 commits: Revert "BB 42647: Make OS HTTP User-Agent OS spoofing configurable by pref"
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 31235564 by Pier Angelo Vendrame at 2025-01-27T14:33:37+01:00 Revert "BB 42647: Make OS HTTP User-Agent OS spoofing configurable by pref" This reverts commit 57c94a79410783c564187a9496d7a5403accf15e. - - - - - ee81cb96 by Pier Angelo Vendrame at 2025-01-27T15:05:09+01:00 Bug 1840385 - Do not spoof the OS in HTTP User Agent. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D234835 - - - - - 6 changed files: - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js - dom/base/Navigator.cpp - netwerk/protocol/http/nsHttpHandler.cpp - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h Changes: ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator.js ===================================== @@ -107,20 +107,13 @@ const DEFAULT_UA_OS = { other: `X11; Linux ${defaultLinuxCpu}`, }; -const SPOOFED_UA_NAVIGATOR_OS = { +const SPOOFED_UA_OS = { linux: "X11; Linux x86_64", win: "Windows NT 10.0; Win64; x64", macosx: "Macintosh; Intel Mac OS X 10.15", android: "Android 10; Mobile", other: "X11; Linux x86_64", }; -const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0; Win64; x64", - win: "Windows NT 10.0; Win64; x64", - macosx: "Windows NT 10.0; Win64; x64", - android: "Android 10; Mobile", - other: "Windows NT 10.0; Win64; x64", -}; const SPOOFED_HW_CONCURRENCY = 2; const CONST_APPCODENAME = "Mozilla"; @@ -169,7 +162,7 @@ async function testUserAgentHeader() { is( result, - expectedResults.userAgentHeader, + expectedResults.userAgent, `Checking ${expectedResults.testDesc} User Agent HTTP Header.` ); @@ -203,7 +196,7 @@ async function testNavigator() { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} navigator.userAgent.` ); is( @@ -308,7 +301,7 @@ async function testWorkerNavigator() { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} worker navigator.userAgent.` ); is( @@ -364,8 +357,7 @@ add_task(async function setupDefaultUserAgent() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -397,8 +389,7 @@ add_task(async function setupRFPExemptions() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -447,8 +438,7 @@ add_task(async function setupETPToggleExemptions() { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHeader: defaultUserAgent, + userAgent: defaultUserAgent, }; await testNavigator(); @@ -482,12 +472,8 @@ add_task(async function setupResistFingerprinting() { let spoofedGeckoTrail = SPOOFED_UA_GECKO_TRAIL[AppConstants.platform]; - let spoofedUserAgentNavigator = `Mozilla/5.0 (${ - SPOOFED_UA_NAVIGATOR_OS[AppConstants.platform] - }; rv:${appVersion}.0) Gecko/${spoofedGeckoTrail} Firefox/${appVersion}.0`; - - let spoofedUserAgentHeader = `Mozilla/5.0 (${ - SPOOFED_UA_HTTPHEADER_OS[AppConstants.platform] + let spoofedUserAgent = `Mozilla/5.0 (${ + SPOOFED_UA_OS[AppConstants.platform] }; rv:${appVersion}.0) Gecko/${spoofedGeckoTrail} Firefox/${appVersion}.0`; expectedResults = { @@ -498,8 +484,7 @@ add_task(async function setupResistFingerprinting() { oscpu: SPOOFED_OSCPU[AppConstants.platform], platform: SPOOFED_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: spoofedUserAgentNavigator, - userAgentHeader: spoofedUserAgentHeader, + userAgent: spoofedUserAgent, }; await testNavigator(); ===================================== browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js ===================================== @@ -122,20 +122,13 @@ const DEFAULT_UA_OS = { other: `X11; Linux ${defaultLinuxCpu}`, }; -const SPOOFED_UA_NAVIGATOR_OS = { +const SPOOFED_UA_OS = { linux: "X11; Linux x86_64", win: "Windows NT 10.0; Win64; x64", macosx: "Macintosh; Intel Mac OS X 10.15", android: "Android 10; Mobile", other: "X11; Linux x86_64", }; -const SPOOFED_UA_HTTPHEADER_OS = { - linux: "Windows NT 10.0; Win64; x64", - win: "Windows NT 10.0; Win64; x64", - macosx: "Windows NT 10.0; Win64; x64", - android: "Android 10; Mobile", - other: "Windows NT 10.0; Win64; x64", -}; const SPOOFED_HW_CONCURRENCY = 2; const CONST_APPCODENAME = "Mozilla"; @@ -186,12 +179,12 @@ async function testNavigator(result, expectedResults, extraData) { ); is( result.userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} navigator.userAgent.` ); is( result.userAgentHTTPHeader, - expectedResults.userAgentHTTPHeader, + expectedResults.userAgent, `Checking ${testDesc} userAgentHTTPHeader.` ); is( @@ -268,7 +261,7 @@ async function testNavigator(result, expectedResults, extraData) { ); is( result.worker_userAgent, - expectedResults.userAgentNavigator, + expectedResults.userAgent, `Checking ${testDesc} worker navigator.userAgent.` ); is( @@ -295,8 +288,7 @@ async function testNavigator(result, expectedResults, extraData) { } let defaultUserAgent; -let spoofedUserAgentNavigator; -let spoofedUserAgentHeader; +let spoofedUserAgent; let allNotSpoofed; let allSpoofed; @@ -308,14 +300,8 @@ add_setup(async () => { DEFAULT_UA_GECKO_TRAIL[AppConstants.platform] } Firefox/${appVersion}.0`; - spoofedUserAgentNavigator = `Mozilla/5.0 (${ - SPOOFED_UA_NAVIGATOR_OS[AppConstants.platform] - }; rv:${appVersion}.0) Gecko/${ - SPOOFED_UA_GECKO_TRAIL[AppConstants.platform] - } Firefox/${appVersion}.0`; - - spoofedUserAgentHeader = `Mozilla/5.0 (${ - SPOOFED_UA_HTTPHEADER_OS[AppConstants.platform] + spoofedUserAgent = `Mozilla/5.0 (${ + SPOOFED_UA_OS[AppConstants.platform] }; rv:${appVersion}.0) Gecko/${ SPOOFED_UA_GECKO_TRAIL[AppConstants.platform] } Firefox/${appVersion}.0`; @@ -331,8 +317,7 @@ add_setup(async () => { oscpu: DEFAULT_OSCPU[AppConstants.platform], platform: DEFAULT_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: defaultUserAgent, - userAgentHTTPHeader: defaultUserAgent, + userAgent: defaultUserAgent, framer_crossOrigin_userAgentHTTPHeader: defaultUserAgent, framee_crossOrigin_userAgentHTTPHeader: defaultUserAgent, }; @@ -343,10 +328,9 @@ add_setup(async () => { oscpu: SPOOFED_OSCPU[AppConstants.platform], platform: SPOOFED_PLATFORM[AppConstants.platform], pluginsLength: 5, - userAgentNavigator: spoofedUserAgentNavigator, - userAgentHTTPHeader: spoofedUserAgentHeader, - framer_crossOrigin_userAgentHTTPHeader: spoofedUserAgentHeader, - framee_crossOrigin_userAgentHTTPHeader: spoofedUserAgentHeader, + userAgent: spoofedUserAgent, + framer_crossOrigin_userAgentHTTPHeader: spoofedUserAgent, + framee_crossOrigin_userAgentHTTPHeader: spoofedUserAgent, }; }); @@ -385,8 +369,7 @@ add_task(async () => { add_task(async () => { expectedResults = structuredClone(allSpoofed); expectedResults.framer_crossOrigin_userAgentHTTPHeader = defaultUserAgent; - expectedResults.framee_crossOrigin_userAgentHTTPHeader = - spoofedUserAgentHeader; + expectedResults.framee_crossOrigin_userAgentHTTPHeader = spoofedUserAgent; await testC(uri, testNavigator, expectedResults); }); @@ -394,8 +377,7 @@ add_task(async () => { add_task(async () => { expectedResults = structuredClone(allSpoofed); expectedResults.framer_crossOrigin_userAgentHTTPHeader = defaultUserAgent; - expectedResults.framee_crossOrigin_userAgentHTTPHeader = - spoofedUserAgentHeader; + expectedResults.framee_crossOrigin_userAgentHTTPHeader = spoofedUserAgent; await testD(uri, testNavigator, expectedResults); }); ===================================== dom/base/Navigator.cpp ===================================== @@ -2118,7 +2118,7 @@ nsresult Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, // specific OS version, etc. if (shouldResistFingerprinting) { nsAutoCString spoofedUA; - nsRFPService::GetSpoofedUserAgent(spoofedUA, false); + nsRFPService::GetSpoofedUserAgent(spoofedUA); CopyASCIItoUTF16(spoofedUA, aUserAgent); return NS_OK; } ===================================== netwerk/protocol/http/nsHttpHandler.cpp ===================================== @@ -409,7 +409,7 @@ nsresult nsHttpHandler::Init() { mMisc.AssignLiteral("rv:" MOZILLA_UAVERSION); // Generate the spoofed User Agent for fingerprinting resistance. - nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); + nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent); mSessionStartTime = NowInSeconds(); mHandlerActive = true; @@ -482,9 +482,6 @@ nsresult nsHttpHandler::Init() { // obsService->AddObserver(this, "net:failed-to-process-uri-content", true); } - Preferences::AddWeakObserver( - this, "privacy.resistFingerprinting.spoofOsInUserAgentHeader"_ns); - MakeNewRequestTokenBucket(); mWifiTickler = new Tickler(); if (NS_FAILED(mWifiTickler->Init())) mWifiTickler = nullptr; @@ -2143,9 +2140,6 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, // Inform nsIOService that network is tearing down. gIOService->SetHttpHandlerAlreadyShutingDown(); - Preferences::RemoveObserver( - this, "privacy.resistFingerprinting.spoofOsInUserAgentHeader"_ns); - ShutdownConnectionManager(); // need to reset the session start time since cache validation may @@ -2268,11 +2262,6 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, ShutdownConnectionManager(); mConnMgr = nullptr; Unused << InitConnectionMgr(); - } else if (!strcmp(topic, "nsPref:changed") && - !NS_strcmp( - data, - u"privacy.resistFingerprinting.spoofOsInUserAgentHeader")) { - nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); } return NS_OK; ===================================== toolkit/components/resistfingerprinting/nsRFPService.cpp ===================================== @@ -895,8 +895,7 @@ uint32_t nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, // User-Agent/Version Stuff /* static */ -void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent, - bool isForHTTPHeader) { +void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent) { // This function generates the spoofed value of User Agent. // We spoof the values of the platform and Firefox version, which could be // used as fingerprinting sources to identify individuals. @@ -904,38 +903,22 @@ void nsRFPService::GetSpoofedUserAgent(nsACString& userAgent, // https://developer.mozilla.org/en-US/docs/Web/API/NavigatorID/userAgent // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent - const bool spoofOs = - isForHTTPHeader && - Preferences::GetBool( - "privacy.resistFingerprinting.spoofOsInUserAgentHeader", true); - // These magic numbers are the lengths of the UA string literals below. // Assume three-digit Firefox version numbers so we have room to grow. size_t preallocatedLength = - 13 + - (spoofOs ? mozilla::ArrayLength(SPOOFED_HTTP_UA_OS) - : mozilla::ArrayLength(SPOOFED_UA_OS)) - - 1 + 5 + 3 + 10 + mozilla::ArrayLength(LEGACY_UA_GECKO_TRAIL) - 1 + 9 + 3 + - 2; + 13 + mozilla::ArrayLength(SPOOFED_UA_OS) - 1 + 5 + 3 + 10 + + mozilla::ArrayLength(LEGACY_UA_GECKO_TRAIL) - 1 + 9 + 3 + 2; userAgent.SetCapacity(preallocatedLength); // "Mozilla/5.0 (%s; rv:%d.0) Gecko/%d Firefox/%d.0" userAgent.AssignLiteral("Mozilla/5.0 ("); - - if (spoofOs) { - userAgent.AppendLiteral(SPOOFED_HTTP_UA_OS); - } else { - userAgent.AppendLiteral(SPOOFED_UA_OS); - } - + userAgent.AppendLiteral(SPOOFED_UA_OS); userAgent.AppendLiteral("; rv:" MOZILLA_UAVERSION ") Gecko/"); - #if defined(ANDROID) userAgent.AppendLiteral(MOZILLA_UAVERSION); #else userAgent.AppendLiteral(LEGACY_UA_GECKO_TRAIL); #endif - userAgent.AppendLiteral(" Firefox/" MOZILLA_UAVERSION); MOZ_ASSERT(userAgent.Length() <= preallocatedLength); ===================================== toolkit/components/resistfingerprinting/nsRFPService.h ===================================== @@ -59,14 +59,6 @@ #define SPOOFED_POINTER_INTERFACE MouseEvent_Binding::MOZ_SOURCE_MOUSE -// For the HTTP User-Agent header, we use a simpler set of spoofed values -// that do not reveal the specific desktop platform. -#if defined(MOZ_WIDGET_ANDROID) -# define SPOOFED_HTTP_UA_OS "Android 10; Mobile" -#else -# define SPOOFED_HTTP_UA_OS "Windows NT 10.0; Win64; x64" -#endif - struct JSContext; class nsIChannel; @@ -267,7 +259,7 @@ class nsRFPService final : public nsIObserver, public nsIRFPService { // -------------------------------------------------------------------------- // This method generates the spoofed value of User Agent. - static void GetSpoofedUserAgent(nsACString& userAgent, bool isForHTTPHeader); + static void GetSpoofedUserAgent(nsACString& userAgent); // -------------------------------------------------------------------------- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d8c660… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d8c660… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-bundle-testsuite][main] 2 commits: Bug 40080: Don't archive *.rpm and *.deb files
by morgan (＠morgan) 27 Jan '25

27 Jan '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite Commits: ece643c6 by Nicolas Vigier at 2025-01-25T10:18:10+01:00 Bug 40080: Don't archive *.rpm and *.deb files In order to save space, don't archive deb and rpm files. - - - - - abcf9a5a by Nicolas Vigier at 2025-01-25T10:22:25+01:00 Bug 40080: Reduce the number of archived nightly builds In order to avoid filling the disk (see tpo/tpa/team#41992), we reduce the number of days we keep builds from 100 to 30. We're still keeping one build from each of the last 30 weeks and last 12 months. - - - - - 1 changed file: - tools/tb-build-06-start-nightly-build Changes: ===================================== tools/tb-build-06-start-nightly-build ===================================== @@ -44,15 +44,13 @@ then -o -name '*-browser-windows*.exe' \ -o -name '*-browser-macos*.dmg' \ -o -name '*-browser-linux*.tar.xz' \ - -o -name '*-browser*.deb' \ - -o -name '*-browser*.rpm' \ -o -name '*-browser*.apk' \ -o -name '*-browser-debug-symbols-*.tar.xz' \ -o -name 'tor-expert-bundle*.tar.gz' \ \) \ -a -execdir cp -a {} "$dname" \; done - /home/tb-builder/tor-browser-bundle-testsuite/clones/tor-browser-build/tools/prune-old-builds --days 100 --weeks 30 --months 12 ~/tor-browser-builds-archive + /home/tb-builder/tor-browser-bundle-testsuite/clones/tor-browser-build/tools/prune-old-builds --days 30 --weeks 30 --months 12 ~/tor-browser-builds-archive fi # Only clean previous builds if we use more than 20GB View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 23 Jan '25

23 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: d8c660d5 by Beatriz Rizental at 2025-01-23T19:18:33+01:00 fixup! Add CI for Base Browser Attempt to download MR branch in case fetching fails due to the pipeline running in the parent project context. - - - - - 1 changed file: - .gitlab/ci/mixins.yml Changes: ===================================== .gitlab/ci/mixins.yml ===================================== @@ -12,7 +12,12 @@ exit 1 fi - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + - | + if ! git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; then + echo -e "\e[31mFetching failed for branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} from $CI_REPOSITORY_URL.\e[0m" + echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" + fi - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} .with-local-repo-pwsh: @@ -33,5 +38,10 @@ exit 1 } - Write-Output "Fetching from remote branch $branchName" - - git fetch origin $branchName + - | + if (! git fetch origin $branchName) { + Write-Output "Fetching failed for branch $branchName from $env:CI_REPOSITORY_URL." + Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" + } - git checkout origin/$branchName View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d8c660d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d8c660d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] 4 commits: fixup! TB 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 23 Jan '25

23 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 90f60943 by clairehurst at 2025-01-23T18:07:07+00:00 fixup! TB 40933: Add tor-launcher functionality Bug 43222: Fix tor logs timestamps - - - - - a1c22a73 by clairehurst at 2025-01-23T18:07:07+00:00 fixup! TB 42247: Android helpers for the TorProvider Bug 43222: Fix tor logs timestamps - - - - - db1d2b30 by clairehurst at 2025-01-23T18:07:07+00:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap Bug 43222: Fix tor logs timestamps - - - - - b270a085 by clairehurst at 2025-01-23T18:07:07+00:00 fixup! TB 40041 [android]: Implement Tor Network Settings Bug 43222: Fix tor logs timestamps - - - - - 8 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLog.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsComposeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsViewModel.kt - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt ===================================== @@ -20,7 +20,7 @@ class TorError( ) { } interface TorLogs { - fun onLog(type: String?, message: String?) + fun onLog(type: String?, message: String?, timestamp: String?) } internal enum class TorStatus(val status: String) { @@ -32,7 +32,7 @@ internal enum class TorStatus(val status: String) { } interface TorController: TorEvents { - val logEntries: MutableList<Pair<String?, String?>> + val logEntries: MutableList<TorLog> val isStarting: Boolean val isRestarting: Boolean val isBootstrapped: Boolean ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -66,7 +66,7 @@ class TorControllerGV( private var isTorBootstrapped = false get() = ((_lastKnownStatus.value.isStarted()) && wasTorBootstrapped) - private val entries = mutableListOf<Pair<String?, String?>>() + private val entries = mutableListOf<TorLog>() override val logEntries get() = entries override val isStarting get() = _lastKnownStatus.value.isStarting() override val isRestarting get() = isTorRestarting @@ -217,10 +217,10 @@ class TorControllerGV( } } - override fun onLog(type: String?, message: String?) { + override fun onLog(type: String?, message: String?, timestamp: String?) { synchronized(torLogListeners) { - entries.add(Pair(type, message)) - torLogListeners.toList().forEach { it.onLog(type, message) } + entries.add(TorLog(type ?: "null", message ?: "null", timestamp ?: "null")) + torLogListeners.toList().forEach { it.onLog(type ?: "null", message ?: "null", timestamp) } } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLog.kt ===================================== @@ -0,0 +1,10 @@ +package org.mozilla.fenix.tor + +import androidx.compose.runtime.Stable + +@Stable +data class TorLog( + val type: String, + val text: String, + val timestamp: String, +) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsComposeFragment.kt ===================================== @@ -108,16 +108,14 @@ class TorLogsComposeFragment : Fragment() { bottom = 16.dp, ), ) { - DisableSelection { - Text( - text = log.timestamp.toString(), - color = PhotonColors.LightGrey40, - modifier = modifier - .padding(bottom = 4.dp), - ) - } Text( - text = log.text, + text = log.timestamp, + color = PhotonColors.LightGrey40, + modifier = modifier + .padding(bottom = 4.dp), + ) + Text( + text = "[${log.type}] " + log.text, color = PhotonColors.LightGrey05, ) } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsViewModel.kt ===================================== @@ -10,22 +10,18 @@ import android.content.ClipboardManager import android.content.Context import android.os.Build import android.widget.Toast -import androidx.compose.runtime.Stable import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import org.mozilla.fenix.R import org.mozilla.fenix.ext.components -import java.sql.Timestamp class TorLogsViewModel(application: Application) : AndroidViewModel(application), TorLogs { private val torController = application.components.torController private val clipboardManager = application.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - private val _torLogs: MutableLiveData<List<TorLog>> = MutableLiveData( - mutableListOf(TorLog("---------------" + application.getString(R.string.tor_initializing_log) + "---------------")), - ) + private val _torLogs: MutableLiveData<List<TorLog>> = MutableLiveData(mutableListOf()) fun torLogs(): LiveData<List<TorLog>> { return _torLogs @@ -38,20 +34,14 @@ class TorLogsViewModel(application: Application) : AndroidViewModel(application) init { setupClipboardListener() torController.registerTorLogListener(this) - val currentEntries = torController.logEntries.filter { it.second != null } - .filter { !(it.second!!.startsWith("Circuit") && it.first == "ON") } - // Keep synchronized with format in onTorStatusUpdate - .flatMap { listOf(TorLog("[${it.first}] ${it.second}")) } + val currentEntries = torController.logEntries for (log in currentEntries) { addLog(log) } } - override fun onLog(type: String?, message: String?) { - if (message == null || type == null) return - if (type == "ON" && type.startsWith("Circuit")) return - - addLog(TorLog("[$type] $message")) + override fun onLog(type: String?, message: String?, timestamp: String?) { + addLog(TorLog(type ?: "null", message ?: "null", timestamp ?: "null")) } override fun onCleared() { @@ -86,14 +76,8 @@ class TorLogsViewModel(application: Application) : AndroidViewModel(application) var ret = "" for (log in torLogs().value ?: return getApplication<Application>().getString(R.string.default_error_msg)) { - ret += log.text + '\n' + ret += "${log.timestamp} [${log.type}] ${log.text}\n" } return ret } } - -@Stable -data class TorLog( - val text: String, - val timestamp: Timestamp = Timestamp(System.currentTimeMillis()), -) ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java ===================================== @@ -169,8 +169,9 @@ public class TorIntegrationAndroid implements BundleEventListener { } else if (EVENT_TOR_LOGS.equals(event)) { String msg = message.getString("message"); String type = message.getString("logType"); + String timestamp = message.getString("timestamp"); for (TorLogListener listener : mLogListeners) { - listener.onLog(type, msg); + listener.onLog(type, msg, timestamp); } } } @@ -636,7 +637,7 @@ public class TorIntegrationAndroid implements BundleEventListener { } public interface TorLogListener { - void onLog(String logType, String message); + void onLog(String logType, String message, String timestamp); } private @NonNull void reloadSettings() { ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -47,7 +47,7 @@ const logger = console.createInstance({ */ /** * @typedef {object} LogEntry An object with a log message - * @property {Date} date The date at which we received the message + * @property {string} timestamp The local date-time stamp at which we received the message * @property {string} type The message level * @property {string} msg The message */ @@ -518,13 +518,7 @@ export class TorProvider { */ getLog() { return this.#logs - .map(logObj => { - const timeStr = logObj.date - .toISOString() - .replace("T", " ") - .replace("Z", ""); - return `${timeStr} [${logObj.type}] ${logObj.msg}`; - }) + .map(logObj => `${logObj.timestamp} [${logObj.type}] ${logObj.msg}`) .join(TorLauncherUtil.isWindows ? "\r\n" : "\n"); } @@ -1031,9 +1025,16 @@ export class TorProvider { Services.obs.notifyObservers(null, TorProviderTopics.HasWarnOrErr); } - Services.obs.notifyObservers({ type, msg }, TorProviderTopics.TorLog); + const timestamp = new Date() + .toISOString() + .replace("T", " ") + .replace("Z", ""); + + Services.obs.notifyObservers( + { type, msg, timestamp }, + TorProviderTopics.TorLog + ); - const date = new Date(); const maxEntries = Services.prefs.getIntPref( Preferences.MaxLogEntries, 1000 @@ -1042,7 +1043,7 @@ export class TorProvider { this.#logs.splice(0, 1); } - this.#logs.push({ date, type, msg }); + this.#logs.push({ type, msg, timestamp }); switch (type) { case "ERR": logger.error(`[Tor error] ${msg}`); ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -136,6 +136,7 @@ class TorAndroidIntegrationImpl { type: EmittedEvents.torLogs, logType: subj.wrappedJSObject.type ?? "", message: subj.wrappedJSObject.msg ?? "", + timestamp: subj.wrappedJSObject.timestamp ?? "", }); break; case lazy.TorSettingsTopics.Ready: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ed4f39… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ed4f39… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-129.0a1-15.0-1
by Pier Angelo Vendrame (＠pierov) 23 Jan '25

23 Jan '25

Pier Angelo Vendrame pushed new branch tor-browser-129.0a1-15.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.5-1] fixup! BB 42305: Add script to combine translation files across versions.
by Pier Angelo Vendrame (＠pierov) 22 Jan '25

22 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 69adf7a7 by Henry Wilkes at 2025-01-22T18:27:21+01:00 fixup! BB 42305: Add script to combine translation files across versions. MB 324: Make the added comments also work for Mullvad Browser. - - - - - 1 changed file: - tools/base-browser/l10n/combine-translation-versions.py Changes: ===================================== tools/base-browser/l10n/combine-translation-versions.py ===================================== @@ -98,6 +98,10 @@ class BrowserBranch: self.name = branch_name self.prefix = version_match.group("prefix") self.browser_version = version_match.group("browser") + # Convert tor-browser to "Tor Browser", and similar. + browser_name = self.prefix.replace("-", " ").title() + self.browser_version_name = f"{browser_name} {self.browser_version}" + self._is_head = is_head self._ref = "HEAD" if is_head else f"origin/{branch_name}" @@ -306,7 +310,7 @@ for file_dict in json.loads(args.files): name, None if current_file is None else current_file.content, None if stable_file is None else stable_file.content, - f"Will be unused in Tor Browser {current_branch.browser_version}!", + f"Will be unused in {current_branch.browser_version_name}!", ) if legacy_branch and not file_dict.get("exclude-legacy", False): @@ -330,7 +334,7 @@ for file_dict in json.loads(args.files): name, content, legacy_file.content, - f"Unused in Tor Browser {stable_branch.browser_version}!", + f"Unused in {stable_branch.browser_version_name}!", ) elif legacy_branch: logger.info(f"Excluding legacy branch for {name}") View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/69a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/69a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.6.0esr-14.5-1] fixup! BB 42305: Add script to combine translation files across versions.
by Pier Angelo Vendrame (＠pierov) 22 Jan '25

22 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: f1e7068c by Henry Wilkes at 2025-01-22T18:26:42+01:00 fixup! BB 42305: Add script to combine translation files across versions. MB 324: Make the added comments also work for Mullvad Browser. - - - - - 1 changed file: - tools/base-browser/l10n/combine-translation-versions.py Changes: ===================================== tools/base-browser/l10n/combine-translation-versions.py ===================================== @@ -98,6 +98,10 @@ class BrowserBranch: self.name = branch_name self.prefix = version_match.group("prefix") self.browser_version = version_match.group("browser") + # Convert tor-browser to "Tor Browser", and similar. + browser_name = self.prefix.replace("-", " ").title() + self.browser_version_name = f"{browser_name} {self.browser_version}" + self._is_head = is_head self._ref = "HEAD" if is_head else f"origin/{branch_name}" @@ -306,7 +310,7 @@ for file_dict in json.loads(args.files): name, None if current_file is None else current_file.content, None if stable_file is None else stable_file.content, - f"Will be unused in Tor Browser {current_branch.browser_version}!", + f"Will be unused in {current_branch.browser_version_name}!", ) if legacy_branch and not file_dict.get("exclude-legacy", False): @@ -330,7 +334,7 @@ for file_dict in json.loads(args.files): name, content, legacy_file.content, - f"Unused in Tor Browser {stable_branch.browser_version}!", + f"Unused in {stable_branch.browser_version_name}!", ) elif legacy_branch: logger.info(f"Excluding legacy branch for {name}") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f1e7068… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f1e7068… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! BB 42305: Add script to combine translation files across versions.
by Pier Angelo Vendrame (＠pierov) 22 Jan '25

22 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: ed4f395b by Henry Wilkes at 2025-01-22T17:18:39+00:00 fixup! BB 42305: Add script to combine translation files across versions. MB 324: Make the added comments also work for Mullvad Browser. - - - - - 1 changed file: - tools/base-browser/l10n/combine-translation-versions.py Changes: ===================================== tools/base-browser/l10n/combine-translation-versions.py ===================================== @@ -98,6 +98,10 @@ class BrowserBranch: self.name = branch_name self.prefix = version_match.group("prefix") self.browser_version = version_match.group("browser") + # Convert tor-browser to "Tor Browser", and similar. + browser_name = self.prefix.replace("-", " ").title() + self.browser_version_name = f"{browser_name} {self.browser_version}" + self._is_head = is_head self._ref = "HEAD" if is_head else f"origin/{branch_name}" @@ -306,7 +310,7 @@ for file_dict in json.loads(args.files): name, None if current_file is None else current_file.content, None if stable_file is None else stable_file.content, - f"Will be unused in Tor Browser {current_branch.browser_version}!", + f"Will be unused in {current_branch.browser_version_name}!", ) if legacy_branch and not file_dict.get("exclude-legacy", False): @@ -330,7 +334,7 @@ for file_dict in json.loads(args.files): name, content, legacy_file.content, - f"Unused in Tor Browser {stable_branch.browser_version}!", + f"Unused in {stable_branch.browser_version_name}!", ) elif legacy_branch: logger.info(f"Excluding legacy branch for {name}") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ed4f395… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ed4f395… You're receiving this email because of your account on gitlab.torproject.org.

1 0