- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.12.0esr-12.5-1-build1
by richard (＠richard) 01 Jun '23

01 Jun '23

richard pushed new tag base-browser-102.12.0esr-12.5-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.12.0esr-12.5-1-build1
by richard (＠richard) 01 Jun '23

01 Jun '23

richard pushed new tag tor-browser-102.12.0esr-12.5-1-build1 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/tor-browser][tor-browser-102.12.0esr-12.5-1] 147 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by richard (＠richard) 01 Jun '23

01 Jun '23

richard pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: e378fd19 by Pier Angelo Vendrame at 2023-05-29T21:47:47+02:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - e7ad4ec2 by Pier Angelo Vendrame at 2023-05-29T21:47:50+02:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - 3b21569d by Jamie Nicol at 2023-05-29T21:47:50+02:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 96a8bf0f by Pier Angelo Vendrame at 2023-05-29T21:47:51+02:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 548f6ea5 by Neill Miller at 2023-05-29T21:47:51+02:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - 8249db36 by Gabriele Svelto at 2023-05-29T21:47:52+02:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - 571ec08f by Gabriele Svelto at 2023-05-29T21:47:52+02:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - 53915255 by Kershaw Chang at 2023-05-29T21:47:52+02:00 Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D164656 - - - - - 03e81e10 by Kathy Brade at 2023-05-29T21:47:53+02:00 Bug 1769028: Disable DNS lookup in nsProfileLock when the proxy bypass protection is enabled r=mossop Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1 when the proxy bypass protection is enabled. Differential Revision: https://phabricator.services.mozilla.com/D161264 - - - - - 2e495698 by Gabriele Svelto at 2023-05-29T21:47:53+02:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - 7ec68505 by Gabriele Svelto at 2023-05-29T21:47:54+02:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - c4cce668 by Hubert Boma Manilla at 2023-05-29T21:47:54+02:00 Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers - Block redirects on sourceMappingUrl - Add debugger test Differential Revision: https://phabricator.services.mozilla.com/D168648 - - - - - 4e7b4149 by Hubert Boma Manilla at 2023-05-29T21:47:54+02:00 Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers .sjs files depend on redirects to load static files. In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js fails because we use .sjs to serve the content. This patch refactors to no longer use .sjs files Differential Revision: https://phabricator.services.mozilla.com/D169739 - - - - - 36ef214d by Jonathan Kew at 2023-05-29T21:47:55+02:00 Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when they 'shadow' system-installed families. r=gfx-reviewers,lsalzman Differential Revision: https://phabricator.services.mozilla.com/D175350 - - - - - 1a7479a9 by Rob Wu at 2023-05-29T21:47:55+02:00 Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl,valentin Depends on D164656 Differential Revision: https://phabricator.services.mozilla.com/D166108 - - - - - 1d6ec0a3 by Kash Shampur at 2023-05-29T21:47:56+02:00 Bug 1803109 - Discard blocks of data that are too big for two chunks. r=canaltinova Currently, `ReserveAndPutRaw` allocates a second span even if the data would be too big for the chunk. Here a second conditional is added to check if the block of data is too big in this scenario and silently discard the data if so. Differential Revision: https://phabricator.services.mozilla.com/D167167 - - - - - b9df30af by Pier Angelo Vendrame at 2023-05-29T21:47:56+02:00 Bug 1814416: Generalize the app name in about:buildconfig. r=ahochheiden Now it displays app display name, instead of having Firefox hardcoded. Differential Revision: https://phabricator.services.mozilla.com/D168562 - - - - - d19663d0 by Jon Coppeard at 2023-05-29T21:47:56+02:00 Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink GC can mutate this vector so don't allow that while we are iterating. I think it would be safe to use index-based iteration but it's safer to just ban it entirely. This fixes the crash produced by the testcase. Differential Revision: https://phabricator.services.mozilla.com/D169701 - - - - - 18f7b13f by Jon Coppeard at 2023-05-29T21:47:57+02:00 Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink To prevent any other instances of this problme we can update the getDebuggers() methods on the global and the realm to require no GC. Depends on D169701 Differential Revision: https://phabricator.services.mozilla.com/D169702 - - - - - 5212ff93 by Pier Angelo Vendrame at 2023-05-29T21:47:57+02: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 - - - - - a94e5a96 by Georg Koppen at 2023-05-29T21:47:58+02:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - a2fd1774 by Henry Wilkes at 2023-05-29T21:47:58+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 57fdaa10 by Henry Wilkes at 2023-05-29T21:47:59+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - a3491594 by Pier Angelo Vendrame at 2023-05-29T21:47:59+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - 2e9d04ea by Marco Simonelli at 2023-05-29T21:47:59+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - df311cf1 by Marco Simonelli at 2023-05-29T21:48:00+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - d1bbca56 by Marco Simonelli at 2023-05-29T21:48:00+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 2cf64e80 by Marco Simonelli at 2023-05-29T21:48:01+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - 28d040c2 by Marco Simonelli at 2023-05-29T21:48:01+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - f280b5d9 by Marco Simonelli at 2023-05-29T21:48:01+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 1b1b7fa5 by Gaba at 2023-05-29T21:48:02+02:00 Adding issue and merge request templates - - - - - 077da1ba by Pier Angelo Vendrame at 2023-05-29T21:48:02+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - b311fefd by Pier Angelo Vendrame at 2023-05-29T21:48:03+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - d885d270 by Dan Ballard at 2023-05-29T21:48:03+02:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restore email link on mac - - - - - d2b697bb by Pier Angelo Vendrame at 2023-05-29T21:48:04+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 08ee26b7 by Dan Ballard at 2023-05-29T21:48:04+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 90bd5913 by Matthew Finkel at 2023-05-29T21:48:09+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 57721aec by Matthew Finkel at 2023-05-29T21:48:10+02:00 Bug 28125: Prevent non-Necko network connections - - - - - f1dd2e85 by Mike Perry at 2023-05-29T21:48:10+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 395f123a by Alex Catarineu at 2023-05-29T21:48:10+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 0edd1905 by Georg Koppen at 2023-05-29T21:48:11+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 75871f8e by Kathy Brade at 2023-05-29T21:48:11+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - ed8bc8b1 by Kathy Brade at 2023-05-29T21:48:12+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 21f7a720 by Alex Catarineu at 2023-05-29T21:48:12+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 51564f53 by Kathy Brade at 2023-05-29T21:48:12+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - 5dc05a02 by Arthur Edelstein at 2023-05-29T21:48:13+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - f916d5b2 by Alex Catarineu at 2023-05-29T21:48:13+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 871e5e7c by Pier Angelo Vendrame at 2023-05-29T21:48:14+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 3a6fb0ac by Georg Koppen at 2023-05-29T21:48:14+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - cbe86b42 by Alex Catarineu at 2023-05-29T21:48:15+02:00 Bug 28369: Stop shipping pingsender executable - - - - - f71ff97f by cypherpunks1 at 2023-05-29T21:48:15+02:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING - - - - - 9e42a9b3 by cypherpunks1 at 2023-05-29T21:48:15+02:00 Bug 41568: Disable LaterRun - - - - - 9236921c by cypherpunks1 at 2023-05-29T21:48:16+02:00 Bug 40717: Hide Windows SSO in settings - - - - - b05f4a1d by Pier Angelo Vendrame at 2023-05-29T21:48:16+02:00 Bug 40788: Prevent nsIURLQueryStrippingListService from calling home when it is not enabled. The URL query stripping service is enabled only in nightly builds, still it is initialized and remote settings are downloaded. This adds a condition that prevents the service from being initialized if disabled. Upstream Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 We should remove this patch if Mozilla decides that this is a problem also for them, or if they do not but we decide to use the feature. - - - - - 4689f713 by Pier Angelo Vendrame at 2023-05-29T21:48:17+02: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 - - - - - 7d2822e9 by Mike Perry at 2023-05-29T21:48:17+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 26280171 by hackademix at 2023-05-29T21:48:17+02:00 fixup! Firefox preference overrides. - - - - - be473441 by Pier Angelo Vendrame at 2023-05-29T21:48:18+02:00 fixup! Firefox preference overrides. Bug 41732: Use font.system.whitelist also on Linux as a defense-in-depth - - - - - f786bce7 by Richard Pospesel at 2023-05-29T21:48:18+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 97d8a03a by Pier Angelo Vendrame at 2023-05-29T21:48:19+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - aae3587d by Alex Catarineu at 2023-05-29T21:48:19+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 274421f2 by Alex Catarineu at 2023-05-29T21:48:19+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - d6b13abc by Alex Catarineu at 2023-05-29T21:48:20+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - a08847ff by Alex Catarineu at 2023-05-29T21:48:20+02:00 Bug 26345: Hide tracking protection UI - - - - - 02a4f59c by Pier Angelo Vendrame at 2023-05-29T21:48:21+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 7985e3ef by Alex Catarineu at 2023-05-29T21:48:21+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 1665d110 by Mike Perry at 2023-05-29T21:48:22+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 0ac9d766 by Igor Oliveira at 2023-05-29T21:48:22+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - 0b4e5e7e by Pier Angelo Vendrame at 2023-05-29T21:48:22+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - f3c5781b by Matthew Finkel at 2023-05-29T21:48:23+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - edbc927b by Pier Angelo Vendrame at 2023-05-29T21:48:23+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 88b7c4de by hackademix at 2023-05-29T21:48:24+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - b78c437c by hackademix at 2023-05-29T21:48:31+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 1be35a46 by hackademix at 2023-05-29T21:48:31+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 2870c4c0 by hackademix at 2023-05-29T21:48:32+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 2f67626c by hackademix at 2023-05-29T21:48:32+02:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - 1caba48f by hackademix at 2023-05-29T21:48:33+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 0e1fcf0b by Pier Angelo Vendrame at 2023-05-29T21:48:33+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 6696cf02 by Henry Wilkes at 2023-05-29T21:48:33+02:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - e337e776 by p13dz at 2023-05-29T21:48:34+02:00 Bug 40283: Workaround for the file upload bug - - - - - 6838297d by Arthur Edelstein at 2023-05-29T21:48:34+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 9e447e40 by Pier Angelo Vendrame at 2023-05-29T21:48:35+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - b4f91cf6 by Henry Wilkes at 2023-05-29T21:48:35+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages and about:firefoxview. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - aa2afcee by Pier Angelo Vendrame at 2023-05-29T21:48:35+02:00 Bug 41542: Disable the creation of a default profile Firefox creates a profile as a fallback for old versions. However, we do not need this, so we want to prevent Firefox from creating the related directories. We comment out the code, but should Mozilla be interested in a compile-time flag, we could rewrite the patch to add one. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174. - - - - - f31c60fd by Kathy Brade at 2023-05-29T21:48:36+02:00 Bug 13379: Allow using NSS to sign and verify MAR signatures Allow using NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, the default on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that can vary. - - - - - 97bb46cb by Kathy Brade at 2023-05-29T21:48:36+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - c5953d55 by Pier Angelo Vendrame at 2023-05-29T21:48:37+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp. They are already defined in toolkit/xre/nsUpdateDriver.h. - - - - - 84017548 by Nicolas Vigier at 2023-05-29T21:48:37+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 59f53216 by hackademix at 2023-05-29T21:48:38+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - f4adbce0 by Pier Angelo Vendrame at 2023-05-29T21:48:38+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 0b23ccdd by Alex Catarineu at 2023-05-29T21:48:38+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - 0e949b64 by Matthew Finkel at 2023-05-29T21:48:39+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 481f6f09 by Pier Angelo Vendrame at 2023-05-29T21:48:39+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - cbf66655 by Pier Angelo Vendrame at 2023-05-29T21:48:40+02:00 Bug 40926: Implemented the New Identity feature - - - - - e4cc418c by Henry Wilkes at 2023-05-29T21:48:40+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - 36ad7907 by Richard Pospesel at 2023-05-29T21:48:40+02:00 Bug 41649: Create rebase and security backport gitlab issue templates - - - - - ab8eb19b by Richard Pospesel at 2023-05-29T21:48:41+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - a5ebac4e by Kathy Brade at 2023-05-29T21:48:41+02:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 18e037ae by Mike Perry at 2023-05-29T21:48:42+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one - - - - - 423f1a72 by Pier Angelo Vendrame at 2023-05-29T21:48:42+02:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41749: Replace the onion-glyph with dedicated icon for onion services - - - - - 6892ffe0 by Alex Catarineu at 2023-05-29T21:48:42+02:00 Bring back old Firefox onboarding Revert "Bug 1462415 - Delete onboarding system add-on r=Standard8,k88hudson" This reverts commit f7ffd78b62541d44d0102f8051d2f4080bdbc432. Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. Bug 28822: Convert onboarding to webextension Partially revert 1564367 (controlCenter in UITour.jsm) - - - - - b8189919 by Kathy Brade at 2023-05-29T21:48:43+02:00 Bug 26961: New user onboarding. Reuse the Firefox onboarding mechanism with minimal changes. Localizable strings are pulled in from Torbutton (if Torbutton is not installed, we lack about:tor and no tour will be shown). Replace SVG images with PNGs (see bug 27002), For defense in depth, omit include OnboardingTelemetry.jsm entirely. Added support for the following UITour page event: torBrowserOpenSecuritySettings Also fix bug 27403: the onboarding bubble is not always displayed. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. Also fix bug 27484: Improve navigation within onboarding. Bug 27082: enable a limited UITour Disallow access to UITour functionality from all pages other than about:home, about:newtab, and about:tor. Implement a whitelist mechanism for page actions. Bug 26962 - implement new features onboarding (part 1). Add an "Explore" button to the "Circuit Display" panel within new user onboarding which opens the DuckDuckGo .onion and then guides users through a short circuit display tutorial. Allow a few additional UITour actions while limiting as much as possible how it can be used. Tweak the UITour styles to match the Tor Browser branding. All user interface strings are retrieved from Torbutton's browserOnboarding.properties file. Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". Bug 29768: Introduce new features to users Add an "update" tour for the Tor Browser 8.5 release that contains two panels: Toolbar and Security (with appropriate description text and images). Display an attention-grabbing dot on the onboarding text bubble when the update tour is active. The animation lasts for 14 seconds. Bug 31768: Introduce toolbar and network settings changes in onboarding Update the "Tor Network" onboarding page to include a note that settings can now be accessed via the application preferences and add an "Adjust Your Tor Network Settings" action button which opens about:preferences#tor. Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one that includes the revised "Tor Network" page and a revised "Toolbar" page. The latter explains that Torbutton's toolbar item has been removed ("Goodbye Onion Button") and explains how to access the New Identity feature using the hamburger menu and new toolbar item. Bug 34321 - Add Learn More onboarding item Bug 40429: Update Onboarding for 10.5 - - - - - b08bbe27 by sanketh at 2023-05-29T21:48:43+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - 74fcc2ed by Mike Perry at 2023-05-29T21:48:44+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - aeea4fee by Henry Wilkes at 2023-05-29T21:48:44+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 869c0d86 by Pier Angelo Vendrame at 2023-05-29T21:48:45+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - 0396544a by Pier Angelo Vendrame at 2023-05-29T21:48:45+02:00 Bug 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - 44b7a4ed by Pier Angelo Vendrame at 2023-05-29T21:48:45+02:00 Bug 40933: Add tor-launcher functionality - - - - - ae4f5530 by Richard Pospesel at 2023-05-29T21:48:48+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - f0cc11ac by Henry Wilkes at 2023-05-29T21:48:49+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Ignore tor connection errors when tor connection is cancelled by the user. This can happen if the bootstrap process is cancelled late in the process. Also remove unused cancelAutoBootstrapping. - - - - - 00cb6181 by Alex Catarineu at 2023-05-29T21:48:49+02:00 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule Bug 31575: Replace Firefox Home (newtab) with about:tor - - - - - 90e1823b by hackademix at 2023-05-29T21:48:50+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 15b45091 by Henry Wilkes at 2023-05-29T21:48:50+02:00 Bug 41600: Add a tor circuit display panel. - - - - - b4440a38 by Henry Wilkes at 2023-05-29T21:48:50+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41770 - Stop blocking event propagation of keydown events that we do not handle. This lets the arrow key events pass on to ToolbarKeyboardNavigator. - - - - - a609ae80 by Amogh Pradeep at 2023-05-29T21:48:51+02:00 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review - - - - - 0c82dc81 by Matthew Finkel at 2023-05-29T21:48:51+02:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - d3f777b1 by Alex Catarineu at 2023-05-29T21:48:52+02:00 Add TorStrings module for localization - - - - - 4018aab1 by Henry Wilkes at 2023-05-29T21:48:52+02:00 fixup! Add TorStrings module for localization Bug 41608 - Add new connection status strings. - - - - - 6771b902 by Kathy Brade at 2023-05-29T21:48:52+02:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - c566dc5d by Pier Angelo Vendrame at 2023-05-29T21:48:53+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - 13be1899 by Richard Pospesel at 2023-05-29T21:48:53+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - f66ea084 by Henry Wilkes at 2023-05-29T21:48:54+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Use the torconnect icon for the onion slash. - - - - - 8450aa32 by Richard Pospesel at 2023-05-29T21:48:54+02:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds tor connection status to url bar and tweaks UX when not online - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor - explicitly allows about:torconnect URIs to ignore Resist Fingerprinting (RFP) - various tweaks to info-pages.inc.css for about:torconnect (also affects other firefox info pages) Bug 40773: Update the about:torconnect frontend page to match additional UI flows - - - - - 173517d6 by Henry Wilkes at 2023-05-29T21:48:55+02:00 amend! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - d99546f6 by Henry Wilkes at 2023-05-29T21:48:55+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 and 41526 - Use KeyboardEvent.repeat to block triggering newly focused buttons in about:torconnect. The approach in tor-browser!607 prevented this by waiting for keyup, but keyup could still be triggered by a key event initialized elsewhere. E.g. when pressing Enter to close a modal dialog, the Enter's keyup event would be sent to the about:torconnect page and trigger the focused button. - - - - - 1322b17d by Arthur Edelstein at 2023-05-29T21:48:55+02:00 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. - - - - - c8cef130 by Pier Angelo Vendrame at 2023-05-29T21:48:56+02:00 Bug 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - 1ababbf3 by Pier Angelo Vendrame at 2023-05-29T21:48:56+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser Bug 41776: Keep shipping the old fontconfig file until users have one - - - - - aa67f6f1 by Pier Angelo Vendrame at 2023-05-29T21:48:57+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser Bug 41776 (fix): Added some missing lines to the previous patch - - - - - 2789e2cc by Kathy Brade at 2023-05-29T21:48:57+02:00 Bug 12647: Support symlinks in the updater. - - - - - fc111acf by Kathy Brade at 2023-05-29T21:48:57+02:00 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - fe061565 by Kathy Brade at 2023-05-29T21:48:58+02:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - e3e4c141 by Georg Koppen at 2023-05-29T21:48:58+02:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - 5d24ce51 by Mike Perry at 2023-05-29T21:48:59+02:00 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. - - - - - 80918d06 by Alex Catarineu at 2023-05-29T21:48:59+02:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - 5d19b2c1 by Richard Pospesel at 2023-05-29T21:48:59+02:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - cd211800 by cypherpunks1 at 2023-05-29T21:49:00+02:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 33298: Warn when submitting form data from http onion sites over an insecure connection - - - - - c6873709 by cypherpunks1 at 2023-05-29T21:49:00+02:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 41785: Show http onion resources as secure in network monitor - - - - - 5197d4b2 by Kathy Brade at 2023-05-29T21:49:01+02:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - 15274076 by Alex Catarineu at 2023-05-29T21:49:01+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - d8e51ba3 by Henry Wilkes at 2023-05-29T21:49:02+02:00 fixup! Bug 21952: Implement Onion-Location Bug 41608 - Use the same styling for ".onion available" urlbar button as the tor-connect-urlbar-button. This also stops the button from overflowing its container like before. Also move to after the bookmark button. - - - - - cba5e42e by Pier Angelo Vendrame at 2023-05-29T21:49:02+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - c4a5b4ec by Pier Angelo Vendrame at 2023-05-29T21:49:02+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 9587a602 by Pier Angelo Vendrame at 2023-05-29T21:49:05+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 7683964b by Dan Ballard at 2023-05-29T21:49:05+02:00 Bug 40701: Add in pane security warning when downloading a file - - - - - 6270dc80 by Henry Wilkes at 2023-05-29T21:49:06+02:00 Bug 41736: Customize toolbar for tor-browser. - - - - - 282e5c98 by hackademix at 2023-05-29T21:49:06+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/Backport Android Security Fixes.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - browser/actors/NetErrorChild.jsm - browser/actors/NetErrorParent.jsm - − browser/actors/RFPHelperChild.jsm - − browser/actors/RFPHelperParent.jsm - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/abouttbupdate/aboutTBUpdate.css - + browser/base/content/abouttbupdate/aboutTBUpdate.js - + browser/base/content/abouttbupdate/aboutTBUpdate.xhtml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/26cfbf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/26cfbf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-12.0.7-build1
by richard (＠richard) 01 Jun '23

01 Jun '23

richard pushed new tag mb-12.0.7-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] Bug 40862: Prepare Mullvad Browser Release 12.0.7
by richard (＠richard) 01 Jun '23

01 Jun '23

richard pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build Commits: 3b86eb93 by Richard Pospesel at 2023-06-01T18:27:26+00:00 Bug 40862: Prepare Mullvad Browser Release 12.0.7 - - - - - 3 changed files: - projects/browser/config - projects/firefox/config - rbm.conf Changes: ===================================== projects/browser/config ===================================== @@ -103,9 +103,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.… name: noscript - sha256sum: 0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338 + sha256sum: 46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e - URL: https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.4… name: ublock-origin sha256sum: 39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d ===================================== projects/firefox/config ===================================== @@ -11,7 +11,7 @@ container: use_container: 1 var: - firefox_platform_version: 102.11.0 + firefox_platform_version: 102.12.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '12.0' browser_branch: '[% c("var/browser_series") %]-1' ===================================== rbm.conf ===================================== @@ -71,13 +71,14 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.0.6' + torbrowser_version: '12.0.7' torbrowser_build: 'build1' torbrowser_incremental_from: # Build incrementals also from 12.0.4 until we have a new certificate for # Windows installers. - 12.0.4 - 12.0.5 + - 12.0.6 updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] Bug 40870: Remove URL without browser name from...
by boklm (＠boklm) 01 Jun '23

01 Jun '23

boklm pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build Commits: c44f6462 by Nicolas Vigier at 2023-06-01T17:58:37+02:00 Bug 40870: Remove URL without browser name from signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo - - - - - 1 changed file: - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo Changes: ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -10,7 +10,6 @@ do tmpfile=$(mktemp) chmod 644 "$tmpfile" for url in \ - "https://people.torproject.org/~$builder/builds/$tbb_version-build$tbb_versi…" \ "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40869: Temporarily set obfs4 to a fixed commit
by richard (＠richard) 01 Jun '23

01 Jun '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 40298e79 by Nicolas Vigier at 2023-06-01T15:56:56+00:00 Bug 40869: Temporarily set obfs4 to a fixed commit To avoid broken nightly builds, we set obfs4 nightly to a fixed commit, until the changes required by the renaming from obfs4 to lyrebird are done. - - - - - 1 changed file: - projects/obfs4/config Changes: ===================================== projects/obfs4/config ===================================== @@ -13,7 +13,8 @@ var: targets: nightly: - git_hash: main + # Set fixed commit until tor-browser-build#40869 is done + git_hash: a34b4cad6d3c20f4abdec357e01101751a583f88 version: '[% c("abbrev") %]' tag_gpg_id: 0 var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40870: Remove URL without browser name from...
by boklm (＠boklm) 01 Jun '23

01 Jun '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 96b1718f by Nicolas Vigier at 2023-05-31T12:58:55+02:00 Bug 40870: Remove URL without browser name from signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo - - - - - 1 changed file: - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo Changes: ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -10,7 +10,6 @@ do tmpfile=$(mktemp) chmod 644 "$tmpfile" for url in \ - "https://people.torproject.org/~$builder/builds/$tbb_version-build$tbb_versi…" \ "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" 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

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.0.7-build1
by richard (＠richard) 01 Jun '23

01 Jun '23

richard pushed new tag tbb-12.0.7-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… 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 40859: Prepare stable release 12.0.7
by richard (＠richard) 01 Jun '23

01 Jun '23

richard pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: a4c88083 by Richard Pospesel at 2023-05-31T18:32:49+00:00 Bug 40859: Prepare stable release 12.0.7 - - - - - 9 changed files: - projects/browser/Bundle-Data/Docs/ChangeLog.txt - projects/browser/allowed_addons.json - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/manual/config - projects/openssl/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs/ChangeLog.txt ===================================== @@ -1,3 +1,52 @@ +Tor Browser 12.0.7 - May 31 2023 + * All Platforms + * Updated Translations + * Updated NoScript to 11.4.22 + * Updated OpenSSL to 1.1.1u + * Bug 41764: TTP-02-004 OOS: No user-activation required to download files (Low) [tor-browser] + * Bug 41794: Rebase Tor Browser and Base Browser stable to 102.12esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.12esr + * Bug 41777: Internally shippped manual does not adapt to RTL languages (it always align to the left) [tor-browser] + * Android + * Updated GeckoView to 102.12esr + * Bug 41805: Backport Android-specific security fixes from Firefox 114 to ESR 102.12-based Tor Browser [tor-browser] + +Tor Browser 12.5a6 - May 22 2023 + * All Platforms + * Updated Translations + * Updated Go to 11.9.9 + * Bug 40860: Improve the transition from the old fontconfig file to the new one [tor-browser-build] + * Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key [tor-browser] + * Bug 41738: Replace the patch to disable live reload with its preference [tor-browser] + * Bug 41757: Rebase Tor Browser Alpha to 102.11.0esr [tor-browser] + * Bug 41763: TTP-02-003 WP1: Data URI allows JS execution despite safest security level (Low) [tor-browser] + * Bug 41764: TTP-02-004 OOS: No user-activation required to download files (Low) [tor-browser] + * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.11esr + * Bug 41607: Update "New Circuit" icon [tor-browser] + * Bug 41736: Customize the default CustomizableUI toolbar using CustomizableUI.jsm [tor-browser] + * Bug 41770: Keyboard navigation broken leaving the toolbar tor circuit button [tor-browser] + * Bug 41777: Internally shippped manual does not adapt to RTL languages (it always align to the left) [tor-browser] + * Windows + Linux + * Bug 41654: UpdateInfo jumped into Data [tor-browser] + * Linux + * Bug 41732: implement linux font whitelist as defense-in-depth [tor-browser] + * Bug 41776: System fonts are temporarily leaked on Linux after the browser is updated from 12.5a4 or earlier [tor-browser] + * Android + * Updated GeckoView to 102.11esr + * Build System + * All Platforms + * Bug 33953: Provide a way for easily updating Go dependencies of projects [tor-browser-build] + * Bug 40673: Avoid building each go module separately [tor-browser-build] + * Bug 40818: Enable wasm target for rust compiler [tor-browser-build] + * Bug 40841: Adapt signing scripts to new signing machines [tor-browser-build] + * Bug 40849: Move Go dependencies to the projects dependent on them, not as a standalone projects [tor-browser-build] + * Bug 40856: Unblock nightly builds [tor-browser-build] + * Windows + * Bug 40846: Temporarily disable Windows signing [tor-browser-build] + Tor Browser 12.0.6 - May 09 2023 * All Platforms * Updated Translations ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 976883, + "average_daily_users": 973594, "categories": { "android": [ "experimental", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5607, - "bayesian_average": 4.559531365183289, - "count": 4987, - "text_count": 1578 + "average": 4.5606, + "bayesian_average": 4.559432842250225, + "count": 5014, + "text_count": 1582 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 24385 + "weekly_downloads": 24071 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 258784, + "average_daily_users": 254357, "categories": { "android": [ "security-privacy" @@ -553,10 +553,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8166, - "bayesian_average": 4.811948101281903, - "count": 1336, - "text_count": 237 + "average": 4.8142, + "bayesian_average": 4.809547541054201, + "count": 1340, + "text_count": 238 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -641,7 +641,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3623 + "weekly_downloads": 3420 }, "notes": null }, @@ -657,7 +657,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1128787, + "average_daily_users": 1107746, "categories": { "android": [ "security-privacy" @@ -669,7 +669,7 @@ "contributions_url": "https://paypal.me/SupportEFF?utm_content=product-page-contribute&utm_medium…", "created": "2014-05-01T18:23:16Z", "current_version": { - "id": 5520250, + "id": 5564707, "compatibility": { "firefox": { "min": "60.0", @@ -680,7 +680,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -691,22 +691,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<ul><li>Added a note to the popup to explain that if you would like to log into websites with your Google account, you need to fully allow <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/361ac6552f690217a6c9f0…" rel=\"nofollow\">accounts.google.com</a></li><li>Added dark theme support to widget replacement placeholders</li><li>Fixed blocking service worker-initiated requests in Chrome</li><li>Fixed various site breakages</li><li>Added Hindi translations</li><li>Improved Traditional Chinese translations</li></ul>" + "en-US": "<ul><li>Expanded protection for \"cookieblocked\" (slider set to yellow) domains. These domains are allowed to load without access to cookies, as a compromise to avoid breaking websites. However, sometimes the same domain is used to serve both unobjectionable content as well as obnoxious fingerprinters that do not need cookies to track your browsing. Privacy Badger will now fully block these fingerprinters.</li><li>Disabled Google's Topics API by default. The Topics API replaces Federated Learning of Cohorts (FLoC).</li><li>You can now see where Privacy Badger observed tracking by a given domain by clicking on the domain name in the list of tracking domains on the options page</li><li>Fixed various site breakages</li><li>Added Vietnamese translations</li><li>Improved translations (Finnish, French, Hebrew, Persian, European Portuguese, Russian, Spanish)</li></ul>" }, - "reviewed": "2023-02-02T18:47:37Z", - "version": "2023.1.31", + "reviewed": "2023-05-16T10:58:52Z", + "version": "2023.5.10", "files": [ { - "id": 4064595, - "created": "2023-01-31T16:05:01Z", - "hash": "sha256:0082d8ffe7b25f370a313d9b899b0c1ba1669b21b3a11791fe5ecf031aeb6a6c", + "id": 4109050, + "created": "2023-05-10T19:28:15Z", + "hash": "sha256:8ff7650d1ce133894293d1a3e268bb24d300e77a1c25488ed17846e71d8b33e8", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1834581, + "size": 1975567, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4064595/privacy_badger17-…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4109050/privacy_badger17-…", "permissions": [ "tabs", "http://*/*", @@ -1134,7 +1134,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-02-02T18:47:37Z", + "last_updated": "2023-05-16T10:58:52Z", "name": { "en-US": "Privacy Badger" }, @@ -1180,10 +1180,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8012, - "bayesian_average": 4.79841359051625, - "count": 2223, - "text_count": 426 + "average": 4.8019, + "bayesian_average": 4.7991176799749775, + "count": 2236, + "text_count": 428 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1207,7 +1207,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 18076 + "weekly_downloads": 16871 }, "notes": null }, @@ -1223,7 +1223,7 @@ "picture_url": null } ], - "average_daily_users": 6319454, + "average_daily_users": 6290605, "categories": { "android": [ "security-privacy" @@ -1388,7 +1388,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-05-08T12:35:48Z", + "last_updated": "2023-05-30T13:20:46Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1533,10 +1533,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7808, - "bayesian_average": 4.780398687268275, - "count": 15366, - "text_count": 3994 + "average": 4.7807, + "bayesian_average": 4.78029998149622, + "count": 15480, + "text_count": 4023 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1598,7 +1598,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 131497 + "weekly_downloads": 129742 }, "notes": null }, @@ -1614,7 +1614,7 @@ "picture_url": null } ], - "average_daily_users": 167016, + "average_daily_users": 168553, "categories": { "android": [ "photos-media" @@ -1713,10 +1713,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4874, - "bayesian_average": 4.4822747330216925, - "count": 1114, - "text_count": 416 + "average": 4.4853, + "bayesian_average": 4.4801851669083215, + "count": 1119, + "text_count": 419 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1738,7 +1738,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 411 + "weekly_downloads": 369 }, "notes": null }, @@ -1754,7 +1754,7 @@ "picture_url": null } ], - "average_daily_users": 88255, + "average_daily_users": 87582, "categories": { "android": [ "experimental", @@ -1867,9 +1867,9 @@ ], "promoted": null, "ratings": { - "average": 4.3684, - "bayesian_average": 4.354580970236878, - "count": 399, + "average": 4.37, + "bayesian_average": 4.356186612333998, + "count": 400, "text_count": 112 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", @@ -1892,7 +1892,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 900 + "weekly_downloads": 1654 }, "notes": null }, @@ -1908,7 +1908,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 259842, + "average_daily_users": 259693, "categories": { "android": [ "photos-media", @@ -2127,10 +2127,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6521, - "bayesian_average": 4.647356516825427, - "count": 1256, - "text_count": 241 + "average": 4.6514, + "bayesian_average": 4.646681076783187, + "count": 1268, + "text_count": 244 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2151,7 +2151,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 4089 + "weekly_downloads": 4107 }, "notes": null }, @@ -2174,7 +2174,7 @@ "picture_url": null } ], - "average_daily_users": 110772, + "average_daily_users": 111400, "categories": { "android": [ "other" @@ -2457,10 +2457,10 @@ "category": "recommended" }, "ratings": { - "average": 4.443, - "bayesian_average": 4.438340772354168, - "count": 1210, - "text_count": 322 + "average": 4.4415, + "bayesian_average": 4.436837247090715, + "count": 1214, + "text_count": 323 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2480,7 +2480,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 40 + "weekly_downloads": 50 }, "notes": null }, @@ -2496,7 +2496,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 313446, + "average_daily_users": 307454, "categories": { "android": [ "performance", @@ -2510,7 +2510,7 @@ "contributions_url": "https://www.paypal.com/donate/?hosted_button_id=9ERKTU5MBH4EW&utm_content=p…", "created": "2005-05-13T10:51:32Z", "current_version": { - "id": 5546627, + "id": 5566736, "compatibility": { "firefox": { "min": "59.0", @@ -2521,7 +2521,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5546627", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5566736", "is_strict_compatibility_enabled": false, "license": { "id": 13, @@ -2532,22 +2532,22 @@ "url": "http://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { - "en-US": "v 11.4.21\n============================================================\nx Fixed mislabeled Tor Browser settings override option\nx [L10n] Updated mk" + "en-US": "v 11.4.22\n============================================================\nx [L10n] Updated uk\nx Consistently apply DEFAULT policy to top-level data: URLs" }, - "reviewed": "2023-04-04T12:01:03Z", - "version": "11.4.21", + "reviewed": "2023-05-18T09:07:59Z", + "version": "11.4.22", "files": [ { - "id": 4090970, - "created": "2023-03-30T09:39:24Z", - "hash": "sha256:0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338", + "id": 4111078, + "created": "2023-05-15T08:32:54Z", + "hash": "sha256:46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 951542, + "size": 948900, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.…", "permissions": [ "contextMenus", "storage", @@ -2614,7 +2614,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-04-04T12:01:03Z", + "last_updated": "2023-05-21T21:36:00Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2686,10 +2686,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4106, - "bayesian_average": 4.407881097196251, - "count": 2058, - "text_count": 799 + "average": 4.4061, + "bayesian_average": 4.403390290765897, + "count": 2071, + "text_count": 804 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2733,7 +2733,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7698 + "weekly_downloads": 7195 }, "notes": null }, @@ -2749,7 +2749,7 @@ "picture_url": null } ], - "average_daily_users": 150188, + "average_daily_users": 150677, "categories": { "android": [ "performance", @@ -2864,10 +2864,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9071, - "bayesian_average": 3.902833394829747, - "count": 1130, - "text_count": 402 + "average": 3.9026, + "bayesian_average": 3.898323122758472, + "count": 1129, + "text_count": 401 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2886,7 +2886,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 2266 + "weekly_downloads": 1722 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -100,9 +100,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.… name: noscript - sha256sum: 0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338 + sha256sum: 46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' - project: hfsplus-tools ===================================== projects/firefox/config ===================================== @@ -12,7 +12,7 @@ container: use_container: 1 var: - firefox_platform_version: 102.11.0 + firefox_platform_version: 102.12.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.0-1' browser_build: 1 ===================================== projects/geckoview/config ===================================== @@ -12,7 +12,7 @@ container: use_container: 1 var: - geckoview_version: 102.11.0esr + geckoview_version: 102.12.0esr torbrowser_branch: 12.0-1 browser_build: 1 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 74065 +version: 79869 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -17,8 +17,8 @@ var: input_files: - project: container-image - - URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip' + - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: 788c2dc2bfacbc6961ce443c5639706cc23fbb7b7730ed7f71a26396511305be + sha256sum: ee4c6e4ce4998736ae44dc3e6f92875a481b9e03860517764ea9af6c2bba24e0 - filename: packagemanual.py name: package_script ===================================== projects/openssl/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1t +version: 1.1.1u filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -31,4 +31,4 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b + sha256sum: e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6 ===================================== projects/translation/config ===================================== @@ -6,19 +6,19 @@ version: '[% c("abbrev") %]' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 97c76d5183b16b069e66feaaf10e00c1d2c7d9e0 + git_hash: 12b7ac4074f64be4d62c4a7e134244988941ca88 targets: nightly: git_hash: 'base-browser' base-browser-fluent: base-browser-fluent: '[% INCLUDE build %]' - git_hash: d473c4dd005325d1be40bae0f816974e195a972d + git_hash: 7a5fa6b283ac0a983250dfb3870fb1ed9d9ec1ad targets: nightly: git_hash: 'basebrowser-newidentityftl' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 267f3c208a323df636ed11e7143164956d3d9d9b + git_hash: 96ce5976d1c1752ee1d920df58e1755464b9d575 targets: nightly: git_hash: 'tor-browser' @@ -26,7 +26,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 0deec2a78dea0013e8c4eaec1d40ef5aac4e43b0 + git_hash: 12c25e54e3a80c22c3c5fd6ccbc00effd37fc538 targets: nightly: git_hash: 'fenix-torbrowserstringsxml' ===================================== rbm.conf ===================================== @@ -71,13 +71,14 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.0.6' + torbrowser_version: '12.0.7' torbrowser_build: 'build1' torbrowser_incremental_from: # Build incrementals also from 12.0.4 until we have a new certificate for # Windows installers. - 12.0.4 - 12.0.5 + - 12.0.6 build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed 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] Pushed new branch base-browser-102.12.0esr-12.0-1
by richard (＠richard) 30 May '23

30 May '23

richard pushed new branch base-browser-102.12.0esr-12.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.12.0esr-12.0-1-build1
by richard (＠richard) 30 May '23

30 May '23

richard pushed new tag tor-browser-102.12.0esr-12.0-1-build1 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/tor-browser] Pushed new tag base-browser-102.12.0esr-12.0-1-build1
by richard (＠richard) 30 May '23

30 May '23

richard pushed new tag base-browser-102.12.0esr-12.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.0-1] 109 commits: Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers, valentin
by richard (＠richard) 30 May '23

30 May '23

richard pushed to branch tor-browser-102.12.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: af1744ba by Kershaw Chang at 2023-05-29T21:45:46+02:00 Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D164656 - - - - - acdd519c by Pier Angelo Vendrame at 2023-05-29T21:45:47+02:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - 73f8c710 by Pier Angelo Vendrame at 2023-05-29T21:45:47+02:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - e16f0c76 by Jamie Nicol at 2023-05-29T21:45:48+02:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 95495145 by Pier Angelo Vendrame at 2023-05-29T21:45:48+02:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 8c3a074e by Neill Miller at 2023-05-29T21:45:48+02:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - 7feb3637 by Gabriele Svelto at 2023-05-29T21:45:49+02:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - 5185cb45 by Gabriele Svelto at 2023-05-29T21:45:49+02:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - 9f934967 by Kathy Brade at 2023-05-29T21:45:50+02:00 Bug 1769028: Disable DNS lookup in nsProfileLock when the proxy bypass protection is enabled r=mossop Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1 when the proxy bypass protection is enabled. Differential Revision: https://phabricator.services.mozilla.com/D161264 - - - - - 45c41c00 by Gabriele Svelto at 2023-05-29T21:45:50+02:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - d1d35195 by Gabriele Svelto at 2023-05-29T21:45:50+02:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 3e89a0f7 by Hubert Boma Manilla at 2023-05-29T21:45:51+02:00 Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers - Block redirects on sourceMappingUrl - Add debugger test Differential Revision: https://phabricator.services.mozilla.com/D168648 - - - - - d5384aec by Hubert Boma Manilla at 2023-05-29T21:45:51+02:00 Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers .sjs files depend on redirects to load static files. In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js fails because we use .sjs to serve the content. This patch refactors to no longer use .sjs files Differential Revision: https://phabricator.services.mozilla.com/D169739 - - - - - fc93493d by Rob Wu at 2023-05-29T21:45:52+02:00 Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl,valentin Depends on D164656 Differential Revision: https://phabricator.services.mozilla.com/D166108 - - - - - 37a8d0de by Kash Shampur at 2023-05-29T21:45:52+02:00 Bug 1803109 - Discard blocks of data that are too big for two chunks. r=canaltinova Currently, `ReserveAndPutRaw` allocates a second span even if the data would be too big for the chunk. Here a second conditional is added to check if the block of data is too big in this scenario and silently discard the data if so. Differential Revision: https://phabricator.services.mozilla.com/D167167 - - - - - a85a85e0 by Pier Angelo Vendrame at 2023-05-29T21:45:52+02:00 Bug 1814416: Generalize the app name in about:buildconfig. r=ahochheiden Now it displays app display name, instead of having Firefox hardcoded. Differential Revision: https://phabricator.services.mozilla.com/D168562 - - - - - 74b96b49 by Jon Coppeard at 2023-05-29T21:45:53+02:00 Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink GC can mutate this vector so don't allow that while we are iterating. I think it would be safe to use index-based iteration but it's safer to just ban it entirely. This fixes the crash produced by the testcase. Differential Revision: https://phabricator.services.mozilla.com/D169701 - - - - - 887e2f5a by Jon Coppeard at 2023-05-29T21:45:53+02:00 Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink To prevent any other instances of this problme we can update the getDebuggers() methods on the global and the realm to require no GC. Depends on D169701 Differential Revision: https://phabricator.services.mozilla.com/D169702 - - - - - 371becbd by Georg Koppen at 2023-05-29T21:45:54+02:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - 33d2e63d by Richard Pospesel at 2023-05-29T21:45:54+02:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - 66b93b7e by Henry Wilkes at 2023-05-29T21:45:54+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - d3b88f8a by Pier Angelo Vendrame at 2023-05-29T21:45:55+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - 16e637c0 by Pier Angelo Vendrame at 2023-05-29T21:45:55+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - f5287c17 by Dan Ballard at 2023-05-29T21:45:56+02:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restore email link on mac - - - - - 5067d5c6 by Gaba at 2023-05-29T21:45:56+02:00 Adding issue template for bugs. - - - - - af79c660 by Pier Angelo Vendrame at 2023-05-29T21:45:57+02:00 Base Browser's .mozconfigs. - - - - - e5dc5d3b by Pier Angelo Vendrame at 2023-05-29T21:45:57+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 25873ee4 by Dan Ballard at 2023-05-29T21:45:57+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 93967115 by Matthew Finkel at 2023-05-29T21:45:58+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 94fa497c by Matthew Finkel at 2023-05-29T21:45:58+02:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - f8073bbe by Matthew Finkel at 2023-05-29T21:45:59+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 2614d340 by Mike Perry at 2023-05-29T21:45:59+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 4289c282 by Alex Catarineu at 2023-05-29T21:45:59+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 615e786a by Georg Koppen at 2023-05-29T21:46:00+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 5de48deb by Kathy Brade at 2023-05-29T21:46:00+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 2492c8e3 by Kathy Brade at 2023-05-29T21:46:01+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 1a3e6516 by Alex Catarineu at 2023-05-29T21:46:01+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - a5931ca0 by Kathy Brade at 2023-05-29T21:46:07+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. - - - - - 457fd06e by Arthur Edelstein at 2023-05-29T21:46:07+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 84911d79 by Alex Catarineu at 2023-05-29T21:46:07+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 854c4634 by Georg Koppen at 2023-05-29T21:46:08+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 8b693beb by Alex Catarineu at 2023-05-29T21:46:08+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 935fe113 by Alex Catarineu at 2023-05-29T21:46:09+02:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - a0648596 by Mike Perry at 2023-05-29T21:46:09+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - c39686a8 by hackademix at 2023-05-29T21:46:10+02:00 fixup! Firefox preference overrides. tor-browser#41764, prevent automatic download stuffing / DOS - - - - - 971ff897 by Richard Pospesel at 2023-05-29T21:46:10+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - d1c03022 by Pier Angelo Vendrame at 2023-05-29T21:46:10+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - fe8eb079 by Alex Catarineu at 2023-05-29T21:46:11+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - e699abc5 by Alex Catarineu at 2023-05-29T21:46:11+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - b11b2636 by Alex Catarineu at 2023-05-29T21:46:12+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - fc077d55 by Alex Catarineu at 2023-05-29T21:46:12+02:00 Bug 26345: Hide tracking protection UI - - - - - eef54b99 by Kathy Brade at 2023-05-29T21:46:12+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - b54f568d by Alex Catarineu at 2023-05-29T21:46:13+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - ca5e4ab7 by Mike Perry at 2023-05-29T21:46:13+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 1388e4a9 by Kathy Brade at 2023-05-29T21:46:14+02:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 9d90c1d6 by Igor Oliveira at 2023-05-29T21:46:14+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - a7b78c94 by Pier Angelo Vendrame at 2023-05-29T21:46:14+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 8deb4c4b by Matthew Finkel at 2023-05-29T21:46:15+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 87fbab52 by hackademix at 2023-05-29T21:46:15+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - f862cf38 by hackademix at 2023-05-29T21:46:16+02:00 Bug 41434: Letterboxing, improve logging. - - - - - d621a155 by hackademix at 2023-05-29T21:46:16+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 7116762e by hackademix at 2023-05-29T21:46:17+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - d0c72e33 by Richard Pospesel at 2023-05-29T21:46:17+02:00 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and outline are tied to the currently selected theme. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1594455 - - - - - 0e789435 by Alex Catarineu at 2023-05-29T21:46:17+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - 99aab4dd by Matthew Finkel at 2023-05-29T21:46:18+02:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - c8da704d by Pier Angelo Vendrame at 2023-05-29T21:46:18+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - f46918d6 by Henry Wilkes at 2023-05-29T21:46:19+02:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - 3949b7e1 by Pier Angelo Vendrame at 2023-05-29T21:46:19+02:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - 7f98b5cb by Pier Angelo Vendrame at 2023-05-29T21:46:19+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 50ef6887 by Pier Angelo Vendrame at 2023-05-29T21:46:20+02:00 Bug 40926: Implemented the New Identity feature - - - - - 4dfb9ee1 by cypherpunks1 at 2023-05-29T21:46:20+02:00 Bug 40717: Hide Windows SSO in settings (cherry picked from commit 1bacd26df8a8ffe481e11ec6b8323150fdf2011d) - - - - - 8f89a4b5 by cypherpunks1 at 2023-05-29T21:46:21+02:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING (cherry picked from commit 47eb7d305746bd1a9e328b1fb7fef40d56769d5b) - - - - - f08354ab by Pier Angelo Vendrame at 2023-05-29T21:46:23+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 6a4e3273 by Pier Angelo Vendrame at 2023-05-29T21:46:24+02:00 Bug 41542: Disable the creation of a default profile Firefox creates a profile as a fallback for old versions. However, we do not need this, so we want to prevent Firefox from creating the related directories. We comment out the code, but should Mozilla be interested in a compile-time flag, we could rewrite the patch to add one. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174. - - - - - abd4aebd by Arthur Edelstein at 2023-05-29T21:46:24+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option (cherry picked from commit 5ff98c20700d45b9bc57d970ff45c1e6519cd64d) - - - - - f20b3c09 by Richard Pospesel at 2023-05-29T21:46:25+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 7340b189 by Mike Perry at 2023-05-29T21:46:25+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one - - - - - e1c024b7 by Alex Catarineu at 2023-05-29T21:46:25+02:00 Bring back old Firefox onboarding Revert "Bug 1462415 - Delete onboarding system add-on r=Standard8,k88hudson" This reverts commit f7ffd78b62541d44d0102f8051d2f4080bdbc432. Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. Bug 28822: Convert onboarding to webextension Partially revert 1564367 (controlCenter in UITour.jsm) - - - - - 491c9784 by Kathy Brade at 2023-05-29T21:46:26+02:00 Bug 26961: New user onboarding. Reuse the Firefox onboarding mechanism with minimal changes. Localizable strings are pulled in from Torbutton (if Torbutton is not installed, we lack about:tor and no tour will be shown). Replace SVG images with PNGs (see bug 27002), For defense in depth, omit include OnboardingTelemetry.jsm entirely. Added support for the following UITour page event: torBrowserOpenSecuritySettings Also fix bug 27403: the onboarding bubble is not always displayed. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. Also fix bug 27484: Improve navigation within onboarding. Bug 27082: enable a limited UITour Disallow access to UITour functionality from all pages other than about:home, about:newtab, and about:tor. Implement a whitelist mechanism for page actions. Bug 26962 - implement new features onboarding (part 1). Add an "Explore" button to the "Circuit Display" panel within new user onboarding which opens the DuckDuckGo .onion and then guides users through a short circuit display tutorial. Allow a few additional UITour actions while limiting as much as possible how it can be used. Tweak the UITour styles to match the Tor Browser branding. All user interface strings are retrieved from Torbutton's browserOnboarding.properties file. Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". Bug 29768: Introduce new features to users Add an "update" tour for the Tor Browser 8.5 release that contains two panels: Toolbar and Security (with appropriate description text and images). Display an attention-grabbing dot on the onboarding text bubble when the update tour is active. The animation lasts for 14 seconds. Bug 31768: Introduce toolbar and network settings changes in onboarding Update the "Tor Network" onboarding page to include a note that settings can now be accessed via the application preferences and add an "Adjust Your Tor Network Settings" action button which opens about:preferences#tor. Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one that includes the revised "Tor Network" page and a revised "Toolbar" page. The latter explains that Torbutton's toolbar item has been removed ("Goodbye Onion Button") and explains how to access the New Identity feature using the hamburger menu and new toolbar item. Bug 34321 - Add Learn More onboarding item Bug 40429: Update Onboarding for 10.5 - - - - - 0029aee5 by Mike Perry at 2023-05-29T21:46:26+02:00 TB3: Tor Browser's official .mozconfigs. Also: Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24 Changes needed to build Mac in 64bit Bug 10715: Enable Webgl for mingw-w64 again. Disable ICU when cross-compiling; clean-up. Bug 15773: Enable ICU on OS X Bug 15990: Don't build the sandbox with mingw-w64 Bug 12761: Switch to ESR 38 for OS X Updating .mozconfig-asan Bug 12516: Compile hardenend Tor Browser with -fwrapv Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 13419: Add back ICU for Windows Bug 21239: Use GTK2 for ESR52 Linux builds Bug 23025: Add hardening flags for macOS Bug 24478: Enable debug assertions and tests in our ASan builds --enable-proxy-bypass-protection Bug 27597: ASan build option in tor-browser-build is broken Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 21849: Don't allow SSL key logging. Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 25741 - TBA: Disable features at compile-time MOZ_NATIVE_DEVICES for casting and the media player MOZ_TELEMETRY_REPORTING for telemetry MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo) Bug 25741 - TBA: Add default configure options in dedicated file Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 29859: Disable HLS support for now Add --disable-tor-launcher build option Add --enable-tor-browser-update build option Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40061: Omit the Windows default browser agent from the build Bug 40107: Adapt .mozconfig-asan for ESR 78 Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 40793: moved Tor configuration options from old-configure.in to moz.configure - - - - - 34314d9e by Henry Wilkes at 2023-05-29T21:46:27+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 128a50dc by Pier Angelo Vendrame at 2023-05-29T21:46:27+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - 1746fd01 by Kathy Brade at 2023-05-29T21:46:28+02:00 Bug 13252: Do not store data in the app bundle When --enable-tor-browser-data-outside-app-dir is enabled, all user data is stored in a directory named TorBrowser-Data which is located next to the application directory. Display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. On Mac OS, add support for the --invisible command line option which is used by the meek-http-helper to avoid showing an icon for the helper browser on the dock. - - - - - 83bbda92 by Pier Angelo Vendrame at 2023-05-29T21:46:28+02:00 Bug 40933: Add tor-launcher functionality - - - - - 6305f01f by Richard Pospesel at 2023-05-29T21:46:28+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - 56e328ab by Alex Catarineu at 2023-05-29T21:46:29+02:00 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule Bug 31575: Replace Firefox Home (newtab) with about:tor Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. - - - - - 86119c3e by hackademix at 2023-05-29T21:46:29+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - d99e1f67 by Amogh Pradeep at 2023-05-29T21:46:30+02:00 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review - - - - - d3ff90db by Alex Catarineu at 2023-05-29T21:46:30+02:00 Add TorStrings module for localization - - - - - fca792d4 by Kathy Brade at 2023-05-29T21:46:30+02:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - d2797210 by sanketh at 2023-05-29T21:46:31+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - 4f3ccc71 by Kathy Brade at 2023-05-29T21:46:31+02:00 Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. Other bugs fixed: Bug 21766: Crash with e10s enabled while trying to download a file Bug 21886: Download is stalled in non-e10s mode Bug 22471: Downloading files via the PDF viewer download button is broken Bug 22472: Fix FTP downloads when external helper app dialog is shown Bug 22610: Avoid crashes when canceling external helper app downloads Bug 22618: Downloading pdf file via file:/// is stalling - - - - - c24c33d5 by Pier Angelo Vendrame at 2023-05-29T21:46:32+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - 179f078d by Richard Pospesel at 2023-05-29T21:46:32+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - dce0dd6d by Richard Pospesel at 2023-05-29T21:46:33+02:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds tor connection status to url bar and tweaks UX when not online - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor - explicitly allows about:torconnect URIs to ignore Resist Fingerprinting (RFP) - various tweaks to info-pages.inc.css for about:torconnect (also affects other firefox info pages) Bug 40773: Update the about:torconnect frontend page to match additional UI flows - - - - - fcf70a22 by Arthur Edelstein at 2023-05-29T21:46:33+02:00 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. - - - - - 9bbaf69b by Kathy Brade at 2023-05-29T21:46:33+02:00 Bug 4234: Use the Firefox Update Process for Tor Browser. The following files are never updated: TorBrowser/Data/Browser/profiles.ini TorBrowser/Data/Browser/profile.default/bookmarks.html TorBrowser/Data/Tor/torrc Mac OS: Store update metadata under TorBrowser/UpdateInfo. Removed the %OS_VERSION% component from the update URL (13047) and added support for minSupportedOSVersion, an attribute of the <update> element that may be used to trigger Firefox's "unsupported platform" behavior. Hide the "What's new" links (set app.releaseNotesURL value to about:blank). Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix Bug 26049: reduce the delay before the update prompt is displayed. Instead of Firefox's 2 days, we use 1 hour (after which time the update doorhanger will be displayed). Also fix bug 27221: purge the startup cache if the Tor Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Tor Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Tor Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 66b2b788 by Kathy Brade at 2023-05-29T21:46:34+02:00 Bug 13379: Sign our MAR files. Configure with --enable-verify-mar (when updating, require a valid signature on the MAR file before it is applied). Use the Tor Browser version instead of the Firefox version inside the MAR file info block (necessary to prevent downgrade attacks). Use NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, which Mozilla does on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used by Mozilla to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that is under TorBrowser-Data, and the location of TorBrowser-Data varies. Also includes the fix for bug 18900. Bug 19121: reinstate the update.xml hash check Revert most changes from Mozilla Bug 1373267 "Remove hashFunction and hashValue attributes from nsIUpdatePatch and code related to these attributes." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. Also partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - f87cd2d3 by Kathy Brade at 2023-05-29T21:46:34+02:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - e46d4798 by Georg Koppen at 2023-05-29T21:46:35+02:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - 8c04eb3a by Mike Perry at 2023-05-29T21:46:35+02:00 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. - - - - - fd289749 by Richard Pospesel at 2023-05-29T21:46:35+02:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - 32b2cfed by Kathy Brade at 2023-05-29T21:46:36+02:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - 95f95339 by Alex Catarineu at 2023-05-29T21:46:36+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - 5d1ddbea by Pier Angelo Vendrame at 2023-05-29T21:46:37+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - e55b17b6 by Pier Angelo Vendrame at 2023-05-29T21:46:37+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 39833b8f by Pier Angelo Vendrame at 2023-05-29T21:46:37+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 88306421 by p13dz at 2023-05-29T21:46:40+02:00 Bug 40283: Workaround for the file upload bug (cherry picked from commit c23f2f397327ee46a1a4de57acf206fd83e8e170) - - - - - e8d02fc5 by hackademix at 2023-05-29T21:46:41+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitmodules - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - browser/actors/NetErrorChild.jsm - browser/actors/NetErrorParent.jsm - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/abouttbupdate/aboutTBUpdate.css - + browser/base/content/abouttbupdate/aboutTBUpdate.js - + browser/base/content/abouttbupdate/aboutTBUpdate.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - + browser/base/content/browser-doctype.inc - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/26cfbf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/26cfbf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-12.5a6-build1
by Pier Angelo Vendrame (＠pierov) 30 May '23

30 May '23

Pier Angelo Vendrame pushed new tag mb-12.5a6-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40840: Mullvad Browser 12.5a6
by Pier Angelo Vendrame (＠pierov) 30 May '23

30 May '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 73e3fc07 by Pier Angelo Vendrame at 2023-05-30T17:12:21+00:00 Bug 40840: Mullvad Browser 12.5a6 This is the first alpha of the 12.5 series. - - - - - 4 changed files: - .gitignore - projects/browser/config - projects/firefox/config - rbm.conf Changes: ===================================== .gitignore ===================================== @@ -4,7 +4,7 @@ /out /torbrowser /basebrowser -/privacybrowser +/mullvadbrowser /testbuild /rbm.local.conf /logs ===================================== projects/browser/config ===================================== @@ -106,13 +106,13 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.… name: noscript sha256sum: 46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e - - URL: https://addons.mozilla.org/firefox/downloads/file/4079064/ublock_origin-1.4… + - URL: https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.4… name: ublock-origin - sha256sum: a35a6c8758ba74616afc09648c96d74ec2e7d27fe30f311d1db6e9a4966e7858 + sha256sum: 39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d enable: '[% c("var/mullvad-browser") %]' - - URL: https://github.com/mullvad/browser-extension/releases/download/v0.7.7-firef… + - URL: https://github.com/mullvad/browser-extension/releases/download/v0.7.9-firef… name: mullvad-extension - sha256sum: dee0e2c089b40fb1a2a8ab5d69eefd382961f695fa4dc76def400aae79b81ecf + sha256sum: 17ce31b32e8be0f0db86a5a5ed93607cc84d5e2092341aee0b8eaba1c0746390 enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/firefox/config ===================================== @@ -85,10 +85,7 @@ targets: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: branding_directory_prefix: 'mb' - firefox_platform_version: 102.9.0 - browser_series: '12.0' - browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 5 + browser_build: 1 gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser linux-x86_64: ===================================== rbm.conf ===================================== @@ -276,10 +276,8 @@ targets: exe_name: mullvadbrowser mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]' locales: [] - torbrowser_version: '12.0a10' - torbrowser_build: 'build1' torbrowser_incremental_from: - - 12.0a9 + - 12.0a10 torbrowser-testbuild: - testbuild View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40864: Add a script to download the latest manual
by Pier Angelo Vendrame (＠pierov) 30 May '23

30 May '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 11636bd7 by Pier Angelo Vendrame at 2023-05-30T19:10:29+02:00 Bug 40864: Add a script to download the latest manual We can use the same GitLab token we use to create the changelogs also to download the list of jobs in the manual project, and a new CI artifact if needed. - - - - - 1 changed file: - + tools/fetch-manual.py Changes: ===================================== tools/fetch-manual.py ===================================== @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 +import hashlib +from pathlib import Path +import sys + +import requests +import yaml + + +GITLAB = "https://gitlab.torproject.org" +API_URL = f"{GITLAB}/api/v4" +PROJECT_ID = 23 +REF_NAME = "main" + + +token_file = Path(__file__).parent / ".changelogs_token" +if not token_file.exists(): + print("This scripts uses the same access token as fetch-changelog.py.") + print("However, the file has not been found.") + print( + "Please run fetch-changelog.py to get the instructions on how to " + "generate it." + ) + sys.exit(1) +with token_file.open() as f: + headers = {"PRIVATE-TOKEN": f.read().strip()} + +r = requests.get(f"{API_URL}/projects/{PROJECT_ID}/jobs", headers=headers) +if r.status_code == 401: + print("Unauthorized! Maybe the token has expired.") + sys.exit(2) +found = False +for job in r.json(): + if job["ref"] != REF_NAME: + continue + for art in job["artifacts"]: + if art["filename"] == "artifacts.zip": + found = True + break + if found: + break +if not found: + print("Cannot find a usable job.") + sys.exit(3) + +pipeline_id = job["pipeline"]["id"] +conf_file = Path(__file__).parent.parent / "projects/manual/config" +with conf_file.open() as f: + config = yaml.load(f, yaml.SafeLoader) +if int(config["version"]) == int(pipeline_id): + print( + "projects/manual/config is already using the latest pipeline. Nothing to do." + ) + sys.exit(0) + +manual_dir = Path(__file__).parent.parent / "out/manual" +manual_dir.mkdir(0o755, parents=True, exist_ok=True) +manual_file = manual_dir / f"manual_{pipeline_id}.zip" +sha256 = hashlib.sha256() +if manual_file.exists(): + with manual_file.open("rb") as f: + while chunk := f.read(8192): + sha256.update(chunk) + print("You already have the latest manual version in your out directory.") + print("Please update projects/manual/config to:") +else: + print("Downloading the new version of the manual...") + url = f"{API_URL}/projects/{PROJECT_ID}/jobs/artifacts/{REF_NAME}/download?job={job['name']}" + r = requests.get(url, headers=headers, stream=True) + # https://stackoverflow.com/a/16696317 + r.raise_for_status() + with manual_file.open("wb") as f: + for chunk in r.iter_content(chunk_size=8192): + f.write(chunk) + sha256.update(chunk) + print(f"File downloaded as {manual_file}.") + print( + "Please upload it to people.torproject.org and then update projects/manual/config:" + ) +sha256 = sha256.hexdigest() + +print(f"\tversion: {pipeline_id}") +print(f"\tSHA256: {sha256}") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_102_12_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 29 May '23

29 May '23

Pier Angelo Vendrame pushed new tag FIREFOX_102_12_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… 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-102.12.0esr-12.5-1
by ma1 (＠ma1) 29 May '23

29 May '23

ma1 pushed new branch tor-browser-102.12.0esr-12.5-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/tor-browser] Pushed new branch tor-browser-102.12.0esr-12.0-1
by ma1 (＠ma1) 29 May '23

29 May '23

ma1 pushed new branch tor-browser-102.12.0esr-12.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/tor-browser][tor-browser-102.11.0esr-13.0-1] 13 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 29 May '23

29 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 16c0f67a by hackademix at 2023-05-29T10:30:14+02:00 fixup! Firefox preference overrides. - - - - - 073b7c85 by Pier Angelo Vendrame at 2023-05-29T10:30:31+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser Bug 41776: Keep shipping the old fontconfig file until users have one - - - - - 2ce0dfb9 by Pier Angelo Vendrame at 2023-05-29T10:30:31+02:00 fixup! Firefox preference overrides. Bug 41732: Use font.system.whitelist also on Linux as a defense-in-depth - - - - - c3a40e82 by Pier Angelo Vendrame at 2023-05-29T10:30:32+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser Bug 41776 (fix): Added some missing lines to the previous patch - - - - - d3a2bcd2 by cypherpunks1 at 2023-05-29T10:30:32+02:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 33298: Warn when submitting form data from http onion sites over an insecure connection - - - - - c8e4ee0b by cypherpunks1 at 2023-05-29T10:30:33+02:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 41785: Show http onion resources as secure in network monitor - - - - - 02ad5977 by Henry Wilkes at 2023-05-29T10:30:33+02:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Ignore tor connection errors when tor connection is cancelled by the user. This can happen if the bootstrap process is cancelled late in the process. Also remove unused cancelAutoBootstrapping. - - - - - 6e08e478 by Henry Wilkes at 2023-05-29T10:30:33+02:00 fixup! Add TorStrings module for localization Bug 41608 - Add new connection status strings. - - - - - df852978 by Henry Wilkes at 2023-05-29T10:30:34+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Use the torconnect icon for the onion slash. - - - - - a71c563a by Henry Wilkes at 2023-05-29T10:30:34+02:00 fixup! Bug 21952: Implement Onion-Location Bug 41608 - Use the same styling for ".onion available" urlbar button as the tor-connect-urlbar-button. This also stops the button from overflowing its container like before. Also move to after the bookmark button. - - - - - b70efa00 by Henry Wilkes at 2023-05-29T10:33:17+02:00 amend! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - 8c2886c8 by Henry Wilkes at 2023-05-29T10:33:19+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 and 41526 - Use KeyboardEvent.repeat to block triggering newly focused buttons in about:torconnect. The approach in tor-browser!607 prevented this by waiting for keyup, but keyup could still be triggered by a key event initialized elsewhere. E.g. when pressing Enter to close a modal dialog, the Enter's keyup event would be sent to the about:torconnect page and trigger the focused button. - - - - - 6c66708f by Dan Ballard at 2023-05-29T10:33:19+02:00 Bug 41749: Replace the onion-glyph with dedicated icon for onion services - - - - - 30 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser.js - browser/base/content/browser.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml - browser/components/onionservices/content/onionlocation.css - browser/components/torconnect/content/aboutTorConnect.js - − browser/components/torconnect/content/onion-slash.svg - − browser/components/torconnect/content/torBootstrapUrlbar.js - + browser/components/torconnect/content/torConnectTitlebarStatus.css - + browser/components/torconnect/content/torConnectTitlebarStatus.js - + browser/components/torconnect/content/torConnectUrlbarButton.js - − browser/components/torconnect/content/torconnect-urlbar.css - − browser/components/torconnect/content/torconnect-urlbar.inc.xhtml - browser/components/torconnect/jar.mn - browser/components/torpreferences/content/torPreferences.css - browser/modules/TorConnect.jsm - browser/modules/TorStrings.jsm - browser/themes/shared/browser-shared.css - browser/themes/shared/identity-block/onion-slash.svg - browser/themes/shared/identity-block/onion-warning.svg - browser/themes/shared/identity-block/onion.svg - browser/themes/shared/jar.inc.mn - + browser/themes/shared/tor-urlbar-button.css - devtools/shared/webconsole/network-helper.js - dom/html/HTMLFormElement.cpp - toolkit/torbutton/chrome/locale/en-US/torConnect.properties - tools/update-packaging/common.sh - tools/update-packaging/make_full_update.sh - tools/update-packaging/make_incremental_update.sh Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -48,6 +48,9 @@ pref("security.nocertdb", true); pref("browser.download.useDownloadDir", false); pref("browser.download.manager.addToRecentDocs", false); +// Prevent download stuffing / DOS (tor-browser#41764) +pref("browser.download.enable_spam_prevention", true); + // Misc privacy: Disk pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); @@ -697,6 +700,8 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S #endif #ifdef XP_LINUX +pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Math, Tinos, Twemoji Mozilla"); + // Arabic pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos"); pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo"); ===================================== browser/base/content/browser.js ===================================== @@ -80,6 +80,8 @@ XPCOMUtils.defineLazyModuleGetters(this, { TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm", TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm", TorConnect: "resource:///modules/TorConnect.jsm", + TorConnectState: "resource:///modules/TorConnect.jsm", + TorConnectTopics: "resource:///modules/TorConnect.jsm", TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.jsm", Translation: "resource:///modules/translation/TranslationParent.jsm", UITour: "resource:///modules/UITour.jsm", @@ -270,6 +272,16 @@ XPCOMUtils.defineLazyScriptGetter( "gSharedTabWarning", "chrome://browser/content/browser-webrtc.js" ); +XPCOMUtils.defineLazyScriptGetter( + this, + ["gTorConnectUrlbarButton"], + "chrome://browser/content/torconnect/torConnectUrlbarButton.js" +); +XPCOMUtils.defineLazyScriptGetter( + this, + ["gTorConnectTitlebarStatus"], + "chrome://browser/content/torconnect/torConnectTitlebarStatus.js" +); XPCOMUtils.defineLazyScriptGetter( this, ["gTorCircuitPanel"], @@ -1809,6 +1821,9 @@ var gBrowserInit = { // Init the OnionAuthPrompt OnionAuthPrompt.init(); + gTorConnectUrlbarButton.init(); + gTorConnectTitlebarStatus.init(); + gTorCircuitPanel.init(); // Certain kinds of automigration rely on this notification to complete @@ -1896,8 +1911,6 @@ var gBrowserInit = { } this._loadHandled = true; - - TorBootstrapUrlbar.init(); }, _cancelDelayedStartup() { @@ -2555,9 +2568,10 @@ var gBrowserInit = { OnionAuthPrompt.uninit(); - gTorCircuitPanel.uninit(); + gTorConnectUrlbarButton.uninit(); + gTorConnectTitlebarStatus.uninit(); - TorBootstrapUrlbar.uninit(); + gTorCircuitPanel.uninit(); gAccessibilityServiceIndicator.uninit(); ===================================== browser/base/content/browser.xhtml ===================================== @@ -37,6 +37,7 @@ <?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/onionservices/onionservices.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/torCircuitPanel.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/torconnect/torConnectTitlebarStatus.css" type="text/css"?> <!DOCTYPE window [ #include browser-doctype.inc @@ -123,7 +124,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/torconnect/torBootstrapUrlbar.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -93,6 +93,11 @@ aria-live="polite"/> <hbox class="private-browsing-indicator"/> + <html:div id="tor-connect-titlebar-status" role="status"> + <html:img alt="" id="tor-connect-titlebar-status-icon" /> + <html:span id="tor-connect-titlebar-status-label"></html:span> + </html:div> + #include titlebar-items.inc.xhtml </toolbar> @@ -335,7 +340,6 @@ data-l10n-id="urlbar-go-button"/> <hbox id="page-action-buttons" context="pageActionContextMenu"> <toolbartabstop/> -#include ../../components/torconnect/content/torconnect-urlbar.inc.xhtml <hbox id="contextual-feature-recommendation" role="button" hidden="true"> <hbox id="cfr-label-container"> <label id="cfr-label"/> @@ -363,9 +367,6 @@ onclick="FullZoom.reset(); FullZoom.resetScalingZoom();" tooltip="dynamic-shortcut-tooltip" hidden="true"/> - -#include ../../components/onionservices/content/onionlocation-urlbar.inc.xhtml - <hbox id="pageActionButton" class="urlbar-page-action" role="button" @@ -383,6 +384,15 @@ class="urlbar-icon"/> </hbox> </hbox> + + <hbox id="tor-connect-urlbar-button" + role="button" + class="tor-urlbar-button" + hidden="true"> + <label id="tor-connect-urlbar-button-label"/> + </hbox> + +#include ../../components/onionservices/content/onionlocation-urlbar.inc.xhtml </hbox> </hbox> <toolbartabstop/> ===================================== browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml ===================================== @@ -1,10 +1,10 @@ # Copyright (c) 2020, The Tor Project, Inc. <hbox id="onion-location-box" - class="urlbar-icon-wrapper urlbar-page-action" + class="tor-urlbar-button" role="button" hidden="true" onclick="OnionLocationParent.buttonClick(event);"> <image id="onion-location-button" role="presentation"/> - <hbox id="onion-label-container"><label id="onion-label"/></hbox> + <label id="onion-label"/> </hbox> ===================================== browser/components/onionservices/content/onionlocation.css ===================================== @@ -1,44 +1,9 @@ /* Copyright (c) 2020, The Tor Project, Inc. */ -#onion-location-box { - background-color: var(--purple-60); - -moz-context-properties: fill; - fill: white; -} - -#onion-location-box:hover { - background-color: var(--purple-70); -} - -#onion-location-box:active { - background-color: var(--purple-80); -} - -@media (prefers-color-scheme: dark) { - #onion-location-box { - background-color: var(--purple-50); - } - - #onion-location-box:hover { - background-color: var(--purple-60); - } - - #onion-location-box:active { - background-color: var(--purple-70); - } -} - #onion-location-button { list-style-image: url(chrome://browser/content/onionservices/onionlocation.svg); - padding-inline-start: 0.5em; -} - -label#onion-label { - margin: 0; - padding-block: 0; - padding-inline: 0.5em; - color: white; - font-weight: normal; + -moz-context-properties: fill; + fill: currentColor; } .onionlocation-notification-icon { ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -769,26 +769,29 @@ class AboutTorConnect { } }); - // Delay the "Enter" activation of the given button from "keydown" to - // "keyup". + // Prevent repeat triggering on keydown when the Enter key is held down. // - // Without this, holding down Enter will continue to trigger the button - // until the user stops holding. This means that a user can accidentally - // re-trigger a button several times. This is particularly bad when the - // focus gets moved to a new button, and the new button can get triggered - // immediately. E.g. when the "Connect" button is triggered it disappears - // and focus moves to the "Cancel" button. + // Without this, holding down Enter will continue to trigger the button's + // click event until the user stops holding. This means that a user can + // accidentally re-trigger a button several times. And if focus moves to a + // new button it can also get triggered, despite not receiving the initial + // keydown event. + // + // E.g. If the user presses down Enter on the "Connect" button it will + // trigger and focus will move to the "Cancel" button. This should prevent + // the user accidentally triggering the "Cancel" button if they hold down + // Enter for a little bit too long. for (const button of document.body.querySelectorAll("button")) { button.addEventListener("keydown", event => { - if (event.key === "Enter") { + // If the keydown is a repeating Enter event, ignore it. + // NOTE: If firefox uses wayland display (rather than xwayland), the + // "repeat" event is always "false" so this will not work. + // See bugzilla bug 1784438. Also see bugzilla bug 1594003. + // Currently tor browser uses xwayland by default on linux. + if (event.key === "Enter" && event.repeat) { event.preventDefault(); } }); - button.addEventListener("keyup", event => { - if (event.key === "Enter") { - button.click(); - } - }); } } ===================================== browser/components/torconnect/content/onion-slash.svg deleted ===================================== @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill-opacity="context-fill-opacity" fill="#ff0039" /> - <path d="m 8,0.5000002 c -1.61963,0 -3.1197431,0.5137987 -4.3457031,1.3867188 l 0.84375,0.8417968 0.7792969,0.78125 0.8613281,0.8613282 0.8164062,0.8164062 0.9863281,0.984375 h 0.058594 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.01968 6.2e-4,0.039074 0,0.058594 L 10.8125,9.0449221 C 10.9334,8.7195921 11,8.3674002 11,8.0000002 c 0,-1.65685 -1.34314,-3 -3,-3 v -1.078125 c 2.25231,0 4.078125,1.825845 4.078125,4.078125 0,0.67051 -0.162519,1.3033281 -0.449219,1.8613281 l 0.861328,0.8613277 C 12.972434,9.9290067 13.25,8.9965102 13.25,8.0000002 c 0,-2.89949 -2.35049,-5.25 -5.25,-5.25 v -1.078125 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,1.29533 -0.388841,2.4990528 -1.056641,3.5019528 l 0.841797,0.84375 C 14.986181,11.119703 15.5,9.6196302 15.5,8.0000002 c 0,-4.14214 -3.3579,-7.5 -7.5,-7.5 z m -6.1113281,3.15625 C 1.0154872,4.8821451 0.5,6.3803304 0.5,8.0000002 0.5,12.1421 3.85786,15.5 8,15.5 c 1.6198027,0 3.117896,-0.515441 4.34375,-1.388672 L 11.501953,13.269531 C 10.498787,13.937828 9.295838,14.328125 8,14.328125 V 13.25 c 0.9967306,0 1.9287093,-0.277621 2.722656,-0.759766 L 9.859375,11.626953 C 9.3016226,11.913918 8.6705338,12.078125 8,12.078125 V 11 C 8.3664751,11 8.716425,10.93088 9.0410156,10.810547 6.6639891,8.4300416 4.2743195,6.0418993 1.8886719,3.6562502 Z" fill-opacity="context-fill-opacity" fill="context-fill"/> -</svg> ===================================== browser/components/torconnect/content/torBootstrapUrlbar.js deleted ===================================== @@ -1,95 +0,0 @@ -// Copyright (c) 2021, The Tor Project, Inc. - -"use strict"; - -const { TorConnect, TorConnectTopics, TorConnectState } = ChromeUtils.import( - "resource:///modules/TorConnect.jsm" -); -const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); - -/* globals browser, gURLBar, Services */ - -var TorBootstrapUrlbar = { - selectors: Object.freeze({ - torConnect: { - box: "hbox#torconnect-box", - label: "label#torconnect-label", - }, - }), - - elements: null, - - updateTorConnectBox(state) { - switch (state) { - case TorConnectState.Initial: - case TorConnectState.Configuring: - case TorConnectState.AutoConfiguring: - case TorConnectState.Error: - case TorConnectState.FatalError: { - this.elements.torConnectBox.removeAttribute("hidden"); - this.elements.torConnectLabel.textContent = - TorStrings.torConnect.torNotConnectedConcise; - this.elements.inputContainer.setAttribute("torconnect", "offline"); - break; - } - case TorConnectState.Bootstrapping: { - this.elements.torConnectBox.removeAttribute("hidden"); - this.elements.torConnectLabel.textContent = - TorStrings.torConnect.torConnectingConcise; - this.elements.inputContainer.setAttribute("torconnect", "connecting"); - break; - } - case TorConnectState.Bootstrapped: { - this.elements.torConnectBox.removeAttribute("hidden"); - this.elements.torConnectLabel.textContent = - TorStrings.torConnect.torConnectedConcise; - this.elements.inputContainer.setAttribute("torconnect", "connected"); - // hide torconnect box after 5 seconds - setTimeout(() => { - this.elements.torConnectBox.setAttribute("hidden", "true"); - }, 5000); - break; - } - case TorConnectState.Disabled: { - this.elements.torConnectBox.setAttribute("hidden", "true"); - break; - } - default: - break; - } - }, - - observe(aSubject, aTopic, aData) { - if (aTopic === TorConnectTopics.StateChange) { - const obj = aSubject?.wrappedJSObject; - this.updateTorConnectBox(obj?.state); - } - }, - - init() { - if (TorConnect.shouldShowTorConnect) { - // browser isn't populated until init - this.elements = Object.freeze({ - torConnectBox: browser.ownerGlobal.document.querySelector( - this.selectors.torConnect.box - ), - torConnectLabel: browser.ownerGlobal.document.querySelector( - this.selectors.torConnect.label - ), - inputContainer: gURLBar._inputContainer, - }); - this.elements.torConnectBox.addEventListener("click", () => { - TorConnect.openTorConnect(); - }); - Services.obs.addObserver(this, TorConnectTopics.StateChange); - this.observing = true; - this.updateTorConnectBox(TorConnect.state); - } - }, - - uninit() { - if (this.observing) { - Services.obs.removeObserver(this, TorConnectTopics.StateChange); - } - }, -}; ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.css ===================================== @@ -0,0 +1,38 @@ +#tor-connect-titlebar-status:not([hidden]) { + display: flex; + align-items: center; + /* Want same as #private-browsing-indicator-with-label */ + margin-inline: 7px; +} + +#tor-connect-titlebar-status-label { + margin-inline: 6px; + white-space: nowrap; +} + +#tor-connect-titlebar-status-icon { + -moz-context-properties: fill; + fill: currentColor; + width: 16px; + height: 16px; +} + +#tor-connect-titlebar-status-icon.tor-connect-status-connected { + fill: var(--purple-60); +} + +@media (prefers-color-scheme: dark) { + #tor-connect-titlebar-status-icon.tor-connect-status-connected { + fill: var(--purple-30); + } +} + +#tor-connect-titlebar-status-icon.tor-connect-status-potentially-blocked { + fill: #c50042; +} + +@media (prefers-color-scheme: dark) { + #tor-connect-titlebar-status-icon.tor-connect-status-potentially-blocked { + fill: #ff9aa2; + } +} ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.js ===================================== @@ -0,0 +1,115 @@ +/* eslint-env mozilla/browser-window */ + +/** + * A TorConnect status shown in the application title bar. + */ +var gTorConnectTitlebarStatus = { + /** + * The status element in the title bar. + * + * @type {Element} + */ + node: null, + /** + * The status label. + * + * @type {Element} + */ + label: null, + /** + * The status icon. + * + * @type {Element} + */ + icon: null, + + /** + * Initialize the component. + */ + init() { + const { TorStrings } = ChromeUtils.import( + "resource:///modules/TorStrings.jsm" + ); + + this._strings = TorStrings.torConnect; + + this.node = document.getElementById("tor-connect-titlebar-status"); + this.icon = document.getElementById("tor-connect-titlebar-status-icon"); + this.label = document.getElementById("tor-connect-titlebar-status-label"); + // The title also acts as an accessible name for the role="status". + this.node.setAttribute("title", this._strings.titlebarStatusName); + + this._observeTopic = TorConnectTopics.StateChange; + this._stateListener = { + observe: (subject, topic, data) => { + if (topic !== this._observeTopic) { + return; + } + this._torConnectStateChanged(); + }, + }; + Services.obs.addObserver(this._stateListener, this._observeTopic); + + this._torConnectStateChanged(); + }, + + /** + * De-initialize the component. + */ + deinit() { + Services.obs.removeObserver(this._stateListener, this._observeTopic); + }, + + /** + * Callback for when the TorConnect state changes. + */ + _torConnectStateChanged() { + let textId; + let connected = false; + let potentiallyBlocked = false; + switch (TorConnect.state) { + case TorConnectState.Disabled: + // Hide immediately. + this.node.hidden = true; + return; + case TorConnectState.Bootstrapped: + this._startHiding(); + textId = "titlebarStatusConnected"; + connected = true; + break; + case TorConnectState.Bootstrapping: + case TorConnectState.AutoBootstrapping: + textId = "titlebarStatusConnecting"; + break; + default: + if (TorConnect.potentiallyBlocked) { + textId = "titlebarStatusPotentiallyBlocked"; + potentiallyBlocked = true; + } else { + textId = "titlebarStatusNotConnected"; + } + break; + } + this.label.textContent = this._strings[textId]; + this.icon.setAttribute( + "src", + connected + ? "chrome://browser/content/torconnect/onion.svg" + : "chrome://browser/content/torconnect/onion-slash-fillable.svg" + ); + this.icon.classList.toggle("tor-connect-status-connected", connected); + this.icon.classList.toggle( + "tor-connect-status-potentially-blocked", + potentiallyBlocked + ); + }, + + /** + * Mark the component to be hidden after some delay. + */ + _startHiding() { + setTimeout(() => { + this.node.hidden = true; + }, 5000); + }, +}; ===================================== browser/components/torconnect/content/torConnectUrlbarButton.js ===================================== @@ -0,0 +1,155 @@ +/* eslint-env mozilla/browser-window */ + +/** + * A "Connect" button shown in the urlbar when not connected to tor and in tabs + * other than about:torconnect. + */ +var gTorConnectUrlbarButton = { + /** + * The urlbar button node. + * + * @type {Element} + */ + button: null, + /** + * Whether we are active. + * + * @type {boolean} + */ + _isActive: false, + /** + * Whether we are in the "about:torconnect" tab. + * + * @type {boolean} + */ + // We init to "true" so that the button can only appear after the first page + // load. + _inAboutTorConnectTab: true, + + /** + * Initialize the button. + */ + init() { + if (this._isActive) { + return; + } + this._isActive = true; + + const { TorStrings } = ChromeUtils.import( + "resource:///modules/TorStrings.jsm" + ); + + this.button = document.getElementById("tor-connect-urlbar-button"); + document.getElementById("tor-connect-urlbar-button-label").value = + TorStrings.torConnect.torConnectButton; + this.button.addEventListener("click", event => { + if (event.button !== 0) { + return; + } + this.connect(); + }); + this.button.addEventListener("keydown", event => { + if (event.key !== "Enter" && event.key !== " ") { + return; + } + this.connect(); + }); + + this._observeTopic = TorConnectTopics.StateChange; + this._stateListener = { + observe: (subject, topic, data) => { + if (topic !== this._observeTopic) { + return; + } + this._torConnectStateChanged(); + }, + }; + Services.obs.addObserver(this._stateListener, this._observeTopic); + + this._locationListener = { + onLocationChange: (webProgress, request, locationURI, flags) => { + if ( + webProgress.isTopLevel && + !(flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) + ) { + this._inAboutTorConnectTab = gBrowser.selectedBrowser.currentURI?.spec.startsWith( + "about:torconnect" + ); + this._updateButtonVisibility(); + } + }, + }; + // Notified of new locations for the currently selected browser (tab) *and* + // switching selected browser. + gBrowser.addProgressListener(this._locationListener); + + this._torConnectStateChanged(); + }, + + /** + * Deactivate and de-initialize the button. + */ + deinit() { + if (!this._isActive) { + return; + } + this._isActive = false; + + Services.obs.removeObserver(this._stateListener, this._observeTopic); + gBrowser.removeProgressListener(this._locationListener); + this._updateButtonVisibility(); + }, + + /** + * Begin the tor connection bootstrapping process. + */ + connect() { + TorConnect.openTorConnect({ beginBootstrap: true }); + }, + + /** + * Callback for when the TorConnect state changes. + */ + _torConnectStateChanged() { + if ( + TorConnect.state === TorConnectState.Bootstrapped || + TorConnect.state === TorConnectState.Disabled + ) { + this.deinit(); + return; + } + this._updateButtonVisibility(); + }, + + /** + * Callback when the TorConnect state, current browser location, or activation + * state changes. + */ + _updateButtonVisibility() { + if (!this.button) { + return; + } + // NOTE: We do not manage focus when hiding the button. We only expect to + // move from "not hidden" to "hidden" when: + // + switching tabs to "about:torconnect", or + // + starting bootstrapping. + // + // When switching tabs, the normal tab switching logic will eventually move + // focus to the new tab or url bar, so whilst the focus may be lost + // temporarily when we hide the button, it will be re-established quickly on + // tab switch. + // + // And we don't expect bootstrapping to start whilst outside of the + // "about:torconnect", and the automatic bootstrapping should only trigger + // at the initial start. + this.button.hidden = + !this._isActive || + this._inAboutTorConnectTab || + !TorConnect.enabled || + !TorConnect.canBeginBootstrap; + this.button.classList.toggle( + "tor-urlbar-button-plain", + TorConnect.potentiallyBlocked + ); + }, +}; ===================================== browser/components/torconnect/content/torconnect-urlbar.css deleted ===================================== @@ -1,37 +0,0 @@ -/* - ensure our torconnect button is always visible (same rule as for the bookmark button) -*/ -label#torconnect-label { - margin: 0; - opacity: 0.6; - padding: 0 0.5em; -} - -hbox.urlbar-page-action#torconnect-box { - display: -moz-inline-box!important; -} - -/* hide when hidden attribute is set */ -hbox.urlbar-page-action#torconnect-box[hidden="true"], -/* hide when user is typing in URL bar */ -#urlbar[usertyping] > #urlbar-input-container > #page-action-buttons > #torconnect-box { - display: none!important; -} - -/* hide urlbar's placeholder text when not connectd to tor */ -hbox#urlbar-input-container[torconnect="offline"] input#urlbar-input::placeholder, -hbox#urlbar-input-container[torconnect="connecting"] input#urlbar-input::placeholder { - opacity: 0; -} - -/* hide search suggestions when not connected to tor */ -hbox#urlbar-input-container[torconnect="offline"] + vbox.urlbarView, -hbox#urlbar-input-container[torconnect="connecting"] + vbox.urlbarView { - display: none!important; -} - -/* hide search icon when we are not connected to tor */ -hbox#urlbar-input-container[torconnect="offline"] > #identity-box[pageproxystate="invalid"] > #identity-icon, -hbox#urlbar-input-container[torconnect="connecting"] > #identity-box[pageproxystate="invalid"] > #identity-icon { - display: none!important; -} ===================================== browser/components/torconnect/content/torconnect-urlbar.inc.xhtml deleted ===================================== @@ -1,11 +0,0 @@ -# Copyright (c) 2021, The Tor Project, Inc. - -<hbox id="torconnect-box" - class="urlbar-icon-wrapper urlbar-page-action" - role="status" - align="center" - hidden="true"> - <hbox id="torconnect-container"> - <label id="torconnect-label"/> - </hbox> -</hbox> \ No newline at end of file ===================================== browser/components/torconnect/jar.mn ===================================== @@ -1,5 +1,7 @@ browser.jar: - content/browser/torconnect/torBootstrapUrlbar.js (content/torBootstrapUrlbar.js) + content/browser/torconnect/torConnectUrlbarButton.js (content/torConnectUrlbarButton.js) + content/browser/torconnect/torConnectTitlebarStatus.js (content/torConnectTitlebarStatus.js) + content/browser/torconnect/torConnectTitlebarStatus.css (content/torConnectTitlebarStatus.css) content/browser/torconnect/aboutTorConnect.css (content/aboutTorConnect.css) * content/browser/torconnect/aboutTorConnect.xhtml (content/aboutTorConnect.xhtml) content/browser/torconnect/aboutTorConnect.js (content/aboutTorConnect.js) @@ -8,6 +10,4 @@ browser.jar: content/browser/torconnect/connection-failure.svg (content/connection-failure.svg) content/browser/torconnect/connection-location.svg (content/connection-location.svg) content/browser/torconnect/onion.svg (content/onion.svg) - content/browser/torconnect/onion-slash.svg (content/onion-slash.svg) content/browser/torconnect/onion-slash-fillable.svg (content/onion-slash-fillable.svg) - skin/classic/browser/torconnect-urlbar.css (content/torconnect-urlbar.css) ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -58,7 +58,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { #torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-icon { - mask: url("chrome://browser/skin/onion-slash.svg"); + mask: url("chrome://browser/content/torconnect/onion-slash-fillable.svg"); background-color: white; } ===================================== browser/modules/TorConnect.jsm ===================================== @@ -99,7 +99,7 @@ const TorConnectState = Object.freeze({ └─┼─────▶ │ │ │ │ └──────────────────────────────────────────────────────────┘ │ │ │ ▲ │ - │ │ beginAutoBootstrap() │ cancelAutoBootstrap() │ + │ │ beginAutoBootstrap() │ cancelBootstrap() │ │ ▼ │ │ │ ┌───────────────────────┐ │ │ └────── │ AutoBootstrapping │ ─┘ │ @@ -464,6 +464,7 @@ const TorConnect = (() => { const tbr = new TorBootstrapRequest(); const internetTest = new InternetTest(); + let cancelled = false; let bootstrapError = ""; let bootstrapErrorDetails = ""; @@ -506,6 +507,7 @@ const TorConnect = (() => { this.on_transition = async nextState => { if (nextState === TorConnectState.Configuring) { // stop bootstrap process if user cancelled + cancelled = true; internetTest.cancel(); await tbr.cancel(); } @@ -520,6 +522,19 @@ const TorConnect = (() => { TorConnect._changeState(TorConnectState.Bootstrapped); }; tbr.onbootstraperror = (message, details) => { + if (cancelled) { + // We ignore this error since it occurred after cancelling (by + // the user). We assume the error is just a side effect of the + // cancelling. + // E.g. If the cancelling is triggered late in the process, we + // get "Building circuits: Establishing a Tor circuit failed". + // TODO: Maybe move this logic deeper in the process to know + // when to filter out such errors triggered by cancelling. + console.log( + `TorConnect: Post-cancel error => ${message}; ${details}` + ); + return; + } // We have to wait for the Internet test to finish before sending the bootstrap error bootstrapError = message; bootstrapErrorDetails = details; @@ -1023,11 +1038,6 @@ const TorConnect = (() => { this._changeState(TorConnectState.AutoBootstrapping, countryCode); }, - cancelAutoBootstrap() { - console.log("TorConnect: cancelAutoBootstrap()"); - this._changeState(TorConnectState.Configuring); - }, - /* Further external commands and helper methods */ ===================================== browser/modules/TorStrings.jsm ===================================== @@ -207,10 +207,6 @@ const Loader = { torConnecting: "Establishing a Connection", - torNotConnectedConcise: "Not Connected", - - torConnectingConcise: "Connecting…", - tryingAgain: "Trying again…", noInternet: "Tor Browser couldn’t reach the Internet", @@ -250,8 +246,6 @@ const Loader = { torConnected: "Connected to the Tor network", - torConnectedConcise: "Connected", - tryAgain: "Try Again", // tor connect strings for message box in about:preferences#connection @@ -275,6 +269,13 @@ const Loader = { autoBootstrappingAllFailed: "None of the configurations we tried worked", cannotDetermineCountry: "Unable to determine user country", noSettingsForCountry: "No settings available for your location", + + // Titlebar status. + titlebarStatusName: "Tor connection", + titlebarStatusNotConnected: "Not connected", + titlebarStatusConnecting: "Connecting…", + titlebarStatusPotentiallyBlocked: "Potentially blocked", + titlebarStatusConnected: "Connected", }; const tsb = new TorPropertyStringBundle( ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -23,8 +23,8 @@ @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/browser-colors.css"); @import url("chrome://branding/content/tor-styles.css"); -@import url("chrome://browser/skin/torconnect-urlbar.css"); @import url("chrome://browser/skin/onionlocation.css"); +@import url("chrome://browser/skin/tor-urlbar-button.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/identity-block/onion-slash.svg ===================================== @@ -1,5 +1,16 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill-opacity="context-fill-opacity" fill="#ff0039" /> - <path d="m 8,0.5000002 c -1.61963,0 -3.1197431,0.5137987 -4.3457031,1.3867188 l 0.84375,0.8417968 0.7792969,0.78125 0.8613281,0.8613282 0.8164062,0.8164062 0.9863281,0.984375 h 0.058594 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.01968 6.2e-4,0.039074 0,0.058594 L 10.8125,9.0449221 C 10.9334,8.7195921 11,8.3674002 11,8.0000002 c 0,-1.65685 -1.34314,-3 -3,-3 v -1.078125 c 2.25231,0 4.078125,1.825845 4.078125,4.078125 0,0.67051 -0.162519,1.3033281 -0.449219,1.8613281 l 0.861328,0.8613277 C 12.972434,9.9290067 13.25,8.9965102 13.25,8.0000002 c 0,-2.89949 -2.35049,-5.25 -5.25,-5.25 v -1.078125 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,1.29533 -0.388841,2.4990528 -1.056641,3.5019528 l 0.841797,0.84375 C 14.986181,11.119703 15.5,9.6196302 15.5,8.0000002 c 0,-4.14214 -3.3579,-7.5 -7.5,-7.5 z m -6.1113281,3.15625 C 1.0154872,4.8821451 0.5,6.3803304 0.5,8.0000002 0.5,12.1421 3.85786,15.5 8,15.5 c 1.6198027,0 3.117896,-0.515441 4.34375,-1.388672 L 11.501953,13.269531 C 10.498787,13.937828 9.295838,14.328125 8,14.328125 V 13.25 c 0.9967306,0 1.9287093,-0.277621 2.722656,-0.759766 L 9.859375,11.626953 C 9.3016226,11.913918 8.6705338,12.078125 8,12.078125 V 11 C 8.3664751,11 8.716425,10.93088 9.0410156,10.810547 6.6639891,8.4300416 4.2743195,6.0418993 1.8886719,3.6562502 Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_1827_6565)"> +<path d="M6.62435 8.54824C6.23983 8.91273 6 9.42836 6 10C6 11.1046 6.89543 12 8 12C8.57164 12 9.08727 11.7602 9.45176 11.3757L8.74414 10.668C8.56107 10.8718 8.29551 11 8 11C7.44772 11 7 10.5523 7 10C7 9.70449 7.12818 9.43893 7.33197 9.25586L6.62435 8.54824Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M9.99442 10.1505C9.99812 10.1008 10 10.0506 10 10C10 8.89543 9.10457 8 8 8C7.94936 8 7.89915 8.00188 7.84946 8.00558L9.99442 10.1505Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M5.20988 7.13377C4.46354 7.86041 4 8.87607 4 10C4 12.2091 5.79086 14 8 14C9.12393 14 10.1396 13.5365 10.8662 12.7901L10.159 12.0829C9.61343 12.6483 8.84778 13 8 13C6.34315 13 5 11.6569 5 10C5 9.15222 5.35166 8.38657 5.91707 7.84097L5.20988 7.13377Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M10.8331 10.9892C10.9412 10.6795 11 10.3466 11 10C11 8.34315 9.65685 7 8 7C7.65339 7 7.32052 7.05878 7.01079 7.16692L6.24731 6.40343C6.77658 6.14502 7.37135 6 8 6C10.2091 6 12 7.79086 12 10C12 10.6286 11.855 11.2234 11.5966 11.7527L10.8331 10.9892Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M14 10C14 8.223 13.2275 6.62643 12 5.52779V4C12 1.79086 10.2091 0 8 0C5.79086 0 4 1.79086 4 4V4.15613L5.50811 5.66423C6.2417 5.2417 7.09263 5 8 5C10.7614 5 13 7.23858 13 10C13 10.9074 12.7583 11.7583 12.3358 12.4919L13.0637 13.2199C13.6565 12.2896 14 11.1849 14 10ZM8 4C7.00883 4 6.0738 4.24033 5.25 4.66591V4C5.25 2.48122 6.48122 1.25 8 1.25C9.51878 1.25 10.75 2.48122 10.75 4V4.66591C9.9262 4.24033 8.99117 4 8 4Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M12.2805 14.2044C11.1919 15.3126 9.67621 16 8 16C4.68629 16 2 13.3137 2 10C2 8.32379 2.68736 6.80812 3.79558 5.71948L4.50272 6.42662C3.57545 7.33427 3 8.59993 3 10C3 12.7614 5.23858 15 8 15C9.40007 15 10.6657 14.4246 11.5734 13.4973L12.2805 14.2044Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M1.25801 3.93806C1.50209 3.69398 1.89782 3.69398 2.14189 3.93806L13.1419 14.9381C13.386 15.1821 13.386 15.5779 13.1419 15.8219C12.8978 16.066 12.5021 16.066 12.258 15.8219L1.25801 4.82194C1.01393 4.57787 1.01393 4.18214 1.25801 3.93806Z" fill="#F90D3F"/> +</g> +<defs> +<clipPath id="clip0_1827_6565"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> </svg> ===================================== browser/themes/shared/identity-block/onion-warning.svg ===================================== @@ -1,4 +1,13 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="M 7.5,0.5 C 3.35786,0.5 0,3.85786 0,8 c 0,3.7093 2.6930488,6.789278 6.2304688,7.392578 -0.032181,-0.0637 -0.060149,-0.128686 -0.085938,-0.195312 -0.00862,-0.02227 -0.01751,-0.04385 -0.025391,-0.06641 -0.023385,-0.0669 -0.043878,-0.135932 -0.060547,-0.205078 -0.00186,-0.0077 -0.00213,-0.01571 -0.00391,-0.02344 -0.017615,-0.07685 -0.032109,-0.153488 -0.041016,-0.232422 -7.27e-5,-6.44e-4 7.2e-5,-0.0013 0,-0.002 -0.0087,-0.07777 -0.011896,-0.157155 -0.011719,-0.236328 7.71e-5,-0.0337 2.127e-4,-0.06769 0.00195,-0.101563 3.337e-4,-0.0065 -3.955e-4,-0.01303 0,-0.01953 0.00318,-0.05219 0.0084,-0.10381 0.015625,-0.15625 0.03623,-0.263929 0.1235201,-0.529812 0.2714844,-0.787109 L 6.421875,13.138672 C 7.1130865,11.933878 7.8482649,10.654869 8.4882812,9.5390625 8.2033713,9.7224325 7.864,9.828125 7.5,9.828125 v -3.65625 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.02558 -9.131e-4,0.050842 -0.00195,0.076172 L 9.6015625,7.5957031 C 9.7779825,7.2883331 10.012797,7.0451975 10.279297,6.8671875 9.8324169,5.7717775 8.75611,5 7.5,5 V 3.921875 c 1.72627,0 3.201675,1.0728106 3.796875,2.5878906 0.4511,-0.0416 0.914353,0.052393 1.314453,0.2832032 C 12.066128,4.4750988 9.98426,2.75 7.5,2.75 V 1.671875 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,0.10641 -0.0026,0.2112863 -0.0078,0.3164062 L 14.74806,9.9355469 C 14.912447,9.3182669 15,8.66904 15,8 15,3.85786 11.6421,0.5 7.5,0.5 Z m 4,7 c -0.40375,0 -0.808156,0.19825 -1.035156,0.59375 l -3.3105471,5.771484 c -0.446,0.775 0.1271562,1.734375 1.0351562,1.734375 H 14.8125 c 0.907,0 1.478203,-0.959375 1.033203,-1.734375 L 12.535156,8.09375 C 12.308156,7.69825 11.90375,7.5 11.5,7.5 Z m 0,2.1015625 c 0.1658,0 0.324206,0.066384 0.441406,0.1835937 0.1172,0.1172101 0.183594,0.2757058 0.183594,0.4414058 v 1.748047 c 0,0.1658 -0.06639,0.324207 -0.183594,0.441407 -0.1172,0.1172 -0.275606,0.183593 -0.441406,0.183593 -0.1657,0 -0.324206,-0.06639 -0.441406,-0.183593 -0.1172,-0.1172 -0.183594,-0.275607 -0.183594,-0.441407 v -1.748047 c 0,-0.165699 0.06639,-0.3241957 0.183594,-0.4414058 C 11.175794,9.6679462 11.3343,9.6015625 11.5,9.6015625 Z m 0,3.7480465 c 0.1658,0 0.324206,0.06639 0.441406,0.183594 0.1172,0.1172 0.183594,0.275706 0.183594,0.441406 0,0.1658 -0.06639,0.32616 -0.183594,0.44336 -0.1172,0.1172 -0.275606,0.18164 -0.441406,0.18164 -0.1657,0 -0.324206,-0.06444 -0.441406,-0.18164 -0.1172,-0.1172 -0.183594,-0.27756 -0.183594,-0.44336 0,-0.1657 0.06639,-0.324206 0.183594,-0.441406 0.1172,-0.1172 0.275706,-0.183594 0.441406,-0.183594 z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_1827_6566)"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M7.92788 10.5342L7.42044 11.408C7.05803 11.7736 6.55546 12 6 12C4.89543 12 4 11.1046 4 10C4 8.89543 4.89543 8 6 8C7.10457 8 8 8.89543 8 10C8 10.185 7.97488 10.3641 7.92788 10.5342ZM7 10C7 10.5523 6.55228 11 6 11C5.44772 11 5 10.5523 5 10C5 9.44772 5.44772 9 6 9C6.55228 9 7 9.44772 7 10Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M6.52221 12.9547C6.35262 12.9845 6.17812 13 6 13C4.34315 13 3 11.6569 3 10C3 8.34315 4.34315 7 6 7C7.30202 7 8.41032 7.82945 8.8253 8.98878L9.35089 8.08372C9.37772 8.03755 9.40587 7.99285 9.43523 7.94962C8.73673 6.78186 7.45967 6 6 6C3.79086 6 2 7.79086 2 10C2 12.1857 3.75302 13.9619 5.92975 13.9994C5.96208 13.9274 5.99884 13.8558 6.0402 13.7847L6.52221 12.9547Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1978 7.00088C10.8782 6.44807 10.4728 5.95098 10 5.52779V4C10 1.79086 8.20914 0 6 0C3.79086 0 2 1.79086 2 4V5.52779C0.772501 6.62643 0 8.223 0 10C0 13.3137 2.68629 16 6 16C6.03024 16 6.06043 15.9998 6.09057 15.9993C5.89561 15.7007 5.77424 15.3557 5.749 14.9938C3.10419 14.8631 1 12.6773 1 10C1 7.23858 3.23858 5 6 5C7.75288 5 9.29509 5.90201 10.1878 7.26719C10.5002 7.0977 10.8482 7.00893 11.1978 7.00088ZM6 4C5.00883 4 4.0738 4.24033 3.25 4.66591V4C3.25 2.48122 4.48122 1.25 6 1.25C7.51878 1.25 8.75 2.48122 8.75 4V4.66591C7.9262 4.24033 6.99117 4 6 4Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M15.5956 14.2875L12.2846 8.58591C11.8306 7.8047 10.6696 7.8047 10.2156 8.58591L6.90465 14.2875C6.45865 15.0529 7.03065 16 7.93865 16H14.5616C15.4686 16 16.0406 15.0529 15.5956 14.2875ZM11.8746 12.4189C11.8746 12.5826 11.8088 12.7396 11.6916 12.8553C11.5744 12.9711 11.4154 13.0361 11.2496 13.0361C11.0839 13.0361 10.9249 12.9711 10.8077 12.8553C10.6905 12.7396 10.6246 12.5826 10.6246 12.4189V10.6935C10.6246 10.5298 10.6905 10.3728 10.8077 10.257C10.9249 10.1413 11.0839 10.0762 11.2496 10.0762C11.4154 10.0762 11.5744 10.1413 11.6916 10.257C11.8088 10.3728 11.8746 10.5298 11.8746 10.6935V12.4189ZM11.2496 15.0124C11.0839 15.0124 10.9249 14.9473 10.8077 14.8316C10.6905 14.7158 10.6246 14.5588 10.6246 14.3951C10.6246 14.2314 10.6905 14.0744 10.8077 13.9586C10.9249 13.8429 11.0839 13.7778 11.2496 13.7778C11.4154 13.7778 11.5744 13.8429 11.6916 13.9586C11.8088 14.0744 11.8746 14.2314 11.8746 14.3951C11.8746 14.5588 11.8088 14.7158 11.6916 14.8316C11.5744 14.9473 11.4154 15.0124 11.2496 15.0124Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +</g> +<defs> +<clipPath id="clip0_1827_6566"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> </svg> ===================================== browser/themes/shared/identity-block/onion.svg ===================================== @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="M 8 0.5 C 3.85786 0.5 0.5 3.85786 0.5 8 C 0.5 12.1421 3.85786 15.5 8 15.5 C 12.1421 15.5 15.5 12.1421 15.5 8 C 15.5 3.85786 12.1421 0.5 8 0.5 z M 8 1.671875 C 11.4949 1.671875 14.328125 4.50507 14.328125 8 C 14.328125 11.4949 11.4949 14.328125 8 14.328125 L 8 13.25 C 10.89951 13.25 13.25 10.89951 13.25 8 C 13.25 5.10051 10.89951 2.75 8 2.75 L 8 1.671875 z M 8 3.921875 C 10.25231 3.921875 12.078125 5.74772 12.078125 8 C 12.078125 10.25231 10.25231 12.078125 8 12.078125 L 8 11 C 9.65686 11 11 9.65686 11 8 C 11 6.34315 9.65686 5 8 5 L 8 3.921875 z M 8 6.171875 C 9.00965 6.171875 9.828125 6.99036 9.828125 8 C 9.828125 9.00965 9.00965 9.828125 8 9.828125 L 8 6.171875 z " clip-rule="evenodd" fill-rule="evenodd" fill="context-fill" fill-opacity="context-fill-opacity"/> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M8 13C9.65685 13 11 11.6569 11 10C11 8.34315 9.65685 7 8 7C6.34315 7 5 8.34315 5 10C5 11.6569 6.34315 13 8 13ZM8 14C10.2091 14 12 12.2091 12 10C12 7.79086 10.2091 6 8 6C5.79086 6 4 7.79086 4 10C4 12.2091 5.79086 14 8 14Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M8 11C8.55228 11 9 10.5523 9 10C9 9.44772 8.55228 9 8 9C7.44772 9 7 9.44772 7 10C7 10.5523 7.44772 11 8 11ZM8 12C9.10457 12 10 11.1046 10 10C10 8.89543 9.10457 8 8 8C6.89543 8 6 8.89543 6 10C6 11.1046 6.89543 12 8 12Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M12 5.52779C13.2275 6.62643 14 8.223 14 10C14 13.3137 11.3137 16 8 16C4.68629 16 2 13.3137 2 10C2 8.223 2.7725 6.62643 4 5.52779V4C4 1.79086 5.79086 0 8 0C10.2091 0 12 1.79086 12 4V5.52779ZM5.25 4.66591C6.0738 4.24033 7.00883 4 8 4C8.99117 4 9.9262 4.24033 10.75 4.66591V4C10.75 2.48122 9.51878 1.25 8 1.25C6.48122 1.25 5.25 2.48122 5.25 4V4.66591ZM13 10C13 12.7614 10.7614 15 8 15C5.23858 15 3 12.7614 3 10C3 7.23858 5.23858 5 8 5C10.7614 5 13 7.23858 13 10Z" fill="context-fill" fill-opacity="context-fill-opacity"/> </svg> ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -32,6 +32,7 @@ skin/classic/browser/tabs.css (../shared/tabs.css) skin/classic/browser/toolbarbuttons.css (../shared/toolbarbuttons.css) skin/classic/browser/toolbarbutton-icons.css (../shared/toolbarbutton-icons.css) + skin/classic/browser/tor-urlbar-button.css (../shared/tor-urlbar-button.css) skin/classic/browser/urlbar-dynamic-results.css (../shared/urlbar-dynamic-results.css) skin/classic/browser/urlbar-searchbar.css (../shared/urlbar-searchbar.css) skin/classic/browser/urlbarView.css (../shared/urlbarView.css) ===================================== browser/themes/shared/tor-urlbar-button.css ===================================== @@ -0,0 +1,107 @@ +.tor-urlbar-button:not([hidden]) { + --tor-urlbar-button-background-color: var(--purple-60); + background-color: var(--tor-urlbar-button-background-color); + /* FIXME: Use different colors for light and dark theme, rather than "white". + * See tor-browser#41787 */ + color: white; + display: flex; + align-items: center; + gap: 0.5em; + border-radius: var(--urlbar-icon-border-radius); + --tor-urlbar-button-inline-padding: 8px; + padding-inline: var(--tor-urlbar-button-inline-padding); + margin: 0; +} + +.tor-urlbar-button > * { + flex: 0 0 auto; + margin: 0; +} + +.tor-urlbar-button:focus-visible { + /* This button lies within the urlbar, so if the outline extends beyond the + * button's boundary, it will be clipped by the urlbar. + * Most button's in the urlbar get around this by using --focus-outline-inset, + * but our button has a purple background, which does not contrast well with + * the focus outline. + * Therefore, we use an offset outline rather than an inset outline, and + * compensate by shrinking the button's width and height so that the outline + * fits within the non-focused button boundary. Essentially, this has a + * similar effect to using an inset outline that matches the color of the + * urlbar background, but we keep the rounded corners. */ + outline: var(--focus-outline); + outline-offset: var(--focus-outline-offset); + /* Use the background color for the outline, same as in-content buttons. */ + outline-color: var(--tor-urlbar-button-background-color); + /* Calculate the difference between the button's border area and the outline + * area. */ + --tor-urlbar-focus-outline-difference: calc( + var(--focus-outline-offset) + + var(--focus-outline-width) + ); + /* For the inline direction, we shrink the padding by the difference, and + * increase the margin by the same amount so that the button text remains in + * the same position. + * For the block direction, the height of the button is flexibly sized with + * the urlbar height, so we should only need to increase the margin. */ + padding-inline: calc( + var(--tor-urlbar-button-inline-padding) + - var(--tor-urlbar-focus-outline-difference) + ); + margin: var(--tor-urlbar-focus-outline-difference); +} + +.tor-urlbar-button:focus-visible > * { + /* Negate the margin that would be added on focus to ensure the button does + * not grow in height. + * Ideally, this should not change anything noticeable, otherwise the text + * could be clipped when focused. */ + margin-block: calc(-1 * var(--tor-urlbar-focus-outline-difference)); +} + +#urlbar[usertyping] .tor-urlbar-button { + /* Hide whilst the user is typing in the url bar. */ + display: none; +} + +.tor-urlbar-button:hover { + --tor-urlbar-button-background-color: var(--purple-70); +} + +.tor-urlbar-button:hover:active { + --tor-urlbar-button-background-color: var(--purple-80); +} + +@media (prefers-color-scheme: dark) { + .tor-urlbar-button { + --tor-urlbar-button-background-color: var(--purple-50); + } + + .tor-urlbar-button:hover { + --tor-urlbar-button-background-color: var(--purple-60); + } + + .tor-urlbar-button:hover:active { + --tor-urlbar-button-background-color: var(--purple-70); + } +} + +/* Make the button look plain like the identity #urlbar-label-box. */ +.tor-urlbar-button.tor-urlbar-button-plain { + --tor-urlbar-button-background-color: var(--urlbar-box-bgcolor); + color: var(--urlbar-box-text-color); +} + +.tor-urlbar-button.tor-urlbar-button-plain:focus-visible { + outline-color: var(--focus-outline-color); +} + +.tor-urlbar-button.tor-urlbar-button-plain:hover { + --tor-urlbar-button-background-color: var(--urlbar-box-hover-bgcolor); + color: var(--urlbar-box-hover-text-color); +} + +.tor-urlbar-button.tor-urlbar-button-plain:hover:active { + --tor-urlbar-button-background-color: var(--urlbar-box-active-bgcolor); + color: var(--urlbar-box-hover-text-color); +} ===================================== devtools/shared/webconsole/network-helper.js ===================================== @@ -600,6 +600,9 @@ var NetworkHelper = { // The request did not contain any security info. if (!securityInfo) { + if (httpActivity.hostname && httpActivity.hostname.endsWith(".onion")) { + info.state = "secure"; + } return info; } @@ -651,7 +654,11 @@ var NetworkHelper = { // schemes other than https and wss are subject to // downgrade/etc at the scheme level and should always be // considered insecure - info.state = "insecure"; + if (httpActivity.hostname && httpActivity.hostname.endsWith(".onion")) { + info.state = "secure"; + } else { + info.state = "insecure"; + } } else if (state & wpl.STATE_IS_SECURE) { // The connection is secure if the scheme is sufficient info.state = "secure"; ===================================== dom/html/HTMLFormElement.cpp ===================================== @@ -893,7 +893,10 @@ nsresult HTMLFormElement::DoSecureToInsecureSubmitCheck(nsIURI* aActionURL, formIsHTTPS = OwnerDoc()->GetDocumentURI()->SchemeIs("https"); } if (!formIsHTTPS) { - return NS_OK; + bool formIsOnion = nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(OwnerDoc()->GetDocumentURI()); + if (!formIsOnion) { + return NS_OK; + } } if (nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackURL(aActionURL)) { ===================================== toolkit/torbutton/chrome/locale/en-US/torConnect.properties ===================================== @@ -3,10 +3,14 @@ # 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/. +torConnect.titlebarStatusName=Tor connection +torConnect.titlebarStatusNotConnected=Not connected +torConnect.titlebarStatusConnecting=Connecting… +torConnect.titlebarStatusPotentiallyBlocked=Potentially blocked +torConnect.titlebarStatusConnected=Connected + torConnect.torConnect=Connect to Tor torConnect.torConnecting=Establishing a Connection -torConnect.torNotConnectedConcise=Not Connected -torConnect.torConnectingConcise=Connecting… torConnect.tryingAgain=Trying again… torConnect.noInternet=Tor Browser couldn’t reach the Internet torConnect.noInternetDescription=This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again. @@ -35,7 +39,6 @@ torConnect.viewLog=View logs… torConnect.torConnectButton=Connect torConnect.cancel=Cancel torConnect.torConnected=Connected to the Tor network! -torConnect.torConnectedConcise=Connected torConnect.tryAgain=Try Again torConnect.connectMessage=Changes to Tor Settings will not take effect until you connect torConnect.tryAgainMessage=Tor Browser has failed to establish a connection to the Tor Network @@ -51,3 +54,8 @@ torConnect.autoBootstrappingFailed=Automatic configuration failed torConnect.autoBootstrappingAllFailed=None of the configurations we tried worked torConnect.cannotDetermineCountry=Unable to determine user country torConnect.noSettingsForCountry=No settings available for your location + +# Urlbar strings used up to 12.0 - TODO: remove when 12.5 becomes stable: +torConnect.torNotConnectedConcise=Not Connected +torConnect.torConnectingConcise=Connecting… +torConnect.torConnectedConcise=Connected ===================================== tools/update-packaging/common.sh ===================================== @@ -108,6 +108,28 @@ make_add_if_not_instruction() { echo "add-if-not \"$f\" \"$f\"" >> "$filev3" } +check_for_add_if_update() { + add_if_file_chk="$1" + + # tor-browser#41776: We will remove with the old fontconfig file manually + # outside the update process. So, let the updater add the file if there. + # TODO: Remove once we do a watershed release. + if [ "$add_if_file_chk" = "TorBrowser/Data/fontconfig/fonts.conf" ]; then + ## "true" *giggle* + return 0; + fi + ## 'false'... because this is bash. Oh yay! + return 1; +} + +make_add_if_instruction() { + f="$1" + filev3="$2" + + verbose_notice " add-if \"$f\" \"$f\"" + echo "add-if \"$f\" \"$f\"" >> "$filev3" +} + make_addsymlink_instruction() { link="$1" target="$2" ===================================== tools/update-packaging/make_full_update.sh ===================================== @@ -106,6 +106,9 @@ for ((i=0; $i<$num_files; i=$i+1)); do if check_for_add_if_not_update "$f"; then make_add_if_not_instruction "$f" "$updatemanifestv3" + elif check_for_add_if_update "$f"; then + # TODO: Remove once we do a watershed release + make_add_if_instruction "$f" "$updatemanifestv3" else make_add_instruction "$f" "$updatemanifestv3" fi ===================================== tools/update-packaging/make_incremental_update.sh ===================================== @@ -220,6 +220,17 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do continue 1 fi + if check_for_add_if_update "$f"; then + # TODO: Remove once we do a watershed release + # The full workdir may not exist yet, so create it if necessary. + mkdir -p `dirname "$workdir/$f"` + $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$newdir/$f" > "$workdir/$f" + copy_perm "$newdir/$f" "$workdir/$f" + make_add_if_instruction "$f" "$updatemanifestv3" + archivefiles="$archivefiles \"$f\"" + continue 1 + fi + if check_for_forced_update "$requested_forced_updates" "$f"; then # The full workdir may not exist yet, so create it if necessary. mkdir -p `dirname "$workdir/$f"` @@ -328,6 +339,9 @@ for ((i=0; $i<$num_newfiles; i=$i+1)); do if check_for_add_if_not_update "$f"; then make_add_if_not_instruction "$f" "$updatemanifestv3" + elif check_for_add_if_update "$f"; then + # TODO: Remove once we do a watershed release + make_add_if_instruction "$f" "$updatemanifestv3" else make_add_instruction "$f" "$updatemanifestv3" fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b547f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5b547f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.5-1] Bug 41749: Replace the onion-glyph with dedicated icon for onion services
by Pier Angelo Vendrame (＠pierov) 29 May '23

29 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d441f698 by Dan Ballard at 2023-05-29T07:59:44+00:00 Bug 41749: Replace the onion-glyph with dedicated icon for onion services - - - - - 3 changed files: - browser/themes/shared/identity-block/onion-slash.svg - browser/themes/shared/identity-block/onion-warning.svg - browser/themes/shared/identity-block/onion.svg Changes: ===================================== browser/themes/shared/identity-block/onion-slash.svg ===================================== @@ -1,5 +1,16 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill-opacity="context-fill-opacity" fill="#ff0039" /> - <path d="m 8,0.5000002 c -1.61963,0 -3.1197431,0.5137987 -4.3457031,1.3867188 l 0.84375,0.8417968 0.7792969,0.78125 0.8613281,0.8613282 0.8164062,0.8164062 0.9863281,0.984375 h 0.058594 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.01968 6.2e-4,0.039074 0,0.058594 L 10.8125,9.0449221 C 10.9334,8.7195921 11,8.3674002 11,8.0000002 c 0,-1.65685 -1.34314,-3 -3,-3 v -1.078125 c 2.25231,0 4.078125,1.825845 4.078125,4.078125 0,0.67051 -0.162519,1.3033281 -0.449219,1.8613281 l 0.861328,0.8613277 C 12.972434,9.9290067 13.25,8.9965102 13.25,8.0000002 c 0,-2.89949 -2.35049,-5.25 -5.25,-5.25 v -1.078125 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,1.29533 -0.388841,2.4990528 -1.056641,3.5019528 l 0.841797,0.84375 C 14.986181,11.119703 15.5,9.6196302 15.5,8.0000002 c 0,-4.14214 -3.3579,-7.5 -7.5,-7.5 z m -6.1113281,3.15625 C 1.0154872,4.8821451 0.5,6.3803304 0.5,8.0000002 0.5,12.1421 3.85786,15.5 8,15.5 c 1.6198027,0 3.117896,-0.515441 4.34375,-1.388672 L 11.501953,13.269531 C 10.498787,13.937828 9.295838,14.328125 8,14.328125 V 13.25 c 0.9967306,0 1.9287093,-0.277621 2.722656,-0.759766 L 9.859375,11.626953 C 9.3016226,11.913918 8.6705338,12.078125 8,12.078125 V 11 C 8.3664751,11 8.716425,10.93088 9.0410156,10.810547 6.6639891,8.4300416 4.2743195,6.0418993 1.8886719,3.6562502 Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_1827_6565)"> +<path d="M6.62435 8.54824C6.23983 8.91273 6 9.42836 6 10C6 11.1046 6.89543 12 8 12C8.57164 12 9.08727 11.7602 9.45176 11.3757L8.74414 10.668C8.56107 10.8718 8.29551 11 8 11C7.44772 11 7 10.5523 7 10C7 9.70449 7.12818 9.43893 7.33197 9.25586L6.62435 8.54824Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M9.99442 10.1505C9.99812 10.1008 10 10.0506 10 10C10 8.89543 9.10457 8 8 8C7.94936 8 7.89915 8.00188 7.84946 8.00558L9.99442 10.1505Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M5.20988 7.13377C4.46354 7.86041 4 8.87607 4 10C4 12.2091 5.79086 14 8 14C9.12393 14 10.1396 13.5365 10.8662 12.7901L10.159 12.0829C9.61343 12.6483 8.84778 13 8 13C6.34315 13 5 11.6569 5 10C5 9.15222 5.35166 8.38657 5.91707 7.84097L5.20988 7.13377Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M10.8331 10.9892C10.9412 10.6795 11 10.3466 11 10C11 8.34315 9.65685 7 8 7C7.65339 7 7.32052 7.05878 7.01079 7.16692L6.24731 6.40343C6.77658 6.14502 7.37135 6 8 6C10.2091 6 12 7.79086 12 10C12 10.6286 11.855 11.2234 11.5966 11.7527L10.8331 10.9892Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M14 10C14 8.223 13.2275 6.62643 12 5.52779V4C12 1.79086 10.2091 0 8 0C5.79086 0 4 1.79086 4 4V4.15613L5.50811 5.66423C6.2417 5.2417 7.09263 5 8 5C10.7614 5 13 7.23858 13 10C13 10.9074 12.7583 11.7583 12.3358 12.4919L13.0637 13.2199C13.6565 12.2896 14 11.1849 14 10ZM8 4C7.00883 4 6.0738 4.24033 5.25 4.66591V4C5.25 2.48122 6.48122 1.25 8 1.25C9.51878 1.25 10.75 2.48122 10.75 4V4.66591C9.9262 4.24033 8.99117 4 8 4Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M12.2805 14.2044C11.1919 15.3126 9.67621 16 8 16C4.68629 16 2 13.3137 2 10C2 8.32379 2.68736 6.80812 3.79558 5.71948L4.50272 6.42662C3.57545 7.33427 3 8.59993 3 10C3 12.7614 5.23858 15 8 15C9.40007 15 10.6657 14.4246 11.5734 13.4973L12.2805 14.2044Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M1.25801 3.93806C1.50209 3.69398 1.89782 3.69398 2.14189 3.93806L13.1419 14.9381C13.386 15.1821 13.386 15.5779 13.1419 15.8219C12.8978 16.066 12.5021 16.066 12.258 15.8219L1.25801 4.82194C1.01393 4.57787 1.01393 4.18214 1.25801 3.93806Z" fill="#F90D3F"/> +</g> +<defs> +<clipPath id="clip0_1827_6565"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> </svg> ===================================== browser/themes/shared/identity-block/onion-warning.svg ===================================== @@ -1,4 +1,13 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="M 7.5,0.5 C 3.35786,0.5 0,3.85786 0,8 c 0,3.7093 2.6930488,6.789278 6.2304688,7.392578 -0.032181,-0.0637 -0.060149,-0.128686 -0.085938,-0.195312 -0.00862,-0.02227 -0.01751,-0.04385 -0.025391,-0.06641 -0.023385,-0.0669 -0.043878,-0.135932 -0.060547,-0.205078 -0.00186,-0.0077 -0.00213,-0.01571 -0.00391,-0.02344 -0.017615,-0.07685 -0.032109,-0.153488 -0.041016,-0.232422 -7.27e-5,-6.44e-4 7.2e-5,-0.0013 0,-0.002 -0.0087,-0.07777 -0.011896,-0.157155 -0.011719,-0.236328 7.71e-5,-0.0337 2.127e-4,-0.06769 0.00195,-0.101563 3.337e-4,-0.0065 -3.955e-4,-0.01303 0,-0.01953 0.00318,-0.05219 0.0084,-0.10381 0.015625,-0.15625 0.03623,-0.263929 0.1235201,-0.529812 0.2714844,-0.787109 L 6.421875,13.138672 C 7.1130865,11.933878 7.8482649,10.654869 8.4882812,9.5390625 8.2033713,9.7224325 7.864,9.828125 7.5,9.828125 v -3.65625 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.02558 -9.131e-4,0.050842 -0.00195,0.076172 L 9.6015625,7.5957031 C 9.7779825,7.2883331 10.012797,7.0451975 10.279297,6.8671875 9.8324169,5.7717775 8.75611,5 7.5,5 V 3.921875 c 1.72627,0 3.201675,1.0728106 3.796875,2.5878906 0.4511,-0.0416 0.914353,0.052393 1.314453,0.2832032 C 12.066128,4.4750988 9.98426,2.75 7.5,2.75 V 1.671875 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,0.10641 -0.0026,0.2112863 -0.0078,0.3164062 L 14.74806,9.9355469 C 14.912447,9.3182669 15,8.66904 15,8 15,3.85786 11.6421,0.5 7.5,0.5 Z m 4,7 c -0.40375,0 -0.808156,0.19825 -1.035156,0.59375 l -3.3105471,5.771484 c -0.446,0.775 0.1271562,1.734375 1.0351562,1.734375 H 14.8125 c 0.907,0 1.478203,-0.959375 1.033203,-1.734375 L 12.535156,8.09375 C 12.308156,7.69825 11.90375,7.5 11.5,7.5 Z m 0,2.1015625 c 0.1658,0 0.324206,0.066384 0.441406,0.1835937 0.1172,0.1172101 0.183594,0.2757058 0.183594,0.4414058 v 1.748047 c 0,0.1658 -0.06639,0.324207 -0.183594,0.441407 -0.1172,0.1172 -0.275606,0.183593 -0.441406,0.183593 -0.1657,0 -0.324206,-0.06639 -0.441406,-0.183593 -0.1172,-0.1172 -0.183594,-0.275607 -0.183594,-0.441407 v -1.748047 c 0,-0.165699 0.06639,-0.3241957 0.183594,-0.4414058 C 11.175794,9.6679462 11.3343,9.6015625 11.5,9.6015625 Z m 0,3.7480465 c 0.1658,0 0.324206,0.06639 0.441406,0.183594 0.1172,0.1172 0.183594,0.275706 0.183594,0.441406 0,0.1658 -0.06639,0.32616 -0.183594,0.44336 -0.1172,0.1172 -0.275606,0.18164 -0.441406,0.18164 -0.1657,0 -0.324206,-0.06444 -0.441406,-0.18164 -0.1172,-0.1172 -0.183594,-0.27756 -0.183594,-0.44336 0,-0.1657 0.06639,-0.324206 0.183594,-0.441406 0.1172,-0.1172 0.275706,-0.183594 0.441406,-0.183594 z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<g clip-path="url(#clip0_1827_6566)"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M7.92788 10.5342L7.42044 11.408C7.05803 11.7736 6.55546 12 6 12C4.89543 12 4 11.1046 4 10C4 8.89543 4.89543 8 6 8C7.10457 8 8 8.89543 8 10C8 10.185 7.97488 10.3641 7.92788 10.5342ZM7 10C7 10.5523 6.55228 11 6 11C5.44772 11 5 10.5523 5 10C5 9.44772 5.44772 9 6 9C6.55228 9 7 9.44772 7 10Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M6.52221 12.9547C6.35262 12.9845 6.17812 13 6 13C4.34315 13 3 11.6569 3 10C3 8.34315 4.34315 7 6 7C7.30202 7 8.41032 7.82945 8.8253 8.98878L9.35089 8.08372C9.37772 8.03755 9.40587 7.99285 9.43523 7.94962C8.73673 6.78186 7.45967 6 6 6C3.79086 6 2 7.79086 2 10C2 12.1857 3.75302 13.9619 5.92975 13.9994C5.96208 13.9274 5.99884 13.8558 6.0402 13.7847L6.52221 12.9547Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1978 7.00088C10.8782 6.44807 10.4728 5.95098 10 5.52779V4C10 1.79086 8.20914 0 6 0C3.79086 0 2 1.79086 2 4V5.52779C0.772501 6.62643 0 8.223 0 10C0 13.3137 2.68629 16 6 16C6.03024 16 6.06043 15.9998 6.09057 15.9993C5.89561 15.7007 5.77424 15.3557 5.749 14.9938C3.10419 14.8631 1 12.6773 1 10C1 7.23858 3.23858 5 6 5C7.75288 5 9.29509 5.90201 10.1878 7.26719C10.5002 7.0977 10.8482 7.00893 11.1978 7.00088ZM6 4C5.00883 4 4.0738 4.24033 3.25 4.66591V4C3.25 2.48122 4.48122 1.25 6 1.25C7.51878 1.25 8.75 2.48122 8.75 4V4.66591C7.9262 4.24033 6.99117 4 6 4Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +<path d="M15.5956 14.2875L12.2846 8.58591C11.8306 7.8047 10.6696 7.8047 10.2156 8.58591L6.90465 14.2875C6.45865 15.0529 7.03065 16 7.93865 16H14.5616C15.4686 16 16.0406 15.0529 15.5956 14.2875ZM11.8746 12.4189C11.8746 12.5826 11.8088 12.7396 11.6916 12.8553C11.5744 12.9711 11.4154 13.0361 11.2496 13.0361C11.0839 13.0361 10.9249 12.9711 10.8077 12.8553C10.6905 12.7396 10.6246 12.5826 10.6246 12.4189V10.6935C10.6246 10.5298 10.6905 10.3728 10.8077 10.257C10.9249 10.1413 11.0839 10.0762 11.2496 10.0762C11.4154 10.0762 11.5744 10.1413 11.6916 10.257C11.8088 10.3728 11.8746 10.5298 11.8746 10.6935V12.4189ZM11.2496 15.0124C11.0839 15.0124 10.9249 14.9473 10.8077 14.8316C10.6905 14.7158 10.6246 14.5588 10.6246 14.3951C10.6246 14.2314 10.6905 14.0744 10.8077 13.9586C10.9249 13.8429 11.0839 13.7778 11.2496 13.7778C11.4154 13.7778 11.5744 13.8429 11.6916 13.9586C11.8088 14.0744 11.8746 14.2314 11.8746 14.3951C11.8746 14.5588 11.8088 14.7158 11.6916 14.8316C11.5744 14.9473 11.4154 15.0124 11.2496 15.0124Z" fill-opacity="context-fill-opacity" fill="context-fill"/> +</g> +<defs> +<clipPath id="clip0_1827_6566"> +<rect width="16" height="16" fill="white"/> +</clipPath> +</defs> </svg> ===================================== browser/themes/shared/identity-block/onion.svg ===================================== @@ -1,4 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="M 8 0.5 C 3.85786 0.5 0.5 3.85786 0.5 8 C 0.5 12.1421 3.85786 15.5 8 15.5 C 12.1421 15.5 15.5 12.1421 15.5 8 C 15.5 3.85786 12.1421 0.5 8 0.5 z M 8 1.671875 C 11.4949 1.671875 14.328125 4.50507 14.328125 8 C 14.328125 11.4949 11.4949 14.328125 8 14.328125 L 8 13.25 C 10.89951 13.25 13.25 10.89951 13.25 8 C 13.25 5.10051 10.89951 2.75 8 2.75 L 8 1.671875 z M 8 3.921875 C 10.25231 3.921875 12.078125 5.74772 12.078125 8 C 12.078125 10.25231 10.25231 12.078125 8 12.078125 L 8 11 C 9.65686 11 11 9.65686 11 8 C 11 6.34315 9.65686 5 8 5 L 8 3.921875 z M 8 6.171875 C 9.00965 6.171875 9.828125 6.99036 9.828125 8 C 9.828125 9.00965 9.00965 9.828125 8 9.828125 L 8 6.171875 z " clip-rule="evenodd" fill-rule="evenodd" fill="context-fill" fill-opacity="context-fill-opacity"/> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M8 13C9.65685 13 11 11.6569 11 10C11 8.34315 9.65685 7 8 7C6.34315 7 5 8.34315 5 10C5 11.6569 6.34315 13 8 13ZM8 14C10.2091 14 12 12.2091 12 10C12 7.79086 10.2091 6 8 6C5.79086 6 4 7.79086 4 10C4 12.2091 5.79086 14 8 14Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M8 11C8.55228 11 9 10.5523 9 10C9 9.44772 8.55228 9 8 9C7.44772 9 7 9.44772 7 10C7 10.5523 7.44772 11 8 11ZM8 12C9.10457 12 10 11.1046 10 10C10 8.89543 9.10457 8 8 8C6.89543 8 6 8.89543 6 10C6 11.1046 6.89543 12 8 12Z" fill="context-fill" fill-opacity="context-fill-opacity"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M12 5.52779C13.2275 6.62643 14 8.223 14 10C14 13.3137 11.3137 16 8 16C4.68629 16 2 13.3137 2 10C2 8.223 2.7725 6.62643 4 5.52779V4C4 1.79086 5.79086 0 8 0C10.2091 0 12 1.79086 12 4V5.52779ZM5.25 4.66591C6.0738 4.24033 7.00883 4 8 4C8.99117 4 9.9262 4.24033 10.75 4.66591V4C10.75 2.48122 9.51878 1.25 8 1.25C6.48122 1.25 5.25 2.48122 5.25 4V4.66591ZM13 10C13 12.7614 10.7614 15 8 15C5.23858 15 3 12.7614 3 10C3 7.23858 5.23858 5 8 5C10.7614 5 13 7.23858 13 10Z" fill="context-fill" fill-opacity="context-fill-opacity"/> </svg> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d441f69… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d441f69… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40858: Add a script for MacOS to selfsign an unsigned browser (so it can run on ARM Mx macs)
by Pier Angelo Vendrame (＠pierov) 29 May '23

29 May '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 96045df2 by Dan Ballard at 2023-05-29T08:02:10+00:00 Bug 40858: Add a script for MacOS to selfsign an unsigned browser (so it can run on ARM Mx macs) - - - - - 1 changed file: - + tools/browser-self-sign-macos.sh Changes: ===================================== tools/browser-self-sign-macos.sh ===================================== @@ -0,0 +1,110 @@ +#!/bin/bash + +CERTNAME=my-codesign-cert-tor +BROWSERPATH=. + +if [ $# -ge 1 ] +then + BROWSERPATH=$1 +fi + + +security find-certificate -c $CERTNAME > /dev/null + +if [ $? -ne 0 ] +then + echo "" + echo "ERROR: Self Signing Certificate not found, please create:" + echo " 1. In the Keychain Access app on your Mac, choose Keychain Access > Certificate Assistant > Create a Certificate." + echo " 2. Enter the name '$CERTNAME' for the certificate" + echo " 3. Choose an identity type: Self Signed Root" + echo " 4. Certificate Type > Code Signing" + echo " 5. Check 'Let me override defaults' & click Continue." + echo " 6. Enter a unique Serial Number. (123 is fine)" + echo " 7. Enter a big Validity Period (days), like 3560 & click Continue." + echo " 8. Fill in your personal information & click Continue." + echo " 9. Accept defaults for the rest of the dialog boxes. (Continue several times)" + echo " 10. Certificate Created! Click Done." + echo "" + echo "For additional help see:" + echo " https://support.apple.com/en-ca/guide/keychain-access/kyca8916/mac" + echo " https://stackoverflow.com/questions/58356844/what-are-the-ways-or-technolog…" + + echo "" + read -n 1 -r -s -p $'Press enter to launch "Keychain Access"...\n' + open /System/Applications/Utilities/Keychain\ Access.app + + exit -1 +fi + +echo "Found $CERTNAME, looking for browser to sign..." + +if [ ! -f "$BROWSERPATH/XUL" ] +then + TESTPATH="$BROWSERPATH/Contents/MacOS" + if [ -f "$TESTPATH/XUL" ] + then + BROWSERPATH=$TESTPATH + else + echo "Error: browser files not detected in $BROWSERPATH!" + echo " This script needs to be run in the 'Contents/MacOS' directory of a SomeBrowser.app directory" + exit -1 + fi +fi + +echo "Mozilla based browser found, signing..." +echo ' Will be asked for password to certificate for all the things that need to be signed. Click "Always Allow" to automate' + +cd "$BROWSERPATH" + +codesign -s $CERTNAME *.dylib +codesign -s $CERTNAME plugin-container.app + +if [ -d Tor ] +then + codesign -s $CERTNAME Tor/PluggableTransports/* + codesign -s $CERTNAME Tor/libevent-2.1.7.dylib + if [ -f Tor/tor.real ] + then + codesign -s $CERTNAME Tor/tor.real + fi + if [ -f Tor/tor ] + then + codesign -s $CERTNAME Tor/tor + fi +fi + +codesign -s $CERTNAME XUL + +if [ -d updater.app ] +then + codesign -s $CERTNAME updater.app +fi + +# mullvadbrowser +if [ -f mullvadbrowser ] +then + codesign -s $CERTNAME mullvadbrowser +fi + +# BB or TB +if [ -f firefox ] +then + codesign -s $CERTNAME firefox +fi + +echo "" +echo "Browser signing step done!" +echo "" + +echo "App still needs one more override to be easily opened with double click in Finder" +echo "Alternatively you can right click it, select 'Open' and then select 'Open' from the override popup" +echo "Or to enable it to be double clicked to open perform the following" +echo "" +echo "Double click the app and select either 'Ok' or 'Cancel' from the warning popup depending on which you get (Do Not 'Move to Trash')" +echo 'Go to Preferences -> Security & Privacy and click on padlock to allow changes. ' +echo ' Then in "Allow appications downloaded from" select either:' +echo ' - App Store and identified developers' +echo ' - Anywhere' +echo ' Below that may be a notice about your specific app saying it was blocked because it was not from an identified developer. Click "Open Anyways" and "Open"' + 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

[Git][tpo/applications/tor-browser-build][main] Bug 40850: Use obfs4 main branch in nightly
by richard (＠richard) 25 May '23

25 May '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ee633476 by Nicolas Vigier at 2023-05-25T20:28:24+00:00 Bug 40850: Use obfs4 main branch in nightly In 076ffcf14d8f51d1837889c25a0fddc0afc42796 we stopped using the main branch, because the build of tpo/anti-censorship/pluggable-transports/obfs4#40011. Since this is now fixed, we can use the main branch again. - - - - - 1 changed file: - projects/obfs4/config Changes: ===================================== projects/obfs4/config ===================================== @@ -11,14 +11,13 @@ container: var: go_vendor_sha256sum: 5d2d82d00afc5fe044ee6df718ffe066b7d9e5446944c0ee0870e060e4e6bcc8 -# Stop using `main` on nightly, until tor-browser-build#40850 is fixed -#targets: -# nightly: -# git_hash: main -# version: '[% c("abbrev") %]' -# tag_gpg_id: 0 -# var: -# go_vendor_sha256sum: ad5cbcb09580c74b02b230b4fad7d2362c3b2f4537cdefd4abdeb0c3c4e97adb +targets: + nightly: + git_hash: main + version: '[% c("abbrev") %]' + tag_gpg_id: 0 + var: + go_vendor_sha256sum: 8b7e04a43bfbcdc829ea5093d8ee0a50eddefad543acd201b25424b33a7f882b steps: build: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.5-1] 6 commits: fixup! Bug 40597: Implement TorSettings module
by richard (＠richard) 25 May '23

25 May '23

richard pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f89920b2 by Henry Wilkes at 2023-05-25T19:57:03+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Ignore tor connection errors when tor connection is cancelled by the user. This can happen if the bootstrap process is cancelled late in the process. Also remove unused cancelAutoBootstrapping. - - - - - 77d2560d by Henry Wilkes at 2023-05-25T19:57:03+00:00 fixup! Add TorStrings module for localization Bug 41608 - Add new connection status strings. - - - - - efa05015 by Henry Wilkes at 2023-05-25T19:57:03+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Use the torconnect icon for the onion slash. - - - - - a71b5035 by Henry Wilkes at 2023-05-25T19:57:03+00:00 fixup! Bug 21952: Implement Onion-Location Bug 41608 - Use the same styling for ".onion available" urlbar button as the tor-connect-urlbar-button. This also stops the button from overflowing its container like before. Also move to after the bookmark button. - - - - - ba98c304 by Henry Wilkes at 2023-05-25T19:57:03+00:00 amend! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - 702051f1 by Henry Wilkes at 2023-05-25T19:57:03+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 and 41526 - Use KeyboardEvent.repeat to block triggering newly focused buttons in about:torconnect. The approach in tor-browser!607 prevented this by waiting for keyup, but keyup could still be triggered by a key event initialized elsewhere. E.g. when pressing Enter to close a modal dialog, the Enter's keyup event would be sent to the about:torconnect page and trigger the focused button. - - - - - 21 changed files: - browser/base/content/browser.js - browser/base/content/browser.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml - browser/components/onionservices/content/onionlocation.css - browser/components/torconnect/content/aboutTorConnect.js - − browser/components/torconnect/content/onion-slash.svg - − browser/components/torconnect/content/torBootstrapUrlbar.js - + browser/components/torconnect/content/torConnectTitlebarStatus.css - + browser/components/torconnect/content/torConnectTitlebarStatus.js - + browser/components/torconnect/content/torConnectUrlbarButton.js - − browser/components/torconnect/content/torconnect-urlbar.css - − browser/components/torconnect/content/torconnect-urlbar.inc.xhtml - browser/components/torconnect/jar.mn - browser/components/torpreferences/content/torPreferences.css - browser/modules/TorConnect.jsm - browser/modules/TorStrings.jsm - browser/themes/shared/browser-shared.css - browser/themes/shared/jar.inc.mn - + browser/themes/shared/tor-urlbar-button.css - toolkit/torbutton/chrome/locale/en-US/torConnect.properties Changes: ===================================== browser/base/content/browser.js ===================================== @@ -80,6 +80,8 @@ XPCOMUtils.defineLazyModuleGetters(this, { TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm", TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm", TorConnect: "resource:///modules/TorConnect.jsm", + TorConnectState: "resource:///modules/TorConnect.jsm", + TorConnectTopics: "resource:///modules/TorConnect.jsm", Translation: "resource:///modules/translation/TranslationParent.jsm", UITour: "resource:///modules/UITour.jsm", UpdateUtils: "resource://gre/modules/UpdateUtils.jsm", @@ -269,6 +271,16 @@ XPCOMUtils.defineLazyScriptGetter( "gSharedTabWarning", "chrome://browser/content/browser-webrtc.js" ); +XPCOMUtils.defineLazyScriptGetter( + this, + ["gTorConnectUrlbarButton"], + "chrome://browser/content/torconnect/torConnectUrlbarButton.js" +); +XPCOMUtils.defineLazyScriptGetter( + this, + ["gTorConnectTitlebarStatus"], + "chrome://browser/content/torconnect/torConnectTitlebarStatus.js" +); XPCOMUtils.defineLazyScriptGetter( this, ["gTorCircuitPanel"], @@ -1808,6 +1820,9 @@ var gBrowserInit = { // Init the OnionAuthPrompt OnionAuthPrompt.init(); + gTorConnectUrlbarButton.init(); + gTorConnectTitlebarStatus.init(); + gTorCircuitPanel.init(); // Certain kinds of automigration rely on this notification to complete @@ -1895,8 +1910,6 @@ var gBrowserInit = { } this._loadHandled = true; - - TorBootstrapUrlbar.init(); }, _cancelDelayedStartup() { @@ -2554,9 +2567,10 @@ var gBrowserInit = { OnionAuthPrompt.uninit(); - gTorCircuitPanel.uninit(); + gTorConnectUrlbarButton.uninit(); + gTorConnectTitlebarStatus.uninit(); - TorBootstrapUrlbar.uninit(); + gTorCircuitPanel.uninit(); gAccessibilityServiceIndicator.uninit(); ===================================== browser/base/content/browser.xhtml ===================================== @@ -37,6 +37,7 @@ <?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/onionservices/onionservices.css" type="text/css"?> <?xml-stylesheet href="chrome://browser/content/torCircuitPanel.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/torconnect/torConnectTitlebarStatus.css" type="text/css"?> <!DOCTYPE window [ #include browser-doctype.inc @@ -123,7 +124,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/torconnect/torBootstrapUrlbar.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -93,6 +93,11 @@ aria-live="polite"/> <hbox class="private-browsing-indicator"/> + <html:div id="tor-connect-titlebar-status" role="status"> + <html:img alt="" id="tor-connect-titlebar-status-icon" /> + <html:span id="tor-connect-titlebar-status-label"></html:span> + </html:div> + #include titlebar-items.inc.xhtml </toolbar> @@ -335,7 +340,6 @@ data-l10n-id="urlbar-go-button"/> <hbox id="page-action-buttons" context="pageActionContextMenu"> <toolbartabstop/> -#include ../../components/torconnect/content/torconnect-urlbar.inc.xhtml <hbox id="contextual-feature-recommendation" role="button" hidden="true"> <hbox id="cfr-label-container"> <label id="cfr-label"/> @@ -363,9 +367,6 @@ onclick="FullZoom.reset(); FullZoom.resetScalingZoom();" tooltip="dynamic-shortcut-tooltip" hidden="true"/> - -#include ../../components/onionservices/content/onionlocation-urlbar.inc.xhtml - <hbox id="pageActionButton" class="urlbar-page-action" role="button" @@ -383,6 +384,15 @@ class="urlbar-icon"/> </hbox> </hbox> + + <hbox id="tor-connect-urlbar-button" + role="button" + class="tor-urlbar-button" + hidden="true"> + <label id="tor-connect-urlbar-button-label"/> + </hbox> + +#include ../../components/onionservices/content/onionlocation-urlbar.inc.xhtml </hbox> </hbox> <toolbartabstop/> ===================================== browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml ===================================== @@ -1,10 +1,10 @@ # Copyright (c) 2020, The Tor Project, Inc. <hbox id="onion-location-box" - class="urlbar-icon-wrapper urlbar-page-action" + class="tor-urlbar-button" role="button" hidden="true" onclick="OnionLocationParent.buttonClick(event);"> <image id="onion-location-button" role="presentation"/> - <hbox id="onion-label-container"><label id="onion-label"/></hbox> + <label id="onion-label"/> </hbox> ===================================== browser/components/onionservices/content/onionlocation.css ===================================== @@ -1,44 +1,9 @@ /* Copyright (c) 2020, The Tor Project, Inc. */ -#onion-location-box { - background-color: var(--purple-60); - -moz-context-properties: fill; - fill: white; -} - -#onion-location-box:hover { - background-color: var(--purple-70); -} - -#onion-location-box:active { - background-color: var(--purple-80); -} - -@media (prefers-color-scheme: dark) { - #onion-location-box { - background-color: var(--purple-50); - } - - #onion-location-box:hover { - background-color: var(--purple-60); - } - - #onion-location-box:active { - background-color: var(--purple-70); - } -} - #onion-location-button { list-style-image: url(chrome://browser/content/onionservices/onionlocation.svg); - padding-inline-start: 0.5em; -} - -label#onion-label { - margin: 0; - padding-block: 0; - padding-inline: 0.5em; - color: white; - font-weight: normal; + -moz-context-properties: fill; + fill: currentColor; } .onionlocation-notification-icon { ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -769,26 +769,29 @@ class AboutTorConnect { } }); - // Delay the "Enter" activation of the given button from "keydown" to - // "keyup". + // Prevent repeat triggering on keydown when the Enter key is held down. // - // Without this, holding down Enter will continue to trigger the button - // until the user stops holding. This means that a user can accidentally - // re-trigger a button several times. This is particularly bad when the - // focus gets moved to a new button, and the new button can get triggered - // immediately. E.g. when the "Connect" button is triggered it disappears - // and focus moves to the "Cancel" button. + // Without this, holding down Enter will continue to trigger the button's + // click event until the user stops holding. This means that a user can + // accidentally re-trigger a button several times. And if focus moves to a + // new button it can also get triggered, despite not receiving the initial + // keydown event. + // + // E.g. If the user presses down Enter on the "Connect" button it will + // trigger and focus will move to the "Cancel" button. This should prevent + // the user accidentally triggering the "Cancel" button if they hold down + // Enter for a little bit too long. for (const button of document.body.querySelectorAll("button")) { button.addEventListener("keydown", event => { - if (event.key === "Enter") { + // If the keydown is a repeating Enter event, ignore it. + // NOTE: If firefox uses wayland display (rather than xwayland), the + // "repeat" event is always "false" so this will not work. + // See bugzilla bug 1784438. Also see bugzilla bug 1594003. + // Currently tor browser uses xwayland by default on linux. + if (event.key === "Enter" && event.repeat) { event.preventDefault(); } }); - button.addEventListener("keyup", event => { - if (event.key === "Enter") { - button.click(); - } - }); } } ===================================== browser/components/torconnect/content/onion-slash.svg deleted ===================================== @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg"> - <path d="m14.1161 15.6245c-.0821.0001-.1634-.016-.2393-.0474-.0758-.0314-.1447-.0775-.2027-.1356l-12.749984-12.749c-.109266-.11882-.168406-.27526-.165071-.43666.003335-.16139.068886-.31525.182967-.42946.114078-.11421.267868-.17994.429258-.18345.16139-.00352.3179.05544.43685.16457l12.74998 12.75c.1168.1176.1824.2767.1824.4425s-.0656.3249-.1824.4425c-.058.058-.1269.1039-.2028.1352-.0759.0312-.1571.0471-.2392.0468z" fill-opacity="context-fill-opacity" fill="#ff0039" /> - <path d="m 8,0.5000002 c -1.61963,0 -3.1197431,0.5137987 -4.3457031,1.3867188 l 0.84375,0.8417968 0.7792969,0.78125 0.8613281,0.8613282 0.8164062,0.8164062 0.9863281,0.984375 h 0.058594 c 1.00965,0 1.828125,0.818485 1.828125,1.828125 0,0.01968 6.2e-4,0.039074 0,0.058594 L 10.8125,9.0449221 C 10.9334,8.7195921 11,8.3674002 11,8.0000002 c 0,-1.65685 -1.34314,-3 -3,-3 v -1.078125 c 2.25231,0 4.078125,1.825845 4.078125,4.078125 0,0.67051 -0.162519,1.3033281 -0.449219,1.8613281 l 0.861328,0.8613277 C 12.972434,9.9290067 13.25,8.9965102 13.25,8.0000002 c 0,-2.89949 -2.35049,-5.25 -5.25,-5.25 v -1.078125 c 3.4949,0 6.328125,2.833195 6.328125,6.328125 0,1.29533 -0.388841,2.4990528 -1.056641,3.5019528 l 0.841797,0.84375 C 14.986181,11.119703 15.5,9.6196302 15.5,8.0000002 c 0,-4.14214 -3.3579,-7.5 -7.5,-7.5 z m -6.1113281,3.15625 C 1.0154872,4.8821451 0.5,6.3803304 0.5,8.0000002 0.5,12.1421 3.85786,15.5 8,15.5 c 1.6198027,0 3.117896,-0.515441 4.34375,-1.388672 L 11.501953,13.269531 C 10.498787,13.937828 9.295838,14.328125 8,14.328125 V 13.25 c 0.9967306,0 1.9287093,-0.277621 2.722656,-0.759766 L 9.859375,11.626953 C 9.3016226,11.913918 8.6705338,12.078125 8,12.078125 V 11 C 8.3664751,11 8.716425,10.93088 9.0410156,10.810547 6.6639891,8.4300416 4.2743195,6.0418993 1.8886719,3.6562502 Z" fill-opacity="context-fill-opacity" fill="context-fill"/> -</svg> ===================================== browser/components/torconnect/content/torBootstrapUrlbar.js deleted ===================================== @@ -1,95 +0,0 @@ -// Copyright (c) 2021, The Tor Project, Inc. - -"use strict"; - -const { TorConnect, TorConnectTopics, TorConnectState } = ChromeUtils.import( - "resource:///modules/TorConnect.jsm" -); -const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); - -/* globals browser, gURLBar, Services */ - -var TorBootstrapUrlbar = { - selectors: Object.freeze({ - torConnect: { - box: "hbox#torconnect-box", - label: "label#torconnect-label", - }, - }), - - elements: null, - - updateTorConnectBox(state) { - switch (state) { - case TorConnectState.Initial: - case TorConnectState.Configuring: - case TorConnectState.AutoConfiguring: - case TorConnectState.Error: - case TorConnectState.FatalError: { - this.elements.torConnectBox.removeAttribute("hidden"); - this.elements.torConnectLabel.textContent = - TorStrings.torConnect.torNotConnectedConcise; - this.elements.inputContainer.setAttribute("torconnect", "offline"); - break; - } - case TorConnectState.Bootstrapping: { - this.elements.torConnectBox.removeAttribute("hidden"); - this.elements.torConnectLabel.textContent = - TorStrings.torConnect.torConnectingConcise; - this.elements.inputContainer.setAttribute("torconnect", "connecting"); - break; - } - case TorConnectState.Bootstrapped: { - this.elements.torConnectBox.removeAttribute("hidden"); - this.elements.torConnectLabel.textContent = - TorStrings.torConnect.torConnectedConcise; - this.elements.inputContainer.setAttribute("torconnect", "connected"); - // hide torconnect box after 5 seconds - setTimeout(() => { - this.elements.torConnectBox.setAttribute("hidden", "true"); - }, 5000); - break; - } - case TorConnectState.Disabled: { - this.elements.torConnectBox.setAttribute("hidden", "true"); - break; - } - default: - break; - } - }, - - observe(aSubject, aTopic, aData) { - if (aTopic === TorConnectTopics.StateChange) { - const obj = aSubject?.wrappedJSObject; - this.updateTorConnectBox(obj?.state); - } - }, - - init() { - if (TorConnect.shouldShowTorConnect) { - // browser isn't populated until init - this.elements = Object.freeze({ - torConnectBox: browser.ownerGlobal.document.querySelector( - this.selectors.torConnect.box - ), - torConnectLabel: browser.ownerGlobal.document.querySelector( - this.selectors.torConnect.label - ), - inputContainer: gURLBar._inputContainer, - }); - this.elements.torConnectBox.addEventListener("click", () => { - TorConnect.openTorConnect(); - }); - Services.obs.addObserver(this, TorConnectTopics.StateChange); - this.observing = true; - this.updateTorConnectBox(TorConnect.state); - } - }, - - uninit() { - if (this.observing) { - Services.obs.removeObserver(this, TorConnectTopics.StateChange); - } - }, -}; ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.css ===================================== @@ -0,0 +1,38 @@ +#tor-connect-titlebar-status:not([hidden]) { + display: flex; + align-items: center; + /* Want same as #private-browsing-indicator-with-label */ + margin-inline: 7px; +} + +#tor-connect-titlebar-status-label { + margin-inline: 6px; + white-space: nowrap; +} + +#tor-connect-titlebar-status-icon { + -moz-context-properties: fill; + fill: currentColor; + width: 16px; + height: 16px; +} + +#tor-connect-titlebar-status-icon.tor-connect-status-connected { + fill: var(--purple-60); +} + +@media (prefers-color-scheme: dark) { + #tor-connect-titlebar-status-icon.tor-connect-status-connected { + fill: var(--purple-30); + } +} + +#tor-connect-titlebar-status-icon.tor-connect-status-potentially-blocked { + fill: #c50042; +} + +@media (prefers-color-scheme: dark) { + #tor-connect-titlebar-status-icon.tor-connect-status-potentially-blocked { + fill: #ff9aa2; + } +} ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.js ===================================== @@ -0,0 +1,115 @@ +/* eslint-env mozilla/browser-window */ + +/** + * A TorConnect status shown in the application title bar. + */ +var gTorConnectTitlebarStatus = { + /** + * The status element in the title bar. + * + * @type {Element} + */ + node: null, + /** + * The status label. + * + * @type {Element} + */ + label: null, + /** + * The status icon. + * + * @type {Element} + */ + icon: null, + + /** + * Initialize the component. + */ + init() { + const { TorStrings } = ChromeUtils.import( + "resource:///modules/TorStrings.jsm" + ); + + this._strings = TorStrings.torConnect; + + this.node = document.getElementById("tor-connect-titlebar-status"); + this.icon = document.getElementById("tor-connect-titlebar-status-icon"); + this.label = document.getElementById("tor-connect-titlebar-status-label"); + // The title also acts as an accessible name for the role="status". + this.node.setAttribute("title", this._strings.titlebarStatusName); + + this._observeTopic = TorConnectTopics.StateChange; + this._stateListener = { + observe: (subject, topic, data) => { + if (topic !== this._observeTopic) { + return; + } + this._torConnectStateChanged(); + }, + }; + Services.obs.addObserver(this._stateListener, this._observeTopic); + + this._torConnectStateChanged(); + }, + + /** + * De-initialize the component. + */ + deinit() { + Services.obs.removeObserver(this._stateListener, this._observeTopic); + }, + + /** + * Callback for when the TorConnect state changes. + */ + _torConnectStateChanged() { + let textId; + let connected = false; + let potentiallyBlocked = false; + switch (TorConnect.state) { + case TorConnectState.Disabled: + // Hide immediately. + this.node.hidden = true; + return; + case TorConnectState.Bootstrapped: + this._startHiding(); + textId = "titlebarStatusConnected"; + connected = true; + break; + case TorConnectState.Bootstrapping: + case TorConnectState.AutoBootstrapping: + textId = "titlebarStatusConnecting"; + break; + default: + if (TorConnect.potentiallyBlocked) { + textId = "titlebarStatusPotentiallyBlocked"; + potentiallyBlocked = true; + } else { + textId = "titlebarStatusNotConnected"; + } + break; + } + this.label.textContent = this._strings[textId]; + this.icon.setAttribute( + "src", + connected + ? "chrome://browser/content/torconnect/onion.svg" + : "chrome://browser/content/torconnect/onion-slash-fillable.svg" + ); + this.icon.classList.toggle("tor-connect-status-connected", connected); + this.icon.classList.toggle( + "tor-connect-status-potentially-blocked", + potentiallyBlocked + ); + }, + + /** + * Mark the component to be hidden after some delay. + */ + _startHiding() { + setTimeout(() => { + this.node.hidden = true; + }, 5000); + }, +}; ===================================== browser/components/torconnect/content/torConnectUrlbarButton.js ===================================== @@ -0,0 +1,155 @@ +/* eslint-env mozilla/browser-window */ + +/** + * A "Connect" button shown in the urlbar when not connected to tor and in tabs + * other than about:torconnect. + */ +var gTorConnectUrlbarButton = { + /** + * The urlbar button node. + * + * @type {Element} + */ + button: null, + /** + * Whether we are active. + * + * @type {boolean} + */ + _isActive: false, + /** + * Whether we are in the "about:torconnect" tab. + * + * @type {boolean} + */ + // We init to "true" so that the button can only appear after the first page + // load. + _inAboutTorConnectTab: true, + + /** + * Initialize the button. + */ + init() { + if (this._isActive) { + return; + } + this._isActive = true; + + const { TorStrings } = ChromeUtils.import( + "resource:///modules/TorStrings.jsm" + ); + + this.button = document.getElementById("tor-connect-urlbar-button"); + document.getElementById("tor-connect-urlbar-button-label").value = + TorStrings.torConnect.torConnectButton; + this.button.addEventListener("click", event => { + if (event.button !== 0) { + return; + } + this.connect(); + }); + this.button.addEventListener("keydown", event => { + if (event.key !== "Enter" && event.key !== " ") { + return; + } + this.connect(); + }); + + this._observeTopic = TorConnectTopics.StateChange; + this._stateListener = { + observe: (subject, topic, data) => { + if (topic !== this._observeTopic) { + return; + } + this._torConnectStateChanged(); + }, + }; + Services.obs.addObserver(this._stateListener, this._observeTopic); + + this._locationListener = { + onLocationChange: (webProgress, request, locationURI, flags) => { + if ( + webProgress.isTopLevel && + !(flags & Ci.nsIWebProgressListener.LOCATION_CHANGE_SAME_DOCUMENT) + ) { + this._inAboutTorConnectTab = gBrowser.selectedBrowser.currentURI?.spec.startsWith( + "about:torconnect" + ); + this._updateButtonVisibility(); + } + }, + }; + // Notified of new locations for the currently selected browser (tab) *and* + // switching selected browser. + gBrowser.addProgressListener(this._locationListener); + + this._torConnectStateChanged(); + }, + + /** + * Deactivate and de-initialize the button. + */ + deinit() { + if (!this._isActive) { + return; + } + this._isActive = false; + + Services.obs.removeObserver(this._stateListener, this._observeTopic); + gBrowser.removeProgressListener(this._locationListener); + this._updateButtonVisibility(); + }, + + /** + * Begin the tor connection bootstrapping process. + */ + connect() { + TorConnect.openTorConnect({ beginBootstrap: true }); + }, + + /** + * Callback for when the TorConnect state changes. + */ + _torConnectStateChanged() { + if ( + TorConnect.state === TorConnectState.Bootstrapped || + TorConnect.state === TorConnectState.Disabled + ) { + this.deinit(); + return; + } + this._updateButtonVisibility(); + }, + + /** + * Callback when the TorConnect state, current browser location, or activation + * state changes. + */ + _updateButtonVisibility() { + if (!this.button) { + return; + } + // NOTE: We do not manage focus when hiding the button. We only expect to + // move from "not hidden" to "hidden" when: + // + switching tabs to "about:torconnect", or + // + starting bootstrapping. + // + // When switching tabs, the normal tab switching logic will eventually move + // focus to the new tab or url bar, so whilst the focus may be lost + // temporarily when we hide the button, it will be re-established quickly on + // tab switch. + // + // And we don't expect bootstrapping to start whilst outside of the + // "about:torconnect", and the automatic bootstrapping should only trigger + // at the initial start. + this.button.hidden = + !this._isActive || + this._inAboutTorConnectTab || + !TorConnect.enabled || + !TorConnect.canBeginBootstrap; + this.button.classList.toggle( + "tor-urlbar-button-plain", + TorConnect.potentiallyBlocked + ); + }, +}; ===================================== browser/components/torconnect/content/torconnect-urlbar.css deleted ===================================== @@ -1,37 +0,0 @@ -/* - ensure our torconnect button is always visible (same rule as for the bookmark button) -*/ -label#torconnect-label { - margin: 0; - opacity: 0.6; - padding: 0 0.5em; -} - -hbox.urlbar-page-action#torconnect-box { - display: -moz-inline-box!important; -} - -/* hide when hidden attribute is set */ -hbox.urlbar-page-action#torconnect-box[hidden="true"], -/* hide when user is typing in URL bar */ -#urlbar[usertyping] > #urlbar-input-container > #page-action-buttons > #torconnect-box { - display: none!important; -} - -/* hide urlbar's placeholder text when not connectd to tor */ -hbox#urlbar-input-container[torconnect="offline"] input#urlbar-input::placeholder, -hbox#urlbar-input-container[torconnect="connecting"] input#urlbar-input::placeholder { - opacity: 0; -} - -/* hide search suggestions when not connected to tor */ -hbox#urlbar-input-container[torconnect="offline"] + vbox.urlbarView, -hbox#urlbar-input-container[torconnect="connecting"] + vbox.urlbarView { - display: none!important; -} - -/* hide search icon when we are not connected to tor */ -hbox#urlbar-input-container[torconnect="offline"] > #identity-box[pageproxystate="invalid"] > #identity-icon, -hbox#urlbar-input-container[torconnect="connecting"] > #identity-box[pageproxystate="invalid"] > #identity-icon { - display: none!important; -} ===================================== browser/components/torconnect/content/torconnect-urlbar.inc.xhtml deleted ===================================== @@ -1,11 +0,0 @@ -# Copyright (c) 2021, The Tor Project, Inc. - -<hbox id="torconnect-box" - class="urlbar-icon-wrapper urlbar-page-action" - role="status" - align="center" - hidden="true"> - <hbox id="torconnect-container"> - <label id="torconnect-label"/> - </hbox> -</hbox> \ No newline at end of file ===================================== browser/components/torconnect/jar.mn ===================================== @@ -1,5 +1,7 @@ browser.jar: - content/browser/torconnect/torBootstrapUrlbar.js (content/torBootstrapUrlbar.js) + content/browser/torconnect/torConnectUrlbarButton.js (content/torConnectUrlbarButton.js) + content/browser/torconnect/torConnectTitlebarStatus.js (content/torConnectTitlebarStatus.js) + content/browser/torconnect/torConnectTitlebarStatus.css (content/torConnectTitlebarStatus.css) content/browser/torconnect/aboutTorConnect.css (content/aboutTorConnect.css) * content/browser/torconnect/aboutTorConnect.xhtml (content/aboutTorConnect.xhtml) content/browser/torconnect/aboutTorConnect.js (content/aboutTorConnect.js) @@ -8,6 +10,4 @@ browser.jar: content/browser/torconnect/connection-failure.svg (content/connection-failure.svg) content/browser/torconnect/connection-location.svg (content/connection-location.svg) content/browser/torconnect/onion.svg (content/onion.svg) - content/browser/torconnect/onion-slash.svg (content/onion-slash.svg) content/browser/torconnect/onion-slash-fillable.svg (content/onion-slash-fillable.svg) - skin/classic/browser/torconnect-urlbar.css (content/torconnect-urlbar.css) ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -58,7 +58,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { #torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-icon { - mask: url("chrome://browser/skin/onion-slash.svg"); + mask: url("chrome://browser/content/torconnect/onion-slash-fillable.svg"); background-color: white; } ===================================== browser/modules/TorConnect.jsm ===================================== @@ -99,7 +99,7 @@ const TorConnectState = Object.freeze({ └─┼─────▶ │ │ │ │ └──────────────────────────────────────────────────────────┘ │ │ │ ▲ │ - │ │ beginAutoBootstrap() │ cancelAutoBootstrap() │ + │ │ beginAutoBootstrap() │ cancelBootstrap() │ │ ▼ │ │ │ ┌───────────────────────┐ │ │ └────── │ AutoBootstrapping │ ─┘ │ @@ -464,6 +464,7 @@ const TorConnect = (() => { const tbr = new TorBootstrapRequest(); const internetTest = new InternetTest(); + let cancelled = false; let bootstrapError = ""; let bootstrapErrorDetails = ""; @@ -506,6 +507,7 @@ const TorConnect = (() => { this.on_transition = async nextState => { if (nextState === TorConnectState.Configuring) { // stop bootstrap process if user cancelled + cancelled = true; internetTest.cancel(); await tbr.cancel(); } @@ -520,6 +522,19 @@ const TorConnect = (() => { TorConnect._changeState(TorConnectState.Bootstrapped); }; tbr.onbootstraperror = (message, details) => { + if (cancelled) { + // We ignore this error since it occurred after cancelling (by + // the user). We assume the error is just a side effect of the + // cancelling. + // E.g. If the cancelling is triggered late in the process, we + // get "Building circuits: Establishing a Tor circuit failed". + // TODO: Maybe move this logic deeper in the process to know + // when to filter out such errors triggered by cancelling. + console.log( + `TorConnect: Post-cancel error => ${message}; ${details}` + ); + return; + } // We have to wait for the Internet test to finish before sending the bootstrap error bootstrapError = message; bootstrapErrorDetails = details; @@ -1023,11 +1038,6 @@ const TorConnect = (() => { this._changeState(TorConnectState.AutoBootstrapping, countryCode); }, - cancelAutoBootstrap() { - console.log("TorConnect: cancelAutoBootstrap()"); - this._changeState(TorConnectState.Configuring); - }, - /* Further external commands and helper methods */ ===================================== browser/modules/TorStrings.jsm ===================================== @@ -207,10 +207,6 @@ const Loader = { torConnecting: "Establishing a Connection", - torNotConnectedConcise: "Not Connected", - - torConnectingConcise: "Connecting…", - tryingAgain: "Trying again…", noInternet: "Tor Browser couldn’t reach the Internet", @@ -250,8 +246,6 @@ const Loader = { torConnected: "Connected to the Tor network", - torConnectedConcise: "Connected", - tryAgain: "Try Again", // tor connect strings for message box in about:preferences#connection @@ -275,6 +269,13 @@ const Loader = { autoBootstrappingAllFailed: "None of the configurations we tried worked", cannotDetermineCountry: "Unable to determine user country", noSettingsForCountry: "No settings available for your location", + + // Titlebar status. + titlebarStatusName: "Tor connection", + titlebarStatusNotConnected: "Not connected", + titlebarStatusConnecting: "Connecting…", + titlebarStatusPotentiallyBlocked: "Potentially blocked", + titlebarStatusConnected: "Connected", }; const tsb = new TorPropertyStringBundle( ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -23,8 +23,8 @@ @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/browser-colors.css"); @import url("chrome://branding/content/tor-styles.css"); -@import url("chrome://browser/skin/torconnect-urlbar.css"); @import url("chrome://browser/skin/onionlocation.css"); +@import url("chrome://browser/skin/tor-urlbar-button.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== browser/themes/shared/jar.inc.mn ===================================== @@ -32,6 +32,7 @@ skin/classic/browser/tabs.css (../shared/tabs.css) skin/classic/browser/toolbarbuttons.css (../shared/toolbarbuttons.css) skin/classic/browser/toolbarbutton-icons.css (../shared/toolbarbutton-icons.css) + skin/classic/browser/tor-urlbar-button.css (../shared/tor-urlbar-button.css) skin/classic/browser/urlbar-dynamic-results.css (../shared/urlbar-dynamic-results.css) skin/classic/browser/urlbar-searchbar.css (../shared/urlbar-searchbar.css) skin/classic/browser/urlbarView.css (../shared/urlbarView.css) ===================================== browser/themes/shared/tor-urlbar-button.css ===================================== @@ -0,0 +1,107 @@ +.tor-urlbar-button:not([hidden]) { + --tor-urlbar-button-background-color: var(--purple-60); + background-color: var(--tor-urlbar-button-background-color); + /* FIXME: Use different colors for light and dark theme, rather than "white". + * See tor-browser#41787 */ + color: white; + display: flex; + align-items: center; + gap: 0.5em; + border-radius: var(--urlbar-icon-border-radius); + --tor-urlbar-button-inline-padding: 8px; + padding-inline: var(--tor-urlbar-button-inline-padding); + margin: 0; +} + +.tor-urlbar-button > * { + flex: 0 0 auto; + margin: 0; +} + +.tor-urlbar-button:focus-visible { + /* This button lies within the urlbar, so if the outline extends beyond the + * button's boundary, it will be clipped by the urlbar. + * Most button's in the urlbar get around this by using --focus-outline-inset, + * but our button has a purple background, which does not contrast well with + * the focus outline. + * Therefore, we use an offset outline rather than an inset outline, and + * compensate by shrinking the button's width and height so that the outline + * fits within the non-focused button boundary. Essentially, this has a + * similar effect to using an inset outline that matches the color of the + * urlbar background, but we keep the rounded corners. */ + outline: var(--focus-outline); + outline-offset: var(--focus-outline-offset); + /* Use the background color for the outline, same as in-content buttons. */ + outline-color: var(--tor-urlbar-button-background-color); + /* Calculate the difference between the button's border area and the outline + * area. */ + --tor-urlbar-focus-outline-difference: calc( + var(--focus-outline-offset) + + var(--focus-outline-width) + ); + /* For the inline direction, we shrink the padding by the difference, and + * increase the margin by the same amount so that the button text remains in + * the same position. + * For the block direction, the height of the button is flexibly sized with + * the urlbar height, so we should only need to increase the margin. */ + padding-inline: calc( + var(--tor-urlbar-button-inline-padding) + - var(--tor-urlbar-focus-outline-difference) + ); + margin: var(--tor-urlbar-focus-outline-difference); +} + +.tor-urlbar-button:focus-visible > * { + /* Negate the margin that would be added on focus to ensure the button does + * not grow in height. + * Ideally, this should not change anything noticeable, otherwise the text + * could be clipped when focused. */ + margin-block: calc(-1 * var(--tor-urlbar-focus-outline-difference)); +} + +#urlbar[usertyping] .tor-urlbar-button { + /* Hide whilst the user is typing in the url bar. */ + display: none; +} + +.tor-urlbar-button:hover { + --tor-urlbar-button-background-color: var(--purple-70); +} + +.tor-urlbar-button:hover:active { + --tor-urlbar-button-background-color: var(--purple-80); +} + +@media (prefers-color-scheme: dark) { + .tor-urlbar-button { + --tor-urlbar-button-background-color: var(--purple-50); + } + + .tor-urlbar-button:hover { + --tor-urlbar-button-background-color: var(--purple-60); + } + + .tor-urlbar-button:hover:active { + --tor-urlbar-button-background-color: var(--purple-70); + } +} + +/* Make the button look plain like the identity #urlbar-label-box. */ +.tor-urlbar-button.tor-urlbar-button-plain { + --tor-urlbar-button-background-color: var(--urlbar-box-bgcolor); + color: var(--urlbar-box-text-color); +} + +.tor-urlbar-button.tor-urlbar-button-plain:focus-visible { + outline-color: var(--focus-outline-color); +} + +.tor-urlbar-button.tor-urlbar-button-plain:hover { + --tor-urlbar-button-background-color: var(--urlbar-box-hover-bgcolor); + color: var(--urlbar-box-hover-text-color); +} + +.tor-urlbar-button.tor-urlbar-button-plain:hover:active { + --tor-urlbar-button-background-color: var(--urlbar-box-active-bgcolor); + color: var(--urlbar-box-hover-text-color); +} ===================================== toolkit/torbutton/chrome/locale/en-US/torConnect.properties ===================================== @@ -3,10 +3,14 @@ # 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/. +torConnect.titlebarStatusName=Tor connection +torConnect.titlebarStatusNotConnected=Not connected +torConnect.titlebarStatusConnecting=Connecting… +torConnect.titlebarStatusPotentiallyBlocked=Potentially blocked +torConnect.titlebarStatusConnected=Connected + torConnect.torConnect=Connect to Tor torConnect.torConnecting=Establishing a Connection -torConnect.torNotConnectedConcise=Not Connected -torConnect.torConnectingConcise=Connecting… torConnect.tryingAgain=Trying again… torConnect.noInternet=Tor Browser couldn’t reach the Internet torConnect.noInternetDescription=This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again. @@ -35,7 +39,6 @@ torConnect.viewLog=View logs… torConnect.torConnectButton=Connect torConnect.cancel=Cancel torConnect.torConnected=Connected to the Tor network! -torConnect.torConnectedConcise=Connected torConnect.tryAgain=Try Again torConnect.connectMessage=Changes to Tor Settings will not take effect until you connect torConnect.tryAgainMessage=Tor Browser has failed to establish a connection to the Tor Network @@ -51,3 +54,8 @@ torConnect.autoBootstrappingFailed=Automatic configuration failed torConnect.autoBootstrappingAllFailed=None of the configurations we tried worked torConnect.cannotDetermineCountry=Unable to determine user country torConnect.noSettingsForCountry=No settings available for your location + +# Urlbar strings used up to 12.0 - TODO: remove when 12.5 becomes stable: +torConnect.torNotConnectedConcise=Not Connected +torConnect.torConnectingConcise=Connecting… +torConnect.torConnectedConcise=Connected View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dbec6c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/dbec6c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40777: Update Go to 1.20.4 and create a Go bootstrap project
by Pier Angelo Vendrame (＠pierov) 25 May '23

25 May '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b37e2ebd by Pier Angelo Vendrame at 2023-05-25T18:28:35+02:00 Bug 40777: Update Go to 1.20.4 and create a Go bootstrap project The Go compiler is written in Go, but it is possible to bootstrap it from C wiht Go 1.4. Before this commit, we used to build Go 1.4 for all our platforms, so we built a compiler to throw it away several times. Starting from Go 1.20, the team decided to require Go V-3 to bootstrap (i.e., Go 1.17 to bootrastrap Go 1.20). Bootstrapping is still feasible, but throwing away two compilers is not a good idea. So, we decided to create a Go bootstrap project, and build it only once (for Linux amd64) until it will be able to build more recent Go compilers. - - - - - 5 changed files: - + projects/go-bootstrap/build - + projects/go-bootstrap/config - projects/go/0001-Use-fixed-go-build-tmp-directory.patch - projects/go/build - projects/go/config Changes: ===================================== projects/go-bootstrap/build ===================================== @@ -0,0 +1,38 @@ +#!/bin/bash +[% c("var/set_default_env") -%] + +# This project is expected to be built only on Linux. +# Then the actual Go compiler will be built for each platform. + +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/build /var/tmp/dist + +# Building go 1.4.x +# This is needed to bootstrap the go that we actually use +# https://golang.org/doc/install/source#go14 +tar -C /var/tmp/build --transform='s,^go\>,go1.4,' -xf $rootdir/[% c('input_files_by_name/go14') %] +cd /var/tmp/build/go1.4/src +# Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. +# https://github.com/golang/go/issues/13114#issuecomment-186922245 +# Disable CC etc. that are set up for cross builds. +CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash +export GOROOT_BOOTSTRAP="/var/tmp/build/go1.4" + +cd $rootdir + +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/go') %] +export GOROOT="$distdir" +mv /var/tmp/dist/go $distdir +cd $distdir/src + +./make.bash + +# This directory is non-reproducible and doesn't exist in official Go releases, +# so remove it to preserve reproducibility of the output. +rm -rf $distdir/pkg/obj/go-build/ + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/go-bootstrap/config ===================================== @@ -0,0 +1,14 @@ +# vim: filetype=yaml sw=2 +version: 1.19.9 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 + +input_files: + - project: container-image + - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' + name: go + sha256sum: 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744 + - URL: https://dl.google.com/go/go1.4-bootstrap-20171003.tar.gz + name: go14 + sha256sum: f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52 ===================================== projects/go/0001-Use-fixed-go-build-tmp-directory.patch ===================================== @@ -1,4 +1,4 @@ -From 958f724b1b434702c3d44ceaca646791674d07b1 Mon Sep 17 00:00:00 2001 +From 2c1c98d6404284df744a194dd23bd3660f365387 Mon Sep 17 00:00:00 2001 From: Georg Koppen <gk(a)torproject.org> Date: Fri, 17 Apr 2020 10:24:23 +0000 Subject: [PATCH] Use fixed go-build tmp directory @@ -6,15 +6,18 @@ Subject: [PATCH] Use fixed go-build tmp directory Use fixed go-build tmp directory, when the directory does not exist, in order to avoid some reproducibility issues where build directory gets embedded in generated binaries. +--- + src/cmd/go/internal/work/action.go | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 33b7818fb2..5e369d0f53 100644 +index 8beb1345d0..dccf39c1c1 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -252,9 +252,13 @@ func (b *Builder) Init() { - if cfg.BuildN { - b.WorkDir = "$WORK" - } else { +@@ -279,9 +279,13 @@ func NewBuilder(workDir string) *Builder { + if !buildInitStarted { + panic("internal error: NewBuilder called before BuildInit") + } - tmp, err := os.MkdirTemp(cfg.Getenv("GOTMPDIR"), "go-build") - if err != nil { - base.Fatalf("go: creating work dir: %v", err) @@ -29,5 +32,5 @@ index 33b7818fb2..5e369d0f53 100644 if !filepath.IsAbs(tmp) { abs, err := filepath.Abs(tmp) -- -2.26.1 +2.39.2 ===================================== projects/go/build ===================================== @@ -3,27 +3,8 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist -[% IF c("var/linux") %] - # Config options for hardening-wrapper - export DEB_BUILD_HARDENING=1 - export DEB_BUILD_HARDENING_STACKPROTECTOR=1 - export DEB_BUILD_HARDENING_FORTIFY=1 - export DEB_BUILD_HARDENING_FORMAT=1 - export DEB_BUILD_HARDENING_PIE=1 -[% END %] - -mkdir -p /var/tmp/build - -# Building go 1.4.x -# This is needed to bootstrap the go that we actually use -# https://golang.org/doc/install/source#go14 -tar -C /var/tmp/build --transform='s,^go\>,go1.4,' -xf $rootdir/[% c('input_files_by_name/go14') %] -cd /var/tmp/build/go1.4/src -# Disable cgo to avoid conflicts with newer GCC. cgo is not needed for the bootstrap go. -# https://github.com/golang/go/issues/13114#issuecomment-186922245 -# Disable CC etc. that are set up for cross builds. -CGO_ENABLED=0 CC= CFLAGS= LDFLAGS= ./make.bash -export GOROOT_BOOTSTRAP="/var/tmp/build/go1.4" +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/go-bootstrap') %] +export GOROOT_BOOTSTRAP="/var/tmp/dist/go-bootstrap" cd $rootdir [% IF ! c("var/linux") %] ===================================== projects/go/config ===================================== @@ -1,12 +1,10 @@ # vim: filetype=yaml sw=2 -version: 1.19.9 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +version: 1.20.4 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 var: - go14_version: 1.4.3 - setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("go_tarfile") %] @@ -121,9 +119,10 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744 - - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' - name: go14 - sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 + sha256sum: 9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6 + - project: go-bootstrap + name: go-bootstrap + target_replace: + '^.*browser-.*': 'basebrowser-linux-x86_64' - filename: 0001-Use-fixed-go-build-tmp-directory.patch enable: '[% c("var/android") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.5-1] fixup! Bug 23247: Communicating security expectations for .onion
by ma1 (＠ma1) 25 May '23

25 May '23

ma1 pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: dbec6cf6 by cypherpunks1 at 2023-05-24T09:21:07-08:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 41785: Show http onion resources as secure in network monitor - - - - - 1 changed file: - devtools/shared/webconsole/network-helper.js Changes: ===================================== devtools/shared/webconsole/network-helper.js ===================================== @@ -600,6 +600,9 @@ var NetworkHelper = { // The request did not contain any security info. if (!securityInfo) { + if (httpActivity.hostname && httpActivity.hostname.endsWith(".onion")) { + info.state = "secure"; + } return info; } @@ -651,7 +654,11 @@ var NetworkHelper = { // schemes other than https and wss are subject to // downgrade/etc at the scheme level and should always be // considered insecure - info.state = "insecure"; + if (httpActivity.hostname && httpActivity.hostname.endsWith(".onion")) { + info.state = "secure"; + } else { + info.state = "insecure"; + } } else if (state & wpl.STATE_IS_SECURE) { // The connection is secure if the scheme is sufficient info.state = "secure"; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dbec6cf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dbec6cf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 12.5a6
by richard (＠richard) 24 May '23

24 May '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 6dc9b712 by Richard Pospesel at 2023-05-24T20:20:54+00:00 alpha: new version, 12.5a6 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/12.5a4-12.5a5-linux32-ALL.xml - − update_3/alpha/12.5a4-12.5a5-linux64-ALL.xml - − update_3/alpha/12.5a4-12.5a5-macos-ALL.xml - − update_3/alpha/12.5a4-12.5a5-win32-ALL.xml - − update_3/alpha/12.5a4-12.5a5-win64-ALL.xml - + update_3/alpha/12.5a4-12.5a6-linux32-ALL.xml - + update_3/alpha/12.5a4-12.5a6-linux64-ALL.xml - + update_3/alpha/12.5a4-12.5a6-macos-ALL.xml - + update_3/alpha/12.5a4-12.5a6-win32-ALL.xml - + update_3/alpha/12.5a4-12.5a6-win64-ALL.xml - + update_3/alpha/12.5a5-12.5a6-linux32-ALL.xml - + update_3/alpha/12.5a5-12.5a6-linux64-ALL.xml - + update_3/alpha/12.5a5-12.5a6-macos-ALL.xml - + update_3/alpha/12.5a5-12.5a6-win32-ALL.xml - + update_3/alpha/12.5a5-12.5a6-win64-ALL.xml - − update_3/alpha/12.5a5-linux32-ALL.xml - − update_3/alpha/12.5a5-linux64-ALL.xml - − update_3/alpha/12.5a5-macos-ALL.xml - − update_3/alpha/12.5a5-win32-ALL.xml - − update_3/alpha/12.5a5-win64-ALL.xml - + update_3/alpha/12.5a6-linux32-ALL.xml - + update_3/alpha/12.5a6-linux64-ALL.xml - + update_3/alpha/12.5a6-macos-ALL.xml - + update_3/alpha/12.5a6-win32-ALL.xml - + update_3/alpha/12.5a6-win64-ALL.xml - update_3/alpha/download-android-aarch64.json - update_3/alpha/download-android-armv7.json - update_3/alpha/download-android-x86.json - update_3/alpha/download-android-x86_64.json The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40866: Remove ansible from README
by Pier Angelo Vendrame (＠pierov) 24 May '23

24 May '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d94b4545 by Nicolas Vigier at 2023-05-24T13:24:07+02:00 Bug 40866: Remove ansible from README - - - - - 1 changed file: - README Changes: ===================================== README ===================================== @@ -156,18 +156,9 @@ Automated builds using tbb-testsuite ------------------------------------ The Tor Browser testsuite scripts can also be used to do nightly builds -and publish the build logs. The recommended way to do that is to use -the ansible roles from the tools/ansible directory. See next section -for details. - - -Using ansible to set up a nightly build machine ------------------------------------------------ - -The directory tools/ansible contains some ansible roles to set up a -nightly build machine. You can look at the playbook defined in -boklm-tbb-nightly-build.yml and variables in group_vars/boklm-tbb-nightly/ -for an example of how it can be used. +and publish the build logs. This page has some information about the +setup we use for nightly builds: +https://gitlab.torproject.org/tpo/applications/tor-browser/-/wikis/Nightly_Builds_Setup Signing builds View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.5-1] fixup! Bug 23247: Communicating security expectations for .onion
by Pier Angelo Vendrame (＠pierov) 24 May '23

24 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4c0986cb by cypherpunks1 at 2023-05-23T14:06:01-08:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 33298: Warn when submitting form data from http onion sites over an insecure connection - - - - - 1 changed file: - dom/html/HTMLFormElement.cpp Changes: ===================================== dom/html/HTMLFormElement.cpp ===================================== @@ -893,7 +893,10 @@ nsresult HTMLFormElement::DoSecureToInsecureSubmitCheck(nsIURI* aActionURL, formIsHTTPS = OwnerDoc()->GetDocumentURI()->SchemeIs("https"); } if (!formIsHTTPS) { - return NS_OK; + bool formIsOnion = nsMixedContentBlocker::IsPotentiallyTrustworthyOnion(OwnerDoc()->GetDocumentURI()); + if (!formIsOnion) { + return NS_OK; + } } if (nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackURL(aActionURL)) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4c0986c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4c0986c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.5a6-build1
by richard (＠richard) 23 May '23

23 May '23

richard pushed new tag tbb-12.5a6-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40843: Prepare Tor Browser Alpha 12.5a6
by richard (＠richard) 23 May '23

23 May '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 63dce0f8 by Pier Angelo Vendrame at 2023-05-23T09:21:54+02:00 Bug 40843: Prepare Tor Browser Alpha 12.5a6 - - - - - 10 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/translation/config - rbm.conf - tools/fetch-changelogs.py Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,57 @@ +Tor Browser 12.5a6 - May 22 2023 + * All Platforms + * Updated Translations + * Updated Go to 11.9.9 + * Bug 40860: Improve the transition from the old fontconfig file to the new one [tor-browser-build] + * Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key [tor-browser] + * Bug 41738: Replace the patch to disable live reload with its preference [tor-browser] + * Bug 41757: Rebase Tor Browser Alpha to 102.11.0esr [tor-browser] + * Bug 41763: TTP-02-003 WP1: Data URI allows JS execution despite safest security level (Low) [tor-browser] + * Bug 41764: TTP-02-004 OOS: No user-activation required to download files (Low) [tor-browser] + * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.11esr + * Bug 41607: Update "New Circuit" icon [tor-browser] + * Bug 41736: Customize the default CustomizableUI toolbar using CustomizableUI.jsm [tor-browser] + * Bug 41770: Keyboard navigation broken leaving the toolbar tor circuit button [tor-browser] + * Bug 41777: Internally shippped manual does not adapt to RTL languages (it always align to the left) [tor-browser] + * Windows + Linux + * Bug 41654: UpdateInfo jumped into Data [tor-browser] + * Linux + * Bug 41732: implement linux font whitelist as defense-in-depth [tor-browser] + * Bug 41776: System fonts are temporarily leaked on Linux after the browser is updated from 12.5a4 or earlier [tor-browser] + * Android + * Updated GeckoView to 102.11esr + * Build System + * All Platforms + * Bug 33953: Provide a way for easily updating Go dependencies of projects [tor-browser-build] + * Bug 40673: Avoid building each go module separately [tor-browser-build] + * Bug 40818: Enable wasm target for rust compiler [tor-browser-build] + * Bug 40841: Adapt signing scripts to new signing machines [tor-browser-build] + * Bug 40849: Move Go dependencies to the projects dependent on them, not as a standalone projects [tor-browser-build] + * Bug 40856: Unblock nightly builds [tor-browser-build] + * Windows + * Bug 40846: Temporarily disable Windows signing [tor-browser-build] + +Tor Browser 12.0.6 - May 09 2023 + * All Platforms + * Updated Translations + * Updated Go to 11.9.9 + * Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key [tor-browser] + * Bug 41756: Rebase Tor Browser Stable to 102.11.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.11esr + * Bug 40501: High CPU load after tor exits unexpectedly [tor-browser] + * Windows + * Bug 41683: Disable the network process on Windows [tor-browser] + * Android + * Updated GeckoView to 102.11esr + * Build System + * Windows + macOS + Linux + * Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date [tor-browser] + * macOS + * Bug 40844: Fix DMG reproducibility problem on 12.0.5 [tor-browser-build] + Tor Browser 12.5a5 - April 18 2023 * All Platforms * Updated Translations ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 970562, + "average_daily_users": 988302, "categories": { "android": [ "experimental", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5575, - "bayesian_average": 4.55632411125665, - "count": 4956, - "text_count": 1572 + "average": 4.5608, + "bayesian_average": 4.559632030468385, + "count": 5005, + "text_count": 1581 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 25917 + "weekly_downloads": 24550 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 258016, + "average_daily_users": 258950, "categories": { "android": [ "security-privacy" @@ -553,10 +553,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8168, - "bayesian_average": 4.81213034274172, - "count": 1332, - "text_count": 235 + "average": 4.8136, + "bayesian_average": 4.808937485557134, + "count": 1336, + "text_count": 237 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -641,7 +641,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3798 + "weekly_downloads": 3514 }, "notes": null }, @@ -657,7 +657,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1125722, + "average_daily_users": 1133122, "categories": { "android": [ "security-privacy" @@ -669,7 +669,7 @@ "contributions_url": "https://paypal.me/SupportEFF?utm_content=product-page-contribute&utm_medium…", "created": "2014-05-01T18:23:16Z", "current_version": { - "id": 5520250, + "id": 5564707, "compatibility": { "firefox": { "min": "60.0", @@ -680,7 +680,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -691,22 +691,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<ul><li>Added a note to the popup to explain that if you would like to log into websites with your Google account, you need to fully allow <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/361ac6552f690217a6c9f0…" rel=\"nofollow\">accounts.google.com</a></li><li>Added dark theme support to widget replacement placeholders</li><li>Fixed blocking service worker-initiated requests in Chrome</li><li>Fixed various site breakages</li><li>Added Hindi translations</li><li>Improved Traditional Chinese translations</li></ul>" + "en-US": "<ul><li>Expanded protection for \"cookieblocked\" (slider set to yellow) domains. These domains are allowed to load without access to cookies, as a compromise to avoid breaking websites. However, sometimes the same domain is used to serve both unobjectionable content as well as obnoxious fingerprinters that do not need cookies to track your browsing. Privacy Badger will now fully block these fingerprinters.</li><li>Disabled Google's Topics API by default. The Topics API replaces Federated Learning of Cohorts (FLoC).</li><li>You can now see where Privacy Badger observed tracking by a given domain by clicking on the domain name in the list of tracking domains on the options page</li><li>Fixed various site breakages</li><li>Added Vietnamese translations</li><li>Improved translations (Finnish, French, Hebrew, Persian, European Portuguese, Russian, Spanish)</li></ul>" }, - "reviewed": "2023-02-02T18:47:37Z", - "version": "2023.1.31", + "reviewed": "2023-05-16T10:58:52Z", + "version": "2023.5.10", "files": [ { - "id": 4064595, - "created": "2023-01-31T16:05:01Z", - "hash": "sha256:0082d8ffe7b25f370a313d9b899b0c1ba1669b21b3a11791fe5ecf031aeb6a6c", + "id": 4109050, + "created": "2023-05-10T19:28:15Z", + "hash": "sha256:8ff7650d1ce133894293d1a3e268bb24d300e77a1c25488ed17846e71d8b33e8", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1834581, + "size": 1975567, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4064595/privacy_badger17-…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4109050/privacy_badger17-…", "permissions": [ "tabs", "http://*/*", @@ -1134,7 +1134,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-02-02T18:47:37Z", + "last_updated": "2023-05-16T10:58:52Z", "name": { "en-US": "Privacy Badger" }, @@ -1180,10 +1180,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8005, - "bayesian_average": 4.797701870245844, - "count": 2215, - "text_count": 428 + "average": 4.802, + "bayesian_average": 4.79921587479466, + "count": 2232, + "text_count": 426 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1207,7 +1207,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 22431 + "weekly_downloads": 18346 }, "notes": null }, @@ -1223,7 +1223,7 @@ "picture_url": null } ], - "average_daily_users": 6247825, + "average_daily_users": 6410036, "categories": { "android": [ "security-privacy" @@ -1235,7 +1235,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5547815, + "id": 5558705, "compatibility": { "firefox": { "min": "78.0", @@ -1246,7 +1246,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/55…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/55…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1257,22 +1257,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/9ba5436deff955b8634d3a…" rel=\"nofollow\">1.48.4</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/2881e29d212046e14a4f20…" rel=\"nofollow\">Fix presumed network filter not being a valid network filter</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/1d29de8f605dc6f4b7684f…" rel=\"nofollow\">Avoid using ! toolbar icon badge when inconsequential</a><ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/04728b2f874e135c8736ae…" rel=\"nofollow\">Clear unprocessed requests status on webNavigation reload event</a></li></ul></li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e34f62492a00e2b8a221ca…" rel=\"nofollow\">Commits history since last version</a>." + "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/24794abbbc5c8930eafab3…" rel=\"nofollow\">1.49.2</a>.\n\n<b>Fixes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/812da480d7e6e2fa7d6fd1…" rel=\"nofollow\">Reverse usage of browser.alarms</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/53eab9764901466ecb7c1c…" rel=\"nofollow\">Mind rejected promises from vAPI.storage API</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/58bde6ecd0ff76608c1456…" rel=\"nofollow\">Properly handle promise rejection from webext.storage.local API</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3f0e0640ef4983e8fd2352…" rel=\"nofollow\">Add more checks against unexpected conditions re. assets.json</a></li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/deebdaa7a15172babdad3e…" rel=\"nofollow\">Commits history since last version</a>." }, - "reviewed": "2023-04-05T17:12:25Z", - "version": "1.48.4", + "reviewed": "2023-05-03T16:26:03Z", + "version": "1.49.2", "files": [ { - "id": 4092158, - "created": "2023-04-01T21:20:42Z", - "hash": "sha256:d7666b963c2969b0014937aae55472eea5098ff21ed3bea8a2e1f595f62856c1", + "id": 4103048, + "created": "2023-04-26T14:37:33Z", + "hash": "sha256:39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3343703, + "size": 3383174, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4092158/ublock_origin-1.4…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.4…", "permissions": [ "dns", "menus", @@ -1388,7 +1388,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-04-16T15:40:30Z", + "last_updated": "2023-05-21T19:05:37Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1533,10 +1533,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7805, - "bayesian_average": 4.780095724686764, - "count": 15264, - "text_count": 3968 + "average": 4.7807, + "bayesian_average": 4.780299334467883, + "count": 15437, + "text_count": 4014 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1598,7 +1598,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 132315 + "weekly_downloads": 131360 }, "notes": null }, @@ -1614,19 +1614,20 @@ "picture_url": null } ], - "average_daily_users": 159848, + "average_daily_users": 168477, "categories": { "android": [ "photos-media" ], "firefox": [ - "games-entertainment" + "games-entertainment", + "photos-music-videos" ] }, "contributions_url": "", "created": "2017-05-03T08:36:43Z", "current_version": { - "id": 5220332, + "id": 5560463, "compatibility": { "firefox": { "min": "42.0", @@ -1637,7 +1638,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/video-background-play-fix…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/video-background-play-fix…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -1648,24 +1649,24 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "de": "Experimentelle Verbesserungen der Handhabung von Youtube.", - "en-US": "Experimental improvement of Youtube handling.", - "ro": "Îmbunătățiri experimentale pentru Youtube." + "de": "Neue Übersetzungen ergänzt", + "en-US": "Added new translations", + "ro": "Adăugat traduceri noi" }, - "reviewed": "2021-04-23T07:50:05Z", - "version": "1.6.0", + "reviewed": "2023-05-05T14:25:10Z", + "version": "1.7.0", "files": [ { - "id": 3764692, - "created": "2021-04-22T21:46:53Z", - "hash": "sha256:73cfa682e0398ca1b51890340e4a6df3fcea945f54e9e677e9db942152aa614d", + "id": 4104806, + "created": "2023-05-01T11:53:35Z", + "hash": "sha256:e8713a1720ffba236c40ebabd5ac1db88702d75c21edc23d61216a5897b3792a", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 12088, + "size": 12968, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/3764692/video_background_…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4104806/video_background_…", "permissions": [ "*://*.youtube.com/*", "*://*.youtube-nocookie.com/*", @@ -1678,9 +1679,9 @@ }, "default_locale": "en-US", "description": { - "de": "ACHTUNG: Im neuen Firefox für Android (Version 79 und neuer) funktioniert Videowiedergabe im Hintergrund erst <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/05bb7b1ef7f63358eeabcd…" rel=\"nofollow\">ab Firefox 82</a> korrekt.\n\nUnterstützt momentan folgende Seiten:\n<ul><li>Youtube</li><li>Vimeo (Wiedergabe nicht unterbrechen wenn Vollbildmodus beendet wird)</li></ul>", - "en-US": "ATTENTION: With the new Firefox on Android (Firefox 79 and newer), background playback only properly works starting <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/05bb7b1ef7f63358eeabcd…" rel=\"nofollow\">from Firefox 82</a>.\n\nThe following pages are currently supported:\n<ul><li>Youtube</li><li>Vimeo (don't stop playback when existing fullscreen)</li></ul>", - "ro": "ATENȚIE: În noul Firefox pentru Android (versiunea 79+), redarea video în fundal funcționează corect abia de la <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/05bb7b1ef7f63358eeabcd…" rel=\"nofollow\">Firefox 82</a>.\n\nÎn prezent este compatibil cu următoarele site-uri:\n<ul><li>Youtube</li><li>Vimeo (nu întrerupeți redarea atunci când ieșiți din modul fullscreen)</li></ul>" + "de": "Unterstützt momentan folgende Seiten:\n<ul><li>Youtube</li><li>Vimeo (Wiedergabe nicht unterbrechen wenn Vollbildmodus beendet wird)</li></ul>", + "en-US": "The following pages are currently supported:\n<ul><li>Youtube</li><li>Vimeo (don't stop playback when existing fullscreen)</li></ul>", + "ro": "În prezent este compatibil cu următoarele site-uri:\n<ul><li>Youtube</li><li>Vimeo (nu întrerupeți redarea atunci când ieșiți din modul fullscreen)</li></ul>" }, "developer_comments": null, "edit_url": "https://addons.mozilla.org/en-US/developers/addon/video-background-play-fix…", @@ -1698,7 +1699,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-04-23T07:50:05Z", + "last_updated": "2023-05-05T14:25:10Z", "name": { "de": "Videowiedergabe im Hintergrund", "en-US": "Video Background Play Fix", @@ -1712,10 +1713,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4964, - "bayesian_average": 4.4911928855659555, - "count": 1100, - "text_count": 407 + "average": 4.4875, + "bayesian_average": 4.482377575890338, + "count": 1118, + "text_count": 418 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1737,7 +1738,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 366 + "weekly_downloads": 387 }, "notes": null }, @@ -1753,7 +1754,7 @@ "picture_url": null } ], - "average_daily_users": 88484, + "average_daily_users": 88341, "categories": { "android": [ "experimental", @@ -1866,9 +1867,9 @@ ], "promoted": null, "ratings": { - "average": 4.3668, - "bayesian_average": 4.352941163663537, - "count": 398, + "average": 4.37, + "bayesian_average": 4.356186612333998, + "count": 400, "text_count": 112 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", @@ -1891,7 +1892,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1034 + "weekly_downloads": 1535 }, "notes": null }, @@ -1907,7 +1908,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 258622, + "average_daily_users": 262509, "categories": { "android": [ "photos-media", @@ -2126,10 +2127,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6538, - "bayesian_average": 4.64901646767579, - "count": 1248, - "text_count": 241 + "average": 4.6537, + "bayesian_average": 4.648959055095389, + "count": 1262, + "text_count": 242 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2150,7 +2151,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 4497 + "weekly_downloads": 3984 }, "notes": null }, @@ -2173,7 +2174,7 @@ "picture_url": null } ], - "average_daily_users": 109747, + "average_daily_users": 111302, "categories": { "android": [ "other" @@ -2456,10 +2457,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4449, - "bayesian_average": 4.440238588001734, - "count": 1207, - "text_count": 321 + "average": 4.4439, + "bayesian_average": 4.439229613376027, + "count": 1212, + "text_count": 322 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2479,7 +2480,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 31 + "weekly_downloads": 32 }, "notes": null }, @@ -2495,7 +2496,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 312295, + "average_daily_users": 314158, "categories": { "android": [ "performance", @@ -2509,7 +2510,7 @@ "contributions_url": "https://www.paypal.com/donate/?hosted_button_id=9ERKTU5MBH4EW&utm_content=p…", "created": "2005-05-13T10:51:32Z", "current_version": { - "id": 5546627, + "id": 5566736, "compatibility": { "firefox": { "min": "59.0", @@ -2520,7 +2521,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5546627", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5566736", "is_strict_compatibility_enabled": false, "license": { "id": 13, @@ -2531,22 +2532,22 @@ "url": "http://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { - "en-US": "v 11.4.21\n============================================================\nx Fixed mislabeled Tor Browser settings override option\nx [L10n] Updated mk" + "en-US": "v 11.4.22\n============================================================\nx [L10n] Updated uk\nx Consistently apply DEFAULT policy to top-level data: URLs" }, - "reviewed": "2023-04-04T12:01:03Z", - "version": "11.4.21", + "reviewed": "2023-05-18T09:07:59Z", + "version": "11.4.22", "files": [ { - "id": 4090970, - "created": "2023-03-30T09:39:24Z", - "hash": "sha256:0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338", + "id": 4111078, + "created": "2023-05-15T08:32:54Z", + "hash": "sha256:46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 951542, + "size": 948900, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.…", "permissions": [ "contextMenus", "storage", @@ -2613,7 +2614,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-04-04T12:01:03Z", + "last_updated": "2023-05-21T21:36:00Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2685,10 +2686,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4117, - "bayesian_average": 4.40897409082447, - "count": 2055, - "text_count": 798 + "average": 4.4074, + "bayesian_average": 4.404687188031893, + "count": 2067, + "text_count": 803 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2732,7 +2733,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 8021 + "weekly_downloads": 7591 }, "notes": null }, @@ -2748,7 +2749,7 @@ "picture_url": null } ], - "average_daily_users": 146192, + "average_daily_users": 151904, "categories": { "android": [ "performance", @@ -2863,10 +2864,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9109, - "bayesian_average": 3.9065939897765096, - "count": 1122, - "text_count": 397 + "average": 3.9026, + "bayesian_average": 3.898323122758472, + "count": 1129, + "text_count": 401 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2885,7 +2886,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1829 + "weekly_downloads": 1860 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -103,9 +103,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4111078/noscript-11.4.22.… name: noscript - sha256sum: 0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338 + sha256sum: 46a84c85df4c6be11905388ad2b66aeb5a010ed615484112c8c1710ad13bc36e - URL: https://addons.mozilla.org/firefox/downloads/file/4079064/ublock_origin-1.4… name: ublock-origin sha256sum: a35a6c8758ba74616afc09648c96d74ec2e7d27fe30f311d1db6e9a4966e7858 ===================================== projects/firefox/config ===================================== @@ -11,7 +11,7 @@ container: use_container: 1 var: - firefox_platform_version: 102.10.0 + firefox_platform_version: 102.11.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '12.5' browser_branch: '[% c("var/browser_series") %]-1' ===================================== projects/geckoview/config ===================================== @@ -11,7 +11,7 @@ container: use_container: 1 var: - geckoview_version: 102.10.0esr + geckoview_version: 102.11.0esr browser_branch: 12.5-1 browser_build: 3 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.19.8 +version: 1.19.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -121,7 +121,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f + sha256sum: 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 74065 +version: 79869 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -17,8 +17,8 @@ var: input_files: - project: container-image - - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip' + - URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: 788c2dc2bfacbc6961ce443c5639706cc23fbb7b7730ed7f71a26396511305be + sha256sum: ee4c6e4ce4998736ae44dc3e6f92875a481b9e03860517764ea9af6c2bba24e0 - filename: packagemanual.py name: package_script ===================================== projects/translation/config ===================================== @@ -6,19 +6,19 @@ version: '[% c("abbrev") %]' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 97c76d5183b16b069e66feaaf10e00c1d2c7d9e0 + git_hash: f1f1204c2421db64ae3d30be31a4d7819b9a3e42 targets: nightly: git_hash: 'base-browser' base-browser-fluent: base-browser-fluent: '[% INCLUDE build %]' - git_hash: e016c52705a2663309a7b05b05ac93002eab3ed0 + git_hash: 3167fc379caac406941ae4fce429c302fd1a6d5d targets: nightly: git_hash: 'basebrowser-newidentityftl' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 69273c40343bd6f8f125109ddac9d949d7bcb605 + git_hash: 7089eb9ac06e0f6de99c386a09821c8799849206 targets: nightly: git_hash: 'tor-browser' @@ -26,7 +26,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 0deec2a78dea0013e8c4eaec1d40ef5aac4e43b0 + git_hash: 65def475aa000981ac3c1b6db203e8e707f72e16 targets: nightly: git_hash: 'fenix-torbrowserstringsxml' ===================================== rbm.conf ===================================== @@ -94,10 +94,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.5a5' + torbrowser_version: '12.5a6' torbrowser_build: 'build1' torbrowser_incremental_from: - 12.5a4 + - 12.5a5 updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' ===================================== tools/fetch-changelogs.py ===================================== @@ -111,15 +111,19 @@ if r.status_code == 401: print("Unauthorized! Has your token expired?") sys.exit(3) issue = None +issues = [] for i in r.json(): if i["title"].find(sys.argv[1]) != -1: - if issue is None: - issue = i - else: - print("More than one matching issue found!") - print("Please use the issue id.") - sys.exit(4) -if not issue: + issues.append(i) +if len(issues) == 1: + issue = issues[0] +elif len(issues) > 1: + print("More than one matching issue found:") + for idx, i in enumerate(issues): + print(f" {idx + 1}) #{i['iid']} - {i['title']}") + print("Please use the issue id.") + sys.exit(4) +else: iid = version version = None if iid[0] == "#": @@ -161,8 +165,9 @@ for issues in linked: print(f" * {issues[0].get_platforms()}") for i in issues: print(f" * {i}") -print(" * Build System") -for issues in linked_build: - print(f" * {issues[0].get_platforms()}") - for i in issues: - print(f" * {i}") +if linked_build: + print(" * Build System") + for issues in linked_build: + print(f" * {issues[0].get_platforms()}") + for i in issues: + print(f" * {i}") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.11.0esr-12.5-1-build3
by Pier Angelo Vendrame (＠pierov) 23 May '23

23 May '23

Pier Angelo Vendrame pushed new tag tor-browser-102.11.0esr-12.5-1-build3 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/tor-browser][tor-browser-102.11.0esr-12.5-1] fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser
by Pier Angelo Vendrame (＠pierov) 23 May '23

23 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d9327485 by Pier Angelo Vendrame at 2023-05-23T09:07:24+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser Bug 41776 (fix): Added some missing lines to the previous patch - - - - - 1 changed file: - tools/update-packaging/make_incremental_update.sh Changes: ===================================== tools/update-packaging/make_incremental_update.sh ===================================== @@ -222,6 +222,10 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do if check_for_add_if_update "$f"; then # TODO: Remove once we do a watershed release + # The full workdir may not exist yet, so create it if necessary. + mkdir -p `dirname "$workdir/$f"` + $XZ $XZ_OPT --compress $BCJ_OPTIONS --lzma2 --format=xz --check=crc64 --force --stdout "$newdir/$f" > "$workdir/$f" + copy_perm "$newdir/$f" "$workdir/$f" make_add_if_instruction "$f" "$updatemanifestv3" archivefiles="$archivefiles \"$f\"" continue 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d932748… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d932748… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.11.0esr-12.5-1-build2
by Pier Angelo Vendrame (＠pierov) 22 May '23

22 May '23

Pier Angelo Vendrame pushed new tag tor-browser-102.11.0esr-12.5-1-build2 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/tor-browser][tor-browser-102.11.0esr-12.5-1] 2 commits: fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser
by Pier Angelo Vendrame (＠pierov) 22 May '23

22 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f115af33 by Pier Angelo Vendrame at 2023-05-22T10:36:55+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser Bug 41776: Keep shipping the old fontconfig file until users have one - - - - - 5ec55d20 by Pier Angelo Vendrame at 2023-05-22T10:36:56+02:00 fixup! Firefox preference overrides. Bug 41732: Use font.system.whitelist also on Linux as a defense-in-depth - - - - - 4 changed files: - browser/app/profile/001-base-profile.js - tools/update-packaging/common.sh - tools/update-packaging/make_full_update.sh - tools/update-packaging/make_incremental_update.sh Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -700,6 +700,8 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S #endif #ifdef XP_LINUX +pref("font.system.whitelist", "Arimo, Cousine, Noto Naskh Arabic, Noto Sans Adlam, Noto Sans Armenian, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, Noto Sans Chakma, Noto Sans Cham, Noto Sans Cherokee, Noto Sans Coptic, Noto Sans Deseret, Noto Sans Devanagari, Noto Sans Elbasan, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Grantha, Noto Sans Gujarati, Noto Sans Gunjala Gondi, Noto Sans Gurmukhi, Noto Sans Hanifi Rohingya, Noto Sans Hanunoo, Noto Sans Hebrew, Noto Sans JP, Noto Sans Javanese, Noto Sans KR, Noto Sans Kannada, Noto Sans Kayah Li, Noto Sans Khmer, Noto Sans Khojki, Noto Sans Khudawadi, Noto Sans Lao, Noto Sans Lepcha, Noto Sans Limbu, Noto Sans Lisu, Noto Sans Mahajani, Noto Sans Malayalam, Noto Sans Mandaic, Noto Sans Masaram Gondi, Noto Sans Medefaidrin, Noto Sans Meetei Mayek, Noto Sans Mende Kikakui, Noto Sans Miao, Noto Sans Modi, Noto Sans Mongolian, Noto Sans Mro, Noto Sans Multani, Noto Sans Myanmar, Noto Sans NKo, Noto Sans New Tai Lue, Noto Sans Newa, Noto Sans Ol Chiki, Noto Sans Oriya, Noto Sans Osage, Noto Sans Osmanya, Noto Sans Pahawh Hmong, Noto Sans Pau Cin Hau, Noto Sans Rejang, Noto Sans Runic, Noto Sans SC, Noto Sans Samaritan, Noto Sans Saurashtra, Noto Sans Sharada, Noto Sans Shavian, Noto Sans Sinhala, Noto Sans Sora Sompeng, Noto Sans Soyombo, Noto Sans Sundanese, Noto Sans Syloti Nagri, Noto Sans Symbols, Noto Sans Symbols2, Noto Sans Syriac, Noto Sans TC, Noto Sans Tagalog, Noto Sans Tagbanwa, Noto Sans Tai Le, Noto Sans Tai Tham, Noto Sans Tai Viet, Noto Sans Takri, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tifinagh, Noto Sans Tifinagh APT, Noto Sans Tifinagh Adrar, Noto Sans Tifinagh Agraw Imazighen, Noto Sans Tifinagh Ahaggar, Noto Sans Tifinagh Air, Noto Sans Tifinagh Azawagh, Noto Sans Tifinagh Ghat, Noto Sans Tifinagh Hawad, Noto Sans Tifinagh Rhissa Ixa, Noto Sans Tifinagh SIL, Noto Sans Tifinagh Tawellemmet, Noto Sans Tirhuta, Noto Sans Vai, Noto Sans Wancho, Noto Sans Warang Citi, Noto Sans Yi, Noto Sans Zanabazar Square, Noto Serif Armenian, Noto Serif Balinese, Noto Serif Bengali, Noto Serif Devanagari, Noto Serif Dogra, Noto Serif Ethiopic, Noto Serif Georgian, Noto Serif Grantha, Noto Serif Gujarati, Noto Serif Gurmukhi, Noto Serif Hebrew, Noto Serif Hmong Nyiakeng, Noto Serif Kannada, Noto Serif Khmer, Noto Serif Khojki, Noto Serif Lao, Noto Serif Malayalam, Noto Serif Myanmar, Noto Serif Sinhala, Noto Serif Tamil, Noto Serif Telugu, Noto Serif Thai, Noto Serif Tibetan, Noto Serif Yezidi, STIX Math, Tinos, Twemoji Mozilla"); + // Arabic pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos"); pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo"); ===================================== tools/update-packaging/common.sh ===================================== @@ -108,6 +108,28 @@ make_add_if_not_instruction() { echo "add-if-not \"$f\" \"$f\"" >> "$filev3" } +check_for_add_if_update() { + add_if_file_chk="$1" + + # tor-browser#41776: We will remove with the old fontconfig file manually + # outside the update process. So, let the updater add the file if there. + # TODO: Remove once we do a watershed release. + if [ "$add_if_file_chk" = "TorBrowser/Data/fontconfig/fonts.conf" ]; then + ## "true" *giggle* + return 0; + fi + ## 'false'... because this is bash. Oh yay! + return 1; +} + +make_add_if_instruction() { + f="$1" + filev3="$2" + + verbose_notice " add-if \"$f\" \"$f\"" + echo "add-if \"$f\" \"$f\"" >> "$filev3" +} + make_addsymlink_instruction() { link="$1" target="$2" ===================================== tools/update-packaging/make_full_update.sh ===================================== @@ -106,6 +106,9 @@ for ((i=0; $i<$num_files; i=$i+1)); do if check_for_add_if_not_update "$f"; then make_add_if_not_instruction "$f" "$updatemanifestv3" + elif check_for_add_if_update "$f"; then + # TODO: Remove once we do a watershed release + make_add_if_instruction "$f" "$updatemanifestv3" else make_add_instruction "$f" "$updatemanifestv3" fi ===================================== tools/update-packaging/make_incremental_update.sh ===================================== @@ -220,6 +220,13 @@ for ((i=0; $i<$num_oldfiles; i=$i+1)); do continue 1 fi + if check_for_add_if_update "$f"; then + # TODO: Remove once we do a watershed release + make_add_if_instruction "$f" "$updatemanifestv3" + archivefiles="$archivefiles \"$f\"" + continue 1 + fi + if check_for_forced_update "$requested_forced_updates" "$f"; then # The full workdir may not exist yet, so create it if necessary. mkdir -p `dirname "$workdir/$f"` @@ -328,6 +335,9 @@ for ((i=0; $i<$num_newfiles; i=$i+1)); do if check_for_add_if_not_update "$f"; then make_add_if_not_instruction "$f" "$updatemanifestv3" + elif check_for_add_if_update "$f"; then + # TODO: Remove once we do a watershed release + make_add_if_instruction "$f" "$updatemanifestv3" else make_add_instruction "$f" "$updatemanifestv3" fi View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2970a4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2970a4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40860: Improve the transition from the old fontconfig file to the new one
by Pier Angelo Vendrame (＠pierov) 22 May '23

22 May '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c78f6080 by Pier Angelo Vendrame at 2023-05-17T19:15:20+02:00 Bug 40860: Improve the transition from the old fontconfig file to the new one - - - - - 2 changed files: - projects/browser/RelativeLink/start-browser - projects/browser/build Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -340,6 +340,15 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} # Set up custom bundled fonts. See fonts-conf(5). export FONTCONFIG_PATH="${HOME}/fontconfig" export FONTCONFIG_FILE="fonts.conf" +[% # tor-browser#41776: We cannot make the updater remove this file. + # So, let's remove it on this script, since we know that at this point the + # browser will not need it anymore. + # Remove once we do a watershed release. + -%] +[% IF c("var/tor-browser") -%] +# Old fontconfig directory, not needed anymore +rm -Rf "${HOME}/TorBrowser/Data/fontconfig" +[% END -%] # Avoid overwriting user's dconf values. Fixes #27903. export GSETTINGS_BACKEND=memory ===================================== projects/browser/build ===================================== @@ -222,6 +222,15 @@ for tbdir in "${TBDIRS[@]}" do [% IF c("var/linux") -%] mv Bundle-Data/linux/Data/fontconfig "$tbdir/" + [% IF c("var/tor-browser") -%] + # tor-browser#41776: We cannot remove the old fontconfig file with the + # updater. So, let's keep it for the mar generation, but remove it from + # new packages. + # Remove once we do a watershed release. + oldfontconfig="$tbdir/TorBrowser/Data/fontconfig" + mkdir -p $oldfontconfig + cp "$tbdir/fontconfig/fonts.conf" "$oldfontconfig/" + [% END -%] [% END -%] mkdir -p "$tbdir/$DOCSPATH" @@ -357,6 +366,12 @@ cd $distdir [% END -%] [% IF c("var/linux") %] + [% IF c("var/tor-browser") %] + # We need the old fontconfig files only when updating from old installations + # that include it, but do not add it to new packages! + # Remove once we do a watershed release. + rm -rf "$TBDIR/TorBrowser/Data/fontconfig" + [% END -%] [% c('tar', { tar_src => [ '$PKG_DIR' ], tar_args => '-cJf $OUTDIR/' _ c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.tar.xz', View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.11.0esr-12.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 18 May '23

18 May '23

richard pushed to branch base-browser-102.11.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: cfca55d2 by hackademix at 2023-05-18T20:09:37+00:00 fixup! Firefox preference overrides. tor-browser#41764, prevent automatic download stuffing / DOS - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -44,6 +44,9 @@ pref("security.nocertdb", true); pref("browser.download.useDownloadDir", false); pref("browser.download.manager.addToRecentDocs", false); +// Prevent download stuffing / DOS (tor-browser#41764) +pref("browser.download.enable_spam_prevention", true); + // Misc privacy: Disk pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cfca55d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cfca55d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.0-1] fixup! Firefox preference overrides.
by richard (＠richard) 18 May '23

18 May '23

richard pushed to branch tor-browser-102.11.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 1a914ae1 by hackademix at 2023-05-18T20:09:05+00:00 fixup! Firefox preference overrides. tor-browser#41764, prevent automatic download stuffing / DOS - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -44,6 +44,9 @@ pref("security.nocertdb", true); pref("browser.download.useDownloadDir", false); pref("browser.download.manager.addToRecentDocs", false); +// Prevent download stuffing / DOS (tor-browser#41764) +pref("browser.download.enable_spam_prevention", true); + // Misc privacy: Disk pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1a914ae… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1a914ae… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.11.0esr-12.5-1] fixup! Firefox preference overrides.
by richard (＠richard) 18 May '23

18 May '23

richard pushed to branch base-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: b937f860 by hackademix at 2023-05-18T20:06:51+00:00 fixup! Firefox preference overrides. tor-browser#41764, prevent automatic download stuffing / DOS - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -48,6 +48,9 @@ pref("security.nocertdb", true); pref("browser.download.useDownloadDir", false); pref("browser.download.manager.addToRecentDocs", false); +// Prevent download stuffing / DOS (tor-browser#41764) +pref("browser.download.enable_spam_prevention", true); + // Misc privacy: Disk pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b937f86… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b937f86… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.5-1] fixup! Firefox preference overrides.
by richard (＠richard) 18 May '23

18 May '23

richard pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 2970a44d by hackademix at 2023-05-18T19:30:57+00:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -48,6 +48,9 @@ pref("security.nocertdb", true); pref("browser.download.useDownloadDir", false); pref("browser.download.manager.addToRecentDocs", false); +// Prevent download stuffing / DOS (tor-browser#41764) +pref("browser.download.enable_spam_prevention", true); + // Misc privacy: Disk pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2970a44… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2970a44… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-13.0-1] 12 commits: fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 17 May '23

17 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 98e75e48 by Pier Angelo Vendrame at 2023-05-17T10:25:44+02:00 fixup! Bug 40933: Add tor-launcher functionality Added a newnym function - - - - - 74e39196 by Pier Angelo Vendrame at 2023-05-17T10:25:52+02:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 40938: Moving the domain isolator out of torbutton - - - - - 0f9ea290 by Arthur Edelstein at 2023-05-17T10:25:53+02:00 Bug 3455: Add DomainIsolator, for isolating circuit by domain. Add an XPCOM component that registers a ProtocolProxyChannelFilter which sets the username/password for each web request according to url bar domain. Bug 9442: Add New Circuit button Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. Bug 19206: Clear out the domain isolator state on `New Identity`. Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes Bug 21745: Fix handling of catch-all circuit Bug 41741: Refactor the domain isolator and new circuit - - - - - 14058280 by Pier Angelo Vendrame at 2023-05-17T10:25:53+02:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. Refactors to the old JS code. - - - - - c94c9662 by Pier Angelo Vendrame at 2023-05-17T10:25:53+02:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. Manage NEWNYM here. - - - - - 994e4ce2 by Pier Angelo Vendrame at 2023-05-17T10:25:54+02:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. Removed the XPCOM definition of the domain isolator. - - - - - bcabee6b by Pier Angelo Vendrame at 2023-05-17T10:25:54+02:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Extract the new identity button from torbutton - - - - - 16cf26ff by Pier Angelo Vendrame at 2023-05-17T10:36:36+02:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. Actually added the new circuit button. - - - - - 39b5273c by Pier Angelo Vendrame at 2023-05-17T10:37:31+02:00 fixup! Bug 41600: Add a tor circuit display panel. Use the new domain isolator interface. - - - - - 9cd44b23 by Pier Angelo Vendrame at 2023-05-17T10:38:45+02:00 fixup! Bug 40209: Implement Basic Crypto Safety Use the new domain isolator interface - - - - - b27d2320 by Pier Angelo Vendrame at 2023-05-17T10:38:48+02:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Remove string changes from Torbutton. We will add them back in the TorStrings commit. - - - - - 5b547f81 by Pier Angelo Vendrame at 2023-05-17T10:38:49+02:00 fixup! Add TorStrings module for localization Add our DTDs where needed. These changes were originally in the torbutton commit, but I think they are better fit here, with all the strings files. - - - - - 15 changed files: - browser/actors/CryptoSafetyParent.jsm - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/browser.js - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/torcircuit/content/torCircuitPanel.js - + toolkit/components/tor-launcher/TorDomainIsolator.jsm - toolkit/components/tor-launcher/TorProtocolService.jsm - toolkit/components/tor-launcher/TorStartupService.jsm - toolkit/components/tor-launcher/moz.build - toolkit/torbutton/chrome/content/torbutton.js - − toolkit/torbutton/components/domain-isolator.js - toolkit/torbutton/jar.mn - toolkit/torbutton/modules/utils.js Changes: ===================================== browser/actors/CryptoSafetyParent.jsm ===================================== @@ -12,6 +12,12 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); +ChromeUtils.defineModuleGetter( + this, + "TorDomainIsolator", + "resource://gre/modules/TorDomainIsolator.jsm" +); + XPCOMUtils.defineLazyGetter(this, "cryptoSafetyBundle", () => { return Services.strings.createBundle( "chrome://browser/locale/cryptoSafetyPrompt.properties" @@ -75,7 +81,11 @@ class CryptoSafetyParent extends JSWindowActorParent { ); if (buttonPressed === 0) { - this.browsingContext.topChromeWindow.torbutton_new_circuit(); + const { browsingContext } = this.manager; + const browser = browsingContext.embedderElement; + if (browser) { + TorDomainIsolator.newCircuitForBrowser(browser.ownerGlobal.gBrowser); + } } } } ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -63,9 +63,9 @@ key="new-identity-key"/> <toolbarbutton id="appMenuNewCircuit" class="subviewbutton" - key="torbutton-new-circuit-key" + key="new-circuit-key" label="&torbutton.context_menu.new_circuit_sentence_case;" - oncommand="torbutton_new_circuit();"/> + oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);"/> <toolbarseparator/> <toolbarbutton id="appMenu-bookmarks-button" class="subviewbutton subviewbutton-nav" ===================================== browser/base/content/browser-menubar.inc ===================================== @@ -33,9 +33,9 @@ key="new-identity-key"/> <menuitem id="menu_newCircuit" accesskey="&torbutton.context_menu.new_circuit_key;" - key="torbutton-new-circuit-key" + key="new-circuit-key" label="&torbutton.context_menu.new_circuit;" - oncommand="torbutton_new_circuit();"/> + oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);"/> <menuseparator/> <menuitem id="menu_openLocation" hidden="true" ===================================== browser/base/content/browser-sets.inc ===================================== @@ -389,5 +389,5 @@ internal="true"/> #endif <key id="new-identity-key" modifiers="accel shift" key="U" oncommand="NewIdentityButton.onCommand(event)"/> - <key id="torbutton-new-circuit-key" modifiers="accel shift" key="L" oncommand="torbutton_new_circuit()"/> + <key id="new-circuit-key" modifiers="accel shift" key="L" oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser)"/> </keyset> ===================================== browser/base/content/browser.js ===================================== @@ -80,6 +80,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm", TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm", TorConnect: "resource:///modules/TorConnect.jsm", + TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.jsm", Translation: "resource:///modules/translation/TranslationParent.jsm", UITour: "resource:///modules/UITour.jsm", UpdateUtils: "resource://gre/modules/UpdateUtils.jsm", ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -557,7 +557,7 @@ <toolbarbutton id="new-circuit-button" class="toolbarbutton-1 chromeclass-toolbar-additional" label="&torbutton.context_menu.new_circuit;" - oncommand="torbutton_new_circuit();" + oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);" tooltiptext="&torbutton.context_menu.new_circuit;"/> <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" ===================================== browser/components/torcircuit/content/torCircuitPanel.js ===================================== @@ -193,7 +193,7 @@ var gTorCircuitPanel = { document .getElementById("tor-circuit-new-circuit") .addEventListener("command", () => { - torbutton_new_circuit(); + TorDomainIsolator.newCircuitForBrowser(gBrowser); // And hide. // NOTE: focus should return to the toolbar button, which we expect to // remain visible during reload. @@ -415,20 +415,14 @@ var gTorCircuitPanel = { */ _updateCurrentBrowser(matchingCredentials = null) { const browser = gBrowser.selectedBrowser; - const { getDomainForBrowser } = ChromeUtils.import( - "resource://torbutton/modules/utils.js" - ); - const domain = getDomainForBrowser(browser); + const domain = TorDomainIsolator.getDomainForBrowser(browser); // We choose the currentURI, which matches what is shown in the URL bar and // will match up with the domain. // In contrast, documentURI corresponds to the shown page. E.g. it could // point to "about:certerror". const scheme = browser.currentURI?.scheme; - const domainIsolator = Cc["@torproject.org/domain-isolator;1"].getService( - Ci.nsISupports - ).wrappedJSObject; - let credentials = domainIsolator.getSocksProxyCredentials( + let credentials = TorDomainIsolator.getSocksProxyCredentials( domain, browser.contentPrincipal.originAttributes.userContextId ); ===================================== toolkit/components/tor-launcher/TorDomainIsolator.jsm ===================================== @@ -0,0 +1,362 @@ +// A component for Tor Browser that puts requests from different +// first party domains on separate Tor circuits. + +var EXPORTED_SYMBOLS = ["TorDomainIsolator"]; + +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { XPCOMUtils } = ChromeUtils.import( + "resource://gre/modules/XPCOMUtils.jsm" +); +const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm"); + +Cu.importGlobalProperties(["crypto"]); + +XPCOMUtils.defineLazyServiceGetters(this, { + ProtocolProxyService: [ + "@mozilla.org/network/protocol-proxy-service;1", + "nsIProtocolProxyService", + ], +}); + +ChromeUtils.defineModuleGetter( + this, + "TorProtocolService", + "resource://gre/modules/TorProtocolService.jsm" +); + +const logger = new ConsoleAPI({ + prefix: "TorDomainIsolator", + maxLogLevel: "warn", + maxLogLevelPref: "browser.tordomainisolator.loglevel", +}); + +// The string to use instead of the domain when it is not known. +const CATCHALL_DOMAIN = "--unknown--"; + +// The preference to observe, to know whether isolation should be enabled or +// disabled. +const NON_TOR_PROXY_PREF = "extensions.torbutton.use_nontor_proxy"; + +// The topic of new identity, to observe to cleanup all the nonces. +const NEW_IDENTITY_TOPIC = "new-identity-requested"; + +class TorDomainIsolatorImpl { + // A mutable map that records what nonce we are using for each domain. + #noncesForDomains = new Map(); + + // A mutable map that records what nonce we are using for each tab container. + #noncesForUserContextId = new Map(); + + // A bool that controls if we use SOCKS auth for isolation or not. + #isolationEnabled = true; + + // Specifies when the current catch-all circuit was first used + #catchallDirtySince = Date.now(); + + /** + * Initialize the domain isolator. + * This function will setup the proxy filter that injects the credentials and + * register some observers. + */ + init() { + logger.info("Setup circuit isolation by domain and user context"); + + if (Services.prefs.getBoolPref(NON_TOR_PROXY_PREF)) { + this.#isolationEnabled = false; + } + this.#setupProxyFilter(); + + Services.prefs.addObserver(NON_TOR_PROXY_PREF, this); + Services.obs.addObserver(this, NEW_IDENTITY_TOPIC); + } + + /** + * Removes the observers added in the initialization. + */ + uninit() { + Services.prefs.removeObserver(NON_TOR_PROXY_PREF, this); + Services.obs.removeObserver(this, NEW_IDENTITY_TOPIC); + } + + enable() { + logger.trace("Domain isolation enabled"); + this.#isolationEnabled = true; + } + + disable() { + logger.trace("Domain isolation disabled"); + this.#isolationEnabled = false; + } + + /** + * Return the credentials to use as username and password for the SOCKS proxy, + * given a certain domain and userContextId. Optionally, create them. + * + * @param firstPartyDomain The first party domain associated to the requests + * @param userContextId The context ID associated to the request + * @param create Whether to create the nonce, if it is not available + * @return Either the credential, or null if we do not have them and create is + * false. + */ + getSocksProxyCredentials(firstPartyDomain, userContextId, create = false) { + if (!this.#noncesForDomains.has(firstPartyDomain)) { + if (!create) { + return null; + } + const nonce = this.#nonce(); + logger.info(`New nonce for first party ${firstPartyDomain}: ${nonce}`); + this.#noncesForDomains.set(firstPartyDomain, nonce); + } + if (!this.#noncesForUserContextId.has(userContextId)) { + if (!create) { + return null; + } + const nonce = this.#nonce(); + logger.info(`New nonce for userContextId ${userContextId}: ${nonce}`); + this.#noncesForUserContextId.set(userContextId, nonce); + } + return { + username: this.#makeUsername(firstPartyDomain, userContextId), + password: + this.#noncesForDomains.get(firstPartyDomain) + + this.#noncesForUserContextId.get(userContextId), + }; + } + + /** + * Create a new nonce for the FP domain of the selected browser and reload the + * tab with a new circuit. + * + * @param browser Should be the gBrowser from the context of the caller + */ + newCircuitForBrowser(browser) { + const firstPartyDomain = getDomainForBrowser(browser.selectedBrowser); + this.#newCircuitForDomain(firstPartyDomain); + // TODO: How to properly handle the user context? Should we use + // (domain, userContextId) pairs, instead of concatenating nonces? + browser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE); + } + + /** + * Clear the isolation state cache, forcing new circuits to be used for all + * subsequent requests. + */ + clearIsolation() { + logger.trace("Clearing isolation nonces."); + + // Per-domain and per contextId nonces are stored in maps, so simply clear + // them. + this.#noncesForDomains.clear(); + this.#noncesForUserContextId.clear(); + + // Force a rotation on the next catch-all circuit use by setting the + // creation time to the epoch. + this.#catchallDirtySince = 0; + } + + async observe(subject, topic, data) { + if (topic === "nsPref:changed" && data === NON_TOR_PROXY_PREF) { + if (Services.prefs.getBoolPref(NON_TOR_PROXY_PREF)) { + this.disable(); + } else { + this.enable(); + } + } else if (topic === NEW_IDENTITY_TOPIC) { + logger.info( + "New identity has been requested, clearing isolation tokens." + ); + this.clearIsolation(); + try { + await TorProtocolService.newnym(); + } catch (e) { + logger.error("Could not send the newnym command", e); + // TODO: What UX to use here? See tor-browser#41708 + } + } + } + + /** + * Setup a filter that for every HTTPChannel, replaces the default SOCKS proxy + * with one that authenticates to the SOCKS server (the tor client process) + * with a username (the first party domain and userContextId) and a nonce + * password. + * Tor provides a separate circuit for each username+password combination. + */ + #setupProxyFilter() { + const filterFunction = (aChannel, aProxy) => { + if (!this.#isolationEnabled) { + return aProxy; + } + try { + const channel = aChannel.QueryInterface(Ci.nsIChannel); + let firstPartyDomain = + channel.loadInfo.originAttributes.firstPartyDomain; + const userContextId = channel.loadInfo.originAttributes.userContextId; + if (firstPartyDomain === "") { + firstPartyDomain = CATCHALL_DOMAIN; + if (Date.now() - this.#catchallDirtySince > 1000 * 10 * 60) { + logger.info( + "tor catchall circuit has been dirty for over 10 minutes. Rotating." + ); + this.#newCircuitForDomain(CATCHALL_DOMAIN); + this.#catchallDirtySince = Date.now(); + } + } + const replacementProxy = this.#applySocksProxyCredentials( + aProxy, + firstPartyDomain, + userContextId + ); + logger.debug( + `Requested ${channel.URI.spec} via ${replacementProxy.username}:${replacementProxy.password}` + ); + return replacementProxy; + } catch (e) { + logger.error("Error while setting a new proxy", e); + return null; + } + }; + + ProtocolProxyService.registerChannelFilter( + { + applyFilter(aChannel, aProxy, aCallback) { + aCallback.onProxyFilterResult(filterFunction(aChannel, aProxy)); + }, + }, + 0 + ); + } + + /** + * Takes a proxyInfo object (originalProxy) and returns a new proxyInfo + * object with the same properties, except the username is set to the + * the domain and userContextId, and the password is a nonce. + */ + #applySocksProxyCredentials(originalProxy, domain, userContextId) { + const proxy = originalProxy.QueryInterface(Ci.nsIProxyInfo); + const { username, password } = this.getSocksProxyCredentials( + domain, + userContextId, + true + ); + return ProtocolProxyService.newProxyInfoWithAuth( + "socks", + proxy.host, + proxy.port, + username, + password, + "", // aProxyAuthorizationHeader + "", // aConnectionIsolationKey + proxy.flags, + proxy.failoverTimeout, + proxy.failoverProxy + ); + } + + /** + * Combine the needed data into a username for the proxy. + */ + #makeUsername(domain, userContextId) { + if (!domain) { + domain = CATCHALL_DOMAIN; + } + return `${domain}:${userContextId}`; + } + + /** + * Generate a new 128 bit random tag. + * + * Strictly speaking both using a cryptographic entropy source and using 128 + * bits of entropy for the tag are likely overkill, as correct behavior only + * depends on how unlikely it is for there to be a collision. + */ + #nonce() { + return Array.from(crypto.getRandomValues(new Uint8Array(16)), byte => + byte.toString(16).padStart(2, "0") + ).join(""); + } + + /** + * Re-generate the nonce for a certain domain. + */ + #newCircuitForDomain(domain) { + if (!domain) { + domain = CATCHALL_DOMAIN; + } + this.#noncesForDomains.set(domain, this.#nonce()); + logger.info( + `New domain isolation for ${domain}: ${this.#noncesForDomains.get( + domain + )}` + ); + } + + /** + * Re-generate the nonce for a userContextId. + * + * Currently, this function is not hooked to anything. + */ + #newCircuitForUserContextId(userContextId) { + this.#noncesForUserContextId.set(userContextId, this.#nonce()); + logger.info( + `New container isolation for ${userContextId}: ${this.#noncesForUserContextId.get( + userContextId + )}` + ); + } +} + +/** + * Get the first party domain for a certain browser. + * + * @param browser The browser to get the FP-domain for. + * + * Please notice that it should be gBrowser.selectedBrowser, because + * browser.documentURI is the actual shown page, and might be an error page. + * In this case, we rely on currentURI, which for gBrowser is an alias of + * gBrowser.selectedBrowser.currentURI. + * See browser/base/content/tabbrowser.js and tor-browser#31562. + */ +function getDomainForBrowser(browser) { + let fpd = browser.contentPrincipal.originAttributes.firstPartyDomain; + + // Bug 31562: For neterror or certerror, get the original URL from + // browser.currentURI and use it to calculate the firstPartyDomain. + const knownErrors = [ + "about:neterror", + "about:certerror", + "about:httpsonlyerror", + ]; + const { documentURI } = browser; + if ( + documentURI && + documentURI.schemeIs("about") && + knownErrors.some(x => documentURI.spec.startsWith(x)) + ) { + const knownSchemes = ["http", "https"]; + const currentURI = browser.currentURI; + if (currentURI && knownSchemes.some(x => currentURI.schemeIs(x))) { + try { + fpd = Services.eTLD.getBaseDomainFromHost(currentURI.host); + } catch (e) { + if ( + e.result === Cr.NS_ERROR_HOST_IS_IP_ADDRESS || + e.result === Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS + ) { + fpd = currentURI.host; + } else { + logger.error( + `Failed to get first party domain for host ${currentURI.host}`, + e + ); + } + } + } + } + + return fpd; +} + +const TorDomainIsolator = new TorDomainIsolatorImpl(); +// Reduce global vars pollution +TorDomainIsolator.getDomainForBrowser = getDomainForBrowser; ===================================== toolkit/components/tor-launcher/TorProtocolService.jsm ===================================== @@ -4,6 +4,7 @@ var EXPORTED_SYMBOLS = ["TorProtocolService"]; +const { ConsoleAPI } = ChromeUtils.import("resource://gre/modules/Console.jsm"); const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); ChromeUtils.defineModuleGetter( @@ -11,9 +12,6 @@ ChromeUtils.defineModuleGetter( "FileUtils", "resource://gre/modules/FileUtils.jsm" ); -const { XPCOMUtils } = ChromeUtils.import( - "resource://gre/modules/XPCOMUtils.jsm" -); Cu.importGlobalProperties(["crypto"]); @@ -45,18 +43,9 @@ const TorTopics = Object.freeze({ ProcessRestarted: "TorProcessRestarted", }); -// Logger adapted from CustomizableUI.jsm -XPCOMUtils.defineLazyGetter(this, "logger", () => { - const { ConsoleAPI } = ChromeUtils.import( - "resource://gre/modules/Console.jsm" - ); - // TODO: Use a preference to set the log level. - const consoleOptions = { - // maxLogLevel: "warn", - maxLogLevel: "all", - prefix: "TorProtocolService", - }; - return new ConsoleAPI(consoleOptions); +const logger = new ConsoleAPI({ + maxLogLevel: "warn", + prefix: "TorProtocolService", }); // Manage the connection to tor's control port, to update its settings and query @@ -194,6 +183,10 @@ const TorProtocolService = { TorMonitorService.retrieveBootstrapStatus(); }, + async newnym() { + return this.sendCommand("SIGNAL NEWNYM"); + }, + // TODO: transform the following 4 functions in getters. At the moment they // are also used in torbutton. ===================================== toolkit/components/tor-launcher/TorStartupService.jsm ===================================== @@ -33,6 +33,12 @@ ChromeUtils.defineModuleGetter( "resource:///modules/TorSettings.jsm" ); +ChromeUtils.defineModuleGetter( + this, + "TorDomainIsolator", + "resource://gre/modules/TorDomainIsolator.jsm" +); + /* Browser observer topis */ const BrowserTopics = Object.freeze({ ProfileAfterChange: "profile-after-change", @@ -67,12 +73,16 @@ class TorStartupService { TorSettings.init(); TorConnect.init(); + TorDomainIsolator.init(); + gInited = true; } _uninit() { Services.obs.removeObserver(this, BrowserTopics.QuitApplicationGranted); + TorDomainIsolator.uninit(); + // Close any helper connection first... TorProtocolService.uninit(); // ... and only then closes the event monitor connection, which will cause ===================================== toolkit/components/tor-launcher/moz.build ===================================== @@ -1,5 +1,6 @@ EXTRA_JS_MODULES += [ "TorBootstrapRequest.jsm", + "TorDomainIsolator.jsm", "TorLauncherUtil.jsm", "TorMonitorService.jsm", "TorParsers.jsm", ===================================== toolkit/torbutton/chrome/content/torbutton.js ===================================== @@ -1,6 +1,5 @@ // window globals var torbutton_init; -var torbutton_new_circuit; (() => { // Bug 1506 P1-P5: This is the main Torbutton overlay file. Much needs to be @@ -16,9 +15,7 @@ var torbutton_new_circuit; let { unescapeTorString, - getDomainForBrowser, torbutton_log, - torbutton_get_property_string, } = ChromeUtils.import("resource://torbutton/modules/utils.js"); let { configureControlPortModule, wait_for_controller } = ChromeUtils.import( "resource://torbutton/modules/tor-control-port.js" @@ -46,32 +43,22 @@ var torbutton_new_circuit; // in a component, not the XUL overlay. var torbutton_unique_pref_observer = { register() { - this.forced_ua = false; - m_tb_prefs.addObserver("extensions.torbutton", this); - m_tb_prefs.addObserver("browser.privatebrowsing.autostart", this); - m_tb_prefs.addObserver("javascript", this); + Services.prefs.addObserver("browser.privatebrowsing.autostart", this); }, unregister() { - m_tb_prefs.removeObserver("extensions.torbutton", this); - m_tb_prefs.removeObserver("browser.privatebrowsing.autostart", this); - m_tb_prefs.removeObserver("javascript", this); + Services.prefs.removeObserver("browser.privatebrowsing.autostart", this); }, // topic: what event occurred // subject: what nsIPrefBranch we're observing // data: which pref has been changed (relative to subject) observe(subject, topic, data) { - if (topic !== "nsPref:changed") { - return; - } - switch (data) { - case "browser.privatebrowsing.autostart": - torbutton_update_disk_prefs(); - break; - case "extensions.torbutton.use_nontor_proxy": - torbutton_use_nontor_proxy(); - break; + if ( + topic === "nsPref:changed" && + data === "browser.privatebrowsing.autostart" + ) { + torbutton_update_disk_prefs(); } }, }; @@ -113,62 +100,6 @@ var torbutton_new_circuit; }, }; - var torbutton_new_identity_observers = { - register() { - Services.obs.addObserver(this, "new-identity-requested"); - }, - - observe(aSubject, aTopic, aData) { - if (aTopic !== "new-identity-requested") { - return; - } - - // Clear the domain isolation state. - torbutton_log(3, "Clearing domain isolator"); - const domainIsolator = Cc["@torproject.org/domain-isolator;1"].getService( - Ci.nsISupports - ).wrappedJSObject; - domainIsolator.clearIsolation(); - - torbutton_log(3, "New Identity: Sending NEWNYM"); - // We only support TBB for newnym. - if ( - !m_tb_control_pass || - (!m_tb_control_ipc_file && !m_tb_control_port) - ) { - const warning = torbutton_get_property_string( - "torbutton.popup.no_newnym" - ); - torbutton_log( - 5, - "Torbutton cannot safely newnym. It does not have access to the Tor Control Port." - ); - window.alert(warning); - } else { - const warning = torbutton_get_property_string( - "torbutton.popup.no_newnym" - ); - torbutton_send_ctrl_cmd("SIGNAL NEWNYM") - .then(res => { - if (!res) { - torbutton_log( - 5, - "Torbutton was unable to request a new circuit from Tor" - ); - window.alert(warning); - } - }) - .catch(e => { - torbutton_log( - 5, - "Torbutton was unable to request a new circuit from Tor " + e - ); - window.alert(warning); - }); - } - }, - }; - // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. @@ -258,8 +189,6 @@ var torbutton_new_circuit; true ); - torbutton_new_identity_observers.register(); - torbutton_log(3, "init completed"); }; @@ -374,36 +303,6 @@ var torbutton_new_circuit; return response; } - // Bug 1506 P4: Needed for New IP Address - torbutton_new_circuit = function() { - let firstPartyDomain = getDomainForBrowser(gBrowser.selectedBrowser); - - let domainIsolator = Cc["@torproject.org/domain-isolator;1"].getService( - Ci.nsISupports - ).wrappedJSObject; - - domainIsolator.newCircuitForDomain(firstPartyDomain); - - gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE); - }; - - /* Called when we switch the use_nontor_proxy pref in either direction. - * - * Enables/disables domain isolation and then does new identity - */ - function torbutton_use_nontor_proxy() { - let domainIsolator = Cc["@torproject.org/domain-isolator;1"].getService( - Ci.nsISupports - ).wrappedJSObject; - - if (m_tb_prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { - // Disable domain isolation - domainIsolator.disableIsolation(); - } else { - domainIsolator.enableIsolation(); - } - } - async function torbutton_do_tor_check() { let checkSvc = Cc["@torproject.org/torbutton-torCheckService;1"].getService( Ci.nsISupports ===================================== toolkit/torbutton/components/domain-isolator.js deleted ===================================== @@ -1,312 +0,0 @@ -// # domain-isolator.js -// A component for TorBrowser that puts requests from different -// first party domains on separate tor circuits. - -// This file is written in call stack order (later functions -// call earlier functions). The code file can be processed -// with docco.js to provide clear documentation. - -// ### Abbreviations - -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { XPCOMUtils } = ChromeUtils.import( - "resource://gre/modules/XPCOMUtils.jsm" -); - -XPCOMUtils.defineLazyModuleGetters(this, { - ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", -}); - -// Make the logger available. -let logger = Cc["@torproject.org/torbutton-logger;1"].getService(Ci.nsISupports) - .wrappedJSObject; - -// Import crypto object (FF 37+). -Cu.importGlobalProperties(["crypto"]); - -// ## mozilla namespace. -// Useful functionality for interacting with Mozilla services. -let mozilla = {}; - -// __mozilla.protocolProxyService__. -// Mozilla's protocol proxy service, useful for managing proxy connections made -// by the browser. -mozilla.protocolProxyService = Cc[ - "@mozilla.org/network/protocol-proxy-service;1" -].getService(Ci.nsIProtocolProxyService); - -// __mozilla.registerProxyChannelFilter(filterFunction, positionIndex)__. -// Registers a proxy channel filter with the Mozilla Protocol Proxy Service, -// which will help to decide the proxy to be used for a given channel. -// The filterFunction should expect two arguments, (aChannel, aProxy), -// where aProxy is the proxy or list of proxies that would be used by default -// for the given channel, and should return a new Proxy or list of Proxies. -mozilla.registerProxyChannelFilter = function(filterFunction, positionIndex) { - let proxyFilter = { - applyFilter(aChannel, aProxy, aCallback) { - aCallback.onProxyFilterResult(filterFunction(aChannel, aProxy)); - }, - }; - mozilla.protocolProxyService.registerChannelFilter( - proxyFilter, - positionIndex - ); -}; - -// ## tor functionality. -let tor = {}; - -// __tor.noncesForDomains__. -// A mutable map that records what nonce we are using for each domain. -tor.noncesForDomains = new Map(); - -// __tor.noncesForUserContextId__. -// A mutable map that records what nonce we are using for each tab container. -tor.noncesForUserContextId = new Map(); - -// __tor.isolationEabled__. -// A bool that controls if we use SOCKS auth for isolation or not. -tor.isolationEnabled = true; - -// __tor.unknownDirtySince__. -// Specifies when the current catch-all circuit was first used -tor.unknownDirtySince = Date.now(); - -tor.passwordForDomainAndUserContextId = function( - domain, - userContextId, - create -) { - // Check if we already have a nonce. If not, possibly create one for this - // domain and userContextId. - if (!tor.noncesForDomains.has(domain)) { - if (!create) { - return null; - } - tor.noncesForDomains.set(domain, tor.nonce()); - } - if (!tor.noncesForUserContextId.has(userContextId)) { - if (!create) { - return null; - } - tor.noncesForUserContextId.set(userContextId, tor.nonce()); - } - return ( - tor.noncesForDomains.get(domain) + - tor.noncesForUserContextId.get(userContextId) - ); -}; - -tor.usernameForDomainAndUserContextId = function(domain, userContextId) { - return `${domain}:${userContextId}`; -}; - -// __tor.socksProxyCredentials(originalProxy, domain, userContextId)__. -// Takes a proxyInfo object (originalProxy) and returns a new proxyInfo -// object with the same properties, except the username is set to the -// the domain and userContextId, and the password is a nonce. -tor.socksProxyCredentials = function(originalProxy, domain, userContextId) { - let proxy = originalProxy.QueryInterface(Ci.nsIProxyInfo); - let proxyUsername = tor.usernameForDomainAndUserContextId( - domain, - userContextId - ); - let proxyPassword = tor.passwordForDomainAndUserContextId( - domain, - userContextId, - true - ); - return mozilla.protocolProxyService.newProxyInfoWithAuth( - "socks", - proxy.host, - proxy.port, - proxyUsername, - proxyPassword, - "", // aProxyAuthorizationHeader - "", // aConnectionIsolationKey - proxy.flags, - proxy.failoverTimeout, - proxy.failoverProxy - ); -}; - -tor.nonce = function() { - // Generate a new 128 bit random tag. Strictly speaking both using a - // cryptographic entropy source and using 128 bits of entropy for the - // tag are likely overkill, as correct behavior only depends on how - // unlikely it is for there to be a collision. - let tag = new Uint8Array(16); - crypto.getRandomValues(tag); - - // Convert the tag to a hex string. - let tagStr = ""; - for (let i = 0; i < tag.length; i++) { - tagStr += (tag[i] >>> 4).toString(16); - tagStr += (tag[i] & 0x0f).toString(16); - } - - return tagStr; -}; - -tor.newCircuitForDomain = function(domain) { - // Re-generate the nonce for the domain. - if (domain === "") { - domain = "--unknown--"; - } - tor.noncesForDomains.set(domain, tor.nonce()); - logger.eclog( - 3, - `New domain isolation for ${domain}: ${tor.noncesForDomains.get(domain)}` - ); -}; - -tor.newCircuitForUserContextId = function(userContextId) { - // Re-generate the nonce for the context. - tor.noncesForUserContextId.set(userContextId, tor.nonce()); - logger.eclog( - 3, - `New container isolation for ${userContextId}: ${tor.noncesForUserContextId.get( - userContextId - )}` - ); -}; - -// __tor.clearIsolation()_. -// Clear the isolation state cache, forcing new circuits to be used for all -// subsequent requests. -tor.clearIsolation = function() { - // Per-domain and per contextId nonces are stored in maps, so simply clear them. - tor.noncesForDomains.clear(); - tor.noncesForUserContextId.clear(); - - // Force a rotation on the next catch-all circuit use by setting the creation - // time to the epoch. - tor.unknownDirtySince = 0; -}; - -// __tor.isolateCircuitsByDomain()__. -// For every HTTPChannel, replaces the default SOCKS proxy with one that authenticates -// to the SOCKS server (the tor client process) with a username (the first party domain -// and userContextId) and a nonce password. Tor provides a separate circuit for each -// username+password combination. -tor.isolateCircuitsByDomain = function() { - mozilla.registerProxyChannelFilter(function(aChannel, aProxy) { - if (!tor.isolationEnabled) { - return aProxy; - } - try { - let channel = aChannel.QueryInterface(Ci.nsIChannel), - firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain, - userContextId = channel.loadInfo.originAttributes.userContextId; - if (firstPartyDomain === "") { - firstPartyDomain = "--unknown--"; - if (Date.now() - tor.unknownDirtySince > 1000 * 10 * 60) { - logger.eclog( - 3, - "tor catchall circuit has been dirty for over 10 minutes. Rotating." - ); - tor.newCircuitForDomain("--unknown--"); - tor.unknownDirtySince = Date.now(); - } - } - let replacementProxy = tor.socksProxyCredentials( - aProxy, - firstPartyDomain, - userContextId - ); - logger.eclog( - 3, - `tor SOCKS: ${channel.URI.spec} via - ${replacementProxy.username}:${replacementProxy.password}` - ); - return replacementProxy; - } catch (e) { - logger.eclog(4, `tor domain isolator error: ${e.message}`); - return null; - } - }, 0); -}; - -// ## XPCOM component construction. -// Module specific constants -const kMODULE_NAME = "TorBrowser Domain Isolator"; -const kMODULE_CONTRACTID = "@torproject.org/domain-isolator;1"; -const kMODULE_CID = Components.ID("e33fd6d4-270f-475f-a96f-ff3140279f68"); - -// DomainIsolator object. -function DomainIsolator() { - this.wrappedJSObject = this; -} - -// Firefox component requirements -DomainIsolator.prototype = { - QueryInterface: ChromeUtils.generateQI([Ci.nsIObserver]), - classDescription: kMODULE_NAME, - classID: kMODULE_CID, - contractID: kMODULE_CONTRACTID, - observe(subject, topic, data) { - if (topic === "profile-after-change") { - logger.eclog(3, "domain isolator: set up isolating circuits by domain"); - - if (Services.prefs.getBoolPref("extensions.torbutton.use_nontor_proxy")) { - tor.isolationEnabled = false; - } - tor.isolateCircuitsByDomain(); - } - }, - - newCircuitForDomain(domain) { - tor.newCircuitForDomain(domain); - }, - - /** - * Return the stored SOCKS proxy username and password for the given domain - * and user context ID. - * - * @param {string} firstPartyDomain - The domain to lookup credentials for. - * @param {integer} userContextId - The ID for the user context. - * - * @return {{ username: string, password: string }?} - The SOCKS credentials, - * or null if none are found. - */ - getSocksProxyCredentials(firstPartyDomain, userContextId) { - if (firstPartyDomain == "") { - firstPartyDomain = "--unknown--"; - } - let proxyPassword = tor.passwordForDomainAndUserContextId( - firstPartyDomain, - userContextId, - // Do not create a new entry if it does not exist. - false - ); - if (!proxyPassword) { - return null; - } - return { - username: tor.usernameForDomainAndUserContextId( - firstPartyDomain, - userContextId - ), - password: proxyPassword, - }; - }, - - enableIsolation() { - tor.isolationEnabled = true; - }, - - disableIsolation() { - tor.isolationEnabled = false; - }, - - clearIsolation() { - tor.clearIsolation(); - }, - - wrappedJSObject: null, -}; - -// Assign factory to global object. -const NSGetFactory = XPCOMUtils.generateNSGetFactory - ? XPCOMUtils.generateNSGetFactory([DomainIsolator]) - : ComponentUtils.generateNSGetFactory([DomainIsolator]); ===================================== toolkit/torbutton/jar.mn ===================================== @@ -43,9 +43,5 @@ torbutton.jar: % component {f36d72c9-9718-4134-b550-e109638331d7} %components/torbutton-logger.js % contract @torproject.org/torbutton-logger;1 {f36d72c9-9718-4134-b550-e109638331d7} -% component {e33fd6d4-270f-475f-a96f-ff3140279f68} %components/domain-isolator.js -% contract @torproject.org/domain-isolator;1 {e33fd6d4-270f-475f-a96f-ff3140279f68} - % category profile-after-change StartupObserver @torproject.org/startup-observer;1 -% category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 % category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1 ===================================== toolkit/torbutton/modules/utils.js ===================================== @@ -213,45 +213,6 @@ var unescapeTorString = function(str) { return _torControl._strUnescape(str); }; -var getFPDFromHost = hostname => { - try { - return Services.eTLD.getBaseDomainFromHost(hostname); - } catch (e) { - if ( - e.result == Cr.NS_ERROR_HOST_IS_IP_ADDRESS || - e.result == Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS - ) { - return hostname; - } - } - return null; -}; - -// Assuming this is called with gBrowser.selectedBrowser -var getDomainForBrowser = browser => { - let fpd = browser.contentPrincipal.originAttributes.firstPartyDomain; - // Bug 31562: For neterror or certerror, get the original URL from - // browser.currentURI and use it to calculate the firstPartyDomain. - let knownErrors = [ - "about:neterror", - "about:certerror", - "about:httpsonlyerror", - ]; - let documentURI = browser.documentURI; - if ( - documentURI && - documentURI.schemeIs("about") && - knownErrors.some(x => documentURI.spec.startsWith(x)) - ) { - let knownSchemes = ["http", "https", "ftp"]; - let currentURI = browser.currentURI; - if (currentURI && knownSchemes.some(x => currentURI.schemeIs(x))) { - fpd = getFPDFromHost(currentURI.host) || fpd; - } - } - return fpd; -}; - var m_tb_torlog = Cc["@torproject.org/torbutton-logger;1"].getService( Ci.nsISupports ).wrappedJSObject; @@ -310,7 +271,6 @@ let EXPORTED_SYMBOLS = [ "bindPrefAndInit", "getEnv", "getLocale", - "getDomainForBrowser", "getPrefValue", "observe", "showDialog", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ff98f1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ff98f1… 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-102.11.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 17 May '23

17 May '23

Pier Angelo Vendrame pushed new branch tor-browser-102.11.0esr-13.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/tor-browser][base-browser-102.11.0esr-12.5-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 17 May '23

17 May '23

Pier Angelo Vendrame pushed to branch base-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: cdb91f71 by Pier Angelo Vendrame at 2023-05-17T08:31:37+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp. They are already defined in toolkit/xre/nsUpdateDriver.h. - - - - - 1 changed file: - toolkit/xre/nsUpdateDriver.cpp Changes: ===================================== toolkit/xre/nsUpdateDriver.cpp ===================================== @@ -64,16 +64,6 @@ static LazyLogModule sUpdateLog("updatedriver"); #endif #define LOG(args) MOZ_LOG(sUpdateLog, mozilla::LogLevel::Debug, args) -#ifdef XP_WIN -# define UPDATER_BIN "updater.exe" -# define MAINTENANCE_SVC_NAME L"MozillaMaintenance" -#elif XP_MACOSX -# define UPDATER_APP "updater.app" -# define UPDATER_BIN "org.mozilla.updater" -#else -# define UPDATER_BIN "updater" -#endif - #ifdef XP_MACOSX static void UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cdb91f7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cdb91f7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.5-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 17 May '23

17 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ff98f1b1 by Pier Angelo Vendrame at 2023-05-11T11:15:17+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp. They are already defined in toolkit/xre/nsUpdateDriver.h. - - - - - 1 changed file: - toolkit/xre/nsUpdateDriver.cpp Changes: ===================================== toolkit/xre/nsUpdateDriver.cpp ===================================== @@ -64,16 +64,6 @@ static LazyLogModule sUpdateLog("updatedriver"); #endif #define LOG(args) MOZ_LOG(sUpdateLog, mozilla::LogLevel::Debug, args) -#ifdef XP_WIN -# define UPDATER_BIN "updater.exe" -# define MAINTENANCE_SVC_NAME L"MozillaMaintenance" -#elif XP_MACOSX -# define UPDATER_APP "updater.app" -# define UPDATER_BIN "org.mozilla.updater" -#else -# define UPDATER_BIN "updater" -#endif - #ifdef XP_MACOSX static void UpdateDriverSetupMacCommandLine(int& argc, char**& argv, bool restart) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ff98f1b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ff98f1b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Update rbm for rbm#40018, rbm#40051 and rbm#40052
by boklm (＠boklm) 17 May '23

17 May '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 9ce60dc8 by Nicolas Vigier at 2023-05-17T08:10:13+02:00 Update rbm for rbm#40018, rbm#40051 and rbm#40052 - - - - - c9d42e1a by Nicolas Vigier at 2023-05-17T08:10:18+02:00 Bug 40849: Use `go mod vendor` to fetch go dependencies Update conjure, webtunnel, obfs4 and snowflake to use `go mod vendor` to fetch dependencies. We still have some go module projects, for dependencies of projects/ncprop279/config, which doesn't have a `go.sum` file yet. - - - - - 30 changed files: - Makefile - + doc/how-to-update-go-dependencies.txt - − projects/agouti/config - − projects/andybalholm-brotli/config - projects/browser/config - − projects/bsbuffer/config - projects/conjure/build - projects/conjure/config - − projects/edwards25519-extra/config - − projects/edwards25519/config - − projects/go-cmp/config - − projects/go-difflib/config - − projects/go-spew/config - projects/go/config - − projects/gocheck/config - − projects/goerrors/config - − projects/gomock/config - − projects/goprotobuf/config - − projects/goptlib/config - − projects/gotapdance/config - − projects/goxtext/config - − projects/goxxerrors/config - − projects/goyaml/config - − projects/kcp-go/config - − projects/klauspost-compress/config - − projects/logrus/config - projects/ncdns/build - projects/ncprop279/build - − projects/obfs4-lib/config - projects/obfs4/build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] 3 commits: Bug 40051: Fix test after change of default value for compress_tar
by boklm (＠boklm) 17 May '23

17 May '23

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: 27a89ca5 by Nicolas Vigier at 2023-05-08T18:06:36+02:00 Bug 40051: Fix test after change of default value for compress_tar Default value for compress_tar was changed in a91d4653cb5f66d86fd4d306c564161acfd6fa79. - - - - - 60c5aff5 by Nicolas Vigier at 2023-05-17T08:03:40+02:00 Bug 40018: Add target_replace option in input_files - - - - - 37c204c3 by Nicolas Vigier at 2023-05-17T08:03:43+02:00 Bug 40052: Allow setting sha256sum as norec - - - - - 6 changed files: - doc/rbm_input_files.asc - lib/RBM.pm - test.pl - + test/projects/change-targets/config - test/projects/mozmill-automation/config - test/rbm.conf Changes: ===================================== doc/rbm_input_files.asc ===================================== @@ -92,6 +92,12 @@ target_prepend:: The same as +target+, but instead of replacing the current targets, the new targets are prepended. +target_replace:: + A hash table containing targets to replace. The key is a regular + expression, and the value the replacement. See +perlre+ manual + page for details about the syntax. Note that referencing capture + groups in the replacement is currently not supported. + enable:: The files are enabled by default. If this option is set to 0, then the file is ignored. ===================================== lib/RBM.pm ===================================== @@ -779,7 +779,7 @@ sub input_file_need_dl { my ($input_file, $t, $fname, $action) = @_; return undef if $action eq 'getfpaths'; if ($fname - && $input_file->{sha256sum} + && ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) && $t->('sha256sum') ne sha256file($fname)) { sha256file($fname, { remove_cache => 1 }); $fname = undef; @@ -787,6 +787,7 @@ sub input_file_need_dl { if ($action eq 'input_files_id') { return undef if $input_file->{input_file_id}; return undef if $input_file->{sha256sum}; + return undef if $input_file->{norec}{sha256sum}; return undef if $input_file->{exec}; return undef if $fname; return 1 if $input_file->{URL}; @@ -810,7 +811,9 @@ sub input_file_id { my ($input_file, $t, $fname, $filename) = @_; return $t->('input_file_id') if $input_file->{input_file_id}; return $input_file->{project} . ':' . $filename if $input_file->{project}; - return $filename . ':' . $t->('sha256sum') if $input_file->{sha256sum}; + if ($input_file->{sha256sum} || $input_file->{norec}{sha256sum}) { + return $filename . ':' . $t->('sha256sum'); + } my $opts = { norec => { output_dir => '/out', getting_id => 1, }}; return $filename . ':' . sha256_hex($t->('exec', $opts)) if $input_file->{exec}; @@ -898,13 +901,18 @@ sub input_files { next; } if ($input_file->{target} || $input_file->{target_append} - || $input_file->{target_prepend}) { + || $input_file->{target_prepend} + || $input_file->{target_replace}) { $input_file = { %$input_file }; foreach my $t (qw/target target_append target_prepend/) { if ($input_file->{$t} && ref $input_file->{$t} ne 'ARRAY') { exit_error("$t should be an ARRAY:\n" . pp($input_file)); } } + if ($input_file->{target_replace} && + ref $input_file->{target_replace} ne 'HASH') { + exit_error("target_replace should be a HASH\n" . pp($input_file)); + } if ($input_file->{target}) { $input_file->{target} = process_template_opt($project, $input_file->{target}, $options); @@ -923,6 +931,14 @@ sub input_files { $input_file->{target_append}, $options) } ]; } + if ($input_file->{target_replace}) { + foreach my $pattern (keys %{$input_file->{target_replace}}) { + my $subst = $input_file->{target_replace}{$pattern}; + $input_file->{target} = [ + map { s/$pattern/$subst/r } @{$input_file->{target}} + ]; + } + } } if ($action eq 'getfnames') { my $getfnames_name; ===================================== test.pl ===================================== @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; use Path::Tiny; -use Test::More tests => 40; +use Test::More tests => 41; use lib 'lib/'; sub set_target { @@ -220,6 +220,14 @@ my @tests = ( 'out/r3' => "1 - build\n2 - build\n3 - build\n", }, }, + { + name => 'multi-steps build with changing targets', + target => [ 'target_a' ], + build => [ 'change-targets', 'build', { pkg_type => 'build' } ], + files => { + 'out/change-targets.txt' => "no\nz\ntta\n", + }, + }, { name => 'build project in a module', target => [], ===================================== test/projects/change-targets/config ===================================== @@ -0,0 +1,49 @@ +# vim: filetype=yaml sw=2 + +targets: + tt_a: + option_a: 'tta' + + +steps: + + build: + filename: change-targets.txt + build: | + #!/bin/sh + cat preptarget.txt replacetarget-1.txt replacetarget-2.txt > [% dest_dir %]/[% c('filename') %] + input_files: + - name: preptarget + refresh_input: 1 + project: change-targets + pkg_type: preptarget + target_prepend: + - target_b + - name: replacetarget + r: 1 + refresh_input: 1 + project: change-targets + pkg_type: replacetarget + target_replace: + '^target_a$': target_z + - name: replacetarget + r: 2 + refresh_input: 1 + project: change-targets + pkg_type: replacetarget + target_replace: + '^target_.*$': 'tt_a' + + preptarget: + filename: preptarget.txt + preptarget: | + #!/bin/sh + echo [% c('option_a') %] > [% dest_dir %]/[% c('filename') %] + input_files: [] + + replacetarget: + filename: 'replacetarget-[% c("r") %].txt' + replacetarget: | + #!/bin/sh + echo [% c('option_a') %] > [% dest_dir %]/[% c('filename') %] + input_files: [] ===================================== test/projects/mozmill-automation/config ===================================== @@ -1,6 +1,7 @@ version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/qa/mozmill-automation/ hg_hash: bbad7215c713 +compress_tar: '' t: '[% sha256(exec("cat testrun_remote.py")) %]' build: | #!/bin/sh ===================================== test/rbm.conf ===================================== @@ -15,6 +15,8 @@ targets: - target_c - target_a - target_b + target_z: + option_a: z steps: rpm: option_rpm: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/compare/bf35e085111a6f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/compare/bf35e085111a6f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.0a1-13.0-1
by Pier Angelo Vendrame (＠pierov) 16 May '23

16 May '23

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

1 0

[Git][tpo/applications/tor-browser-build][main] 4 commits: Bug 32355: binutils: Add linux-cross target
by boklm (＠boklm) 15 May '23

15 May '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 1f881995 by JeremyRand at 2023-05-15T11:34:26+00:00 Bug 32355: binutils: Add linux-cross target - - - - - eb83bb70 by Jeremy Rand at 2023-05-15T11:34:26+00:00 Bug 32355: gcc: Add linux-arm target - - - - - 25d02d5d by JeremyRand at 2023-05-15T11:34:26+00:00 Bug 32355: openssl: Add linux-arm target - - - - - 225f00eb by Jeremy Rand at 2023-05-15T11:34:26+00:00 Bug 32355: gcc: Add osname to output filename Makes it easier to tell which outputs are for linux-cross. - - - - - 5 changed files: - projects/binutils/build - projects/binutils/config - projects/gcc/build - projects/gcc/config - projects/openssl/config Changes: ===================================== projects/binutils/build ===================================== @@ -23,7 +23,11 @@ cd [% project %]-[% c("version") %] make -j[% c("num_procs") %] MAKEINFO=true make install MAKEINFO=true -[% IF c("var/linux") %] +# gold is disabled for linux-cross, because of +# https://sourceware.org/bugzilla/show_bug.cgi?id=14995 +# Once we upgrade to glibc 2.26, we might be able to enable gold for +# linux-cross. +[% IF c("var/linux") && ! c("var/linux-cross") %] # Make sure gold is used with the hardening wrapper for full RELRO, see #13031. cd $distdir/bin rm ld ===================================== projects/binutils/config ===================================== @@ -10,6 +10,11 @@ targets: windows: var: configure_opt: '--target=[% c("arch") %]-w64-mingw32 --disable-multilib --enable-deterministic-archives' + linux-cross: + var: + # gold is disabled on cross-compiles until we upgrade to glibc 2.26 and + # binutils 2.28 + configure_opt: '--target=[% c("var/crosstarget") %] --disable-multilib --enable-deterministic-archives --enable-plugins' input_files: - URL: https://ftp.gnu.org/gnu/binutils/binutils-[% c("version") %].tar.xz ===================================== projects/gcc/build ===================================== @@ -16,11 +16,85 @@ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48817. export DEB_BUILD_HARDENING_FORMAT=0 [% END -%] -distdir=/var/tmp/dist/[% project %] +distdir=/var/tmp/dist/[% c("var/distdir") %] mkdir /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/gcc') %] -cd /var/tmp/build/[% project %]-[% c("version") %] -./configure --prefix=$distdir [% c("var/configure_opt") %] + +[% IF c("var/linux-cross") -%] + + # Install binutils (needed for cross-compiling) + mkdir /var/tmp/dist + cd /var/tmp/dist + tar xf $rootdir/[% c('input_files_by_name/binutils') %] + mv binutils $distdir + export PATH="$distdir/bin:$PATH" + + # Install Linux headers, see Step 2 of + # https://preshing.com/20141119/how-to-build-a-gcc-cross-compiler/ + # Doing this before gcc configure is intended to solve a limits.h issue + cd /var/tmp/build + mkdir linux + cd linux + tar -xJf $rootdir/linux-[% c("var/linux_version") %].tar.xz + cd linux-[% c("var/linux_version") %] + make ARCH=[% c("arch") %] INSTALL_HDR_PATH=$distdir/[% c("var/crosstarget") %] headers_install + + cd /var/tmp/build + mkdir gcc + cd gcc + tar -xJf $rootdir/[% c('input_files_by_name/gcc') %] + # --with-headers is intended to solve a limits.h issue + [% project %]-[% c("version") %]/configure --prefix=$distdir --with-headers=$distdir/[% c("var/crosstarget") %]/include/linux [% c("var/configure_opt") %] + + # For cross-compiling to work, we need to partially build GCC, then build + # glibc, then come back to finish GCC. + + # Build only the components of GCC that don't need glibc, see Step 3 of + # https://preshing.com/20141119/how-to-build-a-gcc-cross-compiler/ + cd /var/tmp/build/gcc + make -j[% c("num_procs") %] all-gcc + make install-gcc + # Removing sys-include is intended to solve a limits.h issue + rm --recursive --force $distdir/[% c("var/crosstarget") %]/sys-include + + # Build glibc headers and startup files, see Step 4 of + # https://preshing.com/20141119/how-to-build-a-gcc-cross-compiler/ + cd /var/tmp/build + mkdir glibc + cd glibc + tar -xJf $rootdir/glibc-[% c("var/glibc_version") %].tar.xz + # TODO: Remove --disable-werror once glibc is upgraded to a version that's + # designed to work with the GCC version we're using. + glibc-[% c("var/glibc_version") %]/configure --prefix=$distdir/[% c("var/crosstarget") %] --build=$MACHTYPE --host=[% c("var/crosstarget") %] --target=[% c("var/crosstarget") %] --with-headers=$distdir/[% c("var/crosstarget") %]/include --disable-multilib --disable-werror libc_cv_forced_unwind=yes + make install-bootstrap-headers=yes install-headers + make -j[% c("num_procs") %] csu/subdir_lib + install csu/crt1.o csu/crti.o csu/crtn.o $distdir/[% c("var/crosstarget") %]/lib + [% c("var/crosstarget") %]-gcc -nostdlib -nostartfiles -shared -x c /dev/null -o $distdir/[% c("var/crosstarget") %]/lib/libc.so + # stdio_lim.h is intended to solve a limits.h issue + touch $distdir/[% c("var/crosstarget") %]/include/gnu/stubs.h $distdir/[% c("var/crosstarget") %]/include/bits/stdio_lim.h + + # Build compiler support library, see Step 5 of + # https://preshing.com/20141119/how-to-build-a-gcc-cross-compiler/ + cd /var/tmp/build/gcc + make -j[% c("num_procs") %] all-target-libgcc + make install-target-libgcc + + # finish building glibc, see Step 6 of + # https://preshing.com/20141119/how-to-build-a-gcc-cross-compiler/ + cd /var/tmp/build/glibc + make -j[% c("num_procs") %] + make install + + # We're done with glibc, we can now finish building gcc... + cd /var/tmp/build/gcc + +[% ELSE -%] + + tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/gcc') %] + cd /var/tmp/build/[% project %]-[% c("version") %] + ./configure --prefix=$distdir [% c("var/configure_opt") %] + +[% END -%] + make -j[% c("num_procs") %] make install # tor-browser-build#31321: we need a link to our GCC, to prevent some projects @@ -28,6 +102,6 @@ make install ln -s gcc $distdir/bin/cc cd /var/tmp/dist [% c('tar', { - tar_src => [ project ], + tar_src => [ c('var/distdir') ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), }) %] ===================================== projects/gcc/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% IF c("var/linux-cross") %][% c("var/osname") %][% ELSE %]x86[% END %]-[% c("var/build_id") %].tar.gz' # Note: When updating the gcc version, if this includes a libstdc++ # ABI change we should also update projects/firefox/abicheck.cc to # require the new version. @@ -7,14 +7,17 @@ version: '[% pc("gcc-source", "version") %]' container: use_container: 1 var: + distdir: gcc deps: - build-essential - libmpc-dev setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] - export PATH="/var/tmp/dist/gcc/bin:$PATH" - export LD_LIBRARY_PATH=/var/tmp/dist/gcc/lib64:/var/tmp/dist/gcc/lib32 + export PATH="/var/tmp/dist/[% c("var/distdir") %]/bin:$PATH" + [% IF ! c("var/linux-cross") -%] + export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64:/var/tmp/dist/[% c("var/distdir") %]/lib32 + [% END -%] [% IF c("hardened_gcc") -%] # Config options for hardening-wrapper @@ -25,14 +28,14 @@ var: export DEB_BUILD_HARDENING_PIE=1 # Make sure we use the hardening wrapper - pushd /var/tmp/dist/gcc/bin + pushd /var/tmp/dist/[% c("var/distdir") %]/bin cp /usr/bin/hardened-cc ./ - mv gcc gcc.real - mv c++ c++.real - mv g++ g++.real - ln -sf hardened-cc gcc - ln -sf hardened-cc c++ - ln -sf hardened-cc g++ + mv [% c("var/target_prefix") %]gcc [% c("var/target_prefix") %]gcc.real + mv [% c("var/target_prefix") %]c++ [% c("var/target_prefix") %]c++.real + mv [% c("var/target_prefix") %]g++ [% c("var/target_prefix") %]g++.real + ln -sf hardened-cc [% c("var/target_prefix") %]gcc + ln -sf hardened-cc [% c("var/target_prefix") %]c++ + ln -sf hardened-cc [% c("var/target_prefix") %]g++ popd [% END -%] @@ -50,8 +53,34 @@ targets: arch_deps: - hardening-wrapper - libc6-dev-i386 + linux-cross: + var: + target_prefix: '[% c("var/crosstarget") %]-' + distdir: gcc-cross + # TODO: Consider upgrading to a glibc that works out of the box with the + # GCC version we use. However, removing our glibc version workarounds may + # not be desirable since we want to be able to easily bump the GCC + # version without worrying about linux-cross breakage. + glibc_version: 2.26 + linux_version: 4.10.1 + arch_deps: + - hardening-wrapper + - libc6-dev-i386 + - gawk + linux-arm: + var: + configure_opt: --disable-multilib --enable-languages=c,c++ --target=arm-linux-gnueabihf --with-arch=armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb input_files: - project: container-image - project: gcc-source name: gcc + - name: binutils + project: binutils + enable: '[% c("var/linux-cross") -%]' + - URL: 'https://ftp.gnu.org/gnu/glibc/glibc-[% c("var/glibc_version") %].tar.xz' + sha256sum: e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd + enable: '[% c("var/linux-cross") -%]' + - URL: 'https://www.kernel.org/pub/linux/kernel/v4.x/linux-[% c("var/linux_version") %].tar.xz' + sha256sum: 6ca06bb5faf5f83600d7388bb623dae41df2a257de85ad5d1792e03302bc3543 + enable: '[% c("var/linux-cross") -%]' ===================================== projects/openssl/config ===================================== @@ -14,6 +14,9 @@ targets: linux-i686: var: configure_opts: -shared linux-x86 + linux-arm: + var: + configure_opts: -shared --cross-compile-prefix=[% c("var/crosstarget") %]- linux-armv4 windows: var: flag_mwindows: '' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40856: Temporarily disable namecoin, until #40845 is fixed
by boklm (＠boklm) 13 May '23

13 May '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 664c0d8a by Nicolas Vigier at 2023-05-13T11:31:26+02:00 Bug 40856: Temporarily disable namecoin, until #40845 is fixed - - - - - 076ffcf1 by Nicolas Vigier at 2023-05-13T12:15:07+02:00 Bug 40856: Temporarily stop using obfs4 main branch in nightly Until #40850 is fixed. - - - - - 2 changed files: - projects/obfs4/config - rbm.conf Changes: ===================================== projects/obfs4/config ===================================== @@ -9,11 +9,12 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil container: use_container: 1 -targets: - nightly: - git_hash: main - version: '[% c("abbrev") %]' - tag_gpg_id: 0 +# Stop using `main` on nightly, until tor-browser-build#40850 is fixed +#targets: +# nightly: +# git_hash: main +# version: '[% c("abbrev") %]' +# tag_gpg_id: 0 input_files: - project: container-image ===================================== rbm.conf ===================================== @@ -465,7 +465,8 @@ targets: compiler: gcc configure_opt: '[% c("var/configure_opt_project") %]' # Only build Namecoin for linux on nightly - namecoin: '[% c("var/nightly") && c("var/tor-browser") %]' + # Temporarily disabled until we have a fix for tor-browser-build#40845 + #namecoin: '[% c("var/nightly") && c("var/tor-browser") %]' container: suite: jessie arch: amd64 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 12.0.6
by richard (＠richard) 12 May '23

12 May '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 4792e4f8 by Richard Pospesel at 2023-05-12T16:42:40+00:00 release: new version, 12.0.6 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/12.0.4-12.0.5-linux32-ALL.xml - − update_3/release/12.0.4-12.0.5-linux64-ALL.xml - − update_3/release/12.0.4-12.0.5-macos-ALL.xml - − update_3/release/12.0.4-12.0.5-win32-ALL.xml - − update_3/release/12.0.4-12.0.5-win64-ALL.xml - + update_3/release/12.0.4-12.0.6-linux32-ALL.xml - + update_3/release/12.0.4-12.0.6-linux64-ALL.xml - + update_3/release/12.0.4-12.0.6-macos-ALL.xml - + update_3/release/12.0.4-12.0.6-win32-ALL.xml - + update_3/release/12.0.4-12.0.6-win64-ALL.xml - + update_3/release/12.0.5-12.0.6-linux32-ALL.xml - + update_3/release/12.0.5-12.0.6-linux64-ALL.xml - + update_3/release/12.0.5-12.0.6-macos-ALL.xml - + update_3/release/12.0.5-12.0.6-win32-ALL.xml - + update_3/release/12.0.5-12.0.6-win64-ALL.xml - − update_3/release/12.0.5-linux32-ALL.xml - − update_3/release/12.0.5-linux64-ALL.xml - − update_3/release/12.0.5-macos-ALL.xml - − update_3/release/12.0.5-win32-ALL.xml - − update_3/release/12.0.5-win64-ALL.xml - + update_3/release/12.0.6-linux32-ALL.xml - + update_3/release/12.0.6-linux64-ALL.xml - + update_3/release/12.0.6-macos-ALL.xml - + update_3/release/12.0.6-win32-ALL.xml - + update_3/release/12.0.6-win64-ALL.xml - update_3/release/download-android-aarch64.json - update_3/release/download-android-armv7.json - update_3/release/download-android-x86.json - update_3/release/download-android-x86_64.json The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.0.6-build1
by Pier Angelo Vendrame (＠pierov) 10 May '23

10 May '23

Pier Angelo Vendrame pushed new tag tbb-12.0.6-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… 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 40820: Prepare stable release 12.0.6
by Pier Angelo Vendrame (＠pierov) 10 May '23

10 May '23

Pier Angelo Vendrame pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 6b72e634 by Pier Angelo Vendrame at 2023-05-10T09:57:03+02:00 Bug 40820: Prepare stable release 12.0.6 - - - - - 8 changed files: - projects/browser/Bundle-Data/Docs/ChangeLog.txt - projects/browser/allowed_addons.json - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs/ChangeLog.txt ===================================== @@ -1,3 +1,89 @@ +Tor Browser 12.0.6 - May 09 2023 + * All Platforms + * Updated Translations + * Updated Go to 11.9.9 + * Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key [tor-browser] + * Bug 41756: Rebase Tor Browser Stable to 102.11.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.11esr + * Bug 40501: High CPU load after tor exits unexpectedly [tor-browser] + * Windows + * Bug 41683: Disable the network process on Windows [tor-browser] + * Android + * Updated GeckoView to 102.11esr + * Build System + * Windows + macOS + Linux + * Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date [tor-browser] + * macOS + * Bug 40844: Fix DMG reproducibility problem on 12.0.5 [tor-browser-build] + +Tor Browser 12.5a5 - April 18 2023 + * All Platforms + * Updated Translations + * Updated NoScript to 11.4.21 + * Updated Go to 11.9.8 + * Bug 40833: base-browser nightly is using the default channel instead of nightly [tor-browser-build] + * Bug 41687: Rebase Tor Browser Alpha to 102.10.0esr [tor-browser] + * Bug 41689: Remove startup.homepage_override_url from Base Browser [tor-browser] + * Bug 41704: Immediately return on remoteSettings.pollChanges [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.10esr + * Bug 165: Fix maximization warning x button and preference [mullvad-browser] + * Bug 40501: High CPU load after tor exits unexpectedly [tor-browser] + * Bug 40701: Improve security warning when downloading a file [tor-browser] + * Bug 40788: Tor Browser 11.0.4-11.0.6 phoning home [tor-browser] + * Bug 40811: Make testing the updater easier [tor-browser-build] + * Bug 40831: Fix update URL for base-browser nightly [tor-browser-build] + * Bug 40958: The number of relays displayed for an onion site can be misleading [tor-browser] + * Bug 41038: Update "Click to Copy" button label in circuit display [tor-browser] + * Bug 41109: "New circuit..." button gets cut-off when onion name wraps [tor-browser] + * Bug 41350: Move the implementation of Bug 19273 out of Torbutton [tor-browser] + * Bug 41521: Improve localization notes [tor-browser] + * Bug 41533: Page Info window for view-source:http://...onion addresses says Connection Not Encrypted [tor-browser] + * Bug 41600: Some users have difficulty finding the circuit display [tor-browser] + * Bug 41617: Improve the UX of the built-in bridges dialog [tor-browser] + * Bug 41668: Move part of the updater patches to base browser [tor-browser] + * Bug 41686: Move the 'Bug 11641: Disable remoting by default' commit from base-browser to tor-browser [tor-browser] + * Bug 41695: Port warning on maximized windows without letterboxing from torbutton [tor-browser] + * Bug 41699: Tighten up the tor onion alias regular expression [tor-browser] + * Bug 41701: Reporting an extension does not work [tor-browser] + * Bug 41702: The connection pill needs to be centered vertically [tor-browser] + * Bug 41709: sendCommand should not try to send a command forever [tor-browser] + * Bug 41711: Race condition when opening a new window in New Identity [tor-browser] + * Bug 41713: “Remove All Bridges” button only appears after hitting “Show All Bridges" [tor-browser] + * Bug 41714: “Show Fewer Bridges” button missing from refactored remove all bridges UI [tor-browser] + * Bug 41719: Update title and button strings in the new circuit display to sentence case [tor-browser] + * Bug 41722: Regression: window maximization warning cannot be closed by the X button [tor-browser] + * Bug 41725: Stray connectionPane.xhtml patch [tor-browser] + * Windows + * Bug 41459: WebRTC fails to build under mingw [tor-browser] + * Bug 41678: WebRTC build fix patches incorrectly defining pid_t [tor-browser] + * Bug 41683: Disable the network process on Windows [tor-browser] + * Linux + * Bug 40830: The fontconfig directory is missing in Base Browser [tor-browser-build] + * Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP [tor-browser] + * Android + * Updated GeckoView to 102.10esr + * Bug 41724: Backport Android-specific security fixes from Firefox 112 to ESR 102.10-based Tor Browser [tor-browser] + * Build System + * All Platforms + * Bug 40828: Use http://archive.debian.org/debian-archive/ for jessie [tor-browser-build] + * Bug 40837: Rebase mullvad-browser build changes onto main [tor-browser-build] + * Windows + macOS + Linux + * Bug 40823: Update appname_* variables in projects/release/update_responses_config.yml [tor-browser-build] + * Bug 40826: Correctly set appname_marfile for basebrowser in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel [tor-browser-build] + * Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date [tor-browser] + * Windows + * Bug 40822: The Tor Browser installer doesn't run with mandatory ASLR on (0xc000007b) [tor-browser-build] + * macOS + * Bug 40824: dmg2mar script using hardcoded project names for paths [tor-browser-build] + * Bug 40844: DMG reproducibility problem on 12.0.5 [tor-browser-build] + * Linux + * Bug 40835: Update faketime URLs in projects/container-image/config [tor-browser-build] + * Android + * Bug 41684: Android improvements for local dev builds [tor-browser] + Tor Browser 12.0.5 - April 12 2023 * All Platforms * Updated Translations ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 989098, + "average_daily_users": 976883, "categories": { "android": [ "experimental", @@ -31,7 +31,7 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5509244, + "id": 5550694, "compatibility": { "firefox": { "min": "54.0", @@ -42,7 +42,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/55092…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/55506…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -53,22 +53,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- Fixed a edge case with extracting color numbers, it's now able to extract `rgb(0 0 0/0.04)`.\n- Improved IPv6 check.\n- Faster UI loading.\n- Users' fixes for websites." + "en-US": "- Site toggle panel (detect dark theme and shortcut).\n- App toggle panel (automation and shortcut).\n- Improved Site List indexing.\n- Users' fixes for websites." }, - "reviewed": "2023-01-09T12:25:16Z", - "version": "4.9.62", + "reviewed": "2023-04-13T13:17:06Z", + "version": "4.9.63", "files": [ { - "id": 4053589, - "created": "2023-01-08T17:15:31Z", - "hash": "sha256:e537a2cee45ed7c26f79ecd3ed362620e3f00d24c158532a58e163a63a3d60cc", + "id": 4095037, + "created": "2023-04-10T09:52:02Z", + "hash": "sha256:16ba6337fcff7ad85e08ad51b384ba26ff751b2b2ded12309f75e8337ace925a", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 636487, + "size": 658318, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4053589/darkreader-4.9.62…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4095037/darkreader-4.9.63…", "permissions": [ "alarms", "contextMenus", @@ -146,7 +146,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-01-09T12:25:16Z", + "last_updated": "2023-04-13T13:17:06Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5565, - "bayesian_average": 4.5553226794282615, - "count": 4938, - "text_count": 1565 + "average": 4.5607, + "bayesian_average": 4.559531365183289, + "count": 4987, + "text_count": 1578 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 27115 + "weekly_downloads": 24385 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 264748, + "average_daily_users": 258784, "categories": { "android": [ "security-privacy" @@ -553,10 +553,10 @@ "category": "recommended" }, "ratings": { - "average": 4.817, - "bayesian_average": 4.812343801154484, - "count": 1333, - "text_count": 235 + "average": 4.8166, + "bayesian_average": 4.811948101281903, + "count": 1336, + "text_count": 237 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -641,7 +641,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3669 + "weekly_downloads": 3623 }, "notes": null }, @@ -657,7 +657,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1152290, + "average_daily_users": 1128787, "categories": { "android": [ "security-privacy" @@ -1180,10 +1180,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7999, - "bayesian_average": 4.797100778126469, - "count": 2209, - "text_count": 428 + "average": 4.8012, + "bayesian_average": 4.79841359051625, + "count": 2223, + "text_count": 426 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1207,7 +1207,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 39372 + "weekly_downloads": 18076 }, "notes": null }, @@ -1223,7 +1223,7 @@ "picture_url": null } ], - "average_daily_users": 6459771, + "average_daily_users": 6319454, "categories": { "android": [ "security-privacy" @@ -1235,7 +1235,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5547815, + "id": 5558705, "compatibility": { "firefox": { "min": "78.0", @@ -1246,7 +1246,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/55…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/55…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1257,22 +1257,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/9ba5436deff955b8634d3a…" rel=\"nofollow\">1.48.4</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/2881e29d212046e14a4f20…" rel=\"nofollow\">Fix presumed network filter not being a valid network filter</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/1d29de8f605dc6f4b7684f…" rel=\"nofollow\">Avoid using ! toolbar icon badge when inconsequential</a><ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/04728b2f874e135c8736ae…" rel=\"nofollow\">Clear unprocessed requests status on webNavigation reload event</a></li></ul></li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e34f62492a00e2b8a221ca…" rel=\"nofollow\">Commits history since last version</a>." + "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/24794abbbc5c8930eafab3…" rel=\"nofollow\">1.49.2</a>.\n\n<b>Fixes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/812da480d7e6e2fa7d6fd1…" rel=\"nofollow\">Reverse usage of browser.alarms</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/53eab9764901466ecb7c1c…" rel=\"nofollow\">Mind rejected promises from vAPI.storage API</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/58bde6ecd0ff76608c1456…" rel=\"nofollow\">Properly handle promise rejection from webext.storage.local API</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3f0e0640ef4983e8fd2352…" rel=\"nofollow\">Add more checks against unexpected conditions re. assets.json</a></li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/deebdaa7a15172babdad3e…" rel=\"nofollow\">Commits history since last version</a>." }, - "reviewed": "2023-04-05T17:12:25Z", - "version": "1.48.4", + "reviewed": "2023-05-03T16:26:03Z", + "version": "1.49.2", "files": [ { - "id": 4092158, - "created": "2023-04-01T21:20:42Z", - "hash": "sha256:d7666b963c2969b0014937aae55472eea5098ff21ed3bea8a2e1f595f62856c1", + "id": 4103048, + "created": "2023-04-26T14:37:33Z", + "hash": "sha256:39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3343703, + "size": 3383174, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4092158/ublock_origin-1.4…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.4…", "permissions": [ "dns", "menus", @@ -1388,7 +1388,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-04-05T17:12:25Z", + "last_updated": "2023-05-08T12:35:48Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1533,10 +1533,10 @@ "category": "recommended" }, "ratings": { - "average": 4.78, - "bayesian_average": 4.7795951137081945, - "count": 15206, - "text_count": 3956 + "average": 4.7808, + "bayesian_average": 4.780398687268275, + "count": 15366, + "text_count": 3994 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1598,7 +1598,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 138089 + "weekly_downloads": 131497 }, "notes": null }, @@ -1614,19 +1614,20 @@ "picture_url": null } ], - "average_daily_users": 159972, + "average_daily_users": 167016, "categories": { "android": [ "photos-media" ], "firefox": [ - "games-entertainment" + "games-entertainment", + "photos-music-videos" ] }, "contributions_url": "", "created": "2017-05-03T08:36:43Z", "current_version": { - "id": 5220332, + "id": 5560463, "compatibility": { "firefox": { "min": "42.0", @@ -1637,7 +1638,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/video-background-play-fix…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/video-background-play-fix…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -1648,24 +1649,24 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "de": "Experimentelle Verbesserungen der Handhabung von Youtube.", - "en-US": "Experimental improvement of Youtube handling.", - "ro": "Îmbunătățiri experimentale pentru Youtube." + "de": "Neue Übersetzungen ergänzt", + "en-US": "Added new translations", + "ro": "Adăugat traduceri noi" }, - "reviewed": "2021-04-23T07:50:05Z", - "version": "1.6.0", + "reviewed": "2023-05-05T14:25:10Z", + "version": "1.7.0", "files": [ { - "id": 3764692, - "created": "2021-04-22T21:46:53Z", - "hash": "sha256:73cfa682e0398ca1b51890340e4a6df3fcea945f54e9e677e9db942152aa614d", + "id": 4104806, + "created": "2023-05-01T11:53:35Z", + "hash": "sha256:e8713a1720ffba236c40ebabd5ac1db88702d75c21edc23d61216a5897b3792a", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 12088, + "size": 12968, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/3764692/video_background_…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4104806/video_background_…", "permissions": [ "*://*.youtube.com/*", "*://*.youtube-nocookie.com/*", @@ -1678,9 +1679,9 @@ }, "default_locale": "en-US", "description": { - "de": "ACHTUNG: Im neuen Firefox für Android (Version 79 und neuer) funktioniert Videowiedergabe im Hintergrund erst <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/05bb7b1ef7f63358eeabcd…" rel=\"nofollow\">ab Firefox 82</a> korrekt.\n\nUnterstützt momentan folgende Seiten:\n<ul><li>Youtube</li><li>Vimeo (Wiedergabe nicht unterbrechen wenn Vollbildmodus beendet wird)</li></ul>", - "en-US": "ATTENTION: With the new Firefox on Android (Firefox 79 and newer), background playback only properly works starting <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/05bb7b1ef7f63358eeabcd…" rel=\"nofollow\">from Firefox 82</a>.\n\nThe following pages are currently supported:\n<ul><li>Youtube</li><li>Vimeo (don't stop playback when existing fullscreen)</li></ul>", - "ro": "ATENȚIE: În noul Firefox pentru Android (versiunea 79+), redarea video în fundal funcționează corect abia de la <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/05bb7b1ef7f63358eeabcd…" rel=\"nofollow\">Firefox 82</a>.\n\nÎn prezent este compatibil cu următoarele site-uri:\n<ul><li>Youtube</li><li>Vimeo (nu întrerupeți redarea atunci când ieșiți din modul fullscreen)</li></ul>" + "de": "Unterstützt momentan folgende Seiten:\n<ul><li>Youtube</li><li>Vimeo (Wiedergabe nicht unterbrechen wenn Vollbildmodus beendet wird)</li></ul>", + "en-US": "The following pages are currently supported:\n<ul><li>Youtube</li><li>Vimeo (don't stop playback when existing fullscreen)</li></ul>", + "ro": "În prezent este compatibil cu următoarele site-uri:\n<ul><li>Youtube</li><li>Vimeo (nu întrerupeți redarea atunci când ieșiți din modul fullscreen)</li></ul>" }, "developer_comments": null, "edit_url": "https://addons.mozilla.org/en-US/developers/addon/video-background-play-fix…", @@ -1698,7 +1699,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-04-23T07:50:05Z", + "last_updated": "2023-05-05T14:25:10Z", "name": { "de": "Videowiedergabe im Hintergrund", "en-US": "Video Background Play Fix", @@ -1712,10 +1713,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5069, - "bayesian_average": 4.501656166558232, - "count": 1093, - "text_count": 405 + "average": 4.4874, + "bayesian_average": 4.4822747330216925, + "count": 1114, + "text_count": 416 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1737,7 +1738,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 386 + "weekly_downloads": 411 }, "notes": null }, @@ -1753,7 +1754,7 @@ "picture_url": null } ], - "average_daily_users": 90974, + "average_daily_users": 88255, "categories": { "android": [ "experimental", @@ -1867,9 +1868,9 @@ "promoted": null, "ratings": { "average": 4.3684, - "bayesian_average": 4.354634977381083, + "bayesian_average": 4.354580970236878, "count": 399, - "text_count": 113 + "text_count": 112 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, @@ -1891,7 +1892,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1200 + "weekly_downloads": 900 }, "notes": null }, @@ -1907,7 +1908,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 261805, + "average_daily_users": 259842, "categories": { "android": [ "photos-media", @@ -2126,9 +2127,9 @@ "category": "recommended" }, "ratings": { - "average": 4.653, - "bayesian_average": 4.6482048070516955, - "count": 1242, + "average": 4.6521, + "bayesian_average": 4.647356516825427, + "count": 1256, "text_count": 241 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", @@ -2150,7 +2151,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 7262 + "weekly_downloads": 4089 }, "notes": null }, @@ -2173,7 +2174,7 @@ "picture_url": null } ], - "average_daily_users": 110023, + "average_daily_users": 110772, "categories": { "android": [ "other" @@ -2456,10 +2457,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4449, - "bayesian_average": 4.440238588001734, - "count": 1207, - "text_count": 321 + "average": 4.443, + "bayesian_average": 4.438340772354168, + "count": 1210, + "text_count": 322 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2479,7 +2480,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 34 + "weekly_downloads": 40 }, "notes": null }, @@ -2495,7 +2496,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 324182, + "average_daily_users": 313446, "categories": { "android": [ "performance", @@ -2685,10 +2686,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4039, - "bayesian_average": 4.401185759316559, - "count": 2055, - "text_count": 801 + "average": 4.4106, + "bayesian_average": 4.407881097196251, + "count": 2058, + "text_count": 799 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2732,7 +2733,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7852 + "weekly_downloads": 7698 }, "notes": null }, @@ -2748,7 +2749,7 @@ "picture_url": null } ], - "average_daily_users": 148389, + "average_daily_users": 150188, "categories": { "android": [ "performance", @@ -2863,10 +2864,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9106, - "bayesian_average": 3.906291934298175, - "count": 1119, - "text_count": 397 + "average": 3.9071, + "bayesian_average": 3.902833394829747, + "count": 1130, + "text_count": 402 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2885,7 +2886,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1519 + "weekly_downloads": 2266 }, "notes": null } ===================================== projects/firefox/config ===================================== @@ -12,10 +12,10 @@ container: use_container: 1 var: - firefox_platform_version: 102.10.0 + firefox_platform_version: 102.11.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.0-1' - browser_build: 2 + browser_build: 1 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -12,9 +12,9 @@ container: use_container: 1 var: - geckoview_version: 102.10.0esr + geckoview_version: 102.11.0esr torbrowser_branch: 12.0-1 - browser_build: 2 + browser_build: 1 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.19.8 +version: 1.19.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -121,7 +121,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f + sha256sum: 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 72637 +version: 74065 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -17,8 +17,8 @@ var: input_files: - project: container-image - - URL: 'https://people.torproject.org/~ma1/tbb_files/manual_[% c("version") %].zip' + - URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: 28379bdb31989d26a4cb735b9cbcd9ee52089f72153881f3802d291743b8cf06 + sha256sum: 788c2dc2bfacbc6961ce443c5639706cc23fbb7b7730ed7f71a26396511305be - filename: packagemanual.py name: package_script ===================================== projects/translation/config ===================================== @@ -6,19 +6,19 @@ version: '[% c("abbrev") %]' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: a7f7d59e21395ba563033060a55903f4f7163c02 + git_hash: 97c76d5183b16b069e66feaaf10e00c1d2c7d9e0 targets: nightly: git_hash: 'base-browser' base-browser-fluent: base-browser-fluent: '[% INCLUDE build %]' - git_hash: 32c09e1c5282cf3c7369d45fc199eb35c10a4fcc + git_hash: d473c4dd005325d1be40bae0f816974e195a972d targets: nightly: git_hash: 'basebrowser-newidentityftl' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: a7be13f5b46a2bd3684146556390d62b1caa2f52 + git_hash: 267f3c208a323df636ed11e7143164956d3d9d9b targets: nightly: git_hash: 'tor-browser' @@ -26,7 +26,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: b2691020553c5e81bacfe3ed33cc66226754c98d + git_hash: 0deec2a78dea0013e8c4eaec1d40ef5aac4e43b0 targets: nightly: git_hash: 'fenix-torbrowserstringsxml' ===================================== rbm.conf ===================================== @@ -71,10 +71,13 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.0.5' - torbrowser_build: 'build2' + torbrowser_version: '12.0.6' + torbrowser_build: 'build1' torbrowser_incremental_from: + # Build incrementals also from 12.0.4 until we have a new certificate for + # Windows installers. - 12.0.4 + - 12.0.5 build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-12.0.6-build1
by Pier Angelo Vendrame (＠pierov) 10 May '23

10 May '23

Pier Angelo Vendrame pushed new tag mb-12.0.6-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] Bug 40853: Prepare Mullvad Browser Release 12.0.6
by Pier Angelo Vendrame (＠pierov) 10 May '23

10 May '23

Pier Angelo Vendrame pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build Commits: 05a3e330 by Pier Angelo Vendrame at 2023-05-10T07:42:24+02:00 Bug 40853: Prepare Mullvad Browser Release 12.0.6 - - - - - 3 changed files: - projects/browser/config - projects/firefox/config - rbm.conf Changes: ===================================== projects/browser/config ===================================== @@ -106,9 +106,9 @@ input_files: - URL: https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.… name: noscript sha256sum: 0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338 - - URL: https://addons.mozilla.org/firefox/downloads/file/4092158/ublock_origin-1.4… + - URL: https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.4… name: ublock-origin - sha256sum: d7666b963c2969b0014937aae55472eea5098ff21ed3bea8a2e1f595f62856c1 + sha256sum: 39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d enable: '[% c("var/mullvad-browser") %]' - URL: https://github.com/mullvad/browser-extension/releases/download/v0.7.9-firef… name: mullvad-extension ===================================== projects/firefox/config ===================================== @@ -11,11 +11,11 @@ container: use_container: 1 var: - firefox_platform_version: 102.10.0 + firefox_platform_version: 102.11.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '12.0' - browser_branch: '[% c("var/browser_series") %]-2' - browser_build: 2 + browser_branch: '[% c("var/browser_series") %]-1' + browser_build: 1 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %][% c("var/osname") %]' ===================================== rbm.conf ===================================== @@ -71,10 +71,13 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.0.5' + torbrowser_version: '12.0.6' torbrowser_build: 'build1' torbrowser_incremental_from: + # Build incrementals also from 12.0.4 until we have a new certificate for + # Windows installers. - 12.0.4 + - 12.0.5 updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] 2 commits: Bug 40841: Add signing machine setup scripts and adapt signing scripts
by Richard Pospesel (＠richard) 09 May '23

09 May '23

Richard Pospesel pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build Commits: 42213fb6 by Nicolas Vigier at 2023-05-09T20:55:38+00:00 Bug 40841: Add signing machine setup scripts and adapt signing scripts Use separate accounts to store the different keys. - - - - - 4875b3ec by Nicolas Vigier at 2023-05-09T20:55:38+00:00 Bug 40846: Temporarily disable Windows signing - - - - - 25 changed files: - + projects/mar-tools/config - projects/osslsigncode/config - + projects/yubihsm-shell/build - + projects/yubihsm-shell/config - rbm.conf - tools/signing/do-all-signing - tools/signing/linux-signer-authenticode-signing - tools/signing/linux-signer-gpg-sign - tools/signing/linux-signer-signmars - + tools/signing/machines-setup/build-yubihsm-shell-pkg - + tools/signing/machines-setup/etc/udev/rules.d/70-yubikey.rules - + tools/signing/machines-setup/etc/yubihsm_pkcs11.conf - + tools/signing/machines-setup/setup-osslsigncode - + tools/signing/machines-setup/setup-signing-machine - + tools/signing/machines-setup/ssh-keys/boklm-tb-release.pub - + tools/signing/machines-setup/ssh-keys/boklm-yk1.pub - + tools/signing/machines-setup/ssh-keys/richard.pub - + tools/signing/machines-setup/sudoers.d/sign-exe - + tools/signing/machines-setup/sudoers.d/sign-gpg - + tools/signing/machines-setup/sudoers.d/sign-mar - + tools/signing/machines-setup/upload-tbb-to-signing-machine - tools/signing/set-config - + tools/signing/wrappers/sign-exe - + tools/signing/wrappers/sign-gpg - + tools/signing/wrappers/sign-mar Changes: ===================================== projects/mar-tools/config ===================================== @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +# +# Used by tools/signing/machines-setup/upload-tbb-to-signing-machine +# to fetch mar-tools for signing machine setup +# +version: 12.0.4 +filename: 'mar-tools-linux64.zip' +container: + use_container: 0 +gpg_keyring: torbrowser.gpg +tag_gpg_id: 1 +input_files: + - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux64.zip' + sha256sum: 726ec4192de61a9342b3262c7ac722cbd59eaba07879be9589c65599d2d69584 + +steps: + fetch_martools: + fetch_martools: | + #!/bin/bash + echo ok ===================================== projects/osslsigncode/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' +version: '[% c("git_hash").substr(0, 12) %]' git_url: https://github.com/mtrojnar/osslsigncode git_hash: e72a1937d1a13e87074e4584f012f13e03fc1d64 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' @@ -15,3 +15,12 @@ var: input_files: - filename: 0001-Make-code-work-with-OpenSSL-1.1.patch - filename: timestamping.patch + - filename: '[% c("var/srcfile") %]' + enable: '[% c("var/no-git") %]' + +targets: + no-git: + git_url: '' + var: + no-git: 1 + srcfile: '[% project %]-[% c("version") %].tar.gz' ===================================== projects/yubihsm-shell/build ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=$(pwd)/dist +tar xf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] +dpkg-buildpackage -us -uc +mkdir -p "$distdir" +mv ../*.deb "$distdir" +dest=[% dest_dir _ '/' _ c('filename') %] +rm -Rf "$dest" +mv "$distdir" "$dest" ===================================== projects/yubihsm-shell/config ===================================== @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: 2.4.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' +container: + use_container: 0 +var: + src_filename: 'yubihsm-shell-[% c("version") %].tar.gz' +input_files: + - URL: 'https://developers.yubico.com/yubihsm-shell/Releases/[% c("var/src_filename") %]' + sha256sum: 319bb2ff2a7af5ecb949a170b181a6ee7c0b44270e31cf10d0840360b1b3b5e0 + +steps: + fetch_src: + fetch_src: | + #!/bin/bash + echo ok ===================================== rbm.conf ===================================== @@ -87,7 +87,7 @@ var: build_id: '[% sha256(c("var/build_id_txt", { num_procs => 4 })).substr(0, 6) %]' build_id_txt: | [% c("version") %] - [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] + [% IF c("git_url") || c("hg_url"); GET c("abbrev"); END; %] [% IF c("container/use_container") && ! c("container/global_disable") -%] [% c("var/container/suite") %] [% c("var/container/arch") %] ===================================== tools/signing/do-all-signing ===================================== @@ -17,9 +17,9 @@ echo test -f "$steps_dir/linux-signer-signmars.done" || read -sp "Enter nssdb7 (mar signing) passphrase: " NSSPASS echo -test -f "$steps_dir/linux-signer-authenticode-signing.done" || - read -sp "Enter windows authenticode (yubihsm) passphrase: " YUBIPASS -echo +#test -f "$steps_dir/linux-signer-authenticode-signing.done" || +# read -sp "Enter windows authenticode (yubihsm) passphrase: " YUBIPASS +#echo test -f "$steps_dir/linux-signer-gpg-sign.done" || read -sp "Enter gpg passphrase: " GPG_PASS echo @@ -199,10 +199,10 @@ do_step sync-scripts-to-linux-signer do_step sync-before-linux-signer-signmars do_step linux-signer-signmars do_step sync-after-signmars -do_step linux-signer-authenticode-signing -do_step sync-after-authenticode-signing -do_step authenticode-timestamping -do_step sync-after-authenticode-timestamping +#do_step linux-signer-authenticode-signing +#do_step sync-after-authenticode-signing +#do_step authenticode-timestamping +#do_step sync-after-authenticode-timestamping do_step hash_signed_bundles do_step sync-after-hash do_step linux-signer-gpg-sign ===================================== tools/signing/linux-signer-authenticode-signing ===================================== @@ -9,26 +9,14 @@ cd ~/"$SIGNING_PROJECTNAME-$tbb_version" test -n "${YUBIPASS:-}" || read -s -p "Authenticode (yubihsm) password:" YUBIPASS echo -tmpdir=$(mktemp -d) -chgrp yubihsm "$tmpdir" -chmod g+rwx "$tmpdir" - cwd=$(pwd) for i in `find . -name "*.exe" -print` do echo "Signing $i" - echo export 'YUBIHSM_PKCS11_CONF=~/yubihsm_pkcs11.conf' \; \ - /home/yubihsm/osslsigncode/osslsigncode \ - -pkcs11engine /usr/lib/engines/engine_pkcs11.so \ - -pkcs11module /usr/local/lib/yubihsm_pkcs11.so \ - -pass "'$YUBIPASS'" \ - -h sha256 \ - -certs /home/yubihsm/tpo-cert.crt \ - -key 1c40 \ - "$cwd/$i" "$tmpdir/$i" \ - | sudo su - yubihsm - mv -vf "$tmpdir/$i" "$cwd/$i" + sudo -u signing-win -- "$wrappers_dir/sign-exe" \ + "$YUBIPASS" \ + "$cwd/$i" + cp /home/signing-win/last-signed-file.exe "$cwd/$i" done unset YUBIPASS -rmdir "$tmpdir" ===================================== tools/signing/linux-signer-gpg-sign ===================================== @@ -7,6 +7,7 @@ source "$script_dir/functions" cd ~/"$SIGNING_PROJECTNAME-$tbb_version" test -n "$GPG_PASS" || read -sp "Enter gpg passphrase: " GPG_PASS +currentdir=$(pwd) for i in `find . -name "*.dmg" -o -name "*.exe" -o -name "*.tar.xz" -o -name "*.txt" -o -name "*.zip" -o -name "*.tar.gz" -o -name "*.apk" | sort` do if test -f "$i.asc" @@ -15,5 +16,8 @@ do rm -f "$i.asc" fi echo "Signing $i" - echo "$GPG_PASS" | gpg -absu 0xe53d989a9e2d47bf! --batch --no-tty --passphrase-fd 0 $i + i="$currentdir/$i" + tmpsig=$(mktemp) + echo "$GPG_PASS" | sudo -u signing-gpg -- "$wrappers_dir/sign-gpg" "$i" > "$tmpsig" + mv -f "$tmpsig" "${i}.asc" done ===================================== tools/signing/linux-signer-signmars ===================================== @@ -1,8 +1,4 @@ #!/bin/bash -# -# -# You may set NSS_DB_DIR and/or NSS_CERTNAME before invoking this script -# (if you don't want to use the default values). set -e set -u @@ -10,38 +6,15 @@ set -u script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -if [ -z "${NSS_DB_DIR+x}" ]; then - if test "$SIGNING_PROJECTNAME" = 'torbrowser'; then - NSS_DB_DIR=/home/boklm/marsigning/nssdb7 - fi - if test "$SIGNING_PROJECTNAME" = 'mullvadbrowser'; then - NSS_DB_DIR=/home/boklm/marsigning/mullvad-browser-nssdb-1 - fi -fi - -if [ -z "${NSS_CERTNAME+x}" ]; then - NSS_CERTNAME=marsigner -fi - export LC_ALL=C -# Check some prerequisites. -if [ ! -r "$NSS_DB_DIR/cert9.db" ]; then - >&2 echo "Please create and populate the $NSS_DB_DIR directory" - exit 2 -fi - -# Extract the MAR tools so we can use the signmar program. -MARTOOLS_TMP_DIR=$(mktemp -d) -trap "rm -rf $MARTOOLS_TMP_DIR" EXIT -MARTOOLS_ZIP=~/gitian-builder/inputs/mar-tools-new-linux32.zip -unzip -d "$MARTOOLS_TMP_DIR" -q "$MARTOOLS_ZIP" -export PATH="$MARTOOLS_TMP_DIR/mar-tools:$PATH" -if [ -z "${LD_LIBRARY_PATH+x}" ]; then - export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools" -else - export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools:$LD_LIBRARY_PATH" +martools_dir=/home/signing-mar/mar-tools +if ! test -d "$martools_dir"; then + >&2 echo "Please create $martools_dir" + exit 3 fi +export LD_LIBRARY_PATH="$martools_dir" +export PATH="$martools_dir:$PATH" # Prompt for the NSS password. # TODO: Test that the entered NSS password is correct. But how? Unfortunately, @@ -70,9 +43,8 @@ for marfile in *.mar; do continue; fi - echo "$NSSPASS" | signmar -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s \ - "$marfile" tmp.mar - mv -f tmp.mar "$marfile" + echo "$NSSPASS" | sudo -u signing-mar -- "$wrappers_dir/sign-mar" "$marfile" + cp /home/signing-mar/last-signed-mar.mar "$marfile" COUNT=$((COUNT + 1)) echo "Signed MAR file $COUNT ($marfile)" done ===================================== tools/signing/machines-setup/build-yubihsm-shell-pkg ===================================== @@ -0,0 +1,26 @@ +#!/bin/bash +set -e + +if test $(whoami) != 'build-pkgs'; then + echo 'This script should be run as the build-pkgs user' >&2 + exit 1 +fi + +destdir=/home/build-pkgs/packages/yubihsm-shell-pkgs +if test -d "$destdir"; then + echo "$destdir already exists. Doing nothing." + exit 0 +fi + +cd /home/build-pkgs +tar xf /signing/tor-browser-build.tar +cd tor-browser-build +tar xf /signing/rbm.tar +yubihsm_src_filename=$(./rbm/rbm showconf yubihsm-shell var/src_filename) +mkdir -p out/yubihsm-shell +cp "/signing/$yubihsm_src_filename" out/yubihsm-shell +./rbm/rbm build yubihsm-shell +yubihsm_out_filename=$(./rbm/rbm showconf yubihsm-shell filename) +rm -Rf "$destdir" +mkdir -p $(dirname $destdir) +mv -f "out/yubihsm-shell/$yubihsm_out_filename" "$destdir" ===================================== tools/signing/machines-setup/etc/udev/rules.d/70-yubikey.rules ===================================== @@ -0,0 +1,2 @@ +ACTION=="add|change", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0010|0110|0111|0114|0116|0120|0401|0403|0405|0407|0410", MODE="0660", GROUP="yubihsm" +ACTION=="add|change", SUBSYSTEM=="usb", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0010|0110|0111|0114|0116|0120|0401|0403|0405|0407|0410", MODE="0660", GROUP="yubihsm" ===================================== tools/signing/machines-setup/etc/yubihsm_pkcs11.conf ===================================== @@ -0,0 +1,5 @@ +connector = yhusb:// +#debug +#dinout +#libdebug +#debug-file = /tmp/yubihsm_pkcs11_debug ===================================== tools/signing/machines-setup/setup-osslsigncode ===================================== @@ -0,0 +1,27 @@ +#!/bin/bash +set -e + +if test $(whoami) != 'signing-win'; then + echo 'This script should be run as the signing-win user' >&2 + exit 1 +fi + +destdir=/home/signing-win/osslsigncode +if test -d "$destdir"; then + echo "$destdir already exists. Doing nothing." + exit 0 +fi + +cd /home/signing-win +tar xf /signing/tor-browser-build.tar +cd tor-browser-build +tar xf /signing/rbm.tar +osslsigncodefile=$(./rbm/rbm showconf osslsigncode --target no-git var/srcfile) +mkdir -p out/osslsigncode +cp "/signing/$osslsigncodefile" out/osslsigncode +./rbm/rbm build osslsigncode --target no-git +osslscbuild=$(./rbm/rbm showconf osslsigncode filename --target no-git) +cd /home/signing-win +tar xf "tor-browser-build/out/osslsigncode/$osslscbuild" +chmod -R 755 /home/signing-win/osslsigncode +echo "Extracted osslsigncode to /home/signing-win/osslsigncode" ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -0,0 +1,134 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +function create_user { + user="$1" + groups="$2" + id "$user" > /dev/null 2>&1 && return 0 + test -n "$groups" && groups="--groups $groups" + useradd -s /bin/bash -m "$user" $groups +} + +function create_group { + group="$1" + getent group "$group" > /dev/null 2>&1 && return 0 + groupadd "$group" +} + +function authorized_keys { + user="$1" + shift + tmpfile=$(mktemp) + for file in "$@"; do + cat "$script_dir/ssh-keys/$file" >> "$tmpfile" + done + sshdir="/home/$user/.ssh" + authkeysfile="$sshdir/authorized_keys" + if diff "$tmpfile" "$authkeysfile" > /dev/null 2>&1; then + rm "$tmpfile" + return 0 + fi + echo "Update authorized_keys for user $user" + if ! test -d "$sshdir"; then + mkdir "$sshdir" + chmod 700 "$sshdir" + chown $user:$user "$sshdir" + fi + mv "$tmpfile" "$authkeysfile" + chown $user:$user "$authkeysfile" + chmod 600 "$authkeysfile" +} + +function sudoers_file { + sfile="$1" + cp "$script_dir/sudoers.d/$sfile" "/etc/sudoers.d/$sfile" + chown root:root "/etc/sudoers.d/$sfile" + chmod 0440 "/etc/sudoers.d/$sfile" +} + +function udev_rule { + udevrule="$1" + rulepath="/etc/udev/rules.d/$udevrule" + if ! diff "$script_dir$rulepath" "$rulepath" > /dev/null 2>&1; then + cp "$script_dir$rulepath" "$rulepath" + udevadm control --reload-rules + fi +} + +function install_packages { + for pkg in "$@" + do + dpkg-query -s "$pkg" 2> /dev/null | grep -q '^Status: .* installed' && continue + apt-get install -y "$pkg" + done +} + +install_packages build-essential rsync unzip +install_packages sudo vim tmux gnupg + +create_user setup +authorized_keys setup boklm-yk1.pub +mkdir -p /signing +chmod 0755 /signing +chown setup /signing + +create_user yubihsm +create_group yubihsm +udev_rule 70-yubikey.rules + +create_user signing +create_group signing +create_user signing-gpg +create_user signing-mar +create_user signing-win yubihsm + + +sudoers_file sign-gpg +sudoers_file sign-mar +sudoers_file sign-exe + +authorized_keys boklm boklm-tb-release.pub boklm-yk1.pub +create_user richard signing +authorized_keys richard richard.pub + +# Install rbm deps +install_packages libyaml-libyaml-perl libtemplate-perl libdatetime-perl \ + libio-handle-util-perl libio-all-perl \ + libio-captureoutput-perl libjson-perl libpath-tiny-perl \ + libstring-shellquote-perl libsort-versions-perl \ + libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ + libfile-copy-recursive-perl libfile-slurp-perl + +# Install deps for building osslsigncode +install_packages autoconf libtool pkg-config libssl-dev libcurl4-openssl-dev +sudo -u signing-win /signing/tor-browser-build/tools/signing/machines-setup/setup-osslsigncode + +# Packages needed for windows signing +install_packages opensc libengine-pkcs11-openssl + +# Install deps for building yubihsm-shell +install_packages cmake libusb-1.0-0-dev libedit-dev gengetopt libpcsclite-dev help2man chrpath dh-exec + +# Build and install yubihsm-pkcs11 package +create_user build-pkgs +if ! dpkg-query -s yubihsm-pkcs11 2> /dev/null | grep -q '^Status: .* installed'; then + yubishm_version=2.4.0 + sudo -u build-pkgs /signing/tor-browser-build/tools/signing/machines-setup/build-yubihsm-shell-pkg + pushd /home/build-pkgs/packages/yubihsm-shell-pkgs + apt-get install -y ./yubihsm-pkcs11_${yubishm_version}_amd64.deb \ + ./libyubihsm1_${yubishm_version}_amd64.deb \ + ./libyubihsm-http1_${yubishm_version}_amd64.deb \ + ./libyubihsm-usb1_${yubishm_version}_amd64.deb + popd +fi + +# install mar-tools +if ! test -d /home/signing-mar/mar-tools; then + tmpdir=$(mktemp -d) + unzip -d "$tmpdir" /signing/mar-tools-linux64.zip + chown -R signing-mar:signing-mar "$tmpdir/mar-tools" + chmod go+rX "$tmpdir/mar-tools"/* + mv "$tmpdir/mar-tools" /home/signing-mar/mar-tools +fi ===================================== tools/signing/machines-setup/ssh-keys/boklm-tb-release.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCwAicsGXrffx9W5vXDUmE/+JP8qvbXp1oCY6eO+vuSwZ5aF7U1jXoEUdhaeytacO9ibhsBsUcC2F9ulzhUk08AKC9ylKf8vfxFMIaTu0kSo983kr+KWpeUgJijY4uwPCyZgwMZi2imTBa/ilmTxzh3Bd1WL2F2BljntdT85sfUOfZT5IEbZs5/eD+aVEbJne9fVK5M3N4fBlRwUAiCpTPe5Eqo1ZxJc3RQB+0wy+VQBJEx0MXrF/WOoyhe8OKpBCg4hraRQVP/PvO5hpVMxgEuC/AWejKB71fwjEfdZlilGqhPVbCK7+uDGfwll2FoRbNTbQRPW6rNYSStpYmP2xVSzJrMVnmEqecltTOEHaNZtrz1N2H79RyRwdx0mdA4DraI4okjgxv/O5yM5uarmW3Nadyr5ddG/9kjmgRv4s4Y94OWzEPk4kS6XMGn5ALecr2NJzlR64QtG7NO8YCRVnseEeDS8nWvDQsdM4lFroko6iDb01HjvyVJJg4jsasw5g8= user@tb-release ===================================== tools/signing/machines-setup/ssh-keys/boklm-yk1.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7nEOKbxQX46guAanVHEfMZL/Udvd3g/HFQnJDDK0Nr+OPe2doGcUs2DD8xxADNihh59fsvVSeerHfe0Fuer039Y2PZNjg1zfm8Gk099zLIJWgZ23Lj59sLmrHQOSgE+VKaLq6OPre9wuhoe0XbiJOmoJRH78TF5GSOidPngLgthrm3rsCAofsJ26DzObVdbKKvR5XmvloBAIiNbvPnyq+0cn6LFSSueRG/v+A9ESl423b6n01msEm8yi5wqUE3ciskRF/IpP8HJV2C2naOgXVLmYw5Ft2NQzRSSgLy+l2mQxU4FTY2SaO7TVlo8aBjxLSHWakZMsnYyWOHrSnpx+l2g2wC2Bw5CwvS4z+n1/u568/UvRvAyZ/i6f7MO56MC9ipaQH165U+Lh4Ra6V82XvOvAtQwr/ts55/ypTzEerNXO5aoRQdnfU+funQEhT80Upqo3Cda+Eexn/thF3B+uCys7gszbWHa0L0WsLmH0vlHOIY/zS34pI2BChaKk237fOMILrY3AdWaK/ZNnkvTks262dMNJiv3WjxoMBvj3M/uOawT+ir2fWoASrcWbWOJcHNcigzWruZ0J4H0tzy7GMizYs2uV7fvTvCvgVyuPtTVb7S61k2PFDozzQaWUkJIs3/OTnfXdvB1d1p/7mK+BuSb8dnNhaklxZWAeMgbSjQw== boklm-yk1 ===================================== tools/signing/machines-setup/ssh-keys/richard.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo+S69a6A3fBaft5va/iZIjRjgn4xLMZ4wszr6HZImJWr7lvSUCOy+3wCp/ABRHuYfhMsrR+YwrW/Ixdu/MqkSOSzhVxVhwoAAgQjxHcOucGzanpdl2ezEPbYtXSnI5XOw/CdYqeDVdK9wZFbADpHxECHu45Knc1dQ9VTbQzA3b6CNZE4Otv1B1gwydfqPIAoM7R4g6HAHK8i50PWczgRqiPMNtoZUYAKDKhSXIaP3gdefKpePHf/KynXYTEwpdYBnxHcC0RbjzvfY5e0oO9Y9/QuXZmSGRTGf7FT8P03gItNKfaEeeSn219M0/xPypODogN9JCg1reTP1UqtOxYSJ YubiKey #18117406 PIV Slot 9a ===================================== tools/signing/machines-setup/sudoers.d/sign-exe ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-win env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-win) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-exe ===================================== tools/signing/machines-setup/sudoers.d/sign-gpg ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-gpg env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-gpg) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-gpg ===================================== tools/signing/machines-setup/sudoers.d/sign-mar ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-mar env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-mar) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-mar ===================================== tools/signing/machines-setup/upload-tbb-to-signing-machine ===================================== @@ -0,0 +1,59 @@ +#!/bin/bash +# Upload tor-browser-build directory from current HEAD commit and other +# dependencies to signing machine +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +cd "$script_dir/../../.." +tmpdir=$(mktemp -d) +tbbtar=$tmpdir/tor-browser-build.tar +git archive --prefix=tor-browser-build/ --output="$tbbtar" HEAD . + +echo "Created $tbbtar" + +make submodule-update +osslsigncodefile=$(./rbm/rbm showconf osslsigncode --target no-git var/srcfile) +if ! test -f "./out/osslsigncode/$osslsigncodefile"; then + ./rbm/rbm tar osslsigncode + echo "Created $osslsigncodefile" +fi + +cd rbm +git archive --prefix=rbm/ --output="$tmpdir/rbm.tar" HEAD . +echo "Created rbm.tar" +cd .. + +martools_filename=mar-tools-linux64.zip +if ! test -f "./out/mar-tools/$martools_filename"; then + ./rbm/rbm build --step fetch_martools mar-tools + echo "Downloaded $martools_filename" +fi + +yubihsm_filename=$(./rbm/rbm showconf yubihsm-shell var/src_filename) +if ! test -f "./out/yubihsm-shell/$yubihsm_filename"; then + ./rbm/rbm build yubihsm-shell --step fetch_src + echo "Fetched $yubihsm_filename" +fi + +signing_machine='linux-signer' +setup_user='setup' +signing_dir='/signing' + +echo "Uploading $osslsigncodefile to $signing_machine" +chmod go+r "./out/osslsigncode/$osslsigncodefile" +rsync -v "./out/osslsigncode/$osslsigncodefile" "$setup_user@$signing_machine:$signing_dir/$osslsigncodefile" +echo "Uploading rbm.tar to $signing_machine" +rsync -v "$tmpdir/rbm.tar" "$setup_user@$signing_machine:$signing_dir/rbm.tar" +echo "Uploading $martools_filename" +chmod go+r "./out/mar-tools/$martools_filename" +rsync -v "./out/mar-tools/$martools_filename" "$setup_user@$signing_machine:$signing_dir/$martools_filename" +echo "Uploading $yubihsm_filename" +chmod go+r "./out/yubihsm-shell/$yubihsm_filename" +rsync -v "./out/yubihsm-shell/$yubihsm_filename" "$setup_user@$signing_machine:$signing_dir/$yubihsm_filename" +echo "Uploading tor-browser-build.tar to $signing_machine" +scp -p "$tbbtar" "$setup_user@$signing_machine:$signing_dir/" +echo "Extracting tor-browser-build.tar on $signing_machine" +ssh "$setup_user@$signing_machine" tar -C $signing_dir -xf $signing_dir/tor-browser-build.tar +echo "You can now run this command on $signing_machine to update signing machine setup:" +echo " sudo -- $signing_dir/tor-browser-build/tools/signing/machines-setup/setup-signing-machine" ===================================== tools/signing/set-config ===================================== @@ -18,6 +18,8 @@ test "$SIGNING_PROJECTNAME" = 'torbrowser' \ || test "$SIGNING_PROJECTNAME" = 'mullvadbrowser' \ || exit_error "Unknown SIGNING_PROJECTNAME $SIGNING_PROJECTNAME" +export SIGNING_PROJECTNAME + test -z "${rbm_not_available+x}" && rbm="$script_dir/../../rbm/rbm" . "$script_dir/set-config.tbb-version" @@ -36,3 +38,4 @@ test -z "${NON_INTERACTIVE:-}" || rsync_progress="--progress" rsync_options="-avH ${rsync_progress:-} ${DRY_RUN:-}" tb_builders='boklm dan henry ma1 pierov richard' +wrappers_dir=/signing/tor-browser-build/tools/signing/wrappers ===================================== tools/signing/wrappers/sign-exe ===================================== @@ -0,0 +1,37 @@ +#!/bin/bash +set -e + +if test "$#" -ne 2; then + echo "Wrong number of arguments" >&2 + exit 1 +fi + +if test $(whoami) != 'signing-win'; then + echo 'This script should be run as the signing-win user' >&2 + exit 2 +fi + +yubipass="$1" +to_sign_exe="$2" + +tpo_cert=/home/signing-win/tpo-cert.crt + +if ! test -f "$tpo_cert"; then + echo "File $tpo_cert is missing" >&2 + exit 2 +fi + +output_signed_exe=/home/signing-win/last-signed-file.exe +rm -f "$output_signed_exe" + +export 'YUBIHSM_PKCS11_CONF=/signing/tor-browser-build/tools/signing/machines-setup/etc/yubihsm_pkcs11.conf' +/home/signing-win/osslsigncode/bin/osslsigncode \ + -pkcs11engine /usr/lib/x86_64-linux-gnu/engines-1.1/pkcs11.so \ + -pkcs11module /usr/lib/x86_64-linux-gnu/pkcs11/yubihsm_pkcs11.so \ + -pass "$yubipass" \ + -h sha256 \ + -certs "$tpo_cert" \ + -key 1c40 \ + "$to_sign_exe" "$output_signed_exe" + +chmod 644 "$output_signed_exe" ===================================== tools/signing/wrappers/sign-gpg ===================================== @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +if test "$#" -ne 1; then + echo "Wrong number of arguments" >&2 + exit 2 +fi + +if test $(whoami) != 'signing-gpg'; then + echo 'This script should be run as the signing-gpg user' >&2 + exit 1 +fi + +exec gpg --homedir /home/signing-gpg/.gnupg -absu 0xe53d989a9e2d47bf! --batch --no-tty -o- --passphrase-fd 0 -- "$1" ===================================== tools/signing/wrappers/sign-mar ===================================== @@ -0,0 +1,41 @@ +#!/bin/bash +set -e + +if test "$#" -ne 1; then + echo "Wrong number of arguments" >&2 + exit 1 +fi + +if test $(whoami) != 'signing-mar'; then + echo 'This script should be run as the signing-mar user' >&2 + exit 2 +fi + +output_signed_mar=/home/signing-mar/last-signed-mar.mar +rm -f "$output_signed_mar" + +if test "$SIGNING_PROJECTNAME" = 'torbrowser'; then + NSS_DB_DIR=/home/signing-mar/nssdb/torbrowser-nssdb7 +elif test "$SIGNING_PROJECTNAME" = 'mullvadbrowser'; then + NSS_DB_DIR=/home/signing-mar/nssdb/mullvadbrowser-nssdb-1 +else + echo "Unknown SIGNING_PROJECTNAME: $SIGNING_PROJECTNAME" + exit 3 +fi +NSS_CERTNAME=marsigner + +if ! test -d "$NSS_DB_DIR"; then + echo "$NSS_DB_DIR is missing" >&2 + exit 3 +fi + +martools_dir=/home/signing-mar/mar-tools +if ! test -d "$martools_dir"; then + >&2 echo "Please create $martools_dir" + exit 4 +fi +export LD_LIBRARY_PATH="$martools_dir" +export PATH="$martools_dir:$PATH" + +"$martools_dir/signmar" -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s "$1" "$output_signed_mar" +chmod 644 "$output_signed_mar" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40841: Add signing machine setup scripts and adapt signing scripts
by Richard Pospesel (＠richard) 09 May '23

09 May '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: deb60089 by Nicolas Vigier at 2023-05-09T20:40:31+00:00 Bug 40841: Add signing machine setup scripts and adapt signing scripts Use separate accounts to store the different keys. - - - - - 5adcbf38 by Nicolas Vigier at 2023-05-09T20:40:31+00:00 Bug 40846: Temporarily disable Windows signing - - - - - 25 changed files: - + projects/mar-tools/config - projects/osslsigncode/config - + projects/yubihsm-shell/build - + projects/yubihsm-shell/config - rbm.conf - tools/signing/do-all-signing - tools/signing/linux-signer-authenticode-signing - tools/signing/linux-signer-gpg-sign - tools/signing/linux-signer-signmars - + tools/signing/machines-setup/build-yubihsm-shell-pkg - + tools/signing/machines-setup/etc/udev/rules.d/70-yubikey.rules - + tools/signing/machines-setup/etc/yubihsm_pkcs11.conf - + tools/signing/machines-setup/setup-osslsigncode - + tools/signing/machines-setup/setup-signing-machine - + tools/signing/machines-setup/ssh-keys/boklm-tb-release.pub - + tools/signing/machines-setup/ssh-keys/boklm-yk1.pub - + tools/signing/machines-setup/ssh-keys/richard.pub - + tools/signing/machines-setup/sudoers.d/sign-exe - + tools/signing/machines-setup/sudoers.d/sign-gpg - + tools/signing/machines-setup/sudoers.d/sign-mar - + tools/signing/machines-setup/upload-tbb-to-signing-machine - tools/signing/set-config - + tools/signing/wrappers/sign-exe - + tools/signing/wrappers/sign-gpg - + tools/signing/wrappers/sign-mar Changes: ===================================== projects/mar-tools/config ===================================== @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +# +# Used by tools/signing/machines-setup/upload-tbb-to-signing-machine +# to fetch mar-tools for signing machine setup +# +version: 12.0.4 +filename: 'mar-tools-linux64.zip' +container: + use_container: 0 +gpg_keyring: torbrowser.gpg +tag_gpg_id: 1 +input_files: + - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux64.zip' + sha256sum: 726ec4192de61a9342b3262c7ac722cbd59eaba07879be9589c65599d2d69584 + +steps: + fetch_martools: + fetch_martools: | + #!/bin/bash + echo ok ===================================== projects/osslsigncode/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' +version: '[% c("git_hash").substr(0, 12) %]' git_url: https://github.com/mtrojnar/osslsigncode git_hash: e72a1937d1a13e87074e4584f012f13e03fc1d64 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' @@ -15,3 +15,12 @@ var: input_files: - filename: 0001-Make-code-work-with-OpenSSL-1.1.patch - filename: timestamping.patch + - filename: '[% c("var/srcfile") %]' + enable: '[% c("var/no-git") %]' + +targets: + no-git: + git_url: '' + var: + no-git: 1 + srcfile: '[% project %]-[% c("version") %].tar.gz' ===================================== projects/yubihsm-shell/build ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=$(pwd)/dist +tar xf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] +dpkg-buildpackage -us -uc +mkdir -p "$distdir" +mv ../*.deb "$distdir" +dest=[% dest_dir _ '/' _ c('filename') %] +rm -Rf "$dest" +mv "$distdir" "$dest" ===================================== projects/yubihsm-shell/config ===================================== @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: 2.4.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' +container: + use_container: 0 +var: + src_filename: 'yubihsm-shell-[% c("version") %].tar.gz' +input_files: + - URL: 'https://developers.yubico.com/yubihsm-shell/Releases/[% c("var/src_filename") %]' + sha256sum: 319bb2ff2a7af5ecb949a170b181a6ee7c0b44270e31cf10d0840360b1b3b5e0 + +steps: + fetch_src: + fetch_src: | + #!/bin/bash + echo ok ===================================== rbm.conf ===================================== @@ -87,7 +87,7 @@ var: build_id: '[% sha256(c("var/build_id_txt", { num_procs => 4 })).substr(0, 6) %]' build_id_txt: | [% c("version") %] - [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] + [% IF c("git_url") || c("hg_url"); GET c("abbrev"); END; %] [% IF c("container/use_container") && ! c("container/global_disable") -%] [% c("var/container/suite") %] [% c("var/container/arch") %] ===================================== tools/signing/do-all-signing ===================================== @@ -17,9 +17,9 @@ echo test -f "$steps_dir/linux-signer-signmars.done" || read -sp "Enter nssdb7 (mar signing) passphrase: " NSSPASS echo -test -f "$steps_dir/linux-signer-authenticode-signing.done" || - read -sp "Enter windows authenticode (yubihsm) passphrase: " YUBIPASS -echo +#test -f "$steps_dir/linux-signer-authenticode-signing.done" || +# read -sp "Enter windows authenticode (yubihsm) passphrase: " YUBIPASS +#echo test -f "$steps_dir/linux-signer-gpg-sign.done" || read -sp "Enter gpg passphrase: " GPG_PASS echo @@ -199,10 +199,10 @@ do_step sync-scripts-to-linux-signer do_step sync-before-linux-signer-signmars do_step linux-signer-signmars do_step sync-after-signmars -do_step linux-signer-authenticode-signing -do_step sync-after-authenticode-signing -do_step authenticode-timestamping -do_step sync-after-authenticode-timestamping +#do_step linux-signer-authenticode-signing +#do_step sync-after-authenticode-signing +#do_step authenticode-timestamping +#do_step sync-after-authenticode-timestamping do_step hash_signed_bundles do_step sync-after-hash do_step linux-signer-gpg-sign ===================================== tools/signing/linux-signer-authenticode-signing ===================================== @@ -9,26 +9,14 @@ cd ~/"$SIGNING_PROJECTNAME-$tbb_version" test -n "${YUBIPASS:-}" || read -s -p "Authenticode (yubihsm) password:" YUBIPASS echo -tmpdir=$(mktemp -d) -chgrp yubihsm "$tmpdir" -chmod g+rwx "$tmpdir" - cwd=$(pwd) for i in `find . -name "*.exe" -print` do echo "Signing $i" - echo export 'YUBIHSM_PKCS11_CONF=~/yubihsm_pkcs11.conf' \; \ - /home/yubihsm/osslsigncode/osslsigncode \ - -pkcs11engine /usr/lib/engines/engine_pkcs11.so \ - -pkcs11module /usr/local/lib/yubihsm_pkcs11.so \ - -pass "'$YUBIPASS'" \ - -h sha256 \ - -certs /home/yubihsm/tpo-cert.crt \ - -key 1c40 \ - "$cwd/$i" "$tmpdir/$i" \ - | sudo su - yubihsm - mv -vf "$tmpdir/$i" "$cwd/$i" + sudo -u signing-win -- "$wrappers_dir/sign-exe" \ + "$YUBIPASS" \ + "$cwd/$i" + cp /home/signing-win/last-signed-file.exe "$cwd/$i" done unset YUBIPASS -rmdir "$tmpdir" ===================================== tools/signing/linux-signer-gpg-sign ===================================== @@ -7,6 +7,7 @@ source "$script_dir/functions" cd ~/"$SIGNING_PROJECTNAME-$tbb_version" test -n "$GPG_PASS" || read -sp "Enter gpg passphrase: " GPG_PASS +currentdir=$(pwd) for i in `find . -name "*.dmg" -o -name "*.exe" -o -name "*.tar.xz" -o -name "*.txt" -o -name "*.zip" -o -name "*.tar.gz" -o -name "*.apk" | sort` do if test -f "$i.asc" @@ -15,5 +16,8 @@ do rm -f "$i.asc" fi echo "Signing $i" - echo "$GPG_PASS" | gpg -absu 0xe53d989a9e2d47bf! --batch --no-tty --passphrase-fd 0 $i + i="$currentdir/$i" + tmpsig=$(mktemp) + echo "$GPG_PASS" | sudo -u signing-gpg -- "$wrappers_dir/sign-gpg" "$i" > "$tmpsig" + mv -f "$tmpsig" "${i}.asc" done ===================================== tools/signing/linux-signer-signmars ===================================== @@ -1,8 +1,4 @@ #!/bin/bash -# -# -# You may set NSS_DB_DIR and/or NSS_CERTNAME before invoking this script -# (if you don't want to use the default values). set -e set -u @@ -10,38 +6,15 @@ set -u script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -if [ -z "${NSS_DB_DIR+x}" ]; then - if test "$SIGNING_PROJECTNAME" = 'torbrowser'; then - NSS_DB_DIR=/home/boklm/marsigning/nssdb7 - fi - if test "$SIGNING_PROJECTNAME" = 'mullvadbrowser'; then - NSS_DB_DIR=/home/boklm/marsigning/mullvad-browser-nssdb-1 - fi -fi - -if [ -z "${NSS_CERTNAME+x}" ]; then - NSS_CERTNAME=marsigner -fi - export LC_ALL=C -# Check some prerequisites. -if [ ! -r "$NSS_DB_DIR/cert9.db" ]; then - >&2 echo "Please create and populate the $NSS_DB_DIR directory" - exit 2 -fi - -# Extract the MAR tools so we can use the signmar program. -MARTOOLS_TMP_DIR=$(mktemp -d) -trap "rm -rf $MARTOOLS_TMP_DIR" EXIT -MARTOOLS_ZIP=~/gitian-builder/inputs/mar-tools-new-linux32.zip -unzip -d "$MARTOOLS_TMP_DIR" -q "$MARTOOLS_ZIP" -export PATH="$MARTOOLS_TMP_DIR/mar-tools:$PATH" -if [ -z "${LD_LIBRARY_PATH+x}" ]; then - export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools" -else - export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools:$LD_LIBRARY_PATH" +martools_dir=/home/signing-mar/mar-tools +if ! test -d "$martools_dir"; then + >&2 echo "Please create $martools_dir" + exit 3 fi +export LD_LIBRARY_PATH="$martools_dir" +export PATH="$martools_dir:$PATH" # Prompt for the NSS password. # TODO: Test that the entered NSS password is correct. But how? Unfortunately, @@ -70,9 +43,8 @@ for marfile in *.mar; do continue; fi - echo "$NSSPASS" | signmar -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s \ - "$marfile" tmp.mar - mv -f tmp.mar "$marfile" + echo "$NSSPASS" | sudo -u signing-mar -- "$wrappers_dir/sign-mar" "$marfile" + cp /home/signing-mar/last-signed-mar.mar "$marfile" COUNT=$((COUNT + 1)) echo "Signed MAR file $COUNT ($marfile)" done ===================================== tools/signing/machines-setup/build-yubihsm-shell-pkg ===================================== @@ -0,0 +1,26 @@ +#!/bin/bash +set -e + +if test $(whoami) != 'build-pkgs'; then + echo 'This script should be run as the build-pkgs user' >&2 + exit 1 +fi + +destdir=/home/build-pkgs/packages/yubihsm-shell-pkgs +if test -d "$destdir"; then + echo "$destdir already exists. Doing nothing." + exit 0 +fi + +cd /home/build-pkgs +tar xf /signing/tor-browser-build.tar +cd tor-browser-build +tar xf /signing/rbm.tar +yubihsm_src_filename=$(./rbm/rbm showconf yubihsm-shell var/src_filename) +mkdir -p out/yubihsm-shell +cp "/signing/$yubihsm_src_filename" out/yubihsm-shell +./rbm/rbm build yubihsm-shell +yubihsm_out_filename=$(./rbm/rbm showconf yubihsm-shell filename) +rm -Rf "$destdir" +mkdir -p $(dirname $destdir) +mv -f "out/yubihsm-shell/$yubihsm_out_filename" "$destdir" ===================================== tools/signing/machines-setup/etc/udev/rules.d/70-yubikey.rules ===================================== @@ -0,0 +1,2 @@ +ACTION=="add|change", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0010|0110|0111|0114|0116|0120|0401|0403|0405|0407|0410", MODE="0660", GROUP="yubihsm" +ACTION=="add|change", SUBSYSTEM=="usb", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0010|0110|0111|0114|0116|0120|0401|0403|0405|0407|0410", MODE="0660", GROUP="yubihsm" ===================================== tools/signing/machines-setup/etc/yubihsm_pkcs11.conf ===================================== @@ -0,0 +1,5 @@ +connector = yhusb:// +#debug +#dinout +#libdebug +#debug-file = /tmp/yubihsm_pkcs11_debug ===================================== tools/signing/machines-setup/setup-osslsigncode ===================================== @@ -0,0 +1,27 @@ +#!/bin/bash +set -e + +if test $(whoami) != 'signing-win'; then + echo 'This script should be run as the signing-win user' >&2 + exit 1 +fi + +destdir=/home/signing-win/osslsigncode +if test -d "$destdir"; then + echo "$destdir already exists. Doing nothing." + exit 0 +fi + +cd /home/signing-win +tar xf /signing/tor-browser-build.tar +cd tor-browser-build +tar xf /signing/rbm.tar +osslsigncodefile=$(./rbm/rbm showconf osslsigncode --target no-git var/srcfile) +mkdir -p out/osslsigncode +cp "/signing/$osslsigncodefile" out/osslsigncode +./rbm/rbm build osslsigncode --target no-git +osslscbuild=$(./rbm/rbm showconf osslsigncode filename --target no-git) +cd /home/signing-win +tar xf "tor-browser-build/out/osslsigncode/$osslscbuild" +chmod -R 755 /home/signing-win/osslsigncode +echo "Extracted osslsigncode to /home/signing-win/osslsigncode" ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -0,0 +1,134 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +function create_user { + user="$1" + groups="$2" + id "$user" > /dev/null 2>&1 && return 0 + test -n "$groups" && groups="--groups $groups" + useradd -s /bin/bash -m "$user" $groups +} + +function create_group { + group="$1" + getent group "$group" > /dev/null 2>&1 && return 0 + groupadd "$group" +} + +function authorized_keys { + user="$1" + shift + tmpfile=$(mktemp) + for file in "$@"; do + cat "$script_dir/ssh-keys/$file" >> "$tmpfile" + done + sshdir="/home/$user/.ssh" + authkeysfile="$sshdir/authorized_keys" + if diff "$tmpfile" "$authkeysfile" > /dev/null 2>&1; then + rm "$tmpfile" + return 0 + fi + echo "Update authorized_keys for user $user" + if ! test -d "$sshdir"; then + mkdir "$sshdir" + chmod 700 "$sshdir" + chown $user:$user "$sshdir" + fi + mv "$tmpfile" "$authkeysfile" + chown $user:$user "$authkeysfile" + chmod 600 "$authkeysfile" +} + +function sudoers_file { + sfile="$1" + cp "$script_dir/sudoers.d/$sfile" "/etc/sudoers.d/$sfile" + chown root:root "/etc/sudoers.d/$sfile" + chmod 0440 "/etc/sudoers.d/$sfile" +} + +function udev_rule { + udevrule="$1" + rulepath="/etc/udev/rules.d/$udevrule" + if ! diff "$script_dir$rulepath" "$rulepath" > /dev/null 2>&1; then + cp "$script_dir$rulepath" "$rulepath" + udevadm control --reload-rules + fi +} + +function install_packages { + for pkg in "$@" + do + dpkg-query -s "$pkg" 2> /dev/null | grep -q '^Status: .* installed' && continue + apt-get install -y "$pkg" + done +} + +install_packages build-essential rsync unzip +install_packages sudo vim tmux gnupg + +create_user setup +authorized_keys setup boklm-yk1.pub +mkdir -p /signing +chmod 0755 /signing +chown setup /signing + +create_user yubihsm +create_group yubihsm +udev_rule 70-yubikey.rules + +create_user signing +create_group signing +create_user signing-gpg +create_user signing-mar +create_user signing-win yubihsm + + +sudoers_file sign-gpg +sudoers_file sign-mar +sudoers_file sign-exe + +authorized_keys boklm boklm-tb-release.pub boklm-yk1.pub +create_user richard signing +authorized_keys richard richard.pub + +# Install rbm deps +install_packages libyaml-libyaml-perl libtemplate-perl libdatetime-perl \ + libio-handle-util-perl libio-all-perl \ + libio-captureoutput-perl libjson-perl libpath-tiny-perl \ + libstring-shellquote-perl libsort-versions-perl \ + libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ + libfile-copy-recursive-perl libfile-slurp-perl + +# Install deps for building osslsigncode +install_packages autoconf libtool pkg-config libssl-dev libcurl4-openssl-dev +sudo -u signing-win /signing/tor-browser-build/tools/signing/machines-setup/setup-osslsigncode + +# Packages needed for windows signing +install_packages opensc libengine-pkcs11-openssl + +# Install deps for building yubihsm-shell +install_packages cmake libusb-1.0-0-dev libedit-dev gengetopt libpcsclite-dev help2man chrpath dh-exec + +# Build and install yubihsm-pkcs11 package +create_user build-pkgs +if ! dpkg-query -s yubihsm-pkcs11 2> /dev/null | grep -q '^Status: .* installed'; then + yubishm_version=2.4.0 + sudo -u build-pkgs /signing/tor-browser-build/tools/signing/machines-setup/build-yubihsm-shell-pkg + pushd /home/build-pkgs/packages/yubihsm-shell-pkgs + apt-get install -y ./yubihsm-pkcs11_${yubishm_version}_amd64.deb \ + ./libyubihsm1_${yubishm_version}_amd64.deb \ + ./libyubihsm-http1_${yubishm_version}_amd64.deb \ + ./libyubihsm-usb1_${yubishm_version}_amd64.deb + popd +fi + +# install mar-tools +if ! test -d /home/signing-mar/mar-tools; then + tmpdir=$(mktemp -d) + unzip -d "$tmpdir" /signing/mar-tools-linux64.zip + chown -R signing-mar:signing-mar "$tmpdir/mar-tools" + chmod go+rX "$tmpdir/mar-tools"/* + mv "$tmpdir/mar-tools" /home/signing-mar/mar-tools +fi ===================================== tools/signing/machines-setup/ssh-keys/boklm-tb-release.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCwAicsGXrffx9W5vXDUmE/+JP8qvbXp1oCY6eO+vuSwZ5aF7U1jXoEUdhaeytacO9ibhsBsUcC2F9ulzhUk08AKC9ylKf8vfxFMIaTu0kSo983kr+KWpeUgJijY4uwPCyZgwMZi2imTBa/ilmTxzh3Bd1WL2F2BljntdT85sfUOfZT5IEbZs5/eD+aVEbJne9fVK5M3N4fBlRwUAiCpTPe5Eqo1ZxJc3RQB+0wy+VQBJEx0MXrF/WOoyhe8OKpBCg4hraRQVP/PvO5hpVMxgEuC/AWejKB71fwjEfdZlilGqhPVbCK7+uDGfwll2FoRbNTbQRPW6rNYSStpYmP2xVSzJrMVnmEqecltTOEHaNZtrz1N2H79RyRwdx0mdA4DraI4okjgxv/O5yM5uarmW3Nadyr5ddG/9kjmgRv4s4Y94OWzEPk4kS6XMGn5ALecr2NJzlR64QtG7NO8YCRVnseEeDS8nWvDQsdM4lFroko6iDb01HjvyVJJg4jsasw5g8= user@tb-release ===================================== tools/signing/machines-setup/ssh-keys/boklm-yk1.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7nEOKbxQX46guAanVHEfMZL/Udvd3g/HFQnJDDK0Nr+OPe2doGcUs2DD8xxADNihh59fsvVSeerHfe0Fuer039Y2PZNjg1zfm8Gk099zLIJWgZ23Lj59sLmrHQOSgE+VKaLq6OPre9wuhoe0XbiJOmoJRH78TF5GSOidPngLgthrm3rsCAofsJ26DzObVdbKKvR5XmvloBAIiNbvPnyq+0cn6LFSSueRG/v+A9ESl423b6n01msEm8yi5wqUE3ciskRF/IpP8HJV2C2naOgXVLmYw5Ft2NQzRSSgLy+l2mQxU4FTY2SaO7TVlo8aBjxLSHWakZMsnYyWOHrSnpx+l2g2wC2Bw5CwvS4z+n1/u568/UvRvAyZ/i6f7MO56MC9ipaQH165U+Lh4Ra6V82XvOvAtQwr/ts55/ypTzEerNXO5aoRQdnfU+funQEhT80Upqo3Cda+Eexn/thF3B+uCys7gszbWHa0L0WsLmH0vlHOIY/zS34pI2BChaKk237fOMILrY3AdWaK/ZNnkvTks262dMNJiv3WjxoMBvj3M/uOawT+ir2fWoASrcWbWOJcHNcigzWruZ0J4H0tzy7GMizYs2uV7fvTvCvgVyuPtTVb7S61k2PFDozzQaWUkJIs3/OTnfXdvB1d1p/7mK+BuSb8dnNhaklxZWAeMgbSjQw== boklm-yk1 ===================================== tools/signing/machines-setup/ssh-keys/richard.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo+S69a6A3fBaft5va/iZIjRjgn4xLMZ4wszr6HZImJWr7lvSUCOy+3wCp/ABRHuYfhMsrR+YwrW/Ixdu/MqkSOSzhVxVhwoAAgQjxHcOucGzanpdl2ezEPbYtXSnI5XOw/CdYqeDVdK9wZFbADpHxECHu45Knc1dQ9VTbQzA3b6CNZE4Otv1B1gwydfqPIAoM7R4g6HAHK8i50PWczgRqiPMNtoZUYAKDKhSXIaP3gdefKpePHf/KynXYTEwpdYBnxHcC0RbjzvfY5e0oO9Y9/QuXZmSGRTGf7FT8P03gItNKfaEeeSn219M0/xPypODogN9JCg1reTP1UqtOxYSJ YubiKey #18117406 PIV Slot 9a ===================================== tools/signing/machines-setup/sudoers.d/sign-exe ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-win env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-win) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-exe ===================================== tools/signing/machines-setup/sudoers.d/sign-gpg ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-gpg env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-gpg) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-gpg ===================================== tools/signing/machines-setup/sudoers.d/sign-mar ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-mar env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-mar) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-mar ===================================== tools/signing/machines-setup/upload-tbb-to-signing-machine ===================================== @@ -0,0 +1,59 @@ +#!/bin/bash +# Upload tor-browser-build directory from current HEAD commit and other +# dependencies to signing machine +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +cd "$script_dir/../../.." +tmpdir=$(mktemp -d) +tbbtar=$tmpdir/tor-browser-build.tar +git archive --prefix=tor-browser-build/ --output="$tbbtar" HEAD . + +echo "Created $tbbtar" + +make submodule-update +osslsigncodefile=$(./rbm/rbm showconf osslsigncode --target no-git var/srcfile) +if ! test -f "./out/osslsigncode/$osslsigncodefile"; then + ./rbm/rbm tar osslsigncode + echo "Created $osslsigncodefile" +fi + +cd rbm +git archive --prefix=rbm/ --output="$tmpdir/rbm.tar" HEAD . +echo "Created rbm.tar" +cd .. + +martools_filename=mar-tools-linux64.zip +if ! test -f "./out/mar-tools/$martools_filename"; then + ./rbm/rbm build --step fetch_martools mar-tools + echo "Downloaded $martools_filename" +fi + +yubihsm_filename=$(./rbm/rbm showconf yubihsm-shell var/src_filename) +if ! test -f "./out/yubihsm-shell/$yubihsm_filename"; then + ./rbm/rbm build yubihsm-shell --step fetch_src + echo "Fetched $yubihsm_filename" +fi + +signing_machine='linux-signer' +setup_user='setup' +signing_dir='/signing' + +echo "Uploading $osslsigncodefile to $signing_machine" +chmod go+r "./out/osslsigncode/$osslsigncodefile" +rsync -v "./out/osslsigncode/$osslsigncodefile" "$setup_user@$signing_machine:$signing_dir/$osslsigncodefile" +echo "Uploading rbm.tar to $signing_machine" +rsync -v "$tmpdir/rbm.tar" "$setup_user@$signing_machine:$signing_dir/rbm.tar" +echo "Uploading $martools_filename" +chmod go+r "./out/mar-tools/$martools_filename" +rsync -v "./out/mar-tools/$martools_filename" "$setup_user@$signing_machine:$signing_dir/$martools_filename" +echo "Uploading $yubihsm_filename" +chmod go+r "./out/yubihsm-shell/$yubihsm_filename" +rsync -v "./out/yubihsm-shell/$yubihsm_filename" "$setup_user@$signing_machine:$signing_dir/$yubihsm_filename" +echo "Uploading tor-browser-build.tar to $signing_machine" +scp -p "$tbbtar" "$setup_user@$signing_machine:$signing_dir/" +echo "Extracting tor-browser-build.tar on $signing_machine" +ssh "$setup_user@$signing_machine" tar -C $signing_dir -xf $signing_dir/tor-browser-build.tar +echo "You can now run this command on $signing_machine to update signing machine setup:" +echo " sudo -- $signing_dir/tor-browser-build/tools/signing/machines-setup/setup-signing-machine" ===================================== tools/signing/set-config ===================================== @@ -18,6 +18,8 @@ test "$SIGNING_PROJECTNAME" = 'torbrowser' \ || test "$SIGNING_PROJECTNAME" = 'mullvadbrowser' \ || exit_error "Unknown SIGNING_PROJECTNAME $SIGNING_PROJECTNAME" +export SIGNING_PROJECTNAME + test -z "${rbm_not_available+x}" && rbm="$script_dir/../../rbm/rbm" . "$script_dir/set-config.tbb-version" @@ -36,3 +38,4 @@ test -z "${NON_INTERACTIVE:-}" || rsync_progress="--progress" rsync_options="-avH ${rsync_progress:-} ${DRY_RUN:-}" tb_builders='boklm dan henry ma1 pierov richard' +wrappers_dir=/signing/tor-browser-build/tools/signing/wrappers ===================================== tools/signing/wrappers/sign-exe ===================================== @@ -0,0 +1,37 @@ +#!/bin/bash +set -e + +if test "$#" -ne 2; then + echo "Wrong number of arguments" >&2 + exit 1 +fi + +if test $(whoami) != 'signing-win'; then + echo 'This script should be run as the signing-win user' >&2 + exit 2 +fi + +yubipass="$1" +to_sign_exe="$2" + +tpo_cert=/home/signing-win/tpo-cert.crt + +if ! test -f "$tpo_cert"; then + echo "File $tpo_cert is missing" >&2 + exit 2 +fi + +output_signed_exe=/home/signing-win/last-signed-file.exe +rm -f "$output_signed_exe" + +export 'YUBIHSM_PKCS11_CONF=/signing/tor-browser-build/tools/signing/machines-setup/etc/yubihsm_pkcs11.conf' +/home/signing-win/osslsigncode/bin/osslsigncode \ + -pkcs11engine /usr/lib/x86_64-linux-gnu/engines-1.1/pkcs11.so \ + -pkcs11module /usr/lib/x86_64-linux-gnu/pkcs11/yubihsm_pkcs11.so \ + -pass "$yubipass" \ + -h sha256 \ + -certs "$tpo_cert" \ + -key 1c40 \ + "$to_sign_exe" "$output_signed_exe" + +chmod 644 "$output_signed_exe" ===================================== tools/signing/wrappers/sign-gpg ===================================== @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +if test "$#" -ne 1; then + echo "Wrong number of arguments" >&2 + exit 2 +fi + +if test $(whoami) != 'signing-gpg'; then + echo 'This script should be run as the signing-gpg user' >&2 + exit 1 +fi + +exec gpg --homedir /home/signing-gpg/.gnupg -absu 0xe53d989a9e2d47bf! --batch --no-tty -o- --passphrase-fd 0 -- "$1" ===================================== tools/signing/wrappers/sign-mar ===================================== @@ -0,0 +1,41 @@ +#!/bin/bash +set -e + +if test "$#" -ne 1; then + echo "Wrong number of arguments" >&2 + exit 1 +fi + +if test $(whoami) != 'signing-mar'; then + echo 'This script should be run as the signing-mar user' >&2 + exit 2 +fi + +output_signed_mar=/home/signing-mar/last-signed-mar.mar +rm -f "$output_signed_mar" + +if test "$SIGNING_PROJECTNAME" = 'torbrowser'; then + NSS_DB_DIR=/home/signing-mar/nssdb/torbrowser-nssdb7 +elif test "$SIGNING_PROJECTNAME" = 'mullvadbrowser'; then + NSS_DB_DIR=/home/signing-mar/nssdb/mullvadbrowser-nssdb-1 +else + echo "Unknown SIGNING_PROJECTNAME: $SIGNING_PROJECTNAME" + exit 3 +fi +NSS_CERTNAME=marsigner + +if ! test -d "$NSS_DB_DIR"; then + echo "$NSS_DB_DIR is missing" >&2 + exit 3 +fi + +martools_dir=/home/signing-mar/mar-tools +if ! test -d "$martools_dir"; then + >&2 echo "Please create $martools_dir" + exit 4 +fi +export LD_LIBRARY_PATH="$martools_dir" +export PATH="$martools_dir:$PATH" + +"$martools_dir/signmar" -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s "$1" "$output_signed_mar" +chmod 644 "$output_signed_mar" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] 3 commits: Bug 40841: Add signing machine setup scripts and adapt signing scripts
by Richard Pospesel (＠richard) 09 May '23

09 May '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 24c07ab6 by Nicolas Vigier at 2023-04-20T16:58:30+02:00 Bug 40841: Add signing machine setup scripts and adapt signing scripts Use separate accounts to store the different keys. - - - - - 985f768a by Nicolas Vigier at 2023-04-20T16:58:32+02:00 Bug 40841: Set SIGNING_PROJECTNAME=torbrowser in signing scripts For compatibility with signing scripts on the main branch. - - - - - 43f474b4 by Nicolas Vigier at 2023-04-20T16:58:33+02:00 Bug 40846: Temporarily disable Windows signing - - - - - 25 changed files: - + projects/mar-tools/config - projects/osslsigncode/config - + projects/yubihsm-shell/build - + projects/yubihsm-shell/config - rbm.conf - tools/signing/do-all-signing - tools/signing/linux-signer-authenticode-signing - tools/signing/linux-signer-gpg-sign - tools/signing/linux-signer-signmars - + tools/signing/machines-setup/build-yubihsm-shell-pkg - + tools/signing/machines-setup/etc/udev/rules.d/70-yubikey.rules - + tools/signing/machines-setup/etc/yubihsm_pkcs11.conf - + tools/signing/machines-setup/setup-osslsigncode - + tools/signing/machines-setup/setup-signing-machine - + tools/signing/machines-setup/ssh-keys/boklm-tb-release.pub - + tools/signing/machines-setup/ssh-keys/boklm-yk1.pub - + tools/signing/machines-setup/ssh-keys/richard.pub - + tools/signing/machines-setup/sudoers.d/sign-exe - + tools/signing/machines-setup/sudoers.d/sign-gpg - + tools/signing/machines-setup/sudoers.d/sign-mar - + tools/signing/machines-setup/upload-tbb-to-signing-machine - tools/signing/set-config - + tools/signing/wrappers/sign-exe - + tools/signing/wrappers/sign-gpg - + tools/signing/wrappers/sign-mar Changes: ===================================== projects/mar-tools/config ===================================== @@ -0,0 +1,20 @@ +# vim: filetype=yaml sw=2 +# +# Used by tools/signing/machines-setup/upload-tbb-to-signing-machine +# to fetch mar-tools for signing machine setup +# +version: 12.0.4 +filename: 'mar-tools-linux64.zip' +container: + use_container: 0 +gpg_keyring: torbrowser.gpg +tag_gpg_id: 1 +input_files: + - URL: 'https://archive.torproject.org/tor-package-archive/torbrowser/[% c("version") %]/mar-tools-linux64.zip' + sha256sum: 726ec4192de61a9342b3262c7ac722cbd59eaba07879be9589c65599d2d69584 + +steps: + fetch_martools: + fetch_martools: | + #!/bin/bash + echo ok ===================================== projects/osslsigncode/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' +version: '[% c("git_hash").substr(0, 12) %]' git_url: https://github.com/mtrojnar/osslsigncode git_hash: e72a1937d1a13e87074e4584f012f13e03fc1d64 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' @@ -15,3 +15,12 @@ var: input_files: - filename: 0001-Make-code-work-with-OpenSSL-1.1.patch - filename: timestamping.patch + - filename: '[% c("var/srcfile") %]' + enable: '[% c("var/no-git") %]' + +targets: + no-git: + git_url: '' + var: + no-git: 1 + srcfile: '[% project %]-[% c("version") %].tar.gz' ===================================== projects/yubihsm-shell/build ===================================== @@ -0,0 +1,11 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=$(pwd)/dist +tar xf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] +dpkg-buildpackage -us -uc +mkdir -p "$distdir" +mv ../*.deb "$distdir" +dest=[% dest_dir _ '/' _ c('filename') %] +rm -Rf "$dest" +mv "$distdir" "$dest" ===================================== projects/yubihsm-shell/config ===================================== @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: 2.4.0 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' +container: + use_container: 0 +var: + src_filename: 'yubihsm-shell-[% c("version") %].tar.gz' +input_files: + - URL: 'https://developers.yubico.com/yubihsm-shell/Releases/[% c("var/src_filename") %]' + sha256sum: 319bb2ff2a7af5ecb949a170b181a6ee7c0b44270e31cf10d0840360b1b3b5e0 + +steps: + fetch_src: + fetch_src: | + #!/bin/bash + echo ok ===================================== rbm.conf ===================================== @@ -84,7 +84,7 @@ var: build_id: '[% sha256(c("var/build_id_txt", { num_procs => 4 })).substr(0, 6) %]' build_id_txt: | [% c("version") %] - [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %] + [% IF c("git_url") || c("hg_url"); GET c("abbrev"); END; %] [% IF c("container/use_container") && ! c("container/global_disable") -%] [% c("var/container/suite") %] [% c("var/container/arch") %] ===================================== tools/signing/do-all-signing ===================================== @@ -17,9 +17,9 @@ echo test -f "$steps_dir/linux-signer-signmars.done" || read -sp "Enter nssdb7 (mar signing) passphrase: " NSSPASS echo -test -f "$steps_dir/linux-signer-authenticode-signing.done" || - read -sp "Enter windows authenticode (yubihsm) passphrase: " YUBIPASS -echo +#test -f "$steps_dir/linux-signer-authenticode-signing.done" || +# read -sp "Enter windows authenticode (yubihsm) passphrase: " YUBIPASS +#echo test -f "$steps_dir/linux-signer-gpg-sign.done" || read -sp "Enter gpg passphrase: " GPG_PASS echo @@ -193,10 +193,10 @@ do_step dmg2mar do_step sync-scripts-to-linux-signer do_step linux-signer-signmars do_step sync-after-signmars -do_step linux-signer-authenticode-signing -do_step sync-after-authenticode-signing -do_step authenticode-timestamping -do_step sync-after-authenticode-timestamping +#do_step linux-signer-authenticode-signing +#do_step sync-after-authenticode-signing +#do_step authenticode-timestamping +#do_step sync-after-authenticode-timestamping do_step hash_signed_bundles do_step sync-after-hash do_step linux-signer-gpg-sign ===================================== tools/signing/linux-signer-authenticode-signing ===================================== @@ -9,26 +9,14 @@ cd ~/"$tbb_version" test -n "${YUBIPASS:-}" || read -s -p "Authenticode (yubihsm) password:" YUBIPASS echo -tmpdir=$(mktemp -d) -chgrp yubihsm "$tmpdir" -chmod g+rwx "$tmpdir" - cwd=$(pwd) for i in `find . -name "*.exe" -print` do echo "Signing $i" - echo export 'YUBIHSM_PKCS11_CONF=~/yubihsm_pkcs11.conf' \; \ - /home/yubihsm/osslsigncode/osslsigncode \ - -pkcs11engine /usr/lib/engines/engine_pkcs11.so \ - -pkcs11module /usr/local/lib/yubihsm_pkcs11.so \ - -pass "'$YUBIPASS'" \ - -h sha256 \ - -certs /home/yubihsm/tpo-cert.crt \ - -key 1c40 \ - "$cwd/$i" "$tmpdir/$i" \ - | sudo su - yubihsm - mv -vf "$tmpdir/$i" "$cwd/$i" + sudo -u signing-win -- "$wrappers_dir/sign-exe" \ + "$YUBIPASS" \ + "$cwd/$i" + cp /home/signing-win/last-signed-file.exe "$cwd/$i" done unset YUBIPASS -rmdir "$tmpdir" ===================================== tools/signing/linux-signer-gpg-sign ===================================== @@ -7,6 +7,7 @@ source "$script_dir/functions" cd ~/"$tbb_version" test -n "$GPG_PASS" || read -sp "Enter gpg passphrase: " GPG_PASS +currentdir=$(pwd) for i in `find . -name "*.dmg" -o -name "*.exe" -o -name "*.tar.xz" -o -name "*.txt" -o -name "*.zip" -o -name "*.tar.gz" -o -name "*.apk" | sort` do if test -f "$i.asc" @@ -15,5 +16,8 @@ do rm -f "$i.asc" fi echo "Signing $i" - echo "$GPG_PASS" | gpg -absu 0xe53d989a9e2d47bf! --batch --no-tty --passphrase-fd 0 $i + i="$currentdir/$i" + tmpsig=$(mktemp) + echo "$GPG_PASS" | sudo -u signing-gpg -- "$wrappers_dir/sign-gpg" "$i" > "$tmpsig" + mv -f "$tmpsig" "${i}.asc" done ===================================== tools/signing/linux-signer-signmars ===================================== @@ -1,8 +1,4 @@ #!/bin/bash -# -# -# You may set NSS_DB_DIR and/or NSS_CERTNAME before invoking this script -# (if you don't want to use the default values). set -e set -u @@ -10,33 +6,15 @@ set -u script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" -if [ -z "${NSS_DB_DIR+x}" ]; then - NSS_DB_DIR=/home/boklm/marsigning/nssdb7 -fi - -if [ -z "${NSS_CERTNAME+x}" ]; then - NSS_CERTNAME=marsigner -fi - export LC_ALL=C -# Check some prerequisites. -if [ ! -r "$NSS_DB_DIR/cert9.db" ]; then - >&2 echo "Please create and populate the $NSS_DB_DIR directory" - exit 2 -fi - -# Extract the MAR tools so we can use the signmar program. -MARTOOLS_TMP_DIR=$(mktemp -d) -trap "rm -rf $MARTOOLS_TMP_DIR" EXIT -MARTOOLS_ZIP=~/gitian-builder/inputs/mar-tools-new-linux32.zip -unzip -d "$MARTOOLS_TMP_DIR" -q "$MARTOOLS_ZIP" -export PATH="$MARTOOLS_TMP_DIR/mar-tools:$PATH" -if [ -z "${LD_LIBRARY_PATH+x}" ]; then - export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools" -else - export LD_LIBRARY_PATH="$MARTOOLS_TMP_DIR/mar-tools:$LD_LIBRARY_PATH" +martools_dir=/home/signing-mar/mar-tools +if ! test -d "$martools_dir"; then + >&2 echo "Please create $martools_dir" + exit 3 fi +export LD_LIBRARY_PATH="$martools_dir" +export PATH="$martools_dir:$PATH" # Prompt for the NSS password. # TODO: Test that the entered NSS password is correct. But how? Unfortunately, @@ -65,9 +43,8 @@ for marfile in *.mar; do continue; fi - echo "$NSSPASS" | signmar -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s \ - "$marfile" tmp.mar - mv -f tmp.mar "$marfile" + echo "$NSSPASS" | sudo -u signing-mar -- "$wrappers_dir/sign-mar" "$marfile" + cp /home/signing-mar/last-signed-mar.mar "$marfile" COUNT=$((COUNT + 1)) echo "Signed MAR file $COUNT ($marfile)" done ===================================== tools/signing/machines-setup/build-yubihsm-shell-pkg ===================================== @@ -0,0 +1,26 @@ +#!/bin/bash +set -e + +if test $(whoami) != 'build-pkgs'; then + echo 'This script should be run as the build-pkgs user' >&2 + exit 1 +fi + +destdir=/home/build-pkgs/packages/yubihsm-shell-pkgs +if test -d "$destdir"; then + echo "$destdir already exists. Doing nothing." + exit 0 +fi + +cd /home/build-pkgs +tar xf /signing/tor-browser-build.tar +cd tor-browser-build +tar xf /signing/rbm.tar +yubihsm_src_filename=$(./rbm/rbm showconf yubihsm-shell var/src_filename) +mkdir -p out/yubihsm-shell +cp "/signing/$yubihsm_src_filename" out/yubihsm-shell +./rbm/rbm build yubihsm-shell +yubihsm_out_filename=$(./rbm/rbm showconf yubihsm-shell filename) +rm -Rf "$destdir" +mkdir -p $(dirname $destdir) +mv -f "out/yubihsm-shell/$yubihsm_out_filename" "$destdir" ===================================== tools/signing/machines-setup/etc/udev/rules.d/70-yubikey.rules ===================================== @@ -0,0 +1,2 @@ +ACTION=="add|change", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0010|0110|0111|0114|0116|0120|0401|0403|0405|0407|0410", MODE="0660", GROUP="yubihsm" +ACTION=="add|change", SUBSYSTEM=="usb", ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0010|0110|0111|0114|0116|0120|0401|0403|0405|0407|0410", MODE="0660", GROUP="yubihsm" ===================================== tools/signing/machines-setup/etc/yubihsm_pkcs11.conf ===================================== @@ -0,0 +1,5 @@ +connector = yhusb:// +#debug +#dinout +#libdebug +#debug-file = /tmp/yubihsm_pkcs11_debug ===================================== tools/signing/machines-setup/setup-osslsigncode ===================================== @@ -0,0 +1,27 @@ +#!/bin/bash +set -e + +if test $(whoami) != 'signing-win'; then + echo 'This script should be run as the signing-win user' >&2 + exit 1 +fi + +destdir=/home/signing-win/osslsigncode +if test -d "$destdir"; then + echo "$destdir already exists. Doing nothing." + exit 0 +fi + +cd /home/signing-win +tar xf /signing/tor-browser-build.tar +cd tor-browser-build +tar xf /signing/rbm.tar +osslsigncodefile=$(./rbm/rbm showconf osslsigncode --target no-git var/srcfile) +mkdir -p out/osslsigncode +cp "/signing/$osslsigncodefile" out/osslsigncode +./rbm/rbm build osslsigncode --target no-git +osslscbuild=$(./rbm/rbm showconf osslsigncode filename --target no-git) +cd /home/signing-win +tar xf "tor-browser-build/out/osslsigncode/$osslscbuild" +chmod -R 755 /home/signing-win/osslsigncode +echo "Extracted osslsigncode to /home/signing-win/osslsigncode" ===================================== tools/signing/machines-setup/setup-signing-machine ===================================== @@ -0,0 +1,134 @@ +#!/bin/bash +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +function create_user { + user="$1" + groups="$2" + id "$user" > /dev/null 2>&1 && return 0 + test -n "$groups" && groups="--groups $groups" + useradd -s /bin/bash -m "$user" $groups +} + +function create_group { + group="$1" + getent group "$group" > /dev/null 2>&1 && return 0 + groupadd "$group" +} + +function authorized_keys { + user="$1" + shift + tmpfile=$(mktemp) + for file in "$@"; do + cat "$script_dir/ssh-keys/$file" >> "$tmpfile" + done + sshdir="/home/$user/.ssh" + authkeysfile="$sshdir/authorized_keys" + if diff "$tmpfile" "$authkeysfile" > /dev/null 2>&1; then + rm "$tmpfile" + return 0 + fi + echo "Update authorized_keys for user $user" + if ! test -d "$sshdir"; then + mkdir "$sshdir" + chmod 700 "$sshdir" + chown $user:$user "$sshdir" + fi + mv "$tmpfile" "$authkeysfile" + chown $user:$user "$authkeysfile" + chmod 600 "$authkeysfile" +} + +function sudoers_file { + sfile="$1" + cp "$script_dir/sudoers.d/$sfile" "/etc/sudoers.d/$sfile" + chown root:root "/etc/sudoers.d/$sfile" + chmod 0440 "/etc/sudoers.d/$sfile" +} + +function udev_rule { + udevrule="$1" + rulepath="/etc/udev/rules.d/$udevrule" + if ! diff "$script_dir$rulepath" "$rulepath" > /dev/null 2>&1; then + cp "$script_dir$rulepath" "$rulepath" + udevadm control --reload-rules + fi +} + +function install_packages { + for pkg in "$@" + do + dpkg-query -s "$pkg" 2> /dev/null | grep -q '^Status: .* installed' && continue + apt-get install -y "$pkg" + done +} + +install_packages build-essential rsync unzip +install_packages sudo vim tmux gnupg + +create_user setup +authorized_keys setup boklm-yk1.pub +mkdir -p /signing +chmod 0755 /signing +chown setup /signing + +create_user yubihsm +create_group yubihsm +udev_rule 70-yubikey.rules + +create_user signing +create_group signing +create_user signing-gpg +create_user signing-mar +create_user signing-win yubihsm + + +sudoers_file sign-gpg +sudoers_file sign-mar +sudoers_file sign-exe + +authorized_keys boklm boklm-tb-release.pub boklm-yk1.pub +create_user richard signing +authorized_keys richard richard.pub + +# Install rbm deps +install_packages libyaml-libyaml-perl libtemplate-perl libdatetime-perl \ + libio-handle-util-perl libio-all-perl \ + libio-captureoutput-perl libjson-perl libpath-tiny-perl \ + libstring-shellquote-perl libsort-versions-perl \ + libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ + libfile-copy-recursive-perl libfile-slurp-perl + +# Install deps for building osslsigncode +install_packages autoconf libtool pkg-config libssl-dev libcurl4-openssl-dev +sudo -u signing-win /signing/tor-browser-build/tools/signing/machines-setup/setup-osslsigncode + +# Packages needed for windows signing +install_packages opensc libengine-pkcs11-openssl + +# Install deps for building yubihsm-shell +install_packages cmake libusb-1.0-0-dev libedit-dev gengetopt libpcsclite-dev help2man chrpath dh-exec + +# Build and install yubihsm-pkcs11 package +create_user build-pkgs +if ! dpkg-query -s yubihsm-pkcs11 2> /dev/null | grep -q '^Status: .* installed'; then + yubishm_version=2.4.0 + sudo -u build-pkgs /signing/tor-browser-build/tools/signing/machines-setup/build-yubihsm-shell-pkg + pushd /home/build-pkgs/packages/yubihsm-shell-pkgs + apt-get install -y ./yubihsm-pkcs11_${yubishm_version}_amd64.deb \ + ./libyubihsm1_${yubishm_version}_amd64.deb \ + ./libyubihsm-http1_${yubishm_version}_amd64.deb \ + ./libyubihsm-usb1_${yubishm_version}_amd64.deb + popd +fi + +# install mar-tools +if ! test -d /home/signing-mar/mar-tools; then + tmpdir=$(mktemp -d) + unzip -d "$tmpdir" /signing/mar-tools-linux64.zip + chown -R signing-mar:signing-mar "$tmpdir/mar-tools" + chmod go+rX "$tmpdir/mar-tools"/* + mv "$tmpdir/mar-tools" /home/signing-mar/mar-tools +fi ===================================== tools/signing/machines-setup/ssh-keys/boklm-tb-release.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCwAicsGXrffx9W5vXDUmE/+JP8qvbXp1oCY6eO+vuSwZ5aF7U1jXoEUdhaeytacO9ibhsBsUcC2F9ulzhUk08AKC9ylKf8vfxFMIaTu0kSo983kr+KWpeUgJijY4uwPCyZgwMZi2imTBa/ilmTxzh3Bd1WL2F2BljntdT85sfUOfZT5IEbZs5/eD+aVEbJne9fVK5M3N4fBlRwUAiCpTPe5Eqo1ZxJc3RQB+0wy+VQBJEx0MXrF/WOoyhe8OKpBCg4hraRQVP/PvO5hpVMxgEuC/AWejKB71fwjEfdZlilGqhPVbCK7+uDGfwll2FoRbNTbQRPW6rNYSStpYmP2xVSzJrMVnmEqecltTOEHaNZtrz1N2H79RyRwdx0mdA4DraI4okjgxv/O5yM5uarmW3Nadyr5ddG/9kjmgRv4s4Y94OWzEPk4kS6XMGn5ALecr2NJzlR64QtG7NO8YCRVnseEeDS8nWvDQsdM4lFroko6iDb01HjvyVJJg4jsasw5g8= user@tb-release ===================================== tools/signing/machines-setup/ssh-keys/boklm-yk1.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7nEOKbxQX46guAanVHEfMZL/Udvd3g/HFQnJDDK0Nr+OPe2doGcUs2DD8xxADNihh59fsvVSeerHfe0Fuer039Y2PZNjg1zfm8Gk099zLIJWgZ23Lj59sLmrHQOSgE+VKaLq6OPre9wuhoe0XbiJOmoJRH78TF5GSOidPngLgthrm3rsCAofsJ26DzObVdbKKvR5XmvloBAIiNbvPnyq+0cn6LFSSueRG/v+A9ESl423b6n01msEm8yi5wqUE3ciskRF/IpP8HJV2C2naOgXVLmYw5Ft2NQzRSSgLy+l2mQxU4FTY2SaO7TVlo8aBjxLSHWakZMsnYyWOHrSnpx+l2g2wC2Bw5CwvS4z+n1/u568/UvRvAyZ/i6f7MO56MC9ipaQH165U+Lh4Ra6V82XvOvAtQwr/ts55/ypTzEerNXO5aoRQdnfU+funQEhT80Upqo3Cda+Eexn/thF3B+uCys7gszbWHa0L0WsLmH0vlHOIY/zS34pI2BChaKk237fOMILrY3AdWaK/ZNnkvTks262dMNJiv3WjxoMBvj3M/uOawT+ir2fWoASrcWbWOJcHNcigzWruZ0J4H0tzy7GMizYs2uV7fvTvCvgVyuPtTVb7S61k2PFDozzQaWUkJIs3/OTnfXdvB1d1p/7mK+BuSb8dnNhaklxZWAeMgbSjQw== boklm-yk1 ===================================== tools/signing/machines-setup/ssh-keys/richard.pub ===================================== @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo+S69a6A3fBaft5va/iZIjRjgn4xLMZ4wszr6HZImJWr7lvSUCOy+3wCp/ABRHuYfhMsrR+YwrW/Ixdu/MqkSOSzhVxVhwoAAgQjxHcOucGzanpdl2ezEPbYtXSnI5XOw/CdYqeDVdK9wZFbADpHxECHu45Knc1dQ9VTbQzA3b6CNZE4Otv1B1gwydfqPIAoM7R4g6HAHK8i50PWczgRqiPMNtoZUYAKDKhSXIaP3gdefKpePHf/KynXYTEwpdYBnxHcC0RbjzvfY5e0oO9Y9/QuXZmSGRTGf7FT8P03gItNKfaEeeSn219M0/xPypODogN9JCg1reTP1UqtOxYSJ YubiKey #18117406 PIV Slot 9a ===================================== tools/signing/machines-setup/sudoers.d/sign-exe ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-win env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-win) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-exe ===================================== tools/signing/machines-setup/sudoers.d/sign-gpg ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-gpg env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-gpg) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-gpg ===================================== tools/signing/machines-setup/sudoers.d/sign-mar ===================================== @@ -0,0 +1,2 @@ +Defaults>signing-mar env_keep += SIGNING_PROJECTNAME +%signing ALL = (signing-mar) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-mar ===================================== tools/signing/machines-setup/upload-tbb-to-signing-machine ===================================== @@ -0,0 +1,59 @@ +#!/bin/bash +# Upload tor-browser-build directory from current HEAD commit and other +# dependencies to signing machine +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +cd "$script_dir/../../.." +tmpdir=$(mktemp -d) +tbbtar=$tmpdir/tor-browser-build.tar +git archive --prefix=tor-browser-build/ --output="$tbbtar" HEAD . + +echo "Created $tbbtar" + +make submodule-update +osslsigncodefile=$(./rbm/rbm showconf osslsigncode --target no-git var/srcfile) +if ! test -f "./out/osslsigncode/$osslsigncodefile"; then + ./rbm/rbm tar osslsigncode + echo "Created $osslsigncodefile" +fi + +cd rbm +git archive --prefix=rbm/ --output="$tmpdir/rbm.tar" HEAD . +echo "Created rbm.tar" +cd .. + +martools_filename=mar-tools-linux64.zip +if ! test -f "./out/mar-tools/$martools_filename"; then + ./rbm/rbm build --step fetch_martools mar-tools + echo "Downloaded $martools_filename" +fi + +yubihsm_filename=$(./rbm/rbm showconf yubihsm-shell var/src_filename) +if ! test -f "./out/yubihsm-shell/$yubihsm_filename"; then + ./rbm/rbm build yubihsm-shell --step fetch_src + echo "Fetched $yubihsm_filename" +fi + +signing_machine='linux-signer' +setup_user='setup' +signing_dir='/signing' + +echo "Uploading $osslsigncodefile to $signing_machine" +chmod go+r "./out/osslsigncode/$osslsigncodefile" +rsync -v "./out/osslsigncode/$osslsigncodefile" "$setup_user@$signing_machine:$signing_dir/$osslsigncodefile" +echo "Uploading rbm.tar to $signing_machine" +rsync -v "$tmpdir/rbm.tar" "$setup_user@$signing_machine:$signing_dir/rbm.tar" +echo "Uploading $martools_filename" +chmod go+r "./out/mar-tools/$martools_filename" +rsync -v "./out/mar-tools/$martools_filename" "$setup_user@$signing_machine:$signing_dir/$martools_filename" +echo "Uploading $yubihsm_filename" +chmod go+r "./out/yubihsm-shell/$yubihsm_filename" +rsync -v "./out/yubihsm-shell/$yubihsm_filename" "$setup_user@$signing_machine:$signing_dir/$yubihsm_filename" +echo "Uploading tor-browser-build.tar to $signing_machine" +scp -p "$tbbtar" "$setup_user@$signing_machine:$signing_dir/" +echo "Extracting tor-browser-build.tar on $signing_machine" +ssh "$setup_user@$signing_machine" tar -C $signing_dir -xf $signing_dir/tor-browser-build.tar +echo "You can now run this command on $signing_machine to update signing machine setup:" +echo " sudo -- $signing_dir/tor-browser-build/tools/signing/machines-setup/setup-signing-machine" ===================================== tools/signing/set-config ===================================== @@ -2,6 +2,7 @@ . "$script_dir/set-config.hosts" bundle_locales="ALL" +export SIGNING_PROJECTNAME=torbrowser signed_dir="$script_dir/../../$tbb_version_type/signed" signed_version_dir="$signed_dir/$tbb_version" @@ -15,3 +16,4 @@ test -z "${NON_INTERACTIVE:-}" || rsync_progress="--progress" rsync_options="-avH ${rsync_progress:-} ${DRY_RUN:-}" tb_builders='boklm dan henry ma1 pierov richard' +wrappers_dir=/signing/tor-browser-build/tools/signing/wrappers ===================================== tools/signing/wrappers/sign-exe ===================================== @@ -0,0 +1,37 @@ +#!/bin/bash +set -e + +if test "$#" -ne 2; then + echo "Wrong number of arguments" >&2 + exit 1 +fi + +if test $(whoami) != 'signing-win'; then + echo 'This script should be run as the signing-win user' >&2 + exit 2 +fi + +yubipass="$1" +to_sign_exe="$2" + +tpo_cert=/home/signing-win/tpo-cert.crt + +if ! test -f "$tpo_cert"; then + echo "File $tpo_cert is missing" >&2 + exit 2 +fi + +output_signed_exe=/home/signing-win/last-signed-file.exe +rm -f "$output_signed_exe" + +export 'YUBIHSM_PKCS11_CONF=/signing/tor-browser-build/tools/signing/machines-setup/etc/yubihsm_pkcs11.conf' +/home/signing-win/osslsigncode/bin/osslsigncode \ + -pkcs11engine /usr/lib/x86_64-linux-gnu/engines-1.1/pkcs11.so \ + -pkcs11module /usr/lib/x86_64-linux-gnu/pkcs11/yubihsm_pkcs11.so \ + -pass "$yubipass" \ + -h sha256 \ + -certs "$tpo_cert" \ + -key 1c40 \ + "$to_sign_exe" "$output_signed_exe" + +chmod 644 "$output_signed_exe" ===================================== tools/signing/wrappers/sign-gpg ===================================== @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +if test "$#" -ne 1; then + echo "Wrong number of arguments" >&2 + exit 2 +fi + +if test $(whoami) != 'signing-gpg'; then + echo 'This script should be run as the signing-gpg user' >&2 + exit 1 +fi + +exec gpg --homedir /home/signing-gpg/.gnupg -absu 0xe53d989a9e2d47bf! --batch --no-tty -o- --passphrase-fd 0 -- "$1" ===================================== tools/signing/wrappers/sign-mar ===================================== @@ -0,0 +1,41 @@ +#!/bin/bash +set -e + +if test "$#" -ne 1; then + echo "Wrong number of arguments" >&2 + exit 1 +fi + +if test $(whoami) != 'signing-mar'; then + echo 'This script should be run as the signing-mar user' >&2 + exit 2 +fi + +output_signed_mar=/home/signing-mar/last-signed-mar.mar +rm -f "$output_signed_mar" + +if test "$SIGNING_PROJECTNAME" = 'torbrowser'; then + NSS_DB_DIR=/home/signing-mar/nssdb/torbrowser-nssdb7 +elif test "$SIGNING_PROJECTNAME" = 'mullvadbrowser'; then + NSS_DB_DIR=/home/signing-mar/nssdb/mullvadbrowser-nssdb-1 +else + echo "Unknown SIGNING_PROJECTNAME: $SIGNING_PROJECTNAME" + exit 3 +fi +NSS_CERTNAME=marsigner + +if ! test -d "$NSS_DB_DIR"; then + echo "$NSS_DB_DIR is missing" >&2 + exit 3 +fi + +martools_dir=/home/signing-mar/mar-tools +if ! test -d "$martools_dir"; then + >&2 echo "Please create $martools_dir" + exit 4 +fi +export LD_LIBRARY_PATH="$martools_dir" +export PATH="$martools_dir:$PATH" + +"$martools_dir/signmar" -d "$NSS_DB_DIR" -n "$NSS_CERTNAME" -s "$1" "$output_signed_mar" +chmod 644 "$output_signed_mar" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.5-1] fixup! Bug 41600: Add a tor circuit display panel.
by Richard Pospesel (＠richard) 09 May '23

09 May '23

Richard Pospesel pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9f9de549 by Henry Wilkes at 2023-05-09T14:54:55+01:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41770 - Stop blocking event propagation of keydown events that we do not handle. This lets the arrow key events pass on to ToolbarKeyboardNavigator. - - - - - 1 changed file: - browser/components/torcircuit/content/torCircuitPanel.js Changes: ===================================== browser/components/torcircuit/content/torCircuitPanel.js ===================================== @@ -221,10 +221,10 @@ var gTorCircuitPanel = { // rather than a <html:button>, or <xul:toolbarbutton>, so we need to set up // listeners for both "click" and "keydown", and not for "command". this.toolbarButton.addEventListener("keydown", event => { - event.stopPropagation(); if (event.key !== "Enter" && event.key !== " ") { return; } + event.stopPropagation(); this.show(); }); this.toolbarButton.addEventListener("click", event => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9f9de54… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9f9de54… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.11.0esr-12.5-1-build1
by Pier Angelo Vendrame (＠pierov) 09 May '23

09 May '23

Pier Angelo Vendrame pushed new tag base-browser-102.11.0esr-12.5-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.11.0esr-12.5-1] 98 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Pier Angelo Vendrame (＠pierov) 09 May '23

09 May '23

Pier Angelo Vendrame pushed to branch base-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: b8260f77 by Pier Angelo Vendrame at 2023-05-08T11:06:44+02:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - bfe1a9f8 by Pier Angelo Vendrame at 2023-05-08T11:06:44+02:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - fd8967c0 by Jamie Nicol at 2023-05-08T11:06:46+02:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 0a6c5d1f by Pier Angelo Vendrame at 2023-05-08T11:06:47+02:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 6435edbc by Neill Miller at 2023-05-08T11:06:48+02:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - c81db90e by Gabriele Svelto at 2023-05-08T11:06:48+02:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - 949bf7af by Gabriele Svelto at 2023-05-08T11:06:49+02:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - 6440fdb3 by Kershaw Chang at 2023-05-08T11:20:16+02:00 Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D164656 - - - - - b1c9ece5 by Kathy Brade at 2023-05-08T11:20:17+02:00 Bug 1769028: Disable DNS lookup in nsProfileLock when the proxy bypass protection is enabled r=mossop Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1 when the proxy bypass protection is enabled. Differential Revision: https://phabricator.services.mozilla.com/D161264 - - - - - 0e6c1d5e by Gabriele Svelto at 2023-05-08T11:20:17+02:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - 15f5b19d by Gabriele Svelto at 2023-05-08T11:20:18+02:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - c3ba271a by Hubert Boma Manilla at 2023-05-08T11:20:18+02:00 Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers - Block redirects on sourceMappingUrl - Add debugger test Differential Revision: https://phabricator.services.mozilla.com/D168648 - - - - - f70410c5 by Hubert Boma Manilla at 2023-05-08T11:20:19+02:00 Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers .sjs files depend on redirects to load static files. In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js fails because we use .sjs to serve the content. This patch refactors to no longer use .sjs files Differential Revision: https://phabricator.services.mozilla.com/D169739 - - - - - aeff7f51 by Jonathan Kew at 2023-05-08T11:27:03+02:00 Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when they 'shadow' system-installed families. r=gfx-reviewers,lsalzman Differential Revision: https://phabricator.services.mozilla.com/D175350 - - - - - 75b2d612 by Rob Wu at 2023-05-08T11:27:03+02:00 Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl,valentin Depends on D164656 Differential Revision: https://phabricator.services.mozilla.com/D166108 - - - - - cb67de40 by Kash Shampur at 2023-05-08T11:27:04+02:00 Bug 1803109 - Discard blocks of data that are too big for two chunks. r=canaltinova Currently, `ReserveAndPutRaw` allocates a second span even if the data would be too big for the chunk. Here a second conditional is added to check if the block of data is too big in this scenario and silently discard the data if so. Differential Revision: https://phabricator.services.mozilla.com/D167167 - - - - - b13cdbda by Pier Angelo Vendrame at 2023-05-08T11:27:04+02:00 Bug 1814416: Generalize the app name in about:buildconfig. r=ahochheiden Now it displays app display name, instead of having Firefox hardcoded. Differential Revision: https://phabricator.services.mozilla.com/D168562 - - - - - 335dd8ed by Jon Coppeard at 2023-05-08T11:27:05+02:00 Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink GC can mutate this vector so don't allow that while we are iterating. I think it would be safe to use index-based iteration but it's safer to just ban it entirely. This fixes the crash produced by the testcase. Differential Revision: https://phabricator.services.mozilla.com/D169701 - - - - - e058417f by Jon Coppeard at 2023-05-08T11:27:05+02:00 Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink To prevent any other instances of this problme we can update the getDebuggers() methods on the global and the realm to require no GC. Depends on D169701 Differential Revision: https://phabricator.services.mozilla.com/D169702 - - - - - cd21be0b by Pier Angelo Vendrame at 2023-05-08T11:27:05+02: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 - - - - - 1f1cc2f2 by Georg Koppen at 2023-05-08T11:27:06+02:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - 4566f55c by Henry Wilkes at 2023-05-08T11:27:06+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 95aa442e by Henry Wilkes at 2023-05-08T11:27:07+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 7d701ea6 by Pier Angelo Vendrame at 2023-05-08T11:27:07+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - bd416af5 by Marco Simonelli at 2023-05-08T11:27:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - acd25f00 by Marco Simonelli at 2023-05-08T11:27:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 685351aa by Marco Simonelli at 2023-05-08T11:27:09+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - e7661797 by Marco Simonelli at 2023-05-08T11:27:09+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - f0d2457e by Marco Simonelli at 2023-05-08T11:27:09+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 1d8b9a48 by Marco Simonelli at 2023-05-08T11:27:10+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 4469c7a4 by Gaba at 2023-05-08T11:27:10+02:00 Adding issue and merge request templates - - - - - 8345094c by Pier Angelo Vendrame at 2023-05-08T12:12:13+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - dd67bdab by Pier Angelo Vendrame at 2023-05-08T12:12:18+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 10913acd by Dan Ballard at 2023-05-08T12:12:18+02:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restore email link on mac - - - - - 445438f6 by Pier Angelo Vendrame at 2023-05-08T12:12:18+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 7de319ec by Dan Ballard at 2023-05-08T12:12:19+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 8edab7e0 by Matthew Finkel at 2023-05-08T12:12:19+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 6c1f5921 by Matthew Finkel at 2023-05-08T12:12:20+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 05bbd73a by Mike Perry at 2023-05-08T12:12:20+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 8dadfc10 by Alex Catarineu at 2023-05-08T12:12:20+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - c5df16e8 by Georg Koppen at 2023-05-08T12:12:21+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 492ec5f7 by Kathy Brade at 2023-05-08T12:12:21+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 03a3e851 by Kathy Brade at 2023-05-08T12:12:22+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - a1f5ca18 by Alex Catarineu at 2023-05-08T12:12:23+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 8df3a38d by Kathy Brade at 2023-05-08T12:12:25+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - aa78dfa3 by Arthur Edelstein at 2023-05-08T12:12:26+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 0dec6f40 by Alex Catarineu at 2023-05-08T12:12:26+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 8ddaa8b6 by Pier Angelo Vendrame at 2023-05-08T12:12:27+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 45f1b5da by Georg Koppen at 2023-05-08T12:12:27+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 7f08f09e by Alex Catarineu at 2023-05-08T12:12:27+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 8f8611ab by cypherpunks1 at 2023-05-08T12:12:28+02:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING - - - - - 0164fd2d by cypherpunks1 at 2023-05-08T12:12:28+02:00 Bug 41568: Disable LaterRun - - - - - 9bd62966 by cypherpunks1 at 2023-05-08T12:19:26+02:00 Bug 40717: Hide Windows SSO in settings - - - - - 0eccee1d by Pier Angelo Vendrame at 2023-05-08T12:19:29+02:00 Bug 40788: Prevent nsIURLQueryStrippingListService from calling home when it is not enabled. The URL query stripping service is enabled only in nightly builds, still it is initialized and remote settings are downloaded. This adds a condition that prevents the service from being initialized if disabled. Upstream Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 We should remove this patch if Mozilla decides that this is a problem also for them, or if they do not but we decide to use the feature. - - - - - 43ee30ab by Pier Angelo Vendrame at 2023-05-08T12:19:30+02: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 - - - - - 9f18f888 by Mike Perry at 2023-05-08T12:19:30+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - b69e2634 by Pier Angelo Vendrame at 2023-05-08T12:19:31+02:00 fixup! Firefox preference overrides. Bug 41738: Drop the patch to disable live reload and use the pref - - - - - 0b4b6464 by Henry Wilkes at 2023-05-08T12:19:31+02:00 fixup! Firefox preference overrides. Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 6a2c271d by Richard Pospesel at 2023-05-08T12:19:33+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 3c379cca by Pier Angelo Vendrame at 2023-05-08T12:19:33+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 8eb4ff2f by Alex Catarineu at 2023-05-08T12:19:35+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - a0268f97 by Alex Catarineu at 2023-05-08T12:19:35+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 2d9c3a02 by Alex Catarineu at 2023-05-08T12:19:36+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 2525d489 by Alex Catarineu at 2023-05-08T12:19:36+02:00 Bug 26345: Hide tracking protection UI - - - - - 7223704f by Pier Angelo Vendrame at 2023-05-08T12:19:37+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - fe4f0c3b by Alex Catarineu at 2023-05-08T12:19:37+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 36e92232 by Mike Perry at 2023-05-08T12:19:37+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 2dd8088f by Igor Oliveira at 2023-05-08T12:19:38+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - ed490bf4 by Pier Angelo Vendrame at 2023-05-08T12:19:38+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - d53c7d18 by Matthew Finkel at 2023-05-08T12:19:39+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - b6ef70bc by Pier Angelo Vendrame at 2023-05-08T12:35:14+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - e849e6a4 by hackademix at 2023-05-08T12:35:22+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 86fc490f by hackademix at 2023-05-08T12:35:26+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 55bc58e3 by hackademix at 2023-05-08T12:35:28+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 7eeeed9d by hackademix at 2023-05-08T12:35:29+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - f090c1b7 by hackademix at 2023-05-08T12:35:29+02:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - fd26f82f by hackademix at 2023-05-08T12:35:30+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 28adcc19 by Pier Angelo Vendrame at 2023-05-08T12:35:30+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - b6789fee by Henry Wilkes at 2023-05-08T12:35:31+02:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - b5620096 by Pier Angelo Vendrame at 2023-05-08T12:35:31+02:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - 10050ab5 by Pier Angelo Vendrame at 2023-05-08T12:35:31+02:00 fixup! Bug 41417: Always prompt users to restart after changing language Bug 41738: Drop the patch to disable live reload Revert "Bug 41417: Always prompt users to restart after changing language" This reverts commit bad85a459ea24b34f3c09924c6d2b9f0bc750d88. - - - - - ff3bf2e4 by p13dz at 2023-05-08T12:35:32+02:00 Bug 40283: Workaround for the file upload bug (cherry picked from commit c23f2f397327ee46a1a4de57acf206fd83e8e170) - - - - - 009b390b by Arthur Edelstein at 2023-05-08T12:35:32+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 51b8bfc4 by Pier Angelo Vendrame at 2023-05-08T12:35:33+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - d88111e9 by Henry Wilkes at 2023-05-08T12:35:33+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages and about:firefoxview. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 2f59717c by Pier Angelo Vendrame at 2023-05-08T12:35:34+02:00 Bug 41542: Disable the creation of a default profile Firefox creates a profile as a fallback for old versions. However, we do not need this, so we want to prevent Firefox from creating the related directories. We comment out the code, but should Mozilla be interested in a compile-time flag, we could rewrite the patch to add one. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174. - - - - - 5cba8e22 by Kathy Brade at 2023-05-08T12:35:34+02:00 Bug 13379: Allow using NSS to sign and verify MAR signatures Allow using NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, the default on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that can vary. - - - - - 04a9c580 by Kathy Brade at 2023-05-08T12:35:34+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 8c82b856 by Pier Angelo Vendrame at 2023-05-08T12:35:35+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41654: Move UpdateInfo into Data again - - - - - f5d06320 by Nicolas Vigier at 2023-05-08T12:35:35+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 03c01cfe by hackademix at 2023-05-08T12:35:36+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 083438e2 by Pier Angelo Vendrame at 2023-05-08T12:35:36+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 3ae7fe81 by Alex Catarineu at 2023-05-08T12:35:36+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - 8eea771c by Matthew Finkel at 2023-05-08T12:35:37+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 3550b7b8 by Pier Angelo Vendrame at 2023-05-08T12:35:37+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - a639a808 by Henry Wilkes at 2023-05-08T12:35:38+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 95b788e1 by Pier Angelo Vendrame at 2023-05-08T12:35:38+02:00 Bug 40926: Implemented the New Identity feature - - - - - 66fde012 by Henry Wilkes at 2023-05-08T12:35:39+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - − browser/actors/RFPHelperChild.jsm - − browser/actors/RFPHelperParent.jsm - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/jar.mn - browser/base/moz.build - browser/components/BrowserContentHandler.jsm - browser/components/BrowserGlue.jsm - browser/components/about/AboutRedirector.cpp The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2686fa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2686fa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.11.0esr-12.5-1-build1
by Pier Angelo Vendrame (＠pierov) 09 May '23

09 May '23

Pier Angelo Vendrame pushed new tag tor-browser-102.11.0esr-12.5-1-build1 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/tor-browser][tor-browser-102.11.0esr-12.5-1] 143 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Pier Angelo Vendrame (＠pierov) 09 May '23

09 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: b8260f77 by Pier Angelo Vendrame at 2023-05-08T11:06:44+02:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - bfe1a9f8 by Pier Angelo Vendrame at 2023-05-08T11:06:44+02:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - fd8967c0 by Jamie Nicol at 2023-05-08T11:06:46+02:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 0a6c5d1f by Pier Angelo Vendrame at 2023-05-08T11:06:47+02:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 6435edbc by Neill Miller at 2023-05-08T11:06:48+02:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - c81db90e by Gabriele Svelto at 2023-05-08T11:06:48+02:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - 949bf7af by Gabriele Svelto at 2023-05-08T11:06:49+02:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - 6440fdb3 by Kershaw Chang at 2023-05-08T11:20:16+02:00 Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D164656 - - - - - b1c9ece5 by Kathy Brade at 2023-05-08T11:20:17+02:00 Bug 1769028: Disable DNS lookup in nsProfileLock when the proxy bypass protection is enabled r=mossop Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1 when the proxy bypass protection is enabled. Differential Revision: https://phabricator.services.mozilla.com/D161264 - - - - - 0e6c1d5e by Gabriele Svelto at 2023-05-08T11:20:17+02:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - 15f5b19d by Gabriele Svelto at 2023-05-08T11:20:18+02:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - c3ba271a by Hubert Boma Manilla at 2023-05-08T11:20:18+02:00 Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers - Block redirects on sourceMappingUrl - Add debugger test Differential Revision: https://phabricator.services.mozilla.com/D168648 - - - - - f70410c5 by Hubert Boma Manilla at 2023-05-08T11:20:19+02:00 Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers .sjs files depend on redirects to load static files. In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js fails because we use .sjs to serve the content. This patch refactors to no longer use .sjs files Differential Revision: https://phabricator.services.mozilla.com/D169739 - - - - - aeff7f51 by Jonathan Kew at 2023-05-08T11:27:03+02:00 Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when they 'shadow' system-installed families. r=gfx-reviewers,lsalzman Differential Revision: https://phabricator.services.mozilla.com/D175350 - - - - - 75b2d612 by Rob Wu at 2023-05-08T11:27:03+02:00 Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl,valentin Depends on D164656 Differential Revision: https://phabricator.services.mozilla.com/D166108 - - - - - cb67de40 by Kash Shampur at 2023-05-08T11:27:04+02:00 Bug 1803109 - Discard blocks of data that are too big for two chunks. r=canaltinova Currently, `ReserveAndPutRaw` allocates a second span even if the data would be too big for the chunk. Here a second conditional is added to check if the block of data is too big in this scenario and silently discard the data if so. Differential Revision: https://phabricator.services.mozilla.com/D167167 - - - - - b13cdbda by Pier Angelo Vendrame at 2023-05-08T11:27:04+02:00 Bug 1814416: Generalize the app name in about:buildconfig. r=ahochheiden Now it displays app display name, instead of having Firefox hardcoded. Differential Revision: https://phabricator.services.mozilla.com/D168562 - - - - - 335dd8ed by Jon Coppeard at 2023-05-08T11:27:05+02:00 Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink GC can mutate this vector so don't allow that while we are iterating. I think it would be safe to use index-based iteration but it's safer to just ban it entirely. This fixes the crash produced by the testcase. Differential Revision: https://phabricator.services.mozilla.com/D169701 - - - - - e058417f by Jon Coppeard at 2023-05-08T11:27:05+02:00 Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink To prevent any other instances of this problme we can update the getDebuggers() methods on the global and the realm to require no GC. Depends on D169701 Differential Revision: https://phabricator.services.mozilla.com/D169702 - - - - - cd21be0b by Pier Angelo Vendrame at 2023-05-08T11:27:05+02: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 - - - - - 1f1cc2f2 by Georg Koppen at 2023-05-08T11:27:06+02:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - 4566f55c by Henry Wilkes at 2023-05-08T11:27:06+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 95aa442e by Henry Wilkes at 2023-05-08T11:27:07+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 7d701ea6 by Pier Angelo Vendrame at 2023-05-08T11:27:07+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - bd416af5 by Marco Simonelli at 2023-05-08T11:27:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - acd25f00 by Marco Simonelli at 2023-05-08T11:27:08+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 685351aa by Marco Simonelli at 2023-05-08T11:27:09+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - e7661797 by Marco Simonelli at 2023-05-08T11:27:09+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - f0d2457e by Marco Simonelli at 2023-05-08T11:27:09+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 1d8b9a48 by Marco Simonelli at 2023-05-08T11:27:10+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 4469c7a4 by Gaba at 2023-05-08T11:27:10+02:00 Adding issue and merge request templates - - - - - 8345094c by Pier Angelo Vendrame at 2023-05-08T12:12:13+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - dd67bdab by Pier Angelo Vendrame at 2023-05-08T12:12:18+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 10913acd by Dan Ballard at 2023-05-08T12:12:18+02:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restore email link on mac - - - - - 445438f6 by Pier Angelo Vendrame at 2023-05-08T12:12:18+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 7de319ec by Dan Ballard at 2023-05-08T12:12:19+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 8edab7e0 by Matthew Finkel at 2023-05-08T12:12:19+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 6c1f5921 by Matthew Finkel at 2023-05-08T12:12:20+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 05bbd73a by Mike Perry at 2023-05-08T12:12:20+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 8dadfc10 by Alex Catarineu at 2023-05-08T12:12:20+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - c5df16e8 by Georg Koppen at 2023-05-08T12:12:21+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 492ec5f7 by Kathy Brade at 2023-05-08T12:12:21+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 03a3e851 by Kathy Brade at 2023-05-08T12:12:22+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - a1f5ca18 by Alex Catarineu at 2023-05-08T12:12:23+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 8df3a38d by Kathy Brade at 2023-05-08T12:12:25+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - aa78dfa3 by Arthur Edelstein at 2023-05-08T12:12:26+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 0dec6f40 by Alex Catarineu at 2023-05-08T12:12:26+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 8ddaa8b6 by Pier Angelo Vendrame at 2023-05-08T12:12:27+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 45f1b5da by Georg Koppen at 2023-05-08T12:12:27+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 7f08f09e by Alex Catarineu at 2023-05-08T12:12:27+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 8f8611ab by cypherpunks1 at 2023-05-08T12:12:28+02:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING - - - - - 0164fd2d by cypherpunks1 at 2023-05-08T12:12:28+02:00 Bug 41568: Disable LaterRun - - - - - 9bd62966 by cypherpunks1 at 2023-05-08T12:19:26+02:00 Bug 40717: Hide Windows SSO in settings - - - - - 0eccee1d by Pier Angelo Vendrame at 2023-05-08T12:19:29+02:00 Bug 40788: Prevent nsIURLQueryStrippingListService from calling home when it is not enabled. The URL query stripping service is enabled only in nightly builds, still it is initialized and remote settings are downloaded. This adds a condition that prevents the service from being initialized if disabled. Upstream Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1812594 We should remove this patch if Mozilla decides that this is a problem also for them, or if they do not but we decide to use the feature. - - - - - 43ee30ab by Pier Angelo Vendrame at 2023-05-08T12:19:30+02: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 - - - - - 9f18f888 by Mike Perry at 2023-05-08T12:19:30+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - b69e2634 by Pier Angelo Vendrame at 2023-05-08T12:19:31+02:00 fixup! Firefox preference overrides. Bug 41738: Drop the patch to disable live reload and use the pref - - - - - 0b4b6464 by Henry Wilkes at 2023-05-08T12:19:31+02:00 fixup! Firefox preference overrides. Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 6a2c271d by Richard Pospesel at 2023-05-08T12:19:33+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 3c379cca by Pier Angelo Vendrame at 2023-05-08T12:19:33+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 8eb4ff2f by Alex Catarineu at 2023-05-08T12:19:35+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - a0268f97 by Alex Catarineu at 2023-05-08T12:19:35+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 2d9c3a02 by Alex Catarineu at 2023-05-08T12:19:36+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 2525d489 by Alex Catarineu at 2023-05-08T12:19:36+02:00 Bug 26345: Hide tracking protection UI - - - - - 7223704f by Pier Angelo Vendrame at 2023-05-08T12:19:37+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - fe4f0c3b by Alex Catarineu at 2023-05-08T12:19:37+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 36e92232 by Mike Perry at 2023-05-08T12:19:37+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 2dd8088f by Igor Oliveira at 2023-05-08T12:19:38+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - ed490bf4 by Pier Angelo Vendrame at 2023-05-08T12:19:38+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - d53c7d18 by Matthew Finkel at 2023-05-08T12:19:39+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - b6ef70bc by Pier Angelo Vendrame at 2023-05-08T12:35:14+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - e849e6a4 by hackademix at 2023-05-08T12:35:22+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 86fc490f by hackademix at 2023-05-08T12:35:26+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 55bc58e3 by hackademix at 2023-05-08T12:35:28+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 7eeeed9d by hackademix at 2023-05-08T12:35:29+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - f090c1b7 by hackademix at 2023-05-08T12:35:29+02:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - fd26f82f by hackademix at 2023-05-08T12:35:30+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 28adcc19 by Pier Angelo Vendrame at 2023-05-08T12:35:30+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - b6789fee by Henry Wilkes at 2023-05-08T12:35:31+02:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - b5620096 by Pier Angelo Vendrame at 2023-05-08T12:35:31+02:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - 10050ab5 by Pier Angelo Vendrame at 2023-05-08T12:35:31+02:00 fixup! Bug 41417: Always prompt users to restart after changing language Bug 41738: Drop the patch to disable live reload Revert "Bug 41417: Always prompt users to restart after changing language" This reverts commit bad85a459ea24b34f3c09924c6d2b9f0bc750d88. - - - - - ff3bf2e4 by p13dz at 2023-05-08T12:35:32+02:00 Bug 40283: Workaround for the file upload bug (cherry picked from commit c23f2f397327ee46a1a4de57acf206fd83e8e170) - - - - - 009b390b by Arthur Edelstein at 2023-05-08T12:35:32+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 51b8bfc4 by Pier Angelo Vendrame at 2023-05-08T12:35:33+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - d88111e9 by Henry Wilkes at 2023-05-08T12:35:33+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages and about:firefoxview. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 2f59717c by Pier Angelo Vendrame at 2023-05-08T12:35:34+02:00 Bug 41542: Disable the creation of a default profile Firefox creates a profile as a fallback for old versions. However, we do not need this, so we want to prevent Firefox from creating the related directories. We comment out the code, but should Mozilla be interested in a compile-time flag, we could rewrite the patch to add one. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174. - - - - - 5cba8e22 by Kathy Brade at 2023-05-08T12:35:34+02:00 Bug 13379: Allow using NSS to sign and verify MAR signatures Allow using NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, the default on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that can vary. - - - - - 04a9c580 by Kathy Brade at 2023-05-08T12:35:34+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 8c82b856 by Pier Angelo Vendrame at 2023-05-08T12:35:35+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41654: Move UpdateInfo into Data again - - - - - f5d06320 by Nicolas Vigier at 2023-05-08T12:35:35+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 03c01cfe by hackademix at 2023-05-08T12:35:36+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 083438e2 by Pier Angelo Vendrame at 2023-05-08T12:35:36+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 3ae7fe81 by Alex Catarineu at 2023-05-08T12:35:36+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - 8eea771c by Matthew Finkel at 2023-05-08T12:35:37+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 3550b7b8 by Pier Angelo Vendrame at 2023-05-08T12:35:37+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - a639a808 by Henry Wilkes at 2023-05-08T12:35:38+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 95b788e1 by Pier Angelo Vendrame at 2023-05-08T12:35:38+02:00 Bug 40926: Implemented the New Identity feature - - - - - 66fde012 by Henry Wilkes at 2023-05-08T12:35:39+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - 4ebd8dc3 by Richard Pospesel at 2023-05-08T12:35:39+02:00 Bug 41649: Create rebase and security backport gitlab issue templates - - - - - b84dfe23 by Richard Pospesel at 2023-05-08T12:35:39+02:00 fixup! Bug 41649: Create rebase and security backport gitlab issue templates - - - - - 51e034d5 by Richard Pospesel at 2023-05-08T12:35:40+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - abcf79e8 by Kathy Brade at 2023-05-08T12:35:40+02:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 1eaf3616 by Mike Perry at 2023-05-08T12:35:41+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one - - - - - a88dcc9b by Alex Catarineu at 2023-05-08T12:35:41+02:00 Bring back old Firefox onboarding Revert "Bug 1462415 - Delete onboarding system add-on r=Standard8,k88hudson" This reverts commit f7ffd78b62541d44d0102f8051d2f4080bdbc432. Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. Bug 28822: Convert onboarding to webextension Partially revert 1564367 (controlCenter in UITour.jsm) - - - - - ad69f280 by Kathy Brade at 2023-05-08T12:35:42+02:00 Bug 26961: New user onboarding. Reuse the Firefox onboarding mechanism with minimal changes. Localizable strings are pulled in from Torbutton (if Torbutton is not installed, we lack about:tor and no tour will be shown). Replace SVG images with PNGs (see bug 27002), For defense in depth, omit include OnboardingTelemetry.jsm entirely. Added support for the following UITour page event: torBrowserOpenSecuritySettings Also fix bug 27403: the onboarding bubble is not always displayed. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. Also fix bug 27484: Improve navigation within onboarding. Bug 27082: enable a limited UITour Disallow access to UITour functionality from all pages other than about:home, about:newtab, and about:tor. Implement a whitelist mechanism for page actions. Bug 26962 - implement new features onboarding (part 1). Add an "Explore" button to the "Circuit Display" panel within new user onboarding which opens the DuckDuckGo .onion and then guides users through a short circuit display tutorial. Allow a few additional UITour actions while limiting as much as possible how it can be used. Tweak the UITour styles to match the Tor Browser branding. All user interface strings are retrieved from Torbutton's browserOnboarding.properties file. Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". Bug 29768: Introduce new features to users Add an "update" tour for the Tor Browser 8.5 release that contains two panels: Toolbar and Security (with appropriate description text and images). Display an attention-grabbing dot on the onboarding text bubble when the update tour is active. The animation lasts for 14 seconds. Bug 31768: Introduce toolbar and network settings changes in onboarding Update the "Tor Network" onboarding page to include a note that settings can now be accessed via the application preferences and add an "Adjust Your Tor Network Settings" action button which opens about:preferences#tor. Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one that includes the revised "Tor Network" page and a revised "Toolbar" page. The latter explains that Torbutton's toolbar item has been removed ("Goodbye Onion Button") and explains how to access the New Identity feature using the hamburger menu and new toolbar item. Bug 34321 - Add Learn More onboarding item Bug 40429: Update Onboarding for 10.5 - - - - - 33fca703 by sanketh at 2023-05-08T12:35:42+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - 168f54a5 by Mike Perry at 2023-05-08T12:35:42+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - f68493fb by Henry Wilkes at 2023-05-08T12:35:43+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - cd268036 by Pier Angelo Vendrame at 2023-05-08T12:35:44+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - 76c2a88b by Henry Wilkes at 2023-05-08T12:35:46+02:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 14407c48 by Pier Angelo Vendrame at 2023-05-08T12:35:47+02:00 Bug 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - ea5e9864 by Pier Angelo Vendrame at 2023-05-08T12:35:47+02:00 Bug 40933: Add tor-launcher functionality - - - - - 5a2fbf11 by Richard Pospesel at 2023-05-08T12:35:48+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - c2a6917a by Alex Catarineu at 2023-05-08T12:35:48+02:00 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule Bug 31575: Replace Firefox Home (newtab) with about:tor - - - - - 44d8945e by Henry Wilkes at 2023-05-08T12:35:49+02:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41607 - New icon for new circuit toolbar button - - - - - 46c4d024 by hackademix at 2023-05-08T12:35:52+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 670414de by Henry Wilkes at 2023-05-08T12:35:53+02:00 Bug 41600: Add a tor circuit display panel. - - - - - 99c9f083 by Amogh Pradeep at 2023-05-08T12:35:54+02:00 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review - - - - - bcc269e5 by Matthew Finkel at 2023-05-08T12:35:54+02:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - a94c55b1 by Alex Catarineu at 2023-05-08T12:35:55+02:00 Add TorStrings module for localization - - - - - f893c537 by Henry Wilkes at 2023-05-08T12:35:55+02:00 fixup! Add TorStrings module for localization Bug 41714 - Add settings.bridgeShowFewer string. - - - - - 86cf13d1 by Kathy Brade at 2023-05-08T12:35:55+02:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - 7661247d by Pier Angelo Vendrame at 2023-05-08T12:35:56+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - d3866581 by Richard Pospesel at 2023-05-08T12:35:56+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - b9f5a42f by Richard Pospesel at 2023-05-08T12:35:57+02:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds tor connection status to url bar and tweaks UX when not online - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor - explicitly allows about:torconnect URIs to ignore Resist Fingerprinting (RFP) - various tweaks to info-pages.inc.css for about:torconnect (also affects other firefox info pages) Bug 40773: Update the about:torconnect frontend page to match additional UI flows - - - - - 3b32116e by Arthur Edelstein at 2023-05-08T12:35:57+02:00 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. - - - - - 77403282 by Pier Angelo Vendrame at 2023-05-08T12:35:58+02:00 Bug 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - 6de2cce1 by Pier Angelo Vendrame at 2023-05-08T12:35:58+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser Bug 41654: Fix the UpdateInfo directory path - - - - - ba877dc0 by Kathy Brade at 2023-05-08T12:35:59+02:00 Bug 12647: Support symlinks in the updater. - - - - - 450997cf by Kathy Brade at 2023-05-08T12:35:59+02:00 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - 2487cb9f by Kathy Brade at 2023-05-08T12:35:59+02:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - 9a6560be by Georg Koppen at 2023-05-08T12:36:00+02:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - bfb53e1c by Mike Perry at 2023-05-08T12:36:00+02:00 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. - - - - - 292858bc by Alex Catarineu at 2023-05-08T12:36:01+02:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - 2ef4d553 by Richard Pospesel at 2023-05-08T12:36:01+02:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - 38d9b0cc by Kathy Brade at 2023-05-08T12:36:02+02:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - 5aef813d by Alex Catarineu at 2023-05-08T12:36:02+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - 0d7b5f22 by Pier Angelo Vendrame at 2023-05-08T12:36:02+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - d3e6365e by Pier Angelo Vendrame at 2023-05-08T12:36:03+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 1c4bf4ab by Pier Angelo Vendrame at 2023-05-08T12:36:03+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - e91a2aa8 by Dan Ballard at 2023-05-08T12:36:04+02:00 Bug 40701: Add in pane security warning when downloading a file - - - - - 46710a6a by Henry Wilkes at 2023-05-08T12:36:04+02:00 Bug 41736: Customize toolbar for tor-browser. - - - - - f2cb93f6 by hackademix at 2023-05-08T12:36:06+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/Backport Android Security Fixes.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - browser/actors/NetErrorChild.jsm - browser/actors/NetErrorParent.jsm - − browser/actors/RFPHelperChild.jsm - − browser/actors/RFPHelperParent.jsm - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/abouttbupdate/aboutTBUpdate.css - + browser/base/content/abouttbupdate/aboutTBUpdate.js - + browser/base/content/abouttbupdate/aboutTBUpdate.xhtml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2686fa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2686fa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.11.0esr-12.0-1-build1
by Pier Angelo Vendrame (＠pierov) 09 May '23

09 May '23

Pier Angelo Vendrame pushed new tag tor-browser-102.11.0esr-12.0-1-build1 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/tor-browser] Pushed new tag base-browser-102.11.0esr-12.0-1-build1
by Pier Angelo Vendrame (＠pierov) 09 May '23

09 May '23

Pier Angelo Vendrame pushed new tag base-browser-102.11.0esr-12.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.11.0esr-12.0-1] 75 commits: Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers, valentin
by Pier Angelo Vendrame (＠pierov) 09 May '23

09 May '23

Pier Angelo Vendrame pushed to branch base-browser-102.11.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: e5b1d877 by Kershaw Chang at 2023-05-08T10:37:40+02:00 Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D164656 - - - - - 68f2b809 by Pier Angelo Vendrame at 2023-05-08T10:37:40+02:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - b498929c by Pier Angelo Vendrame at 2023-05-08T10:37:41+02:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - a14e7402 by Jamie Nicol at 2023-05-08T10:37:41+02:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - fc9f76c2 by Pier Angelo Vendrame at 2023-05-08T10:37:42+02:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - ff393146 by Neill Miller at 2023-05-08T10:37:42+02:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - 479be7a7 by Gabriele Svelto at 2023-05-08T10:37:42+02:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - db215d32 by Gabriele Svelto at 2023-05-08T10:37:43+02:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - 7db9ec6c by Kathy Brade at 2023-05-08T11:00:48+02:00 Bug 1769028: Disable DNS lookup in nsProfileLock when the proxy bypass protection is enabled r=mossop Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1 when the proxy bypass protection is enabled. Differential Revision: https://phabricator.services.mozilla.com/D161264 - - - - - 240c10c7 by Gabriele Svelto at 2023-05-08T11:00:57+02:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - 698693b6 by Gabriele Svelto at 2023-05-08T11:00:57+02:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 59afee38 by Hubert Boma Manilla at 2023-05-08T11:00:58+02:00 Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers - Block redirects on sourceMappingUrl - Add debugger test Differential Revision: https://phabricator.services.mozilla.com/D168648 - - - - - cd2fcf2b by Hubert Boma Manilla at 2023-05-08T11:00:58+02:00 Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers .sjs files depend on redirects to load static files. In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js fails because we use .sjs to serve the content. This patch refactors to no longer use .sjs files Differential Revision: https://phabricator.services.mozilla.com/D169739 - - - - - b0820bb4 by Rob Wu at 2023-05-08T11:00:59+02:00 Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl,valentin Depends on D164656 Differential Revision: https://phabricator.services.mozilla.com/D166108 - - - - - a3a5cc08 by Kash Shampur at 2023-05-08T11:00:59+02:00 Bug 1803109 - Discard blocks of data that are too big for two chunks. r=canaltinova Currently, `ReserveAndPutRaw` allocates a second span even if the data would be too big for the chunk. Here a second conditional is added to check if the block of data is too big in this scenario and silently discard the data if so. Differential Revision: https://phabricator.services.mozilla.com/D167167 - - - - - 871d06ca by Pier Angelo Vendrame at 2023-05-08T11:01:00+02:00 Bug 1814416: Generalize the app name in about:buildconfig. r=ahochheiden Now it displays app display name, instead of having Firefox hardcoded. Differential Revision: https://phabricator.services.mozilla.com/D168562 - - - - - 2f88a2bc by Jon Coppeard at 2023-05-08T11:01:00+02:00 Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink GC can mutate this vector so don't allow that while we are iterating. I think it would be safe to use index-based iteration but it's safer to just ban it entirely. This fixes the crash produced by the testcase. Differential Revision: https://phabricator.services.mozilla.com/D169701 - - - - - e8465d3d by Jon Coppeard at 2023-05-08T11:01:00+02:00 Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink To prevent any other instances of this problme we can update the getDebuggers() methods on the global and the realm to require no GC. Depends on D169701 Differential Revision: https://phabricator.services.mozilla.com/D169702 - - - - - 2eb5684d by Georg Koppen at 2023-05-08T11:01:01+02:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - 013c0772 by Richard Pospesel at 2023-05-08T11:01:01+02:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - a7ab945a by Henry Wilkes at 2023-05-08T11:01:02+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 6e9b7ba8 by Pier Angelo Vendrame at 2023-05-08T11:01:02+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - d9567e9b by Pier Angelo Vendrame at 2023-05-08T11:01:02+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - a80054e2 by Dan Ballard at 2023-05-08T11:01:03+02:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restore email link on mac - - - - - 57c78f8d by Gaba at 2023-05-08T11:01:03+02:00 Adding issue template for bugs. - - - - - d03e82d9 by Pier Angelo Vendrame at 2023-05-08T11:01:04+02:00 Base Browser's .mozconfigs. - - - - - a6c53089 by Pier Angelo Vendrame at 2023-05-08T11:01:04+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 88280b6b by Dan Ballard at 2023-05-08T11:01:05+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - c49cd408 by Matthew Finkel at 2023-05-08T11:01:05+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - c63107e2 by Matthew Finkel at 2023-05-08T11:01:06+02:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - b7863e91 by Matthew Finkel at 2023-05-08T11:01:09+02:00 Bug 28125: Prevent non-Necko network connections - - - - - d981aeb5 by Mike Perry at 2023-05-08T11:01:09+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 8c1a75d3 by Alex Catarineu at 2023-05-08T11:01:10+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - e3357606 by Georg Koppen at 2023-05-08T11:01:10+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 24101a0d by Kathy Brade at 2023-05-08T11:01:13+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - d51d23e6 by Kathy Brade at 2023-05-08T11:01:13+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 2945e91d by Alex Catarineu at 2023-05-08T11:01:14+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - cf23c4a7 by Kathy Brade at 2023-05-08T11:01:14+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. - - - - - 111eead7 by Arthur Edelstein at 2023-05-08T11:01:14+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 2cf47e72 by Alex Catarineu at 2023-05-08T11:01:15+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - fbfe0932 by Georg Koppen at 2023-05-08T11:01:15+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 91cae3cd by Alex Catarineu at 2023-05-08T11:01:16+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 16012ce7 by Alex Catarineu at 2023-05-08T11:01:16+02:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - 9fc9b474 by Mike Perry at 2023-05-08T11:01:16+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 7c2109ae by Pier Angelo Vendrame at 2023-05-08T11:01:17+02:00 fixup! Firefox preference overrides. Bug 41683: Disable the network process on Windows - - - - - 990a4f63 by Richard Pospesel at 2023-05-08T11:01:17+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 4992028b by Pier Angelo Vendrame at 2023-05-08T11:01:18+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 7635c171 by Alex Catarineu at 2023-05-08T11:01:18+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - c4a6b22f by Alex Catarineu at 2023-05-08T11:01:19+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 2c84b001 by Alex Catarineu at 2023-05-08T11:01:19+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 0e8619e7 by Alex Catarineu at 2023-05-08T11:01:19+02:00 Bug 26345: Hide tracking protection UI - - - - - 6f537087 by Kathy Brade at 2023-05-08T11:01:20+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - 2e99fd39 by Alex Catarineu at 2023-05-08T11:01:20+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - cdab4157 by Mike Perry at 2023-05-08T11:01:21+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - eb7e8a30 by Kathy Brade at 2023-05-08T11:01:21+02:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 7bdd1660 by Igor Oliveira at 2023-05-08T11:01:22+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - e2fa4062 by Pier Angelo Vendrame at 2023-05-08T11:01:22+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 59df37bb by Matthew Finkel at 2023-05-08T11:01:22+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 2d0ca8f6 by hackademix at 2023-05-08T11:01:23+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 90b41dac by hackademix at 2023-05-08T11:01:23+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 331323ba by hackademix at 2023-05-08T11:01:24+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 53f91b11 by hackademix at 2023-05-08T11:01:24+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 971019f7 by Richard Pospesel at 2023-05-08T11:01:24+02:00 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and outline are tied to the currently selected theme. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1594455 - - - - - f3715bef by Alex Catarineu at 2023-05-08T11:01:25+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - b06f6c6a by Matthew Finkel at 2023-05-08T11:01:25+02:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - c5c39b6c by Pier Angelo Vendrame at 2023-05-08T11:01:26+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 138de20c by Henry Wilkes at 2023-05-08T11:01:26+02:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - bd218069 by Pier Angelo Vendrame at 2023-05-08T11:01:27+02:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - 86648500 by Pier Angelo Vendrame at 2023-05-08T11:01:27+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 240fb51b by Pier Angelo Vendrame at 2023-05-08T11:01:27+02:00 Bug 40926: Implemented the New Identity feature - - - - - e56bdf6c by cypherpunks1 at 2023-05-08T11:01:28+02:00 Bug 40717: Hide Windows SSO in settings (cherry picked from commit 1bacd26df8a8ffe481e11ec6b8323150fdf2011d) - - - - - 136abaec by cypherpunks1 at 2023-05-08T11:01:28+02:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING (cherry picked from commit 47eb7d305746bd1a9e328b1fb7fef40d56769d5b) - - - - - 7c2cfde6 by Pier Angelo Vendrame at 2023-05-08T11:01:31+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - e20003a6 by Pier Angelo Vendrame at 2023-05-08T11:01:31+02:00 Bug 41542: Disable the creation of a default profile Firefox creates a profile as a fallback for old versions. However, we do not need this, so we want to prevent Firefox from creating the related directories. We comment out the code, but should Mozilla be interested in a compile-time flag, we could rewrite the patch to add one. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174. - - - - - 042af9e8 by Arthur Edelstein at 2023-05-08T11:01:32+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option (cherry picked from commit 5ff98c20700d45b9bc57d970ff45c1e6519cd64d) - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/jar.mn - + browser/branding/alpha/document_pdf.ico - browser/components/BrowserGlue.jsm - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/aboutlogins/AboutLoginsParent.jsm - browser/components/aboutlogins/content/aboutLogins.css - browser/components/aboutlogins/content/aboutLogins.js - browser/components/aboutlogins/content/components/fxaccounts-button.css - browser/components/moz.build - + browser/components/newidentity/content/newidentity.js - + browser/components/newidentity/jar.mn The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2686fa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2686fa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.11.0esr-12.0-1] 111 commits: Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers, valentin
by Pier Angelo Vendrame (＠pierov) 09 May '23

09 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.11.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: e5b1d877 by Kershaw Chang at 2023-05-08T10:37:40+02:00 Bug 1685403 - Use NS_GetFinalChannelURI at some places, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D164656 - - - - - 68f2b809 by Pier Angelo Vendrame at 2023-05-08T10:37:40+02:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - b498929c by Pier Angelo Vendrame at 2023-05-08T10:37:41+02:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - a14e7402 by Jamie Nicol at 2023-05-08T10:37:41+02:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - fc9f76c2 by Pier Angelo Vendrame at 2023-05-08T10:37:42+02:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - ff393146 by Neill Miller at 2023-05-08T10:37:42+02:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - 479be7a7 by Gabriele Svelto at 2023-05-08T10:37:42+02:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - db215d32 by Gabriele Svelto at 2023-05-08T10:37:43+02:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - 7db9ec6c by Kathy Brade at 2023-05-08T11:00:48+02:00 Bug 1769028: Disable DNS lookup in nsProfileLock when the proxy bypass protection is enabled r=mossop Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1 when the proxy bypass protection is enabled. Differential Revision: https://phabricator.services.mozilla.com/D161264 - - - - - 240c10c7 by Gabriele Svelto at 2023-05-08T11:00:57+02:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - 698693b6 by Gabriele Svelto at 2023-05-08T11:00:57+02:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 59afee38 by Hubert Boma Manilla at 2023-05-08T11:00:58+02:00 Bug 1790542 - [devtools] Do not allow redirects on the 'sourceMappingUrl' r=jdescottes,devtools-reviewers - Block redirects on sourceMappingUrl - Add debugger test Differential Revision: https://phabricator.services.mozilla.com/D168648 - - - - - cd2fcf2b by Hubert Boma Manilla at 2023-05-08T11:00:58+02:00 Bug 1790542 - [devtools] Convert browser_source_map-reload.js test from using .sjs files to createTestHTTPServer r=ochameau,devtools-reviewers .sjs files depend on redirects to load static files. In D168648 we block redirects on sourceMappingUrl, so this browser_source_map-reload.js fails because we use .sjs to serve the content. This patch refactors to no longer use .sjs files Differential Revision: https://phabricator.services.mozilla.com/D169739 - - - - - b0820bb4 by Rob Wu at 2023-05-08T11:00:59+02:00 Bug 1802385 - Use NS_GetFinalChannelURI in FetchDriver r=rpl,valentin Depends on D164656 Differential Revision: https://phabricator.services.mozilla.com/D166108 - - - - - a3a5cc08 by Kash Shampur at 2023-05-08T11:00:59+02:00 Bug 1803109 - Discard blocks of data that are too big for two chunks. r=canaltinova Currently, `ReserveAndPutRaw` allocates a second span even if the data would be too big for the chunk. Here a second conditional is added to check if the block of data is too big in this scenario and silently discard the data if so. Differential Revision: https://phabricator.services.mozilla.com/D167167 - - - - - 871d06ca by Pier Angelo Vendrame at 2023-05-08T11:01:00+02:00 Bug 1814416: Generalize the app name in about:buildconfig. r=ahochheiden Now it displays app display name, instead of having Firefox hardcoded. Differential Revision: https://phabricator.services.mozilla.com/D168562 - - - - - 2f88a2bc by Jon Coppeard at 2023-05-08T11:01:00+02:00 Bug 1816158 - Part 1: Disallow GC while iterating global's debugger vector r=sfink GC can mutate this vector so don't allow that while we are iterating. I think it would be safe to use index-based iteration but it's safer to just ban it entirely. This fixes the crash produced by the testcase. Differential Revision: https://phabricator.services.mozilla.com/D169701 - - - - - e8465d3d by Jon Coppeard at 2023-05-08T11:01:00+02:00 Bug 1816158 - Part 2: Require no GC when giving out references to the realm's debugger vector r=sfink To prevent any other instances of this problme we can update the getDebuggers() methods on the global and the realm to require no GC. Depends on D169701 Differential Revision: https://phabricator.services.mozilla.com/D169702 - - - - - 2eb5684d by Georg Koppen at 2023-05-08T11:01:01+02:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - 013c0772 by Richard Pospesel at 2023-05-08T11:01:01+02:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - a7ab945a by Henry Wilkes at 2023-05-08T11:01:02+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 6e9b7ba8 by Pier Angelo Vendrame at 2023-05-08T11:01:02+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - d9567e9b by Pier Angelo Vendrame at 2023-05-08T11:01:02+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - a80054e2 by Dan Ballard at 2023-05-08T11:01:03+02:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restore email link on mac - - - - - 57c78f8d by Gaba at 2023-05-08T11:01:03+02:00 Adding issue template for bugs. - - - - - d03e82d9 by Pier Angelo Vendrame at 2023-05-08T11:01:04+02:00 Base Browser's .mozconfigs. - - - - - a6c53089 by Pier Angelo Vendrame at 2023-05-08T11:01:04+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 88280b6b by Dan Ballard at 2023-05-08T11:01:05+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - c49cd408 by Matthew Finkel at 2023-05-08T11:01:05+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - c63107e2 by Matthew Finkel at 2023-05-08T11:01:06+02:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - b7863e91 by Matthew Finkel at 2023-05-08T11:01:09+02:00 Bug 28125: Prevent non-Necko network connections - - - - - d981aeb5 by Mike Perry at 2023-05-08T11:01:09+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 8c1a75d3 by Alex Catarineu at 2023-05-08T11:01:10+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - e3357606 by Georg Koppen at 2023-05-08T11:01:10+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 24101a0d by Kathy Brade at 2023-05-08T11:01:13+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - d51d23e6 by Kathy Brade at 2023-05-08T11:01:13+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 2945e91d by Alex Catarineu at 2023-05-08T11:01:14+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - cf23c4a7 by Kathy Brade at 2023-05-08T11:01:14+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. - - - - - 111eead7 by Arthur Edelstein at 2023-05-08T11:01:14+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 2cf47e72 by Alex Catarineu at 2023-05-08T11:01:15+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - fbfe0932 by Georg Koppen at 2023-05-08T11:01:15+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 91cae3cd by Alex Catarineu at 2023-05-08T11:01:16+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 16012ce7 by Alex Catarineu at 2023-05-08T11:01:16+02:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - 9fc9b474 by Mike Perry at 2023-05-08T11:01:16+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 7c2109ae by Pier Angelo Vendrame at 2023-05-08T11:01:17+02:00 fixup! Firefox preference overrides. Bug 41683: Disable the network process on Windows - - - - - 990a4f63 by Richard Pospesel at 2023-05-08T11:01:17+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 4992028b by Pier Angelo Vendrame at 2023-05-08T11:01:18+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 7635c171 by Alex Catarineu at 2023-05-08T11:01:18+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - c4a6b22f by Alex Catarineu at 2023-05-08T11:01:19+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 2c84b001 by Alex Catarineu at 2023-05-08T11:01:19+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 0e8619e7 by Alex Catarineu at 2023-05-08T11:01:19+02:00 Bug 26345: Hide tracking protection UI - - - - - 6f537087 by Kathy Brade at 2023-05-08T11:01:20+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - 2e99fd39 by Alex Catarineu at 2023-05-08T11:01:20+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - cdab4157 by Mike Perry at 2023-05-08T11:01:21+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - eb7e8a30 by Kathy Brade at 2023-05-08T11:01:21+02:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 7bdd1660 by Igor Oliveira at 2023-05-08T11:01:22+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - e2fa4062 by Pier Angelo Vendrame at 2023-05-08T11:01:22+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 59df37bb by Matthew Finkel at 2023-05-08T11:01:22+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 2d0ca8f6 by hackademix at 2023-05-08T11:01:23+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 90b41dac by hackademix at 2023-05-08T11:01:23+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 331323ba by hackademix at 2023-05-08T11:01:24+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 53f91b11 by hackademix at 2023-05-08T11:01:24+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 971019f7 by Richard Pospesel at 2023-05-08T11:01:24+02:00 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and outline are tied to the currently selected theme. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1594455 - - - - - f3715bef by Alex Catarineu at 2023-05-08T11:01:25+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - b06f6c6a by Matthew Finkel at 2023-05-08T11:01:25+02:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - c5c39b6c by Pier Angelo Vendrame at 2023-05-08T11:01:26+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 138de20c by Henry Wilkes at 2023-05-08T11:01:26+02:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - bd218069 by Pier Angelo Vendrame at 2023-05-08T11:01:27+02:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - 86648500 by Pier Angelo Vendrame at 2023-05-08T11:01:27+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 240fb51b by Pier Angelo Vendrame at 2023-05-08T11:01:27+02:00 Bug 40926: Implemented the New Identity feature - - - - - e56bdf6c by cypherpunks1 at 2023-05-08T11:01:28+02:00 Bug 40717: Hide Windows SSO in settings (cherry picked from commit 1bacd26df8a8ffe481e11ec6b8323150fdf2011d) - - - - - 136abaec by cypherpunks1 at 2023-05-08T11:01:28+02:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING (cherry picked from commit 47eb7d305746bd1a9e328b1fb7fef40d56769d5b) - - - - - 7c2cfde6 by Pier Angelo Vendrame at 2023-05-08T11:01:31+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - e20003a6 by Pier Angelo Vendrame at 2023-05-08T11:01:31+02:00 Bug 41542: Disable the creation of a default profile Firefox creates a profile as a fallback for old versions. However, we do not need this, so we want to prevent Firefox from creating the related directories. We comment out the code, but should Mozilla be interested in a compile-time flag, we could rewrite the patch to add one. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174. - - - - - 042af9e8 by Arthur Edelstein at 2023-05-08T11:01:32+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option (cherry picked from commit 5ff98c20700d45b9bc57d970ff45c1e6519cd64d) - - - - - 9f93a287 by Richard Pospesel at 2023-05-08T11:01:32+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 89caf071 by Richard Pospesel at 2023-05-08T11:01:32+02:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date - - - - - 69f776f5 by Mike Perry at 2023-05-08T11:01:33+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one - - - - - a9146915 by Alex Catarineu at 2023-05-08T11:01:33+02:00 Bring back old Firefox onboarding Revert "Bug 1462415 - Delete onboarding system add-on r=Standard8,k88hudson" This reverts commit f7ffd78b62541d44d0102f8051d2f4080bdbc432. Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. Bug 28822: Convert onboarding to webextension Partially revert 1564367 (controlCenter in UITour.jsm) - - - - - b42d5c69 by Kathy Brade at 2023-05-08T11:01:34+02:00 Bug 26961: New user onboarding. Reuse the Firefox onboarding mechanism with minimal changes. Localizable strings are pulled in from Torbutton (if Torbutton is not installed, we lack about:tor and no tour will be shown). Replace SVG images with PNGs (see bug 27002), For defense in depth, omit include OnboardingTelemetry.jsm entirely. Added support for the following UITour page event: torBrowserOpenSecuritySettings Also fix bug 27403: the onboarding bubble is not always displayed. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. Also fix bug 27484: Improve navigation within onboarding. Bug 27082: enable a limited UITour Disallow access to UITour functionality from all pages other than about:home, about:newtab, and about:tor. Implement a whitelist mechanism for page actions. Bug 26962 - implement new features onboarding (part 1). Add an "Explore" button to the "Circuit Display" panel within new user onboarding which opens the DuckDuckGo .onion and then guides users through a short circuit display tutorial. Allow a few additional UITour actions while limiting as much as possible how it can be used. Tweak the UITour styles to match the Tor Browser branding. All user interface strings are retrieved from Torbutton's browserOnboarding.properties file. Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". Bug 29768: Introduce new features to users Add an "update" tour for the Tor Browser 8.5 release that contains two panels: Toolbar and Security (with appropriate description text and images). Display an attention-grabbing dot on the onboarding text bubble when the update tour is active. The animation lasts for 14 seconds. Bug 31768: Introduce toolbar and network settings changes in onboarding Update the "Tor Network" onboarding page to include a note that settings can now be accessed via the application preferences and add an "Adjust Your Tor Network Settings" action button which opens about:preferences#tor. Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one that includes the revised "Tor Network" page and a revised "Toolbar" page. The latter explains that Torbutton's toolbar item has been removed ("Goodbye Onion Button") and explains how to access the New Identity feature using the hamburger menu and new toolbar item. Bug 34321 - Add Learn More onboarding item Bug 40429: Update Onboarding for 10.5 - - - - - cd19e421 by Mike Perry at 2023-05-08T11:01:36+02:00 TB3: Tor Browser's official .mozconfigs. Also: Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24 Changes needed to build Mac in 64bit Bug 10715: Enable Webgl for mingw-w64 again. Disable ICU when cross-compiling; clean-up. Bug 15773: Enable ICU on OS X Bug 15990: Don't build the sandbox with mingw-w64 Bug 12761: Switch to ESR 38 for OS X Updating .mozconfig-asan Bug 12516: Compile hardenend Tor Browser with -fwrapv Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 13419: Add back ICU for Windows Bug 21239: Use GTK2 for ESR52 Linux builds Bug 23025: Add hardening flags for macOS Bug 24478: Enable debug assertions and tests in our ASan builds --enable-proxy-bypass-protection Bug 27597: ASan build option in tor-browser-build is broken Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 21849: Don't allow SSL key logging. Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 25741 - TBA: Disable features at compile-time MOZ_NATIVE_DEVICES for casting and the media player MOZ_TELEMETRY_REPORTING for telemetry MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo) Bug 25741 - TBA: Add default configure options in dedicated file Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 29859: Disable HLS support for now Add --disable-tor-launcher build option Add --enable-tor-browser-update build option Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40061: Omit the Windows default browser agent from the build Bug 40107: Adapt .mozconfig-asan for ESR 78 Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 40793: moved Tor configuration options from old-configure.in to moz.configure - - - - - d7b923da by Henry Wilkes at 2023-05-08T11:01:37+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 281cd689 by Pier Angelo Vendrame at 2023-05-08T11:01:37+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - 4e48999f by Kathy Brade at 2023-05-08T11:01:38+02:00 Bug 13252: Do not store data in the app bundle When --enable-tor-browser-data-outside-app-dir is enabled, all user data is stored in a directory named TorBrowser-Data which is located next to the application directory. Display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. On Mac OS, add support for the --invisible command line option which is used by the meek-http-helper to avoid showing an icon for the helper browser on the dock. - - - - - e7b90812 by Pier Angelo Vendrame at 2023-05-08T11:01:38+02:00 Bug 40933: Add tor-launcher functionality - - - - - ae241b43 by Richard Pospesel at 2023-05-08T11:01:38+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - ae3d26cf by Alex Catarineu at 2023-05-08T11:01:39+02:00 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule Bug 31575: Replace Firefox Home (newtab) with about:tor Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. - - - - - da0061e0 by Pier Angelo Vendrame at 2023-05-08T11:01:39+02:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 40501: High CPU load after tor exits unexpectedly When a peers (tor) disconnects, Firefox seems to keep the stream open, and return 0 on available, rather than throwing. So, as a matter of fact, we had a while trying to read 0 bytes without any pause in _readLine, hence the 100% CPU usage. - - - - - 2066b523 by hackademix at 2023-05-08T11:01:40+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 5ccaa46b by Amogh Pradeep at 2023-05-08T11:01:40+02:00 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review - - - - - a7dbea1c by Alex Catarineu at 2023-05-08T11:01:41+02:00 Add TorStrings module for localization - - - - - 8094cd20 by Kathy Brade at 2023-05-08T11:01:41+02:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - 8bf16eef by sanketh at 2023-05-08T11:01:41+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - 7c281f42 by Kathy Brade at 2023-05-08T11:01:42+02:00 Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. Other bugs fixed: Bug 21766: Crash with e10s enabled while trying to download a file Bug 21886: Download is stalled in non-e10s mode Bug 22471: Downloading files via the PDF viewer download button is broken Bug 22472: Fix FTP downloads when external helper app dialog is shown Bug 22610: Avoid crashes when canceling external helper app downloads Bug 22618: Downloading pdf file via file:/// is stalling - - - - - 4c896ad8 by Pier Angelo Vendrame at 2023-05-08T11:01:42+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - cd11e987 by Richard Pospesel at 2023-05-08T11:01:43+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - f9c988a1 by Richard Pospesel at 2023-05-08T11:01:43+02:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds tor connection status to url bar and tweaks UX when not online - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor - explicitly allows about:torconnect URIs to ignore Resist Fingerprinting (RFP) - various tweaks to info-pages.inc.css for about:torconnect (also affects other firefox info pages) Bug 40773: Update the about:torconnect frontend page to match additional UI flows - - - - - f2ecc4ac by Arthur Edelstein at 2023-05-08T11:01:44+02:00 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. - - - - - 3af67a1b by Kathy Brade at 2023-05-08T11:01:44+02:00 Bug 4234: Use the Firefox Update Process for Tor Browser. The following files are never updated: TorBrowser/Data/Browser/profiles.ini TorBrowser/Data/Browser/profile.default/bookmarks.html TorBrowser/Data/Tor/torrc Mac OS: Store update metadata under TorBrowser/UpdateInfo. Removed the %OS_VERSION% component from the update URL (13047) and added support for minSupportedOSVersion, an attribute of the <update> element that may be used to trigger Firefox's "unsupported platform" behavior. Hide the "What's new" links (set app.releaseNotesURL value to about:blank). Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix Bug 26049: reduce the delay before the update prompt is displayed. Instead of Firefox's 2 days, we use 1 hour (after which time the update doorhanger will be displayed). Also fix bug 27221: purge the startup cache if the Tor Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Tor Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Tor Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 89173005 by Kathy Brade at 2023-05-08T11:01:45+02:00 Bug 13379: Sign our MAR files. Configure with --enable-verify-mar (when updating, require a valid signature on the MAR file before it is applied). Use the Tor Browser version instead of the Firefox version inside the MAR file info block (necessary to prevent downgrade attacks). Use NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, which Mozilla does on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used by Mozilla to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that is under TorBrowser-Data, and the location of TorBrowser-Data varies. Also includes the fix for bug 18900. Bug 19121: reinstate the update.xml hash check Revert most changes from Mozilla Bug 1373267 "Remove hashFunction and hashValue attributes from nsIUpdatePatch and code related to these attributes." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. Also partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - e97cd622 by Kathy Brade at 2023-05-08T11:01:45+02:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - da956dff by Georg Koppen at 2023-05-08T11:01:45+02:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - ef3c8a07 by Mike Perry at 2023-05-08T11:01:46+02:00 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. - - - - - 85c717b8 by Richard Pospesel at 2023-05-08T11:01:46+02:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - b9ca580d by Kathy Brade at 2023-05-08T11:01:47+02:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - f104e77e by Alex Catarineu at 2023-05-08T11:01:47+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - 46b3d95a by Pier Angelo Vendrame at 2023-05-08T11:01:48+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 955d7fa0 by Pier Angelo Vendrame at 2023-05-08T11:01:48+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 3fb8d5ca by Pier Angelo Vendrame at 2023-05-08T11:01:48+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 28dcd9db by p13dz at 2023-05-08T11:01:49+02:00 Bug 40283: Workaround for the file upload bug (cherry picked from commit c23f2f397327ee46a1a4de57acf206fd83e8e170) - - - - - 7913966d by hackademix at 2023-05-08T11:01:49+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitmodules - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - browser/actors/NetErrorChild.jsm - browser/actors/NetErrorParent.jsm - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/abouttbupdate/aboutTBUpdate.css - + browser/base/content/abouttbupdate/aboutTBUpdate.js - + browser/base/content/abouttbupdate/aboutTBUpdate.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - + browser/base/content/browser-doctype.inc - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2686fa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2686fa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 08 May '23

08 May '23

Pier Angelo Vendrame pushed to branch base-browser-102.10.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 476f17a6 by Pier Angelo Vendrame at 2023-05-08T10:18:22+02:00 fixup! Firefox preference overrides. Bug 41683: Disable the network process on Windows - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -404,6 +404,14 @@ pref("captivedetect.canonicalURL", ""); // See tor-browser#18801. pref("dom.push.serverURL", ""); +#ifdef XP_WIN +// tor-browser#41683: Disable the network process on Windows +// Mozilla already disables the network process for HTTP. +// With this preference, we completely disable it, because we found that it +// breaks stuff with mingw. See also tor-browser#41489. +pref("network.process.enabled", false); +#endif + // Extension support pref("extensions.autoDisableScopes", 0); pref("extensions.databaseSchema", 3); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/476f17a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/476f17a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.0-1] 3 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 08 May '23

08 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 8b73ad9e by Pier Angelo Vendrame at 2023-05-08T10:15:38+02:00 fixup! Firefox preference overrides. Bug 41683: Disable the network process on Windows - - - - - c26520af by Pier Angelo Vendrame at 2023-05-08T10:16:07+02:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 40501: High CPU load after tor exits unexpectedly When a peers (tor) disconnects, Firefox seems to keep the stream open, and return 0 on available, rather than throwing. So, as a matter of fact, we had a while trying to read 0 bytes without any pause in _readLine, hence the 100% CPU usage. - - - - - 23ddf6d2 by hackademix at 2023-05-08T10:16:21+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - security/manager/ssl/StaticHPKPins.h - toolkit/torbutton/modules/tor-control-port.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -404,6 +404,14 @@ pref("captivedetect.canonicalURL", ""); // See tor-browser#18801. pref("dom.push.serverURL", ""); +#ifdef XP_WIN +// tor-browser#41683: Disable the network process on Windows +// Mozilla already disables the network process for HTTP. +// With this preference, we completely disable it, because we found that it +// breaks stuff with mingw. See also tor-browser#41489. +pref("network.process.enabled", false); +#endif + // Extension support pref("extensions.autoDisableScopes", 0); pref("extensions.databaseSchema", 3); ===================================== security/manager/ssl/StaticHPKPins.h ===================================== @@ -451,6 +451,14 @@ static const StaticFingerprints kPinset_tor = { kPinset_tor_Data }; +static const char* const kPinset_tor_browser_Data[] = { + kISRG_Root_X1Fingerprint, +}; +static const StaticFingerprints kPinset_tor_browser = { + sizeof(kPinset_tor_browser_Data) / sizeof(const char*), + kPinset_tor_browser_Data +}; + static const char* const kPinset_twitterCom_Data[] = { kGOOGLE_PIN_VeriSignClass2_G2Fingerprint, kGOOGLE_PIN_VeriSignClass3_G2Fingerprint, @@ -619,6 +627,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { { "blogger.com", true, false, false, -1, &kPinset_google_root_pems }, { "blogspot.com", true, false, false, -1, &kPinset_google_root_pems }, { "br.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, + { "bridges.torproject.org", false, false, false, -1, &kPinset_tor_browser }, { "bugs.chromium.org", true, false, false, -1, &kPinset_google_root_pems }, { "build.chromium.org", true, false, false, -1, &kPinset_google_root_pems }, { "business.facebook.com", true, false, false, -1, &kPinset_facebook }, ===================================== toolkit/torbutton/modules/tor-control-port.js ===================================== @@ -135,6 +135,18 @@ class AsyncSocket { this.inputQueue.push({ onInputStreamReady: stream => { try { + if (!this.scriptableInputStream.available()) { + // This means EOF, but not closed yet. However, arriving at EOF + // should be an error condition for us, since we are in a socket, + // and EOF should mean peer disconnected. + // If the stream has been closed, this function itself should + // throw. + reject( + new Error("onInputStreamReady called without available bytes.") + ); + return; + } + // read our string from input stream let str = this.scriptableInputStream.read( this.scriptableInputStream.available() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/77a7ec… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/77a7ec… 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-102.11.0esr-12.5-1
by Pier Angelo Vendrame (＠pierov) 04 May '23

04 May '23

Pier Angelo Vendrame pushed new branch tor-browser-102.11.0esr-12.5-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/tor-browser] Pushed new branch base-browser-102.11.0esr-12.5-1
by Pier Angelo Vendrame (＠pierov) 04 May '23

04 May '23

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-102.11.0esr-12.0-1
by Pier Angelo Vendrame (＠pierov) 04 May '23

04 May '23

Pier Angelo Vendrame pushed new branch base-browser-102.11.0esr-12.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… 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-102.11.0esr-12.0-1
by Pier Angelo Vendrame (＠pierov) 04 May '23

04 May '23

Pier Angelo Vendrame pushed new branch tor-browser-102.11.0esr-12.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/tor-browser] Pushed new tag FIREFOX_102_11_0esr_BUILD2
by Pier Angelo Vendrame (＠pierov) 04 May '23

04 May '23

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-13.0-1] 11 commits: fixup! Bug 41417: Always prompt users to restart after changing language
by Pier Angelo Vendrame (＠pierov) 04 May '23

04 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 7cf4e447 by Pier Angelo Vendrame at 2023-04-20T20:16:02+02:00 fixup! Bug 41417: Always prompt users to restart after changing language Bug 41738: Drop the patch to disable live reload Revert "Bug 41417: Always prompt users to restart after changing language" This reverts commit bad85a459ea24b34f3c09924c6d2b9f0bc750d88. - - - - - 4ae88530 by Pier Angelo Vendrame at 2023-04-20T20:16:02+02:00 fixup! Firefox preference overrides. Bug 41738: Drop the patch to disable live reload and use the pref - - - - - 1ce930e3 by Henry Wilkes at 2023-04-20T20:03:08+00:00 Bug 41736 - Customize toolbar for base-browser. - - - - - d354800c by Henry Wilkes at 2023-04-20T20:03:08+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - adacb2c3 by Henry Wilkes at 2023-04-20T20:03:08+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 491718d1 by Henry Wilkes at 2023-04-20T20:03:08+00:00 fixup! Firefox preference overrides. Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 352acb10 by Henry Wilkes at 2023-04-20T20:03:08+00:00 Bug 41736 - Customize toolbar for tor-browser. - - - - - 96796fa5 by Henry Wilkes at 2023-04-20T20:03:08+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 9b35dbeb by hackademix at 2023-04-20T20:11:22+00:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 0db7a4bd by Richard Pospesel at 2023-04-23T11:51:30+00:00 fixup! Bug 41649: Create rebase and security backport gitlab issue templates - - - - - d1f3b52e by Henry Wilkes at 2023-05-04T08:43:14+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41607 - New icon for new circuit toolbar button - - - - - 10 changed files: - .gitlab/issue_templates/Backport Android Security Fixes.md - .gitlab/issue_templates/Rebase Browser - Alpha.md - .gitlab/issue_templates/Rebase Browser - Stable.md - browser/app/profile/000-tor-browser.js - browser/app/profile/001-base-profile.js - browser/components/customizableui/CustomizableUI.jsm - browser/components/extensions/parent/ext-browserAction.js - browser/components/preferences/main.js - browser/themes/shared/icons/new_circuit.svg - security/manager/ssl/StaticHPKPins.h Changes: ===================================== .gitlab/issue_templates/Backport Android Security Fixes.md ===================================== @@ -4,6 +4,7 @@ - example : `102.8.0` - `$(RR_VERSION)` : the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train. - example: `110` +- `$(PROJECT_NAME)` : the name of the browser project, either `base-browser` or `tor-browser` - `$(TOR_BROWSER_MAJOR)` : the Tor Browser major version - example : `12` - `$(TOR_BROWSER_MINOR)` : the Tor Browser minor version @@ -12,7 +13,7 @@ - example : `build1` </details> -**NOTE:** It is assumed the `tor-browser` rebase has already happened and there exists a `build1` build tag for both `base-browser` and `tor-browser` +**NOTE:** It is assumed the `tor-browser` rebase (stable and alpha) has already happened and there exists a `build1` build tags for both `base-browser` and `tor-browser` (stable and alpha) ### **Bookkeeping** @@ -36,26 +37,53 @@ - Create link to the CVE on [mozilla.org](https://www.mozilla.org/en-US/security/advisories/) - example: https://www.mozilla.org/en-US/security/advisories/mfsa2023-05/#CVE-2023-257… - Create link to the associated Bugzilla issues (found in the CVE description) - - Create a link to the relevant `gecko-dev`/other commit hashes which need to be backported OR a brief justification for why the fix does not need to be backported + - Create links to the relevant `gecko-dev`/other commit hashes which need to be backported OR a brief justification for why the fix does not need to be backported - To find the `gecko-dev` version of a `mozilla-central`, search for a unique string in the relevant `mozilla-central` commit message in the `gecko-dev/release` branch log. - **NOTE:** This process is unfortunately somewhat poorly defined/ad-hoc given the general variation in how Bugzilla issues are labeled and resolved. In general this is going to involve a bit of hunting to identify needed commits or determining whether or not the fix is relevant. +### CVEs + + ### **tor-browser** : https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - - [ ] Sign/Tag commit: - - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - [ ] Backport patches to `tor-browser` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto: + - [ ] `base-browser` stable + - [ ] `tor-browser` alpha + - [ ] `base-browser` alpha + - [ ] Sign/Tag commits: + - Tag : `$(PROJECT_NAME)-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` - - [ ] Push tag to `origin` + - [ ] `base-browser` stable + - [ ] `tor-browser` stable + - [ ] `base-browser` alpha + - [ ] `tor-browser` alpha + - [ ] Push tags to `origin` **OR** - [ ] No backports ### **application-services** : *TODO: we will need to setup a gitlab copy of this repo that we can apply security backports to if there are ever any security issues here* - [ ] Backport any Android-specific security fixes from Firefox rapid-release - - [ ] Sign/Tag commit: + - [ ] Backport patches to `application-services` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto `application-services` alpha + - [ ] Sign/Tag commits: - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha` - - [ ] Push tag to `origin` + - [ ] `application-services` stable + - [ ] `application-services` alpha + - [ ] Push tags to `origin` **OR** - [ ] No backports @@ -63,10 +91,16 @@ ### **android-components** : https://gitlab.torproject.org/tpo/applications/android-components.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - **NOTE**: Since November 2022, this repo has been merged with `fenix` into a singular `firefox-android` repo: https://github.com/mozilla-mobile/firefox-android. Any backport will require a patch rewrite to apply to our legacy `android-components` project. - - [ ] Sign/Tag commit: + - [ ] Backport patches to `android-components` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto `android-components` alpha + - [ ] Sign/Tag commits: - Tag : `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` - - [ ] Push tag to `origin` + - [ ] `android-components` stable + - [ ] `android-components` alpha + - [ ] Push tags to `origin` **OR** - [ ] No backports @@ -74,15 +108,17 @@ ### **fenix** : https://gitlab.torproject.org/tpo/applications/fenix.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - **NOTE**: Since February 2023, this repo has been merged with `android-components` into a singular `firefox-android` repo: https://github.com/mozilla-mobile/firefox-android. Any backport will require a patch rewrite to apply to our legacy `fenix` project. - - [ ] Sign/Tag commit: + - [ ] Backport patches to `fenix` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto `fenix` alpha + - [ ] Sign/Tag commits: - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` - - [ ] Push tag to `origin` + - [ ] `fenix` stable + - [ ] `fenix` alpha + - [ ] Push tags to `origin` **OR** - [ ] No backports -### CVEs - - - /confidential ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -27,14 +27,46 @@ - [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +### Update Branch Protection Rules + +- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: + - [ ] Remove previous alpha `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) + - [ ] Create new `base-browser` and `tor-browser` branch protection rule: + - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` + - example: `*-102.8.0esr-12.5-1*` + - **Allowed to merge**: `Maintainers` + - **Allowed to push and merge**: `Maintainers` + - **Allowed to force push**: `false` + +### **Create New Branches** + +- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag (found during the stable rebase) + - branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` + - example: `base-browser-102.8.0esr-12.5-1` +- [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag + - branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` + - example: `tor-browser-102.8.0esr-12.5-1` +- [ ] Push new `base-browser` branch to `origin` +- [ ] Push new `tor-browser` branch to `origin` + ### **Rebase base-browser** -- [ ] Checkout a new branch for the `base-browser` rebase +- [ ] Checkout a new local branch for the `base-browser` rebase - example: `git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1` - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `build1` tag onto new `base-browser` rebase branch - example: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.5-1-build1` - [ ] Rebase and autosquash these cherry-picked commits - example: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD` + - [ ] **(Optional)** Patch reordering + - Relocate new `base-browser` patches in the patch-set to enforce this rough thematic ordering: + - **MOZILLA BACKPORTS** - official Firefox patches we have backported to our ESR branch: Android-specific security updates, critical bug fixes, worthwhile features, etc + - **MOZILLA REVERTS** - revert commits of official Firefox patches + - **UPLIFT CANDIDATES** - patches which stand on their own and should be uplifted to `mozilla-central` + - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc + - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc + - **SECURITY PATCHES** - security improvements, hardening, etc + - **PRIVACY PATCHES** - fingerprinting, linkability, proxy bypass, etc + - **FEATURES** - new functionality: updater, UX, letterboxing, security level, add-on integration, etc - [ ] Cherry-pick remainder of patches after the `build1` tag - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1 origin/base-browser-102.7.0esr-12.5-1` - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: @@ -61,15 +93,30 @@ - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..tor-browser-102.7.0esr-12.5-1-build1` - [ ] Rebase and autosquash these cherry-picked commits (from the last new `base-browser` commit to `HEAD`) - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.5-1-build1 HEAD` + - [ ] **(Optional)** Patch reordering + - Relocate new `tor-browser` patches in the patch-set to enforce this rough thematic ordering: + - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc + - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc + - **UPDATER PATCHES** - updater tweaks, signing keys, etc + - **SECURITY PATCHES** - non tor-dependent security improvements, hardening, etc + - **PRIVACY PATCHES** - non tor-dependent fingerprinting, linkability, proxy bypass, etc + - **FEAURES** - non tor-dependent features + - **TOR INTEGRATION** - legacy tor-launcher/torbutton, tor modules, bootstrapping, etc + - **TOR SECURITY PATCHES** - tor-specific security improvements + - **TOR PRIVACY PATCHES** - tor-specific privacy improvements + - **TOR FEATURES** - new tor-specific functionality: manual, onion-location, onion service client auth, etc - [ ] Cherry-pick remainder of patches after the last `buildN` tag - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..origin/tor-browser-102.7.0esr-12.5-1` +- [ ] Rebase and autosquash again (from the last new `base-browser` commit to `HEAD`), this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify. + - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.5-1-build1 HEAD` + - **NOTE**: Do not allow `fixup` or `squash` commands here! - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - [ ] diff of diffs: - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD` - [ ] Open MR for the `tor-browser` rebase ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -25,6 +25,17 @@ - [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +### Update Branch Protection Rules + +- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: + - [ ] Remove previous stable `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) + - [ ] Create new `base-browser` and `tor-browser` branch protection rule: + - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` + - example: `*-102.8.0esr-12.0-1*` + - **Allowed to merge**: `Maintainers` + - **Allowed to push and merge**: `Maintainers` + - **Allowed to force push**: `false` + ### **Identify the Firefox Tagged Commit and Create New Branches** - [ ] Find the Firefox mercurial tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags @@ -48,7 +59,7 @@ ### **Rebase base-browser** -- [ ] Checkout a new branch for the `base-browser` rebase +- [ ] Checkout a new local branch for the `base-browser` rebase - example: `git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1` - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `build1` tag onto new `base-browser` rebase branch - example: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.0-1-build1` @@ -72,6 +83,7 @@ - Message : `Tagging build1 for $(ESR_VERSION)esr-based stable` - [ ] Push tag to `origin` + ### **Rebase tor-browser** - [ ] Checkout a new branch for the `tor-browser` rebase starting from the `base-browser` `build1` tag @@ -88,7 +100,7 @@ - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD` - [ ] Open MR for the `tor-browser` rebase @@ -97,4 +109,3 @@ - Tag : `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - Message : `Tagging build1 for $(ESR_VERSION)esr-based stable` - [ ] Push tag to `origin` - ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -30,8 +30,6 @@ pref("network.security.ports.banned", "", locked); pref("network.dns.disabled", true); // This should cover the #5741 patch for DNS leaks pref("network.http.max-persistent-connections-per-proxy", 256); -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"torbutton-button\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); - // Treat .onions as secure pref("dom.securecontext.allowlist_onions", true); ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -464,9 +464,6 @@ pref("intl.multilingual.downloadEnabled", false); // Disk activity: Disable storage.sync (tor-browser#41424) pref("webextensions.storage.sync.enabled", false); -// Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); - // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); @@ -499,6 +496,10 @@ pref("browser.urlbar.suggest.topsites", false); // is only reported via telemetry (which is disabled). See tor-browser#40048. pref("corroborator.enabled", false); +// tor-browser#41417: do not allow live reload until we switch to Fluent and +// stop using .textContent. +pref("intl.multilingual.liveReload", false); + // Onboarding. pref("browser.onboarding.tourset-version", 5); pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services,learn-more"); ===================================== browser/components/customizableui/CustomizableUI.jsm ===================================== @@ -65,6 +65,16 @@ const kSubviewEvents = ["ViewShowing", "ViewHiding"]; */ var kVersion = 17; +/** + * The current version for base browser. + */ +var kVersionBaseBrowser = 1; + +/** + * The current version for tor browser. + */ +var kVersionTorBrowser = 1; + /** * Buttons removed from built-ins by version they were removed. kVersion must be * bumped any time a new id is added to this. Use the button id as key, and @@ -218,6 +228,8 @@ var CustomizableUIInternal = { this._updateForNewVersion(); this._updateForNewProtonVersion(); this._markObsoleteBuiltinButtonsSeen(); + this._updateForBaseBrowser(); + this._updateForTorBrowser(); this.registerArea( CustomizableUI.AREA_FIXED_OVERFLOW_PANEL, @@ -236,10 +248,17 @@ var CustomizableUIInternal = { Services.policies.isAllowed("removeHomeButtonByDefault") ? null : "home-button", - "spring", + // Don't want springs either side of the urlbar. tor-browser#41736 "urlbar-container", - "spring", - "save-to-pocket-button", + // save-to-pocket-button is entirely disabled. See tor-browser#18886 and + // tor-browser#31602. + // Base-browser additions tor-browser#41736. If you want to add to, remove + // from, or rearrange this list, then bump the kVersionBaseBrowser and + // update existing saved states in _updateForBaseBrowser. + // Or if the change is only meant for tor-browser, bump kVersionTorBrowser + // instead and update the existing saved states in _updateForTorBrowser. + "security-level-button", + "new-identity-button", "downloads-button", AppConstants.MOZ_DEV_EDITION ? "developer-button" : null, "fxa-toolbar-menu-button", @@ -255,6 +274,10 @@ var CustomizableUIInternal = { }, true ); + // navbarPlacements does not match the initial default XHTML layout. + // Therefore we always need to rebuild the navbar area when + // registerToolbarNode is called. tor-browser#41736 + gDirtyAreaCache.add(CustomizableUI.AREA_NAVBAR); if (AppConstants.MENUBAR_CAN_AUTOHIDE) { this.registerArea( @@ -687,6 +710,123 @@ var CustomizableUIInternal = { } }, + _updateForBaseBrowser() { + if (!gSavedState) { + // Use the defaults. + return; + } + + const currentVersion = gSavedState.currentVersionBaseBrowser; + + if (currentVersion < 1) { + // NOTE: In base-browser/tor-browser version 12.5a5, and earlier, the + // toolbar was configured by setting the full JSON string for the default + // "browser.uiCustomization.state" preference value. The disadvantage is + // that we could not update this value in a way that existing users (who + // would have non-default preference values) would also get the desired + // change (e.g. for adding or removing a button). + // + // With tor-browser#41736 we want to switch to changing the toolbar + // dynamically like firefox. Therefore, this first version transfer simply + // gets the toolbar into the same state we wanted before, away from the + // default firefox state. + // + // If an existing user state aligned with the previous default + // "browser.uiCustomization.state" then this shouldn't visibly change + // anything. + // If a user explicitly customized the toolbar to go back to the firefox + // default, then this may undo those changes. + const navbarPlacements = + gSavedState.placements[CustomizableUI.AREA_NAVBAR]; + if (navbarPlacements) { + const getBeforeAfterUrlbar = () => { + // NOTE: The urlbar is non-removable from the navbar, so should have + // an index. + const index = navbarPlacements.indexOf("urlbar-container"); + let after = index + 1; + if ( + after < navbarPlacements.length && + navbarPlacements[after] === "search-container" + ) { + // Skip past the search-container. + after++; + } + return { before: index - 1, after }; + }; + + // Remove the urlbar springs either side of the urlbar. + const { before, after } = getBeforeAfterUrlbar(); + if ( + after < navbarPlacements.length && + this.matchingSpecials(navbarPlacements[after], "spring") + ) { + // Remove the spring after. + navbarPlacements.splice(after, 1); + // NOTE: The `before` index does not change. + } + if ( + before >= 0 && + this.matchingSpecials(navbarPlacements[before], "spring") + ) { + // Remove the spring before. + navbarPlacements.splice(before, 1); + } + + // Make sure the security-level-button and new-identity-button appears + // in the toolbar. + for (const id of ["new-identity-button", "security-level-button"]) { + let alreadyAdded = false; + for (const placements of Object.values(gSavedState.placements)) { + if (placements.includes(id)) { + alreadyAdded = true; + break; + } + } + if (alreadyAdded) { + continue; + } + + // Add to the nav-bar, after the urlbar-container. + // NOTE: We have already removed the spring after the urlbar. + navbarPlacements.splice(getBeforeAfterUrlbar().after, 0, id); + } + } + + // Remove save-to-pocket-button. See tor-browser#18886 and + // tor-browser#31602. + for (const placements of Object.values(gSavedState.placements)) { + let buttonIndex = placements.indexOf("save-to-pocket-button"); + if (buttonIndex != -1) { + placements.splice(buttonIndex, 1); + } + } + + // Remove unused fields that used to be part of + // "browser.uiCustomization.state". + delete gSavedState.placements["PanelUI-contents"]; + delete gSavedState.placements["addon-bar"]; + } + }, + + _updateForTorBrowser() { + if (!gSavedState) { + // Use the defaults. + return; + } + + const currentVersion = gSavedState.currentVersionTorBrowser; + + if (currentVersion < 1) { + // Remove torbutton-button, which no longer exists. + for (const placements of Object.values(gSavedState.placements)) { + let buttonIndex = placements.indexOf("torbutton-button"); + if (buttonIndex != -1) { + placements.splice(buttonIndex, 1); + } + } + } + }, + _placeNewDefaultWidgetsInArea(aArea) { let futurePlacedWidgets = gFuturePlacements.get(aArea); let savedPlacements = @@ -2501,6 +2641,14 @@ var CustomizableUIInternal = { gSavedState.currentVersion = 0; } + if (!("currentVersionBaseBrowser" in gSavedState)) { + gSavedState.currentVersionBaseBrowser = 0; + } + + if (!("currentVersionTorBrowser" in gSavedState)) { + gSavedState.currentVersionTorBrowser = 0; + } + gSeenWidgets = new Set(gSavedState.seen || []); gDirtyAreaCache = new Set(gSavedState.dirtyAreaCache || []); gNewElementCount = gSavedState.newElementCount || 0; @@ -2579,6 +2727,8 @@ var CustomizableUIInternal = { seen: gSeenWidgets, dirtyAreaCache: gDirtyAreaCache, currentVersion: kVersion, + currentVersionBaseBrowser: kVersionBaseBrowser, + currentVersionTorBrowser: kVersionTorBrowser, newElementCount: gNewElementCount, }; ===================================== browser/components/extensions/parent/ext-browserAction.js ===================================== @@ -193,6 +193,10 @@ this.browserAction = class extends ExtensionAPIPersistent { } build() { + // The extension ID for NoScript (WebExtension) + const isNoScript = + this.extension.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}"; + let widget = CustomizableUI.createWidget({ id: this.id, viewId: this.viewId, @@ -200,7 +204,11 @@ this.browserAction = class extends ExtensionAPIPersistent { removable: true, label: this.action.getProperty(null, "title"), tooltiptext: this.action.getProperty(null, "title"), - defaultArea: browserAreas[this.action.getDefaultArea()], + // Do not want to add the NoScript extension to the toolbar by default. + // tor-browser#41736 + defaultArea: isNoScript + ? null + : browserAreas[this.action.getDefaultArea()], showInPrivateBrowsing: this.extension.privateBrowsingAllowed, // Don't attempt to load properties from the built-in widget string ===================================== browser/components/preferences/main.js ===================================== @@ -1196,17 +1196,18 @@ var gMainPane = { gMainPane.recordBrowserLanguagesTelemetry("reorder"); switch (gMainPane.getLanguageSwitchTransitionType(newLocales)) { - // tor-browser#41417: Always prompt for the restart, until we switch to - // Fluent, since the current way we use to update languages does not allow - // live-reload. We could also call showConfirmLanguageChangeMessageBar in - // the official live-reload case, but the result is inconsistent and makes - // handling the locales-match case harder. case "requires-restart": - case "live-reload": // Prepare to change the locales, as they were different. gMainPane.showConfirmLanguageChangeMessageBar(newLocales); gMainPane.updatePrimaryBrowserLanguageUI(newLocales[0]); break; + case "live-reload": + Services.locale.requestedLocales = newLocales; + gMainPane.updatePrimaryBrowserLanguageUI( + Services.locale.appLocaleAsBCP47 + ); + gMainPane.hideConfirmLanguageChangeMessageBar(); + break; case "locales-match": // They matched, so we can reset the UI. gMainPane.updatePrimaryBrowserLanguageUI( @@ -1459,12 +1460,18 @@ var gMainPane = { } switch (gMainPane.getLanguageSwitchTransitionType(selected)) { - // tor-browser#41417: see onPrimaryBrowserLanguageMenuChange case "requires-restart": - case "live-reload": gMainPane.showConfirmLanguageChangeMessageBar(selected); gMainPane.updatePrimaryBrowserLanguageUI(selected[0]); break; + case "live-reload": + Services.locale.requestedLocales = selected; + + gMainPane.updatePrimaryBrowserLanguageUI( + Services.locale.appLocaleAsBCP47 + ); + gMainPane.hideConfirmLanguageChangeMessageBar(); + break; case "locales-match": // They matched, so we can reset the UI. gMainPane.updatePrimaryBrowserLanguageUI( ===================================== browser/themes/shared/icons/new_circuit.svg ===================================== @@ -1,6 +1,4 @@ -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g stroke="none" stroke-width="1" fill="context-fill" fill-rule="evenodd" opacity="context-fill-opacity"> - <path d="m10.707 6h3.993l.3-.3v-3.993c.0002-.09902-.0291-.19586-.084-.27825s-.1331-.14661-.2245-.18453c-.0915-.03792-.1922-.04782-.2893-.02845-.0971.01936-.1863.06713-.2562.13723l-1.459 1.459c-1.2817-1.16743-2.95335-1.813714-4.687-1.812-3.859 0-7 3.141-7 7s3.141 7 7 7c1.74123.007 3.422-.6379 4.7116-1.8079 1.2896-1.1701 2.0945-2.7804 2.2564-4.5141.0156-.1649-.0348-.32927-.1401-.4571s-.2571-.2087-.4219-.2249c-.1644-.01324-.3275.03801-.4548.1429s-.2088.2552-.2272.4191c-.1334 1.42392-.7948 2.7464-1.854 3.7072-1.0593.9609-2.43986 1.4905-3.87 1.4848-3.171 0-5.75-2.579-5.75-5.75s2.579-5.75 5.75-5.75c1.40277-.00207 2.7572.5123 3.805 1.445l-1.451 1.451c-.07.06987-.1178.15895-.1372.25597-.0194.09701-.0096.1976.0282.28903.0378.09144.1019.1696.1841.22461.0823.055.179.08437.2779.08439z"/> - <path d="m8 12.5c-2.48528 0-4.5-2.0147-4.5-4.5 0-2.48528 2.01472-4.5 4.5-4.5z"/> - </g> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5994 2.89744C9.52191 2.34851 8.2983 2.15477 7.10392 2.34398C6.64247 2.41708 6.19453 2.5459 5.76923 2.72578C5.82159 2.91042 5.84961 3.10529 5.84961 3.3067C5.84961 4.48031 4.89821 5.4317 3.72461 5.4317C2.551 5.4317 1.59961 4.48031 1.59961 3.3067C1.59961 2.1331 2.551 1.1817 3.72461 1.1817C4.23757 1.1817 4.70808 1.36346 5.07525 1.66608C5.65429 1.3987 6.27072 1.21038 6.90834 1.10937C8.36342 0.878863 9.85413 1.11489 11.1668 1.78364C12.4795 2.45239 13.5468 3.51953 14.2158 4.83212C14.8848 6.14471 15.121 7.63538 14.8907 9.0905C14.8368 9.43143 14.5167 9.66408 14.1757 9.61013C13.8348 9.55617 13.6022 9.23605 13.6561 8.89511C13.8451 7.70071 13.6512 6.47713 13.1021 5.39971C12.553 4.3223 11.6769 3.44636 10.5994 2.89744ZM4.64961 3.3067C4.64961 3.81756 4.23547 4.2317 3.72461 4.2317C3.21375 4.2317 2.79961 3.81756 2.79961 3.3067C2.79961 2.79584 3.21375 2.3817 3.72461 2.3817C4.23547 2.3817 4.64961 2.79584 4.64961 3.3067Z" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M1.82421 6.38991C2.16514 6.44387 2.39779 6.76399 2.34383 7.10492C2.15482 8.29933 2.34875 9.52291 2.89785 10.6003C3.44695 11.6777 4.32303 12.5537 5.40053 13.1026C6.47803 13.6515 7.70165 13.8453 8.89602 13.6561C9.35628 13.5831 9.8031 13.4548 10.2274 13.2757C10.1734 13.0884 10.1445 12.8906 10.1445 12.686C10.1445 11.5124 11.0959 10.561 12.2695 10.561C13.4431 10.561 14.3945 11.5124 14.3945 12.686C14.3945 13.8596 13.4431 14.811 12.2695 14.811C11.7602 14.811 11.2927 14.6318 10.9267 14.333C10.3471 14.6009 9.72997 14.7895 9.0916 14.8907C7.63652 15.1212 6.14581 14.8851 4.83311 14.2164C3.52042 13.5476 2.45311 12.4805 1.78415 11.1679C1.11519 9.85533 0.878921 8.36466 1.1092 6.90954C1.16315 6.56861 1.48327 6.33596 1.82421 6.38991ZM13.1945 12.686C13.1945 13.1968 12.7804 13.611 12.2695 13.611C11.7587 13.611 11.3445 13.1968 11.3445 12.686C11.3445 12.1751 11.7587 11.761 12.2695 11.761C12.7804 11.761 13.1945 12.1751 13.1945 12.686Z" fill="context-fill"/> </svg> ===================================== security/manager/ssl/StaticHPKPins.h ===================================== @@ -451,6 +451,14 @@ static const StaticFingerprints kPinset_tor = { kPinset_tor_Data }; +static const char* const kPinset_tor_browser_Data[] = { + kISRG_Root_X1Fingerprint, +}; +static const StaticFingerprints kPinset_tor_browser = { + sizeof(kPinset_tor_browser_Data) / sizeof(const char*), + kPinset_tor_browser_Data +}; + static const char* const kPinset_twitterCom_Data[] = { kGOOGLE_PIN_VeriSignClass2_G2Fingerprint, kGOOGLE_PIN_VeriSignClass3_G2Fingerprint, @@ -619,6 +627,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { { "blogger.com", true, false, false, -1, &kPinset_google_root_pems }, { "blogspot.com", true, false, false, -1, &kPinset_google_root_pems }, { "br.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, + { "bridges.torproject.org", false, false, false, -1, &kPinset_tor_browser }, { "bugs.chromium.org", true, false, false, -1, &kPinset_google_root_pems }, { "build.chromium.org", true, false, false, -1, &kPinset_google_root_pems }, { "business.facebook.com", true, false, false, -1, &kPinset_facebook }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/337dcb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/337dcb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 04 May '23

04 May '23

Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d1f3b52e by Henry Wilkes at 2023-05-04T08:43:14+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41607 - New icon for new circuit toolbar button - - - - - 1 changed file: - browser/themes/shared/icons/new_circuit.svg Changes: ===================================== browser/themes/shared/icons/new_circuit.svg ===================================== @@ -1,6 +1,4 @@ -<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <g stroke="none" stroke-width="1" fill="context-fill" fill-rule="evenodd" opacity="context-fill-opacity"> - <path d="m10.707 6h3.993l.3-.3v-3.993c.0002-.09902-.0291-.19586-.084-.27825s-.1331-.14661-.2245-.18453c-.0915-.03792-.1922-.04782-.2893-.02845-.0971.01936-.1863.06713-.2562.13723l-1.459 1.459c-1.2817-1.16743-2.95335-1.813714-4.687-1.812-3.859 0-7 3.141-7 7s3.141 7 7 7c1.74123.007 3.422-.6379 4.7116-1.8079 1.2896-1.1701 2.0945-2.7804 2.2564-4.5141.0156-.1649-.0348-.32927-.1401-.4571s-.2571-.2087-.4219-.2249c-.1644-.01324-.3275.03801-.4548.1429s-.2088.2552-.2272.4191c-.1334 1.42392-.7948 2.7464-1.854 3.7072-1.0593.9609-2.43986 1.4905-3.87 1.4848-3.171 0-5.75-2.579-5.75-5.75s2.579-5.75 5.75-5.75c1.40277-.00207 2.7572.5123 3.805 1.445l-1.451 1.451c-.07.06987-.1178.15895-.1372.25597-.0194.09701-.0096.1976.0282.28903.0378.09144.1019.1696.1841.22461.0823.055.179.08437.2779.08439z"/> - <path d="m8 12.5c-2.48528 0-4.5-2.0147-4.5-4.5 0-2.48528 2.01472-4.5 4.5-4.5z"/> - </g> +<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"> +<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5994 2.89744C9.52191 2.34851 8.2983 2.15477 7.10392 2.34398C6.64247 2.41708 6.19453 2.5459 5.76923 2.72578C5.82159 2.91042 5.84961 3.10529 5.84961 3.3067C5.84961 4.48031 4.89821 5.4317 3.72461 5.4317C2.551 5.4317 1.59961 4.48031 1.59961 3.3067C1.59961 2.1331 2.551 1.1817 3.72461 1.1817C4.23757 1.1817 4.70808 1.36346 5.07525 1.66608C5.65429 1.3987 6.27072 1.21038 6.90834 1.10937C8.36342 0.878863 9.85413 1.11489 11.1668 1.78364C12.4795 2.45239 13.5468 3.51953 14.2158 4.83212C14.8848 6.14471 15.121 7.63538 14.8907 9.0905C14.8368 9.43143 14.5167 9.66408 14.1757 9.61013C13.8348 9.55617 13.6022 9.23605 13.6561 8.89511C13.8451 7.70071 13.6512 6.47713 13.1021 5.39971C12.553 4.3223 11.6769 3.44636 10.5994 2.89744ZM4.64961 3.3067C4.64961 3.81756 4.23547 4.2317 3.72461 4.2317C3.21375 4.2317 2.79961 3.81756 2.79961 3.3067C2.79961 2.79584 3.21375 2.3817 3.72461 2.3817C4.23547 2.3817 4.64961 2.79584 4.64961 3.3067Z" fill="context-fill"/> +<path fill-rule="evenodd" clip-rule="evenodd" d="M1.82421 6.38991C2.16514 6.44387 2.39779 6.76399 2.34383 7.10492C2.15482 8.29933 2.34875 9.52291 2.89785 10.6003C3.44695 11.6777 4.32303 12.5537 5.40053 13.1026C6.47803 13.6515 7.70165 13.8453 8.89602 13.6561C9.35628 13.5831 9.8031 13.4548 10.2274 13.2757C10.1734 13.0884 10.1445 12.8906 10.1445 12.686C10.1445 11.5124 11.0959 10.561 12.2695 10.561C13.4431 10.561 14.3945 11.5124 14.3945 12.686C14.3945 13.8596 13.4431 14.811 12.2695 14.811C11.7602 14.811 11.2927 14.6318 10.9267 14.333C10.3471 14.6009 9.72997 14.7895 9.0916 14.8907C7.63652 15.1212 6.14581 14.8851 4.83311 14.2164C3.52042 13.5476 2.45311 12.4805 1.78415 11.1679C1.11519 9.85533 0.878921 8.36466 1.1092 6.90954C1.16315 6.56861 1.48327 6.33596 1.82421 6.38991ZM13.1945 12.686C13.1945 13.1968 12.7804 13.611 12.2695 13.611C11.7587 13.611 11.3445 13.1968 11.3445 12.686C11.3445 12.1751 11.7587 11.761 12.2695 11.761C12.7804 11.761 13.1945 12.1751 13.1945 12.686Z" fill="context-fill"/> </svg> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d1f3b52… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d1f3b52… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] fixup! Bug 41649: Create rebase and security backport gitlab issue templates
by Richard Pospesel (＠richard) 23 Apr '23

23 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 0db7a4bd by Richard Pospesel at 2023-04-23T11:51:30+00:00 fixup! Bug 41649: Create rebase and security backport gitlab issue templates - - - - - 3 changed files: - .gitlab/issue_templates/Backport Android Security Fixes.md - .gitlab/issue_templates/Rebase Browser - Alpha.md - .gitlab/issue_templates/Rebase Browser - Stable.md Changes: ===================================== .gitlab/issue_templates/Backport Android Security Fixes.md ===================================== @@ -4,6 +4,7 @@ - example : `102.8.0` - `$(RR_VERSION)` : the Mozilla defined Rapid-Release version; Tor Browser for Android is based off of the `$(ESR_VERSION)`, but Mozilla's Firefox for Android is based off of the `$(RR_VERSION)` so we need to keep track of security vulnerabilities to backport from the monthly Rapid-Release train and our frozen ESR train. - example: `110` +- `$(PROJECT_NAME)` : the name of the browser project, either `base-browser` or `tor-browser` - `$(TOR_BROWSER_MAJOR)` : the Tor Browser major version - example : `12` - `$(TOR_BROWSER_MINOR)` : the Tor Browser minor version @@ -12,7 +13,7 @@ - example : `build1` </details> -**NOTE:** It is assumed the `tor-browser` rebase has already happened and there exists a `build1` build tag for both `base-browser` and `tor-browser` +**NOTE:** It is assumed the `tor-browser` rebase (stable and alpha) has already happened and there exists a `build1` build tags for both `base-browser` and `tor-browser` (stable and alpha) ### **Bookkeeping** @@ -36,26 +37,53 @@ - Create link to the CVE on [mozilla.org](https://www.mozilla.org/en-US/security/advisories/) - example: https://www.mozilla.org/en-US/security/advisories/mfsa2023-05/#CVE-2023-257… - Create link to the associated Bugzilla issues (found in the CVE description) - - Create a link to the relevant `gecko-dev`/other commit hashes which need to be backported OR a brief justification for why the fix does not need to be backported + - Create links to the relevant `gecko-dev`/other commit hashes which need to be backported OR a brief justification for why the fix does not need to be backported - To find the `gecko-dev` version of a `mozilla-central`, search for a unique string in the relevant `mozilla-central` commit message in the `gecko-dev/release` branch log. - **NOTE:** This process is unfortunately somewhat poorly defined/ad-hoc given the general variation in how Bugzilla issues are labeled and resolved. In general this is going to involve a bit of hunting to identify needed commits or determining whether or not the fix is relevant. +### CVEs + + ### **tor-browser** : https://gitlab.torproject.org/tpo/applications/tor-browser.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - - [ ] Sign/Tag commit: - - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` + - [ ] Backport patches to `tor-browser` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto: + - [ ] `base-browser` stable + - [ ] `tor-browser` alpha + - [ ] `base-browser` alpha + - [ ] Sign/Tag commits: + - Tag : `$(PROJECT_NAME)-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` - - [ ] Push tag to `origin` + - [ ] `base-browser` stable + - [ ] `tor-browser` stable + - [ ] `base-browser` alpha + - [ ] `tor-browser` alpha + - [ ] Push tags to `origin` **OR** - [ ] No backports ### **application-services** : *TODO: we will need to setup a gitlab copy of this repo that we can apply security backports to if there are ever any security issues here* - [ ] Backport any Android-specific security fixes from Firefox rapid-release - - [ ] Sign/Tag commit: + - [ ] Backport patches to `application-services` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto `application-services` alpha + - [ ] Sign/Tag commits: - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha` - - [ ] Push tag to `origin` + - [ ] `application-services` stable + - [ ] `application-services` alpha + - [ ] Push tags to `origin` **OR** - [ ] No backports @@ -63,10 +91,16 @@ ### **android-components** : https://gitlab.torproject.org/tpo/applications/android-components.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - **NOTE**: Since November 2022, this repo has been merged with `fenix` into a singular `firefox-android` repo: https://github.com/mozilla-mobile/firefox-android. Any backport will require a patch rewrite to apply to our legacy `android-components` project. - - [ ] Sign/Tag commit: + - [ ] Backport patches to `android-components` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto `android-components` alpha + - [ ] Sign/Tag commits: - Tag : `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` - - [ ] Push tag to `origin` + - [ ] `android-components` stable + - [ ] `android-components` alpha + - [ ] Push tags to `origin` **OR** - [ ] No backports @@ -74,15 +108,17 @@ ### **fenix** : https://gitlab.torproject.org/tpo/applications/fenix.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - **NOTE**: Since February 2023, this repo has been merged with `android-components` into a singular `firefox-android` repo: https://github.com/mozilla-mobile/firefox-android. Any backport will require a patch rewrite to apply to our legacy `fenix` project. - - [ ] Sign/Tag commit: + - [ ] Backport patches to `fenix` stable branch + - [ ] Open MR + - [ ] Merge + - [ ] Rebase patches onto `fenix` alpha + - [ ] Sign/Tag commits: - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` - - [ ] Push tag to `origin` + - [ ] `fenix` stable + - [ ] `fenix` alpha + - [ ] Push tags to `origin` **OR** - [ ] No backports -### CVEs - - - /confidential ===================================== .gitlab/issue_templates/Rebase Browser - Alpha.md ===================================== @@ -27,14 +27,46 @@ - [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +### Update Branch Protection Rules + +- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: + - [ ] Remove previous alpha `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) + - [ ] Create new `base-browser` and `tor-browser` branch protection rule: + - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` + - example: `*-102.8.0esr-12.5-1*` + - **Allowed to merge**: `Maintainers` + - **Allowed to push and merge**: `Maintainers` + - **Allowed to force push**: `false` + +### **Create New Branches** + +- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag (found during the stable rebase) + - branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` + - example: `base-browser-102.8.0esr-12.5-1` +- [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag + - branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` + - example: `tor-browser-102.8.0esr-12.5-1` +- [ ] Push new `base-browser` branch to `origin` +- [ ] Push new `tor-browser` branch to `origin` + ### **Rebase base-browser** -- [ ] Checkout a new branch for the `base-browser` rebase +- [ ] Checkout a new local branch for the `base-browser` rebase - example: `git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1` - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `build1` tag onto new `base-browser` rebase branch - example: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.5-1-build1` - [ ] Rebase and autosquash these cherry-picked commits - example: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD` + - [ ] **(Optional)** Patch reordering + - Relocate new `base-browser` patches in the patch-set to enforce this rough thematic ordering: + - **MOZILLA BACKPORTS** - official Firefox patches we have backported to our ESR branch: Android-specific security updates, critical bug fixes, worthwhile features, etc + - **MOZILLA REVERTS** - revert commits of official Firefox patches + - **UPLIFT CANDIDATES** - patches which stand on their own and should be uplifted to `mozilla-central` + - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc + - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc + - **SECURITY PATCHES** - security improvements, hardening, etc + - **PRIVACY PATCHES** - fingerprinting, linkability, proxy bypass, etc + - **FEATURES** - new functionality: updater, UX, letterboxing, security level, add-on integration, etc - [ ] Cherry-pick remainder of patches after the `build1` tag - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1 origin/base-browser-102.7.0esr-12.5-1` - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: @@ -61,15 +93,30 @@ - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..tor-browser-102.7.0esr-12.5-1-build1` - [ ] Rebase and autosquash these cherry-picked commits (from the last new `base-browser` commit to `HEAD`) - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.5-1-build1 HEAD` + - [ ] **(Optional)** Patch reordering + - Relocate new `tor-browser` patches in the patch-set to enforce this rough thematic ordering: + - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc + - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc + - **UPDATER PATCHES** - updater tweaks, signing keys, etc + - **SECURITY PATCHES** - non tor-dependent security improvements, hardening, etc + - **PRIVACY PATCHES** - non tor-dependent fingerprinting, linkability, proxy bypass, etc + - **FEAURES** - non tor-dependent features + - **TOR INTEGRATION** - legacy tor-launcher/torbutton, tor modules, bootstrapping, etc + - **TOR SECURITY PATCHES** - tor-specific security improvements + - **TOR PRIVACY PATCHES** - tor-specific privacy improvements + - **TOR FEATURES** - new tor-specific functionality: manual, onion-location, onion service client auth, etc - [ ] Cherry-pick remainder of patches after the last `buildN` tag - example: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..origin/tor-browser-102.7.0esr-12.5-1` +- [ ] Rebase and autosquash again (from the last new `base-browser` commit to `HEAD`), this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify. + - example: `git rebase --autosquash --interactive base-browser-102.8.0esr-12.5-1-build1 HEAD` + - **NOTE**: Do not allow `fixup` or `squash` commands here! - [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - [ ] diff of diffs: - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD` - [ ] Open MR for the `tor-browser` rebase ===================================== .gitlab/issue_templates/Rebase Browser - Stable.md ===================================== @@ -25,6 +25,17 @@ - [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. +### Update Branch Protection Rules + +- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: + - [ ] Remove previous stable `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) + - [ ] Create new `base-browser` and `tor-browser` branch protection rule: + - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` + - example: `*-102.8.0esr-12.0-1*` + - **Allowed to merge**: `Maintainers` + - **Allowed to push and merge**: `Maintainers` + - **Allowed to force push**: `false` + ### **Identify the Firefox Tagged Commit and Create New Branches** - [ ] Find the Firefox mercurial tag here : https://hg.mozilla.org/releases/mozilla-esr102/tags @@ -48,7 +59,7 @@ ### **Rebase base-browser** -- [ ] Checkout a new branch for the `base-browser` rebase +- [ ] Checkout a new local branch for the `base-browser` rebase - example: `git branch base-browser-rebase FIREFOX_102_8_0esr_BUILD1` - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `build1` tag onto new `base-browser` rebase branch - example: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.0-1-build1` @@ -72,6 +83,7 @@ - Message : `Tagging build1 for $(ESR_VERSION)esr-based stable` - [ ] Push tag to `origin` + ### **Rebase tor-browser** - [ ] Checkout a new branch for the `tor-browser` rebase starting from the `base-browser` `build1` tag @@ -88,7 +100,7 @@ - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - example: `git range-dif FIREFOX_102_7_0esr_BUILD1..origin/tor-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD` - [ ] Open MR for the `tor-browser` rebase @@ -97,4 +109,3 @@ - Tag : `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1` - Message : `Tagging build1 for $(ESR_VERSION)esr-based stable` - [ ] Push tag to `origin` - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0db7a4b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0db7a4b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key
by Richard Pospesel (＠richard) 20 Apr '23

20 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9b35dbeb by hackademix at 2023-04-20T20:11:22+00:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 1 changed file: - security/manager/ssl/StaticHPKPins.h Changes: ===================================== security/manager/ssl/StaticHPKPins.h ===================================== @@ -451,6 +451,14 @@ static const StaticFingerprints kPinset_tor = { kPinset_tor_Data }; +static const char* const kPinset_tor_browser_Data[] = { + kISRG_Root_X1Fingerprint, +}; +static const StaticFingerprints kPinset_tor_browser = { + sizeof(kPinset_tor_browser_Data) / sizeof(const char*), + kPinset_tor_browser_Data +}; + static const char* const kPinset_twitterCom_Data[] = { kGOOGLE_PIN_VeriSignClass2_G2Fingerprint, kGOOGLE_PIN_VeriSignClass3_G2Fingerprint, @@ -619,6 +627,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = { { "blogger.com", true, false, false, -1, &kPinset_google_root_pems }, { "blogspot.com", true, false, false, -1, &kPinset_google_root_pems }, { "br.search.yahoo.com", false, true, false, -1, &kPinset_yahoo }, + { "bridges.torproject.org", false, false, false, -1, &kPinset_tor_browser }, { "bugs.chromium.org", true, false, false, -1, &kPinset_google_root_pems }, { "build.chromium.org", true, false, false, -1, &kPinset_google_root_pems }, { "business.facebook.com", true, false, false, -1, &kPinset_facebook }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b35dbe… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b35dbe… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] 4 commits: Bug 41736 - Customize toolbar for base-browser.
by Richard Pospesel (＠richard) 20 Apr '23

20 Apr '23

Richard Pospesel pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ca768445 by Henry Wilkes at 2023-04-20T20:00:45+00:00 Bug 41736 - Customize toolbar for base-browser. - - - - - 1cc48456 by Henry Wilkes at 2023-04-20T20:00:45+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 4bea1315 by Henry Wilkes at 2023-04-20T20:00:46+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 90750ca9 by Henry Wilkes at 2023-04-20T20:00:46+00:00 fixup! Firefox preference overrides. Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 3 changed files: - browser/app/profile/001-base-profile.js - browser/components/customizableui/CustomizableUI.jsm - browser/components/extensions/parent/ext-browserAction.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -464,9 +464,6 @@ pref("intl.multilingual.downloadEnabled", false); // Disk activity: Disable storage.sync (tor-browser#41424) pref("webextensions.storage.sync.enabled", false); -// Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); - // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); ===================================== browser/components/customizableui/CustomizableUI.jsm ===================================== @@ -65,6 +65,11 @@ const kSubviewEvents = ["ViewShowing", "ViewHiding"]; */ var kVersion = 17; +/** + * The current version for base browser. + */ +var kVersionBaseBrowser = 1; + /** * Buttons removed from built-ins by version they were removed. kVersion must be * bumped any time a new id is added to this. Use the button id as key, and @@ -218,6 +223,7 @@ var CustomizableUIInternal = { this._updateForNewVersion(); this._updateForNewProtonVersion(); this._markObsoleteBuiltinButtonsSeen(); + this._updateForBaseBrowser(); this.registerArea( CustomizableUI.AREA_FIXED_OVERFLOW_PANEL, @@ -236,10 +242,15 @@ var CustomizableUIInternal = { Services.policies.isAllowed("removeHomeButtonByDefault") ? null : "home-button", - "spring", + // Don't want springs either side of the urlbar. tor-browser#41736 "urlbar-container", - "spring", - "save-to-pocket-button", + // save-to-pocket-button is entirely disabled. See tor-browser#18886 and + // tor-browser#31602. + // Base-browser additions tor-browser#41736. If you want to add to, remove + // from, or rearrange this list, then bump the kVersionBaseBrowser and + // update existing saved states in _updateForBaseBrowser. + "security-level-button", + "new-identity-button", "downloads-button", AppConstants.MOZ_DEV_EDITION ? "developer-button" : null, "fxa-toolbar-menu-button", @@ -255,6 +266,10 @@ var CustomizableUIInternal = { }, true ); + // navbarPlacements does not match the initial default XHTML layout. + // Therefore we always need to rebuild the navbar area when + // registerToolbarNode is called. tor-browser#41736 + gDirtyAreaCache.add(CustomizableUI.AREA_NAVBAR); if (AppConstants.MENUBAR_CAN_AUTOHIDE) { this.registerArea( @@ -687,6 +702,104 @@ var CustomizableUIInternal = { } }, + _updateForBaseBrowser() { + if (!gSavedState) { + // Use the defaults. + return; + } + + const currentVersion = gSavedState.currentVersionBaseBrowser; + + if (currentVersion < 1) { + // NOTE: In base-browser/tor-browser version 12.5a5, and earlier, the + // toolbar was configured by setting the full JSON string for the default + // "browser.uiCustomization.state" preference value. The disadvantage is + // that we could not update this value in a way that existing users (who + // would have non-default preference values) would also get the desired + // change (e.g. for adding or removing a button). + // + // With tor-browser#41736 we want to switch to changing the toolbar + // dynamically like firefox. Therefore, this first version transfer simply + // gets the toolbar into the same state we wanted before, away from the + // default firefox state. + // + // If an existing user state aligned with the previous default + // "browser.uiCustomization.state" then this shouldn't visibly change + // anything. + // If a user explicitly customized the toolbar to go back to the firefox + // default, then this may undo those changes. + const navbarPlacements = + gSavedState.placements[CustomizableUI.AREA_NAVBAR]; + if (navbarPlacements) { + const getBeforeAfterUrlbar = () => { + // NOTE: The urlbar is non-removable from the navbar, so should have + // an index. + const index = navbarPlacements.indexOf("urlbar-container"); + let after = index + 1; + if ( + after < navbarPlacements.length && + navbarPlacements[after] === "search-container" + ) { + // Skip past the search-container. + after++; + } + return { before: index - 1, after }; + }; + + // Remove the urlbar springs either side of the urlbar. + const { before, after } = getBeforeAfterUrlbar(); + if ( + after < navbarPlacements.length && + this.matchingSpecials(navbarPlacements[after], "spring") + ) { + // Remove the spring after. + navbarPlacements.splice(after, 1); + // NOTE: The `before` index does not change. + } + if ( + before >= 0 && + this.matchingSpecials(navbarPlacements[before], "spring") + ) { + // Remove the spring before. + navbarPlacements.splice(before, 1); + } + + // Make sure the security-level-button and new-identity-button appears + // in the toolbar. + for (const id of ["new-identity-button", "security-level-button"]) { + let alreadyAdded = false; + for (const placements of Object.values(gSavedState.placements)) { + if (placements.includes(id)) { + alreadyAdded = true; + break; + } + } + if (alreadyAdded) { + continue; + } + + // Add to the nav-bar, after the urlbar-container. + // NOTE: We have already removed the spring after the urlbar. + navbarPlacements.splice(getBeforeAfterUrlbar().after, 0, id); + } + } + + // Remove save-to-pocket-button. See tor-browser#18886 and + // tor-browser#31602. + for (const placements of Object.values(gSavedState.placements)) { + let buttonIndex = placements.indexOf("save-to-pocket-button"); + if (buttonIndex != -1) { + placements.splice(buttonIndex, 1); + } + } + + // Remove unused fields that used to be part of + // "browser.uiCustomization.state". + delete gSavedState.placements["PanelUI-contents"]; + delete gSavedState.placements["addon-bar"]; + } + }, + _placeNewDefaultWidgetsInArea(aArea) { let futurePlacedWidgets = gFuturePlacements.get(aArea); let savedPlacements = @@ -2501,6 +2614,10 @@ var CustomizableUIInternal = { gSavedState.currentVersion = 0; } + if (!("currentVersionBaseBrowser" in gSavedState)) { + gSavedState.currentVersionBaseBrowser = 0; + } + gSeenWidgets = new Set(gSavedState.seen || []); gDirtyAreaCache = new Set(gSavedState.dirtyAreaCache || []); gNewElementCount = gSavedState.newElementCount || 0; @@ -2579,6 +2696,7 @@ var CustomizableUIInternal = { seen: gSeenWidgets, dirtyAreaCache: gDirtyAreaCache, currentVersion: kVersion, + currentVersionBaseBrowser: kVersionBaseBrowser, newElementCount: gNewElementCount, }; ===================================== browser/components/extensions/parent/ext-browserAction.js ===================================== @@ -193,6 +193,10 @@ this.browserAction = class extends ExtensionAPIPersistent { } build() { + // The extension ID for NoScript (WebExtension) + const isNoScript = + this.extension.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}"; + let widget = CustomizableUI.createWidget({ id: this.id, viewId: this.viewId, @@ -200,7 +204,11 @@ this.browserAction = class extends ExtensionAPIPersistent { removable: true, label: this.action.getProperty(null, "title"), tooltiptext: this.action.getProperty(null, "title"), - defaultArea: browserAreas[this.action.getDefaultArea()], + // Do not want to add the NoScript extension to the toolbar by default. + // tor-browser#41736 + defaultArea: isNoScript + ? null + : browserAreas[this.action.getDefaultArea()], showInPrivateBrowsing: this.extension.privateBrowsingAllowed, // Don't attempt to load properties from the built-in widget string View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fd31ee… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fd31ee… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 6 commits: Bug 41736 - Customize toolbar for base-browser.
by Richard Pospesel (＠richard) 20 Apr '23

20 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1ce930e3 by Henry Wilkes at 2023-04-20T20:03:08+00:00 Bug 41736 - Customize toolbar for base-browser. - - - - - d354800c by Henry Wilkes at 2023-04-20T20:03:08+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - adacb2c3 by Henry Wilkes at 2023-04-20T20:03:08+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 491718d1 by Henry Wilkes at 2023-04-20T20:03:08+00:00 fixup! Firefox preference overrides. Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 352acb10 by Henry Wilkes at 2023-04-20T20:03:08+00:00 Bug 41736 - Customize toolbar for tor-browser. - - - - - 96796fa5 by Henry Wilkes at 2023-04-20T20:03:08+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 4 changed files: - browser/app/profile/000-tor-browser.js - browser/app/profile/001-base-profile.js - browser/components/customizableui/CustomizableUI.jsm - browser/components/extensions/parent/ext-browserAction.js Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -30,8 +30,6 @@ pref("network.security.ports.banned", "", locked); pref("network.dns.disabled", true); // This should cover the #5741 patch for DNS leaks pref("network.http.max-persistent-connections-per-proxy", 256); -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"torbutton-button\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); - // Treat .onions as secure pref("dom.securecontext.allowlist_onions", true); ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -464,9 +464,6 @@ pref("intl.multilingual.downloadEnabled", false); // Disk activity: Disable storage.sync (tor-browser#41424) pref("webextensions.storage.sync.enabled", false); -// Toolbar layout -pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); - // Enforce certificate pinning, see: https://bugs.torproject.org/16206 pref("security.cert_pinning.enforcement_level", 2); ===================================== browser/components/customizableui/CustomizableUI.jsm ===================================== @@ -65,6 +65,16 @@ const kSubviewEvents = ["ViewShowing", "ViewHiding"]; */ var kVersion = 17; +/** + * The current version for base browser. + */ +var kVersionBaseBrowser = 1; + +/** + * The current version for tor browser. + */ +var kVersionTorBrowser = 1; + /** * Buttons removed from built-ins by version they were removed. kVersion must be * bumped any time a new id is added to this. Use the button id as key, and @@ -218,6 +228,8 @@ var CustomizableUIInternal = { this._updateForNewVersion(); this._updateForNewProtonVersion(); this._markObsoleteBuiltinButtonsSeen(); + this._updateForBaseBrowser(); + this._updateForTorBrowser(); this.registerArea( CustomizableUI.AREA_FIXED_OVERFLOW_PANEL, @@ -236,10 +248,17 @@ var CustomizableUIInternal = { Services.policies.isAllowed("removeHomeButtonByDefault") ? null : "home-button", - "spring", + // Don't want springs either side of the urlbar. tor-browser#41736 "urlbar-container", - "spring", - "save-to-pocket-button", + // save-to-pocket-button is entirely disabled. See tor-browser#18886 and + // tor-browser#31602. + // Base-browser additions tor-browser#41736. If you want to add to, remove + // from, or rearrange this list, then bump the kVersionBaseBrowser and + // update existing saved states in _updateForBaseBrowser. + // Or if the change is only meant for tor-browser, bump kVersionTorBrowser + // instead and update the existing saved states in _updateForTorBrowser. + "security-level-button", + "new-identity-button", "downloads-button", AppConstants.MOZ_DEV_EDITION ? "developer-button" : null, "fxa-toolbar-menu-button", @@ -255,6 +274,10 @@ var CustomizableUIInternal = { }, true ); + // navbarPlacements does not match the initial default XHTML layout. + // Therefore we always need to rebuild the navbar area when + // registerToolbarNode is called. tor-browser#41736 + gDirtyAreaCache.add(CustomizableUI.AREA_NAVBAR); if (AppConstants.MENUBAR_CAN_AUTOHIDE) { this.registerArea( @@ -687,6 +710,123 @@ var CustomizableUIInternal = { } }, + _updateForBaseBrowser() { + if (!gSavedState) { + // Use the defaults. + return; + } + + const currentVersion = gSavedState.currentVersionBaseBrowser; + + if (currentVersion < 1) { + // NOTE: In base-browser/tor-browser version 12.5a5, and earlier, the + // toolbar was configured by setting the full JSON string for the default + // "browser.uiCustomization.state" preference value. The disadvantage is + // that we could not update this value in a way that existing users (who + // would have non-default preference values) would also get the desired + // change (e.g. for adding or removing a button). + // + // With tor-browser#41736 we want to switch to changing the toolbar + // dynamically like firefox. Therefore, this first version transfer simply + // gets the toolbar into the same state we wanted before, away from the + // default firefox state. + // + // If an existing user state aligned with the previous default + // "browser.uiCustomization.state" then this shouldn't visibly change + // anything. + // If a user explicitly customized the toolbar to go back to the firefox + // default, then this may undo those changes. + const navbarPlacements = + gSavedState.placements[CustomizableUI.AREA_NAVBAR]; + if (navbarPlacements) { + const getBeforeAfterUrlbar = () => { + // NOTE: The urlbar is non-removable from the navbar, so should have + // an index. + const index = navbarPlacements.indexOf("urlbar-container"); + let after = index + 1; + if ( + after < navbarPlacements.length && + navbarPlacements[after] === "search-container" + ) { + // Skip past the search-container. + after++; + } + return { before: index - 1, after }; + }; + + // Remove the urlbar springs either side of the urlbar. + const { before, after } = getBeforeAfterUrlbar(); + if ( + after < navbarPlacements.length && + this.matchingSpecials(navbarPlacements[after], "spring") + ) { + // Remove the spring after. + navbarPlacements.splice(after, 1); + // NOTE: The `before` index does not change. + } + if ( + before >= 0 && + this.matchingSpecials(navbarPlacements[before], "spring") + ) { + // Remove the spring before. + navbarPlacements.splice(before, 1); + } + + // Make sure the security-level-button and new-identity-button appears + // in the toolbar. + for (const id of ["new-identity-button", "security-level-button"]) { + let alreadyAdded = false; + for (const placements of Object.values(gSavedState.placements)) { + if (placements.includes(id)) { + alreadyAdded = true; + break; + } + } + if (alreadyAdded) { + continue; + } + + // Add to the nav-bar, after the urlbar-container. + // NOTE: We have already removed the spring after the urlbar. + navbarPlacements.splice(getBeforeAfterUrlbar().after, 0, id); + } + } + + // Remove save-to-pocket-button. See tor-browser#18886 and + // tor-browser#31602. + for (const placements of Object.values(gSavedState.placements)) { + let buttonIndex = placements.indexOf("save-to-pocket-button"); + if (buttonIndex != -1) { + placements.splice(buttonIndex, 1); + } + } + + // Remove unused fields that used to be part of + // "browser.uiCustomization.state". + delete gSavedState.placements["PanelUI-contents"]; + delete gSavedState.placements["addon-bar"]; + } + }, + + _updateForTorBrowser() { + if (!gSavedState) { + // Use the defaults. + return; + } + + const currentVersion = gSavedState.currentVersionTorBrowser; + + if (currentVersion < 1) { + // Remove torbutton-button, which no longer exists. + for (const placements of Object.values(gSavedState.placements)) { + let buttonIndex = placements.indexOf("torbutton-button"); + if (buttonIndex != -1) { + placements.splice(buttonIndex, 1); + } + } + } + }, + _placeNewDefaultWidgetsInArea(aArea) { let futurePlacedWidgets = gFuturePlacements.get(aArea); let savedPlacements = @@ -2501,6 +2641,14 @@ var CustomizableUIInternal = { gSavedState.currentVersion = 0; } + if (!("currentVersionBaseBrowser" in gSavedState)) { + gSavedState.currentVersionBaseBrowser = 0; + } + + if (!("currentVersionTorBrowser" in gSavedState)) { + gSavedState.currentVersionTorBrowser = 0; + } + gSeenWidgets = new Set(gSavedState.seen || []); gDirtyAreaCache = new Set(gSavedState.dirtyAreaCache || []); gNewElementCount = gSavedState.newElementCount || 0; @@ -2579,6 +2727,8 @@ var CustomizableUIInternal = { seen: gSeenWidgets, dirtyAreaCache: gDirtyAreaCache, currentVersion: kVersion, + currentVersionBaseBrowser: kVersionBaseBrowser, + currentVersionTorBrowser: kVersionTorBrowser, newElementCount: gNewElementCount, }; ===================================== browser/components/extensions/parent/ext-browserAction.js ===================================== @@ -193,6 +193,10 @@ this.browserAction = class extends ExtensionAPIPersistent { } build() { + // The extension ID for NoScript (WebExtension) + const isNoScript = + this.extension.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}"; + let widget = CustomizableUI.createWidget({ id: this.id, viewId: this.viewId, @@ -200,7 +204,11 @@ this.browserAction = class extends ExtensionAPIPersistent { removable: true, label: this.action.getProperty(null, "title"), tooltiptext: this.action.getProperty(null, "title"), - defaultArea: browserAreas[this.action.getDefaultArea()], + // Do not want to add the NoScript extension to the toolbar by default. + // tor-browser#41736 + defaultArea: isNoScript + ? null + : browserAreas[this.action.getDefaultArea()], showInPrivateBrowsing: this.extension.privateBrowsingAllowed, // Don't attempt to load properties from the built-in widget string View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4ae885… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4ae885… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] alpha: new version, 12.5a5
by boklm (＠boklm) 20 Apr '23

20 Apr '23

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: f3488a32 by Nicolas Vigier at 2023-04-20T21:46:33+02:00 alpha: new version, 12.5a5 - - - - - 30 changed files: - update_3/alpha/.htaccess - − update_3/alpha/12.5a3-12.5a4-linux32-ALL.xml - − update_3/alpha/12.5a3-12.5a4-linux64-ALL.xml - − update_3/alpha/12.5a3-12.5a4-macos-ALL.xml - − update_3/alpha/12.5a3-12.5a4-win32-ALL.xml - − update_3/alpha/12.5a3-12.5a4-win64-ALL.xml - + update_3/alpha/12.5a4-12.5a5-linux32-ALL.xml - + update_3/alpha/12.5a4-12.5a5-linux64-ALL.xml - + update_3/alpha/12.5a4-12.5a5-macos-ALL.xml - + update_3/alpha/12.5a4-12.5a5-win32-ALL.xml - + update_3/alpha/12.5a4-12.5a5-win64-ALL.xml - − update_3/alpha/12.5a4-linux32-ALL.xml - − update_3/alpha/12.5a4-linux64-ALL.xml - − update_3/alpha/12.5a4-macos-ALL.xml - − update_3/alpha/12.5a4-win32-ALL.xml - − update_3/alpha/12.5a4-win64-ALL.xml - + update_3/alpha/12.5a5-linux32-ALL.xml - + update_3/alpha/12.5a5-linux64-ALL.xml - + update_3/alpha/12.5a5-macos-ALL.xml - + update_3/alpha/12.5a5-win32-ALL.xml - + update_3/alpha/12.5a5-win64-ALL.xml - update_3/alpha/download-android-aarch64.json - update_3/alpha/download-android-armv7.json - update_3/alpha/download-android-x86.json - update_3/alpha/download-android-x86_64.json - update_3/alpha/download-linux-i686.json - update_3/alpha/download-linux-x86_64.json - update_3/alpha/download-macos.json - update_3/alpha/download-windows-i686.json - update_3/alpha/download-windows-x86_64.json The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 2 commits: fixup! Bug 41417: Always prompt users to restart after changing language
by Pier Angelo Vendrame (＠pierov) 20 Apr '23

20 Apr '23

Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 7cf4e447 by Pier Angelo Vendrame at 2023-04-20T20:16:02+02:00 fixup! Bug 41417: Always prompt users to restart after changing language Bug 41738: Drop the patch to disable live reload Revert "Bug 41417: Always prompt users to restart after changing language" This reverts commit bad85a459ea24b34f3c09924c6d2b9f0bc750d88. - - - - - 4ae88530 by Pier Angelo Vendrame at 2023-04-20T20:16:02+02:00 fixup! Firefox preference overrides. Bug 41738: Drop the patch to disable live reload and use the pref - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - browser/components/preferences/main.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -499,6 +499,10 @@ pref("browser.urlbar.suggest.topsites", false); // is only reported via telemetry (which is disabled). See tor-browser#40048. pref("corroborator.enabled", false); +// tor-browser#41417: do not allow live reload until we switch to Fluent and +// stop using .textContent. +pref("intl.multilingual.liveReload", false); + // Onboarding. pref("browser.onboarding.tourset-version", 5); pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services,learn-more"); ===================================== browser/components/preferences/main.js ===================================== @@ -1196,17 +1196,18 @@ var gMainPane = { gMainPane.recordBrowserLanguagesTelemetry("reorder"); switch (gMainPane.getLanguageSwitchTransitionType(newLocales)) { - // tor-browser#41417: Always prompt for the restart, until we switch to - // Fluent, since the current way we use to update languages does not allow - // live-reload. We could also call showConfirmLanguageChangeMessageBar in - // the official live-reload case, but the result is inconsistent and makes - // handling the locales-match case harder. case "requires-restart": - case "live-reload": // Prepare to change the locales, as they were different. gMainPane.showConfirmLanguageChangeMessageBar(newLocales); gMainPane.updatePrimaryBrowserLanguageUI(newLocales[0]); break; + case "live-reload": + Services.locale.requestedLocales = newLocales; + gMainPane.updatePrimaryBrowserLanguageUI( + Services.locale.appLocaleAsBCP47 + ); + gMainPane.hideConfirmLanguageChangeMessageBar(); + break; case "locales-match": // They matched, so we can reset the UI. gMainPane.updatePrimaryBrowserLanguageUI( @@ -1459,12 +1460,18 @@ var gMainPane = { } switch (gMainPane.getLanguageSwitchTransitionType(selected)) { - // tor-browser#41417: see onPrimaryBrowserLanguageMenuChange case "requires-restart": - case "live-reload": gMainPane.showConfirmLanguageChangeMessageBar(selected); gMainPane.updatePrimaryBrowserLanguageUI(selected[0]); break; + case "live-reload": + Services.locale.requestedLocales = selected; + + gMainPane.updatePrimaryBrowserLanguageUI( + Services.locale.appLocaleAsBCP47 + ); + gMainPane.hideConfirmLanguageChangeMessageBar(); + break; case "locales-match": // They matched, so we can reset the UI. gMainPane.updatePrimaryBrowserLanguageUI( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/337dcb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/337dcb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update Mullvad Browser release prep templates to include downstream package...
by Richard Pospesel (＠richard) 20 Apr '23

20 Apr '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b1b4bf77 by Richard Pospesel at 2023-04-20T17:53:16+00:00 Update Mullvad Browser release prep templates to include downstream package notification/maintenance - - - - - 1 changed file: - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -98,7 +98,7 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU </details> <details> - <summary>Communications</summary> + <summary>Downstream</summary> ### notify stakeholders @@ -107,9 +107,15 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU - [ ] New `mullvad-browser` project branch and tags - [ ] mullvad-browser-update-responses git hash - [ ] changelog +- [ ] Email downstream consumers: + - [ ] flathub package maintainer: proletarius101(a)protonmail.com + - [ ] arch package maintainer: bootctl(a)gmail.com -</details> +### merge requests +- [ ] homebrew: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/mullvad-browser… + - **NOTE**: should just need to update the version to latest +</details> /label ~"Release Prep" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40818: Enable wasm target for rust
by Pier Angelo Vendrame (＠pierov) 20 Apr '23

20 Apr '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d86056dd by Cecylia Bocovich at 2023-04-20T13:11:22+00:00 Bug 40818: Enable wasm target for rust - - - - - 2 changed files: - projects/rust/build - projects/rust/config Changes: ===================================== projects/rust/build ===================================== @@ -6,6 +6,8 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH=/var/tmp/dist/binutils/bin:$PATH +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH=/var/tmp/dist/ninja:$PATH tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust_prebuilt') %] cd /var/tmp/dist/rust-[% c('version') %]-x86_64-unknown-linux-gnu ./install.sh --prefix=$distdir-rust-prebuilt @@ -52,6 +54,11 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% c('input_files_by_name/rust') %] cd /var/tmp/build/rustc-[% c('version') %]-src +# This is a workaround to get access to the libunwind header files. Our LLVM_CONFIG +# thinks that the llvm source root is at /var/tmp/dist/clang-source because that's +# where it was when clang was compiled. +ln -s "/var/tmp/build/rustc-[% c('version') %]-src/src/llvm-project" "/var/tmp/build/clang-source" + mkdir build cd build ../configure --prefix=$distdir --disable-docs --disable-compiler-docs [% c("var/configure_opt") %] ===================================== projects/rust/config ===================================== @@ -7,7 +7,7 @@ container: targets: android: var: - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,armv7-linux-androideabi,thumbv7neon-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.armv7-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.thumbv7neon-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=aarch64-linux-android-ar --set=target.i686-linux-android.cc=i686-linux-android16-clang --set=target.i686-linux-android.ar=i686-linux-android-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=x86_64-linux-android-ar + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,armv7-linux-androideabi,thumbv7neon-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android,wasm32-unknown-unknown --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.armv7-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.thumbv7neon-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=aarch64-linux-android-ar --set=target.i686-linux-android.cc=i686-linux-android16-clang --set=target.i686-linux-android.ar=i686-linux-android-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=x86_64-linux-android-ar --set target.wasm32-unknown-unknown.linker=clang --set target.wasm32-unknown-unknown.ar=llvm-ar --set target.wasm32-unknown-unknown.ranlib=llvm-ranlib --set rust.lld=true linux: var: @@ -41,11 +41,11 @@ targets: # # Finally, we tell Rust to use some tools from LLVM, like the prebuilt # binaries do. - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib --set target.i686-unknown-linux-gnu.linker=clang --set target.i686-unknown-linux-gnu.ar=llvm-ar --set target.i686-unknown-linux-gnu.ranlib=llvm-ranlib + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,i686-unknown-linux-gnu,wasm32-unknown-unknown --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib --set target.i686-unknown-linux-gnu.linker=clang --set target.i686-unknown-linux-gnu.ar=llvm-ar --set target.i686-unknown-linux-gnu.ranlib=llvm-ranlib --set target.wasm32-unknown-unknown.linker=clang --set target.wasm32-unknown-unknown.ar=llvm-ar --set target.wasm32-unknown-unknown.ranlib=llvm-ranlib --set rust.lld=true macos: var: - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %],wasm32-unknown-unknown --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib --set target.wasm32-unknown-unknown.linker=clang --set target.wasm32-unknown-unknown.ar=llvm-ar --set target.wasm32-unknown-unknown.ranlib=llvm-ranlib --set rust.lld=true arch_deps: - pkg-config @@ -53,7 +53,7 @@ targets: var: # See tor-browser-build#29320 compiler: mingw-w64 - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --target=x86_64-unknown-linux-gnu,[% c("arch") %]-pc-windows-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --target=x86_64-unknown-linux-gnu,[% c("arch") %]-pc-windows-gnu,wasm32-unknown-unknown --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib --set target.wasm32-unknown-unknown.linker=clang --set target.wasm32-unknown-unknown.ar=llvm-ar --set target.wasm32-unknown-unknown.ranlib=llvm-ranlib --set rust.lld=true arch_deps: - pkg-config @@ -72,6 +72,8 @@ input_files: # libgcc, and the GNU/LLVM is a tier 3 platform supported only for x86_64). # macOS does not need Clang because it comes already with its compiler. enable: '[% c("var/linux") || c("var/android") || c("var/windows") %]' + - project: ninja + name: ninja - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz' name: rust sig_ext: asc View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… 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-102.10.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 20 Apr '23

20 Apr '23

Pier Angelo Vendrame pushed new branch tor-browser-102.10.0esr-13.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/tor-browser][tor-browser-102.10.0esr-12.5-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 20 Apr '23

20 Apr '23

Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 337dcb91 by Henry Wilkes at 2023-04-20T09:21:20+00:00 fixup! Add TorStrings module for localization Bug 41714 - Add settings.bridgeShowFewer string. - - - - - 1 changed file: - toolkit/torbutton/chrome/locale/en-US/settings.properties Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -46,6 +46,7 @@ settings.whatAreThese=What are these? settings.bridgeCopy=Copy Bridge Address settings.copied=Copied! settings.bridgeShowAll=Show All Bridges +settings.bridgeShowFewer=Show Fewer Bridges settings.allBridgesEnabled=Use current bridges settings.bridgeRemoveAll=Remove All Bridges settings.bridgeRemoveAllDialogTitle=Remove all bridges? View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/337dcb9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/337dcb9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-12.0.5-build1
by Pier Angelo Vendrame (＠pierov) 20 Apr '23

20 Apr '23

Pier Angelo Vendrame pushed new tag mb-12.0.5-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] Bug 40839: Prepare Mullvad Browser Release 12.0.5
by Pier Angelo Vendrame (＠pierov) 20 Apr '23

20 Apr '23

Pier Angelo Vendrame pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build Commits: 7fa3141d by Pier Angelo Vendrame at 2023-04-19T12:29:10+02:00 Bug 40839: Prepare Mullvad Browser Release 12.0.5 - - - - - 4 changed files: - .gitignore - projects/browser/config - projects/firefox/config - rbm.conf Changes: ===================================== .gitignore ===================================== @@ -4,7 +4,7 @@ /out /torbrowser /basebrowser -/privacybrowser +/mullvadbrowser /testbuild /rbm.local.conf /logs ===================================== projects/browser/config ===================================== @@ -103,12 +103,12 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4086528/noscript-11.4.20.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.… name: noscript - sha256sum: 014aec3ce142222338372d227eaadfa2ae13c9e3861f6d43869615b932ce4b53 - - URL: https://addons.mozilla.org/firefox/downloads/file/4086892/ublock_origin-1.4… + sha256sum: 0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338 + - URL: https://addons.mozilla.org/firefox/downloads/file/4092158/ublock_origin-1.4… name: ublock-origin - sha256sum: 787950ad4fdbf57ffab136c706918077ed15b0b4fb22b5429ddd0043de3c9720 + sha256sum: d7666b963c2969b0014937aae55472eea5098ff21ed3bea8a2e1f595f62856c1 enable: '[% c("var/mullvad-browser") %]' - URL: https://github.com/mullvad/browser-extension/releases/download/v0.7.9-firef… name: mullvad-extension ===================================== projects/firefox/config ===================================== @@ -11,10 +11,10 @@ container: use_container: 1 var: - firefox_platform_version: 102.9.0 + firefox_platform_version: 102.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - browser_series: '12.5' - browser_branch: '[% c("var/browser_series") %]-1' + browser_series: '12.0' + browser_branch: '[% c("var/browser_series") %]-2' browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' @@ -79,10 +79,6 @@ targets: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: branding_directory_prefix: 'mb' - firefox_platform_version: 102.9.0 - browser_series: '12.0' - browser_branch: '[% c("var/browser_series") %]-2' - browser_build: 1 gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser linux-x86_64: ===================================== rbm.conf ===================================== @@ -71,10 +71,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.5a4' + torbrowser_version: '12.0.5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 12.5a3 + - 12.0.4 updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' @@ -252,9 +252,6 @@ targets: exe_name: mullvadbrowser mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]' locales: [] - torbrowser_version: '12.0.4' - torbrowser_build: 'build1' - torbrowser_incremental_from: torbrowser-testbuild: - testbuild View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 20 Apr '23

20 Apr '23

Pier Angelo Vendrame pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: fd31ee11 by Pier Angelo Vendrame at 2023-04-20T09:01:57+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41654: Move UpdateInfo into Data again - - - - - 1 changed file: - toolkit/xre/nsXREDirProvider.cpp Changes: ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1211,15 +1211,15 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, NS_ENSURE_SUCCESS(rv, rv); #if defined(BASE_BROWSER_UPDATE) - nsCOMPtr<nsIFile> dataDir; // For Base Browser and derivatives, we store update history, etc. within the // UpdateInfo directory under the user data directory. # if defined(ANDROID) # error "The Base Browser updater is not supported on Android." -# else - rv = GetUserDataDirectoryHome(getter_AddRefs(dataDir), false); +# elif defined(XP_MACOSX) + rv = GetUserDataDirectory(getter_AddRefs(updRoot), false); NS_ENSURE_SUCCESS(rv, rv); - rv = dataDir->GetParent(getter_AddRefs(updRoot)); +# else + rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false); NS_ENSURE_SUCCESS(rv, rv); # endif rv = updRoot->AppendNative("UpdateInfo"_ns); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fd31ee1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fd31ee1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 2 commits: fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
by Pier Angelo Vendrame (＠pierov) 20 Apr '23

20 Apr '23

Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 07d2f3f1 by Pier Angelo Vendrame at 2023-04-20T08:58:20+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41654: Move UpdateInfo into Data again - - - - - 83901ef7 by Pier Angelo Vendrame at 2023-04-20T08:58:35+02:00 fixup! Bug 41668: Tweaks to the Base Browser updater for Tor Browser Bug 41654: Fix the UpdateInfo directory path - - - - - 1 changed file: - toolkit/xre/nsXREDirProvider.cpp Changes: ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1213,16 +1213,24 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, NS_ENSURE_SUCCESS(rv, rv); #if defined(BASE_BROWSER_UPDATE) - nsCOMPtr<nsIFile> dataDir; // For Base Browser and derivatives, we store update history, etc. within the // UpdateInfo directory under the user data directory. # if defined(ANDROID) # error "The Base Browser updater is not supported on Android." -# else +# endif + nsCOMPtr<nsIFile> dataDir; rv = GetUserDataDirectoryHome(getter_AddRefs(dataDir), false); NS_ENSURE_SUCCESS(rv, rv); rv = dataDir->GetParent(getter_AddRefs(updRoot)); NS_ENSURE_SUCCESS(rv, rv); +# if !defined(XP_MACOSX) + // For Tor Browser, the profile directory is TorBrowser/Data/Browser. + // Updates used to be in TorBrowser/updateInfo, so go up two directories. + // If we switch to data directory outside also on Windows and on Linux, we + // should remove this block. + dataDir = updRoot; + rv = dataDir->GetParent(getter_AddRefs(updRoot)); + NS_ENSURE_SUCCESS(rv, rv); # endif rv = updRoot->AppendNative("UpdateInfo"_ns); NS_ENSURE_SUCCESS(rv, rv); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c24cc0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c24cc0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.5a5-build1
by Richard Pospesel (＠richard) 19 Apr '23

19 Apr '23

Richard Pospesel pushed new tag tbb-12.5a5-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40759: Prepare Tor Browser Alpha 12.5a5
by Richard Pospesel (＠richard) 19 Apr '23

19 Apr '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f6675851 by Richard Pospesel at 2023-04-18T18:26:47+00:00 Bug 40759: Prepare Tor Browser Alpha 12.5a5 - - - - - 10 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/browser/config - projects/fenix/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,89 @@ +Tor Browser 12.5a5 - April 18 2023 + * All Platforms + * Updated Translations + * Updated NoScript to 11.4.21 + * Updated Go to 11.9.8 + * Bug 40833: base-browser nightly is using the default channel instead of nightly [tor-browser-build] + * Bug 41687: Rebase Tor Browser Alpha to 102.10.0esr [tor-browser] + * Bug 41689: Remove startup.homepage_override_url from Base Browser [tor-browser] + * Bug 41704: Immediately return on remoteSettings.pollChanges [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.10esr + * Bug 165: Fix maximization warning x button and preference [mullvad-browser] + * Bug 40501: High CPU load after tor exits unexpectedly [tor-browser] + * Bug 40701: Improve security warning when downloading a file [tor-browser] + * Bug 40788: Tor Browser 11.0.4-11.0.6 phoning home [tor-browser] + * Bug 40811: Make testing the updater easier [tor-browser-build] + * Bug 40831: Fix update URL for base-browser nightly [tor-browser-build] + * Bug 40958: The number of relays displayed for an onion site can be misleading [tor-browser] + * Bug 41038: Update "Click to Copy" button label in circuit display [tor-browser] + * Bug 41109: "New circuit..." button gets cut-off when onion name wraps [tor-browser] + * Bug 41350: Move the implementation of Bug 19273 out of Torbutton [tor-browser] + * Bug 41521: Improve localization notes [tor-browser] + * Bug 41533: Page Info window for view-source:http://...onion addresses says Connection Not Encrypted [tor-browser] + * Bug 41600: Some users have difficulty finding the circuit display [tor-browser] + * Bug 41617: Improve the UX of the built-in bridges dialog [tor-browser] + * Bug 41668: Move part of the updater patches to base browser [tor-browser] + * Bug 41686: Move the 'Bug 11641: Disable remoting by default' commit from base-browser to tor-browser [tor-browser] + * Bug 41695: Port warning on maximized windows without letterboxing from torbutton [tor-browser] + * Bug 41699: Tighten up the tor onion alias regular expression [tor-browser] + * Bug 41701: Reporting an extension does not work [tor-browser] + * Bug 41702: The connection pill needs to be centered vertically [tor-browser] + * Bug 41709: sendCommand should not try to send a command forever [tor-browser] + * Bug 41711: Race condition when opening a new window in New Identity [tor-browser] + * Bug 41713: “Remove All Bridges” button only appears after hitting “Show All Bridges" [tor-browser] + * Bug 41714: “Show Fewer Bridges” button missing from refactored remove all bridges UI [tor-browser] + * Bug 41719: Update title and button strings in the new circuit display to sentence case [tor-browser] + * Bug 41722: Regression: window maximization warning cannot be closed by the X button [tor-browser] + * Bug 41725: Stray connectionPane.xhtml patch [tor-browser] + * Windows + * Bug 41459: WebRTC fails to build under mingw [tor-browser] + * Bug 41678: WebRTC build fix patches incorrectly defining pid_t [tor-browser] + * Bug 41683: Disable the network process on Windows [tor-browser] + * Linux + * Bug 40830: The fontconfig directory is missing in Base Browser [tor-browser-build] + * Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP [tor-browser] + * Android + * Updated GeckoView to 102.10esr + * Bug 41724: Backport Android-specific security fixes from Firefox 112 to ESR 102.10-based Tor Browser [tor-browser] + * Build System + * All Platforms + * Bug 40828: Use http://archive.debian.org/debian-archive/ for jessie [tor-browser-build] + * Bug 40837: Rebase mullvad-browser build changes onto main [tor-browser-build] + * Windows + macOS + Linux + * Bug 40823: Update appname_* variables in projects/release/update_responses_config.yml [tor-browser-build] + * Bug 40826: Correctly set appname_marfile for basebrowser in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel [tor-browser-build] + * Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date [tor-browser] + * Windows + * Bug 40822: The Tor Browser installer doesn't run with mandatory ASLR on (0xc000007b) [tor-browser-build] + * macOS + * Bug 40824: dmg2mar script using hardcoded project names for paths [tor-browser-build] + * Bug 40844: DMG reproducibility problem on 12.0.5 [tor-browser-build] + * Linux + * Bug 40835: Update faketime URLs in projects/container-image/config [tor-browser-build] + * Android + * Bug 41684: Android improvements for local dev builds [tor-browser] + +Tor Browser 12.0.5 - April 12 2023 + * All Platforms + * Updated Translations + * Updated NoScript to 11.4.21 + * Updated Go to 11.9.8 + * Bug 41688: Rebase Tor Browser Stable to 102.10.0esr [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.10esr + * Bug 41526: "Cancel" button when establishing a connection should be grey [tor-browser] + * Android + * Updated GeckoView to 102.10esr + * Bug 41724: Backport Android-specific security fixes from Firefox 112 to ESR 102.10-based Tor Browser [tor-browser] + * Build System + * Windows + * Bug 40822: The Tor Browser installer doesn't run with mandatory ASLR on (0xc000007b) [tor-browser-build] + * Linux + * Bug 40828: Use http://archive.debian.org/debian-archive/ for jessie [tor-browser-build] + * Bug 40835: Update faketime URLs in projects/container-image/config [tor-browser-build] + Tor Browser 12.5a4 - March 20 2023 * All Platforms * Updated Translations @@ -245,7 +331,7 @@ Tor Browser 12.5a2 - January 22 2023 * Android * Bug 40738: Update Android git hashes templates [tor-browser-build] -Tor Browser 12.0.2 - January 16 2023 +Tor Browser 12.0.2 - January 18 2023 * All Platforms * Updated tor to 0.4.7.13 * Updated NoScript to 11.4.14 @@ -278,6 +364,7 @@ Tor Browser 12.0.2 - January 16 2023 * Bug 40739: tor-expert-bundle should include ClientTransportPlugin torrc lines for each pluggable transport [tor-browser-build] * Windows + macOS + Linux * Bug 40734: Backport the translation project [tor-browser-build] + * Bug 40746: Remove pt_config.json from pt dir [tor-browser-build] * macOS * Bug 40706: macos-signer-stapler should wait for user interaction before attempting stapling [tor-browser-build] ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 991330, + "average_daily_users": 970562, "categories": { "android": [ "experimental", @@ -31,7 +31,7 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5509244, + "id": 5550694, "compatibility": { "firefox": { "min": "54.0", @@ -42,7 +42,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/55092…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/55506…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -53,22 +53,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- Fixed a edge case with extracting color numbers, it's now able to extract `rgb(0 0 0/0.04)`.\n- Improved IPv6 check.\n- Faster UI loading.\n- Users' fixes for websites." + "en-US": "- Site toggle panel (detect dark theme and shortcut).\n- App toggle panel (automation and shortcut).\n- Improved Site List indexing.\n- Users' fixes for websites." }, - "reviewed": "2023-01-09T12:25:16Z", - "version": "4.9.62", + "reviewed": "2023-04-13T13:17:06Z", + "version": "4.9.63", "files": [ { - "id": 4053589, - "created": "2023-01-08T17:15:31Z", - "hash": "sha256:e537a2cee45ed7c26f79ecd3ed362620e3f00d24c158532a58e163a63a3d60cc", + "id": 4095037, + "created": "2023-04-10T09:52:02Z", + "hash": "sha256:16ba6337fcff7ad85e08ad51b384ba26ff751b2b2ded12309f75e8337ace925a", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 636487, + "size": 658318, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4053589/darkreader-4.9.62…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4095037/darkreader-4.9.63…", "permissions": [ "alarms", "contextMenus", @@ -146,7 +146,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-01-09T12:25:16Z", + "last_updated": "2023-04-13T13:17:06Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5572, - "bayesian_average": 4.556020910333306, - "count": 4912, - "text_count": 1556 + "average": 4.5575, + "bayesian_average": 4.55632411125665, + "count": 4956, + "text_count": 1572 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 29096 + "weekly_downloads": 25917 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 266501, + "average_daily_users": 258016, "categories": { "android": [ "security-privacy" @@ -553,10 +553,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8173, - "bayesian_average": 4.812651456820935, - "count": 1330, - "text_count": 236 + "average": 4.8168, + "bayesian_average": 4.81213034274172, + "count": 1332, + "text_count": 235 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -641,7 +641,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 4398 + "weekly_downloads": 3798 }, "notes": null }, @@ -657,7 +657,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1141854, + "average_daily_users": 1125722, "categories": { "android": [ "security-privacy" @@ -1180,10 +1180,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8016, - "bayesian_average": 4.798796787815379, - "count": 2198, - "text_count": 426 + "average": 4.8005, + "bayesian_average": 4.797701870245844, + "count": 2215, + "text_count": 428 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1207,7 +1207,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 41171 + "weekly_downloads": 22431 }, "notes": null }, @@ -1223,7 +1223,7 @@ "picture_url": null } ], - "average_daily_users": 6481174, + "average_daily_users": 6247825, "categories": { "android": [ "security-privacy" @@ -1235,7 +1235,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5534721, + "id": 5547815, "compatibility": { "firefox": { "min": "78.0", @@ -1246,7 +1246,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/55…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/55…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1257,22 +1257,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ea467320fde698dd660f5e…" rel=\"nofollow\">1.47.4</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/90332d429df9e9702298e1…" rel=\"nofollow\">Add list for Macedonia; add languages to Persian list</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/f99dde6a629e89c9f720b2…" rel=\"nofollow\">Support update period below 1-day</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/07f7b3b6b630e4e4652b00…" rel=\"nofollow\">Restore behind-the-scene origin for docless secondary resources</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/538445e0e1306d365a45a8…" rel=\"nofollow\">Refine AST template's regex for hosts file entries</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4b7349389c22c2bd89ddd6…" rel=\"nofollow\">Flush cached result when adding to FilterDomainHitSet</a></li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/25aa2ca137134570435ed8…" rel=\"nofollow\">Commits history since last version</a>." + "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/9ba5436deff955b8634d3a…" rel=\"nofollow\">1.48.4</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/2881e29d212046e14a4f20…" rel=\"nofollow\">Fix presumed network filter not being a valid network filter</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/1d29de8f605dc6f4b7684f…" rel=\"nofollow\">Avoid using ! toolbar icon badge when inconsequential</a><ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/04728b2f874e135c8736ae…" rel=\"nofollow\">Clear unprocessed requests status on webNavigation reload event</a></li></ul></li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/e34f62492a00e2b8a221ca…" rel=\"nofollow\">Commits history since last version</a>." }, - "reviewed": "2023-03-08T13:21:02Z", - "version": "1.47.4", + "reviewed": "2023-04-05T17:12:25Z", + "version": "1.48.4", "files": [ { - "id": 4079064, - "created": "2023-03-03T22:26:56Z", - "hash": "sha256:a35a6c8758ba74616afc09648c96d74ec2e7d27fe30f311d1db6e9a4966e7858", + "id": 4092158, + "created": "2023-04-01T21:20:42Z", + "hash": "sha256:d7666b963c2969b0014937aae55472eea5098ff21ed3bea8a2e1f595f62856c1", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3246151, + "size": 3343703, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4079064/ublock_origin-1.4…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4092158/ublock_origin-1.4…", "permissions": [ "dns", "menus", @@ -1388,7 +1388,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-03-19T11:30:30Z", + "last_updated": "2023-04-16T15:40:30Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1534,9 +1534,9 @@ }, "ratings": { "average": 4.7805, - "bayesian_average": 4.780094594455903, - "count": 15128, - "text_count": 3934 + "bayesian_average": 4.780095724686764, + "count": 15264, + "text_count": 3968 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1598,7 +1598,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 143423 + "weekly_downloads": 132315 }, "notes": null }, @@ -1614,7 +1614,7 @@ "picture_url": null } ], - "average_daily_users": 159499, + "average_daily_users": 159848, "categories": { "android": [ "photos-media" @@ -1712,10 +1712,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5055, - "bayesian_average": 4.50026668386193, - "count": 1090, - "text_count": 405 + "average": 4.4964, + "bayesian_average": 4.4911928855659555, + "count": 1100, + "text_count": 407 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1737,7 +1737,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 363 + "weekly_downloads": 366 }, "notes": null }, @@ -1753,7 +1753,7 @@ "picture_url": null } ], - "average_daily_users": 92182, + "average_daily_users": 88484, "categories": { "android": [ "experimental", @@ -1866,8 +1866,8 @@ ], "promoted": null, "ratings": { - "average": 4.3769, - "bayesian_average": 4.3630961936527894, + "average": 4.3668, + "bayesian_average": 4.352941163663537, "count": 398, "text_count": 112 }, @@ -1891,7 +1891,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1406 + "weekly_downloads": 1034 }, "notes": null }, @@ -1907,7 +1907,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 259947, + "average_daily_users": 258622, "categories": { "android": [ "photos-media", @@ -2126,10 +2126,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6513, - "bayesian_average": 4.646506092845788, - "count": 1236, - "text_count": 240 + "average": 4.6538, + "bayesian_average": 4.64901646767579, + "count": 1248, + "text_count": 241 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2150,7 +2150,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 7883 + "weekly_downloads": 4497 }, "notes": null }, @@ -2173,7 +2173,7 @@ "picture_url": null } ], - "average_daily_users": 109654, + "average_daily_users": 109747, "categories": { "android": [ "other" @@ -2456,10 +2456,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4426, - "bayesian_average": 4.437933242019955, - "count": 1202, - "text_count": 319 + "average": 4.4449, + "bayesian_average": 4.440238588001734, + "count": 1207, + "text_count": 321 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2479,7 +2479,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 50 + "weekly_downloads": 31 }, "notes": null }, @@ -2495,7 +2495,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 326501, + "average_daily_users": 312295, "categories": { "android": [ "performance", @@ -2509,7 +2509,7 @@ "contributions_url": "https://www.paypal.com/donate/?hosted_button_id=9ERKTU5MBH4EW&utm_content=p…", "created": "2005-05-13T10:51:32Z", "current_version": { - "id": 5542185, + "id": 5546627, "compatibility": { "firefox": { "min": "59.0", @@ -2520,7 +2520,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5542185", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5546627", "is_strict_compatibility_enabled": false, "license": { "id": 13, @@ -2531,22 +2531,22 @@ "url": "http://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { - "en-US": "v 11.4.20\n============================================================\nx Generalized prompt safety hooks\nx Better blob: URL support\nx [nscl] Improved cross-window patch cascading\nx [nscl] Avoid unneeded side effects when checking for\n zombie patched objects\nx [nscl] Prompt safety hooks\nx [L10n] Updated fr, fi\nx Fix font family typo (!283, thanks alex-kinokon)" + "en-US": "v 11.4.21\n============================================================\nx Fixed mislabeled Tor Browser settings override option\nx [L10n] Updated mk" }, - "reviewed": "2023-03-21T12:03:50Z", - "version": "11.4.20", + "reviewed": "2023-04-04T12:01:03Z", + "version": "11.4.21", "files": [ { - "id": 4086528, - "created": "2023-03-20T22:48:31Z", - "hash": "sha256:014aec3ce142222338372d227eaadfa2ae13c9e3861f6d43869615b932ce4b53", + "id": 4090970, + "created": "2023-03-30T09:39:24Z", + "hash": "sha256:0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 951165, + "size": 951542, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4086528/noscript-11.4.20.…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.…", "permissions": [ "contextMenus", "storage", @@ -2613,7 +2613,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-03-21T12:03:50Z", + "last_updated": "2023-04-04T12:01:03Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2685,10 +2685,10 @@ "category": "recommended" }, "ratings": { - "average": 4.405, - "bayesian_average": 4.402291645516784, - "count": 2052, - "text_count": 801 + "average": 4.4117, + "bayesian_average": 4.40897409082447, + "count": 2055, + "text_count": 798 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2732,7 +2732,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 8165 + "weekly_downloads": 8021 }, "notes": null }, @@ -2748,7 +2748,7 @@ "picture_url": null } ], - "average_daily_users": 148495, + "average_daily_users": 146192, "categories": { "android": [ "performance", @@ -2863,10 +2863,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9155, - "bayesian_average": 3.9111787696510967, - "count": 1113, - "text_count": 396 + "average": 3.9109, + "bayesian_average": 3.9065939897765096, + "count": 1122, + "text_count": 397 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2885,7 +2885,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1769 + "weekly_downloads": 1829 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -103,9 +103,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4086528/noscript-11.4.20.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4090970/noscript-11.4.21.… name: noscript - sha256sum: 014aec3ce142222338372d227eaadfa2ae13c9e3861f6d43869615b932ce4b53 + sha256sum: 0fd3b66a2780d03a5b3cd460216105f3df2b27c6d3a552c1769c5de48c9e2338 - URL: https://addons.mozilla.org/firefox/downloads/file/4079064/ublock_origin-1.4… name: ublock-origin sha256sum: a35a6c8758ba74616afc09648c96d74ec2e7d27fe30f311d1db6e9a4966e7858 ===================================== projects/fenix/config ===================================== @@ -14,7 +14,7 @@ container: var: fenix_version: 102.2.1 browser_branch: 12.5-1 - fenix_build: 3 + fenix_build: 4 git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/browser_branch") %]' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' # This should be updated when the list of gradle dependencies is changed. ===================================== projects/firefox/config ===================================== @@ -11,11 +11,11 @@ container: use_container: 1 var: - firefox_platform_version: 102.9.0 + firefox_platform_version: 102.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '12.5' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 2 + browser_build: 3 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -11,9 +11,9 @@ container: use_container: 1 var: - geckoview_version: 102.9.0esr + geckoview_version: 102.10.0esr browser_branch: 12.5-1 - browser_build: 2 + browser_build: 3 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.19.7 +version: 1.19.8 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -121,7 +121,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633 + sha256sum: 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 69998 +version: 74065 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -19,6 +19,6 @@ input_files: - project: container-image - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: 236ad8b877d9bdb3ad5309deee8acb4025e10e4faf4626d063cbf6c87fc209a4 + sha256sum: 788c2dc2bfacbc6961ce443c5639706cc23fbb7b7730ed7f71a26396511305be - filename: packagemanual.py name: package_script ===================================== projects/translation/config ===================================== @@ -6,19 +6,19 @@ version: '[% c("abbrev") %]' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 50ec65bc65e510156c1e9f5c835eb6ea034450d0 + git_hash: 97c76d5183b16b069e66feaaf10e00c1d2c7d9e0 targets: nightly: git_hash: 'base-browser' base-browser-fluent: base-browser-fluent: '[% INCLUDE build %]' - git_hash: 667a6daeba46b7aeb0a8b664bd9ae006f8ac233d + git_hash: e016c52705a2663309a7b05b05ac93002eab3ed0 targets: nightly: git_hash: 'basebrowser-newidentityftl' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: e9ad920fc7427ff1b84e3723a97212ccd78dfe26 + git_hash: 69273c40343bd6f8f125109ddac9d949d7bcb605 targets: nightly: git_hash: 'tor-browser' @@ -26,7 +26,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: f9fd1869f6904e3a9fe99fa3626382b20ff33e66 + git_hash: 0deec2a78dea0013e8c4eaec1d40ef5aac4e43b0 targets: nightly: git_hash: 'fenix-torbrowserstringsxml' ===================================== rbm.conf ===================================== @@ -71,10 +71,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.5a4' + torbrowser_version: '12.5a5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 12.5a3 + - 12.5a4 updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 12.0.5
by boklm (＠boklm) 19 Apr '23

19 Apr '23

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: d88821fb by Nicolas Vigier at 2023-04-19T18:03:46+02:00 release: new version, 12.0.5 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/12.0.3-12.0.4-linux32-ALL.xml - − update_3/release/12.0.3-12.0.4-linux64-ALL.xml - − update_3/release/12.0.3-12.0.4-macos-ALL.xml - − update_3/release/12.0.3-12.0.4-win32-ALL.xml - − update_3/release/12.0.3-12.0.4-win64-ALL.xml - + update_3/release/12.0.4-12.0.5-linux32-ALL.xml - + update_3/release/12.0.4-12.0.5-linux64-ALL.xml - + update_3/release/12.0.4-12.0.5-macos-ALL.xml - + update_3/release/12.0.4-12.0.5-win32-ALL.xml - + update_3/release/12.0.4-12.0.5-win64-ALL.xml - − update_3/release/12.0.4-linux32-ALL.xml - − update_3/release/12.0.4-linux64-ALL.xml - − update_3/release/12.0.4-macos-ALL.xml - − update_3/release/12.0.4-win32-ALL.xml - − update_3/release/12.0.4-win64-ALL.xml - + update_3/release/12.0.5-linux32-ALL.xml - + update_3/release/12.0.5-linux64-ALL.xml - + update_3/release/12.0.5-macos-ALL.xml - + update_3/release/12.0.5-win32-ALL.xml - + update_3/release/12.0.5-win64-ALL.xml - update_3/release/download-android-aarch64.json - update_3/release/download-android-armv7.json - update_3/release/download-android-x86.json - update_3/release/download-android-x86_64.json - update_3/release/download-linux-i686.json - update_3/release/download-linux-x86_64.json - update_3/release/download-macos.json - update_3/release/download-windows-i686.json - update_3/release/download-windows-x86_64.json The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40831: Fix update URL for base-browser nightly
by boklm (＠boklm) 18 Apr '23

18 Apr '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4e92f461 by Nicolas Vigier at 2023-04-18T15:17:05+02:00 Bug 40831: Fix update URL for base-browser nightly - - - - - 2 changed files: - projects/firefox/build - projects/firefox/config Changes: ===================================== projects/firefox/build ===================================== @@ -97,7 +97,7 @@ fi cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der [% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%] # Set update url for nightly (#33402 / #40033) - sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in + sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%] ===================================== projects/firefox/config ===================================== @@ -18,7 +18,7 @@ var: browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' - nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %][% c("var/osname") %]' + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' deps: @@ -133,7 +133,7 @@ targets: macos: var: martools_filename: 'mar-tools-macos-[% c("var/macos_arch") %].zip' - nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]macos' + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-macos' arch_deps: - python3 - python3-distutils View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Deleted branch bug_40759
by Richard Pospesel (＠richard) 17 Apr '23

17 Apr '23

Richard Pospesel deleted branch bug_40759 at The Tor Project / Applications / tor-browser-build -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch bug_40759
by Richard Pospesel (＠richard) 17 Apr '23

17 Apr '23

Richard Pospesel pushed new branch bug_40759 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/bug… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.10.0esr-12.5-1-build3
by Richard Pospesel (＠richard) 17 Apr '23

17 Apr '23

Richard Pospesel pushed new tag tor-browser-102.10.0esr-12.5-1-build3 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/tor-browser][base-browser-102.10.0esr-12.5-1] 2 commits: Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when...
by Pier Angelo Vendrame (＠pierov) 17 Apr '23

17 Apr '23

Pier Angelo Vendrame pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: b0a97d20 by Jonathan Kew at 2023-04-17T21:38:31+02:00 Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when they 'shadow' system-installed families. r=gfx-reviewers,lsalzman Differential Revision: https://phabricator.services.mozilla.com/D175350 - - - - - 970ae0b1 by Pier Angelo Vendrame at 2023-04-17T21:38:40+02:00 fixup! Firefox preference overrides. Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP Removed the workaround now that we have the upstream fix. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - gfx/thebes/gfxFcPlatformFontList.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -690,8 +690,6 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S #endif #ifdef XP_LINUX -pref("layout.css.font-visibility.resistFingerprinting", 3); // work around bug 41163 - // Arabic pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos"); pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo"); ===================================== gfx/thebes/gfxFcPlatformFontList.cpp ===================================== @@ -1869,17 +1869,19 @@ void gfxFcPlatformFontList::InitSharedFontListForPlatform() { } }; - // iterate over available fonts - FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); - addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); - #ifdef MOZ_BUNDLED_FONTS + // Add bundled fonts before system fonts, to set correct visibility status + // for any families that appear in both. if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication); addFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true); } #endif + // iterate over available fonts + FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); + addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); + mozilla::fontlist::FontList* list = SharedFontList(); list->SetFamilyNames(families); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/220549… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/220549… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 2 commits: Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when...
by Pier Angelo Vendrame (＠pierov) 17 Apr '23

17 Apr '23

Pier Angelo Vendrame pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: a0b015c4 by Jonathan Kew at 2023-04-17T19:00:43+02:00 Bug 1792157 - Ensure correct font-visibility for bundled fonts on Linux when they 'shadow' system-installed families. r=gfx-reviewers,lsalzman Differential Revision: https://phabricator.services.mozilla.com/D175350 - - - - - c24cc05f by Pier Angelo Vendrame at 2023-04-17T19:02:29+02:00 fixup! Firefox preference overrides. Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP Removed the workaround now that we have the upstream fix. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - gfx/thebes/gfxFcPlatformFontList.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -696,8 +696,6 @@ pref("font.name-list.monospace.x-unicode", "Consolas, Noto Sans Balinese, Noto S #endif #ifdef XP_LINUX -pref("layout.css.font-visibility.resistFingerprinting", 3); // work around bug 41163 - // Arabic pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos"); pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo"); ===================================== gfx/thebes/gfxFcPlatformFontList.cpp ===================================== @@ -1869,17 +1869,19 @@ void gfxFcPlatformFontList::InitSharedFontListForPlatform() { } }; - // iterate over available fonts - FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); - addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); - #ifdef MOZ_BUNDLED_FONTS + // Add bundled fonts before system fonts, to set correct visibility status + // for any families that appear in both. if (StaticPrefs::gfx_bundled_fonts_activate_AtStartup() != 0) { FcFontSet* appFonts = FcConfigGetFonts(nullptr, FcSetApplication); addFontSetFamilies(appFonts, policy.get(), /* aAppFonts = */ true); } #endif + // iterate over available fonts + FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem); + addFontSetFamilies(systemFonts, policy.get(), /* aAppFonts = */ false); + mozilla::fontlist::FontList* list = SharedFontList(); list->SetFamilyNames(families); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/64ea04… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/64ea04… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0-mullvad] Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time
by boklm (＠boklm) 17 Apr '23

17 Apr '23

boklm pushed to branch maint-12.0-mullvad at The Tor Project / Applications / tor-browser-build Commits: e51dec66 by Nicolas Vigier at 2023-04-17T19:03:44+02:00 Bug 40844: Fix reproducibility issue in hfsplus-tools when hwclock is set to local time - - - - - 4 changed files: - projects/hfsplus-tools/build - projects/hfsplus-tools/config - + projects/hfsplus-tools/ignore-timezone.diff - tools/signing/gatekeeper-bundling.sh Changes: ===================================== projects/hfsplus-tools/build ===================================== @@ -11,6 +11,7 @@ tar -xf diskdev_cmds-[% c("version") %].tar.gz cd diskdev_cmds-[% c("version") %] patch -p1 < $rootdir/newfs_hfs.diff +patch -p1 < $rootdir/ignore-timezone.diff make -j[% c("num_procs") %] ===================================== projects/hfsplus-tools/config ===================================== @@ -21,3 +21,6 @@ input_files: # exist on Linux (at that path) and is not required on Linux either, and make # the UUID deterministic. - filename: newfs_hfs.diff + # Remove UTCToLocal conversion to avoid a different result when hwclock + # is set to local time or utc time (tor-browser-build#40844) + - filename: ignore-timezone.diff ===================================== projects/hfsplus-tools/ignore-timezone.diff ===================================== @@ -0,0 +1,13 @@ +diff -ru diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c +--- diskdev_cmds-540.1.linux3/newfs_hfs.tproj/makehfs.c 2012-02-02 23:36:59.000000000 +0100 ++++ diskdev_cmds-540.1.linux3.n/newfs_hfs.tproj/makehfs.c 2023-04-17 13:59:41.993000000 +0200 +@@ -463,8 +463,7 @@ + } + hp->lastMountedVersion = kHFSPlusMountVersion; + +- /* NOTE: create date is in local time, not GMT! */ +- hp->createDate = UTCToLocal(defaults->createDate); ++ hp->createDate = defaults->createDate; + hp->modifyDate = defaults->createDate; + hp->backupDate = 0; + hp->checkedDate = defaults->createDate; ===================================== tools/signing/gatekeeper-bundling.sh ===================================== @@ -45,7 +45,7 @@ test -f "$libdmg_file" || \ "You can build it with:" \ " ./rbm/rbm build --target no_containers libdmg-hfsplus" \ "See var/deps in projects/libdmg-hfsplus/config for the list of build dependencies" -hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz" +hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-81ff5b.tar.gz" test -f "$hfstools_file" || \ exit_error "$hfstools_file is missing." \ "You can build it with:" \ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0