- tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-128.7.0esr-14.0-1
by Pier Angelo Vendrame (＠pierov) 28 Jan '25

28 Jan '25

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

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-128.7.0esr-14.0-1-build1
by Pier Angelo Vendrame (＠pierov) 28 Jan '25

28 Jan '25

Pier Angelo Vendrame pushed new tag base-browser-128.7.0esr-14.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… 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-128.7.0esr-14.0-1-build1
by Pier Angelo Vendrame (＠pierov) 28 Jan '25

28 Jan '25

Pier Angelo Vendrame pushed new tag base-browser-128.7.0esr-14.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] Pushed new branch base-browser-128.7.0esr-14.0-1
by Pier Angelo Vendrame (＠pierov) 28 Jan '25

28 Jan '25

Pier Angelo Vendrame pushed new branch base-browser-128.7.0esr-14.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][tor-browser-128.7.0esr-14.0-1] 222 commits: Bug 1436226: Ignore user prefs and hardware support for media capabilities...
by Pier Angelo Vendrame (＠pierov) 28 Jan '25

28 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: cf9c8915 by Fatih at 2025-01-27T21:20:16+01:00 Bug 1436226: Ignore user prefs and hardware support for media capabilities when RFPTarget::MediaCapabilities is enabled. r=tjr,media-playback-reviewers,padenot This patch mostly targeted Android, as media.mediasource.vp9.enabled is disabled on only Android and HW support takes precedence over pref, hence leaking HW support for VP9. However, we ended up modifying the patch to ignore prefs or HW support, fixing both possible user pref leak and HW support leak. Differential Revision: https://phabricator.services.mozilla.com/D221338 - - - - - 43e0f070 by stransky at 2025-01-27T21:20:17+01:00 Bug 1501744 [Linux] Fill PointerEvents on the Gtk backend r=emilio Patch author is tpxp <tpxp(a)live.fr> Differential Revision: https://phabricator.services.mozilla.com/D215201 - - - - - 4261072f by Fatih at 2025-01-27T21:20:18+01:00 Bug 1607032: Spoof screen orientation and angle to primary values. r=tjr,geckoview-reviewers,owlish Differential Revision: https://phabricator.services.mozilla.com/D220904 - - - - - f42851ee by Henry Wilkes at 2025-01-27T21:20:18+01:00 Bug 1436462 - Use "Open in new private window" for bookmarks when in PBM. r=places-reviewers,mak This makes the bookmark menu consistent with the "File" and context menu when using private browsing mode. We also share the same hide item logic for these "open" items in one place in PlacesUIUtils so that they can be shared between the two consumers (regular bookmarks and managed bookmarks). This ensures that the "Open in container" item if hidden for managed bookmarks in a private window. Differential Revision: https://phabricator.services.mozilla.com/D220120 - - - - - 0097f565 by Fatih at 2025-01-27T21:20:18+01:00 Bug 1834307: Change StaticPrefs::general_smoothScroll() calls with nsLayoutUtils::IsSmoothScrollingEnabled. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221363 - - - - - 6fabd6e6 by Fatih at 2025-01-27T21:20:19+01:00 Bug 1834307: Check RFPTarget::CSSPrefersReducedMotion in nsLayoutUtils::IsSmoothScrollingEnabled. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221364 - - - - - d452336a by Roger Yang at 2025-01-27T21:20:19+01:00 Bug 1862537 - Do not try to go back when it's a initial load r=android-reviewers,harrisono, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D219782 - - - - - 15da60fb by Timothy Nikkel at 2025-01-27T21:20:20+01:00 Bug 1899180. If a channel is not nsIPrivateBrowsingChannel and has no load context, use the private browsing field from it's origin attributes. r=necko-reviewers,anti-tracking-reviewers,valentin If the channel is not a nsIPrivateBrowsingChannel, and it also has no load context (eg inside svg images) then we will over write a non-zero mPrivateBrowsingId on the OriginAttributes of the channel with 0, making NS_UsePrivateBrowsing return false for the channel. Differential Revision: https://phabricator.services.mozilla.com/D212083 - - - - - de25b46e by pollymce at 2025-01-27T21:20:20+01:00 Bug 1902996 - Improve messaging for fullscreen notifications. r=android-reviewers,gl Instead of explaining to users that they are in fullscreen mode, which may be obvious, we explain how to get out of it :) Also use a Toast rather than a custom Dialog. Update Focus too. Fix lint errors. Differential Revision: https://phabricator.services.mozilla.com/D215782 - - - - - a939bb5b by Jon Coppeard at 2025-01-27T21:20:20+01:00 Bug 1904011 - Ignore finalized scripts when iterating code covarage tables r=iain Differential Revision: https://phabricator.services.mozilla.com/D214799 - - - - - d3d1cf08 by rahulsainani at 2025-01-27T21:20:21+01:00 Bug 1906024 - Format download file names better a=diannaS Original Revision: https://phabricator.services.mozilla.com/D220559 Differential Revision: https://phabricator.services.mozilla.com/D222254 - - - - - 6413e270 by rahulsainani at 2025-01-27T21:20:21+01:00 Bug 1906024 - Format download file names a=diannaS Original Revision: https://phabricator.services.mozilla.com/D221771 Differential Revision: https://phabricator.services.mozilla.com/D222259 - - - - - 971ae5a6 by Arturo Mejia at 2025-01-27T21:20:21+01:00 Bug 1908344 - Improve prompts showing a=dmeehan - BP, tor-browser#43005 Original Revision: https://phabricator.services.mozilla.com/D216996 Differential Revision: https://phabricator.services.mozilla.com/D217718 - - - - - 2b930b67 by Sam Foster at 2025-01-27T21:20:22+01:00 Bug 1909099 - Always clean up old session restore and sync log files. r=markh,sessionstore-reviewers,dao Differential Revision: https://phabricator.services.mozilla.com/D217520 - - - - - 90279c70 by Nika Layzell at 2025-01-27T21:20:22+01:00 Bug 1911745 - Unify BrowsingContext flag coherency checks, r=mccr8 Previously these checks were largely diagnostic tools for finding bugs in other code as it evolves. This unifies the checks a bit more and makes them stronger for BrowsingContexts created over IPC, providing a place for more coherency checks to be added in the future. Differential Revision: https://phabricator.services.mozilla.com/D218860 - - - - - f73de56a by Pier Angelo Vendrame at 2025-01-27T21:20:23+01:00 Bug 1918009 - Fix the RFP-spoofed User-Agent header. r=tjr The spoofed value of the HTTP user-agent header is not consistent with the value of navigator.userAgent on Windows, and this can lead to compatibility issues. Differential Revision: https://phabricator.services.mozilla.com/D223745 - - - - - 855c05cc by Fatih at 2025-01-27T21:20:23+01:00 Bug 1918202: Spoof orientation based on screen size. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D221863 - - - - - 3fd5595e by Henry Wilkes at 2025-01-27T21:20:23+01:00 Bug 1919363 - Only show one app menu "new window" item in permanent private browsing. r=mconley We also update the browser_private_browsing_window.js test. The previous test was limited because it was referring to non-existent "appmenu_newNavigator" and "appmenu_newPrivateWindow". Differential Revision: https://phabricator.services.mozilla.com/D222507 - - - - - 83f47f56 by Fatih at 2025-01-27T21:20:24+01:00 Bug 1922204: fixup square spoofed orientation. r=tjr Differential Revision: https://phabricator.services.mozilla.com/D224312 - - - - - 416069d8 by Pier Angelo Vendrame at 2025-01-27T21:20:24+01:00 Bug 1923264 - Discard unsupported updates in selectUpdate. r=bytesized,nalexander UpdateService.#selectUpdate currently chooses always the most recent update even when unsupported and an older but supported one is available. This commit makes #selectUpdate discard the unsupported update if a supported alternative is found. Differential Revision: https://phabricator.services.mozilla.com/D224905 - - - - - 1a9705cb by Arturo Mejia at 2025-01-27T21:20:24+01:00 Bug 1836921 - Improve dialogs a=dmeehan Original Revision: https://phabricator.services.mozilla.com/D226961 Differential Revision: https://phabricator.services.mozilla.com/D228842 - - - - - a0493daf by Malte Juergens at 2025-01-27T21:20:25+01:00 Bug 1909396 - Remove HTTPS-Only exception button in iframes r=freddyb,fluent-reviewers Rationale for this can be read in Bug 1909396, but the main reason is that the iframe will get blocked regardless by mixed content blocking. Differential Revision: https://phabricator.services.mozilla.com/D220257 - - - - - c3148d3f by Makoto Kato at 2025-01-27T21:20:25+01:00 Bug 1776646 - Support EXTRA_IS_SENSITIVE for clipboard. r=geckoview-reviewers,owlish When nsITransferable.isPrivateData is true, such as coping password or private mode, we should set EXTRA_IS_SENSITIVE to ClipData. AndroidJunit test runner doesn't often get `ClipDescription.extras` from clipboard service in test runner. So we cannot write a unit test using AndroidJUnit test runner. Differential Revision: https://phabricator.services.mozilla.com/D225326 - - - - - 94382b10 by Cathy Lu at 2025-01-27T21:20:25+01:00 Bug 1914797 - Part 1 + 2 + partial backout (details below) Bug 1914797 - Part 1 - Revert bug 1868469 r=android-reviewers,jonalmeida, a=dmeehan Differential Revision: https://phabricator.services.mozilla.com/D226431 Bug 1914797 - Part 2 - Add url change during onPageStart for slow loading sites r=android-reviewers,jonalmeida, a=dmeehan Differential Revision: https://phabricator.services.mozilla.com/D226432 Backed out 1 changesets (bug 1914797) for causing Bug 1929028 Backed out changeset a79554879d7b (bug 1914797) - - - - - 28e35a6c by Emilio Cobos Álvarez at 2025-01-27T21:20:26+01:00 Bug 1909625 - Ignore CSS zoom and text zoom for canvas. r=gfx-reviewers,lsalzman The spec doesn't mention anything about applying them, and other browsers don't, so let's just be consistent... Differential Revision: https://phabricator.services.mozilla.com/D221709 - - - - - 1e454322 by Emilio Cobos Álvarez at 2025-01-27T21:20:26+01:00 Bug 1918454 - Prevent divide by zero when inverting effective zoom. r=firefox-style-system-reviewers,layout-reviewers,boris See comment. Differential Revision: https://phabricator.services.mozilla.com/D222090 - - - - - 641c3c57 by Henry Wilkes at 2025-01-27T21:20:27+01:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - c1e7efe3 by Henry Wilkes at 2025-01-27T21:20:27+01:00 Bug 43072: Add aria label and description to moz-message-bar. Ensures that moz-message-bar, including notifications, are announced on Orca. This addresses upstream bugzilla bug 1895857 and should likely be replaced when it is fixed. - - - - - d6e6e88b by hackademix at 2025-01-27T21:20:27+01:00 Bug 42194: Fix blank net error page on failed DNS resolution with active proxy. - - - - - 77821260 by Henry Wilkes at 2025-01-27T21:20:28+01:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 5c033715 by hackademix at 2025-01-27T21:20:28+01:00 Bug 43101: Deep link to the startup security warning explanation. - - - - - 9c7203c5 by Marco Simonelli at 2025-01-27T21:20:28+01:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - 71761596 by Marco Simonelli at 2025-01-27T21:20:29+01:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 11c607f2 by Marco Simonelli at 2025-01-27T21:20:29+01:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 46d620b3 by Marco Simonelli at 2025-01-27T21:20:29+01:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - de12c542 by Marco Simonelli at 2025-01-27T21:20:30+01:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 87966dc8 by Marco Simonelli at 2025-01-27T21:20:30+01:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 7d6b21ad by june wilde at 2025-01-27T21:20:31+01:00 Bug 42758: Fix WebRTC build errors. - - - - - 3d040551 by hackademix at 2025-01-27T21:20:31+01:00 Bug 41854: Allow overriding download spam protection. - - - - - 3aab5794 by hackademix at 2025-01-27T21:20:31+01:00 Bug 42832: Download spam prevention exemption for browser extensions. - - - - - 5a8b68fc by Pier Angelo Vendrame at 2025-01-27T21:20:32+01:00 Bug 42220: Allow for more file types to be forced-inline. Firefox allows to open some files in the browser without any confirmation, but this will result in a disk leak, because the file will be downloaded to the temporary directory first (and not deleted, in some cases). A preference allows PDFs to be opened without being downloaded to disk. So, we introduce a similar one to do the same for all the files that are set to be opened automatically in the browser. - - - - - 05b54f9b by hackademix at 2025-01-27T21:20:34+01:00 Bug 42835: Create an actor to filter file data transfers - - - - - 88b51022 by Beatriz Rizental at 2025-01-27T21:20:34+01:00 Bug 42728: Modify ./mach lint to skip unused linters - - - - - b4feeced by Gaba at 2025-01-27T21:20:34+01:00 Adding issue and merge request templates - - - - - 249823a2 by Richard Pospesel at 2025-01-27T21:20:35+01:00 Bug 42683: Create script to generate issue triage csv file from bugzilla query and git logs - - - - - 431c3364 by Beatriz Rizental at 2025-01-27T21:20:35+01:00 Add CI for Base Browser - - - - - ada1d7e0 by Beatriz Rizental at 2025-01-28T10:31:30+01:00 fixup! Add CI for Base Browser - - - - - 3e634621 by Beatriz Rizental at 2025-01-28T10:31:32+01:00 fixup! Add CI for Base Browser - - - - - 1476871c by Pier Angelo Vendrame at 2025-01-28T10:31:32+01: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 - - - - - f11d26e7 by Pier Angelo Vendrame at 2025-01-28T10:31:33+01: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. - - - - - c35e09e1 by Pier Angelo Vendrame at 2025-01-28T10:31:33+01:00 Bug 29320: Replace the gnu target with gnullvm for Rust. - - - - - e4ec2ae1 by Pier Angelo Vendrame at 2025-01-28T10:31:33+01:00 Bug 42616: Remove VideoCaptureTest.kt. This is a workaround to fix the GeckoView build with WebRTC disabled. We should replace this workaround with a proper solution, that excludes this test when MOZ_WEBRTC is undefined/False. - - - - - dbe8a93e by Pier Angelo Vendrame at 2025-01-28T10:31:34+01:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - b687cacb by Dan Ballard at 2025-01-28T10:31:34+01:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - a57d077e by Henry Wilkes at 2025-01-28T10:31:34+01:00 Bug 43092: Disable wayland by default in Base Browser. - - - - - bd892d30 by Matthew Finkel at 2025-01-28T10:31:35+01: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. - - - - - feb34de8 by Matthew Finkel at 2025-01-28T10:31:35+01:00 Bug 28125: Prevent non-Necko network connections - - - - - 41d3c22b by Mike Perry at 2025-01-28T10:31:35+01: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 - - - - - 065b3064 by cypherpunks1 at 2025-01-28T10:31:36+01:00 Bug 40717: Hide Windows SSO in settings - - - - - 2ec76f89 by Georg Koppen at 2025-01-28T10:31:36+01: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. - - - - - e0319323 by Kathy Brade at 2025-01-28T10:31:37+01:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 510b949e by Henry Wilkes at 2025-01-28T10:31:37+01:00 Bug 42831: Remove the shopping components. - - - - - f1a12241 by Kathy Brade at 2025-01-28T10:31:37+01: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. - - - - - f6a06023 by Alex Catarineu at 2025-01-28T10:31:38+01:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 7dcc0cb9 by Kathy Brade at 2025-01-28T10:31:38+01: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. - - - - - 70b6419d by Morgan at 2025-01-28T10:31:38+01:00 Bug 42716: Disable unwanted about: pages - - - - - 4a624783 by Arthur Edelstein at 2025-01-28T10:31:39+01: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. - - - - - 95151c26 by Alex Catarineu at 2025-01-28T10:31:39+01: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. - - - - - 9f50958d by cypherpunks1 at 2025-01-28T10:31:39+01:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - ef93cffe by cypherpunks1 at 2025-01-28T10:31:40+01:00 Bug 42730: Patch RemoteSettings to use only local dumps as a data source - - - - - 262c9b12 by Pier Angelo Vendrame at 2025-01-28T10:31:40+01:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 2f2b1986 by Georg Koppen at 2025-01-28T10:31:40+01:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 553adbd5 by Alex Catarineu at 2025-01-28T10:31:41+01:00 Bug 28369: Stop shipping pingsender executable - - - - - 9671a3e3 by Henry Wilkes at 2025-01-28T10:31:41+01:00 Bug 42630: Disable LaterRun module. - - - - - cd936a1b by Pier Angelo Vendrame at 2025-01-28T10:31:41+01:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 60b62a51 by Pier Angelo Vendrame at 2025-01-28T10:31:42+01:00 Bug 42647: Make OS HTTP User-Agent OS spoofing configurable by pref This commits makes it possible to disable OS spoofing in the HTTP User-Agent header, to see if matching header and JS property improve usability. - - - - - c065497a by Richard Pospesel at 2025-01-28T10:31:42+01:00 Bug 41327: Disable UrlbarProviderInterventions - - - - - cd326ef6 by Richard Pospesel at 2025-01-28T10:31:43+01:00 Bug 42037: Disable about:firefoxview page - - - - - 2b1a64eb by Mike Perry at 2025-01-28T10:31:43+01: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. - - - - - 92cbf57f by Pier Angelo Vendrame at 2025-01-28T10:31:43+01: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). Bug 43141: Hardcode system-ui to Arimo. - - - - - 0451c532 by Pier Angelo Vendrame at 2025-01-28T10:31:44+01:00 Bug 41901: Hardcode normalized FontSubstitutes. Windows has a system to set font aliases through the registry. This allows some customization that could be used as a fingerprinting vector. Moreover, this mechanism is used by Windows itself, and different SKUs might have different default FontSubstitutes. - - - - - c39f0d63 by Alex Catarineu at 2025-01-28T10:31:44+01: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 - - - - - 64d8f960 by Pier Angelo Vendrame at 2025-01-28T10:31:44+01:00 Bug 42562: Normalized the Accepted Languages on Android. The OS language might be outside the list of actually supported languages and it might leak the user's region. Therefore, we force the locale reported in Accept-Language to match one we support with translations, even when it means using a not exact region tag. - - - - - b6c3d939 by Alex Catarineu at 2025-01-28T10:31:45+01:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 241902b0 by Alex Catarineu at 2025-01-28T10:31:45+01:00 Bug 26345: Hide tracking protection UI - - - - - a9712f2a by Henry Wilkes at 2025-01-28T10:31:45+01:00 Bug 43109: Hide Firefox Relay from settings. This should remain disabled, see tor-browser#42814. - - - - - e652d878 by Henry Wilkes at 2025-01-28T10:31:46+01:00 Bug 42777: Hide Website Privacy Preferences. We hide the Website Privacy Preferences section, which controls the "global privacy control" (GPC) and "do not track" (DNT) settings. - - - - - cd7ff12f by Morgan at 2025-01-28T10:31:46+01:00 Bug 42070: Hide "Use smooth scrolling" from settings - - - - - f05a10ae by Arthur Edelstein at 2025-01-28T10:31:49+01:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 6c183326 by Pier Angelo Vendrame at 2025-01-28T10:31:49+01:00 Bug 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - f1cb31ba by Henry Wilkes at 2025-01-28T10:31:50+01:00 Bug 43117: Hide "Always underline links" from settings. - - - - - ffa2f99b by Pier Angelo Vendrame at 2025-01-28T10:31:50+01:00 Bug 42774: Always hide the third-pary certs UI. - - - - - 13e27a30 by Henry Wilkes at 2025-01-28T10:31:50+01:00 Bug 43118: Hide feature recommendation (CFR) settings. - - - - - b172aed8 by Pier Angelo Vendrame at 2025-01-28T10:31:51+01: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). - - - - - 7ec475d6 by Pier Angelo Vendrame at 2025-01-28T10:31:51+01:00 Bug 42773: Replace ~ with the original home. In Bug 93141, Mozilla started sending users to their home when they type ~ in the URL bar. On Linux, we change $HOME for various reason, therefore you would be redirected to the spoofed home directory when typing ~. So, we check if the original home directory is known, and use that, instead. - - - - - bdeeb755 by Alex Catarineu at 2025-01-28T10:31:51+01:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 9dfde7be by Mike Perry at 2025-01-28T10:31:52+01: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 - - - - - 30ff9fa0 by Pier Angelo Vendrame at 2025-01-28T10:31:52+01: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. - - - - - 3c8d7712 by Matthew Finkel at 2025-01-28T10:31:53+01:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 9bc6dd6c by cypherpunks1 at 2025-01-28T10:31:53+01:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - a52dd6a7 by cypherpunks1 at 2025-01-28T10:31:53+01:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 5a42c51c by hackademix at 2025-01-28T10:31:54+01:00 Bug 42288: Allow language spoofing in status messages. - - - - - 6bf7c964 by Pier Angelo Vendrame at 2025-01-28T10:31:54+01:00 Bug 43196: Remove the vendor name from media notifications on Linux. Firefox shows "vendor remoteName" as a title of the "... is playing media" notification on Linux. However, for our browser the remote name is enough, and prepending the vendor to it creates a string users usually never see. - - - - - 800ef302 by Pier Angelo Vendrame at 2025-01-28T10:31:54+01:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - a5909cbf by Pier Angelo Vendrame at 2025-01-28T10:31:55+01: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. - - - - - 4615129c by p13dz at 2025-01-28T10:31:55+01:00 Bug 40283: Workaround for the file upload bug - - - - - 50ce1dc0 by hackademix at 2025-01-28T10:31:55+01:00 Bug 42019: Empty browser's clipboard on browser shutdown - - - - - 2f10aedf by hackademix at 2025-01-28T10:31:56+01:00 Bug 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - 6f9fcb85 by Pier Angelo Vendrame at 2025-01-28T10:31:56+01:00 Bug 41930: Remove the UI to customize accept_languages. - - - - - e268c75f by hackademix at 2025-01-28T10:31:57+01:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 90240a29 by hackademix at 2025-01-28T10:31:57+01:00 Bug 41434: Letterboxing, improve logging. - - - - - 9597069d by hackademix at 2025-01-28T10:31:57+01:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - ff750681 by hackademix at 2025-01-28T10:31:58+01:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - fbc1ff61 by hackademix at 2025-01-28T10:31:58+01:00 Bug 42574: Letterboxing, exempt pdf.js. - - - - - 823598e5 by hackademix at 2025-01-28T10:31:58+01:00 Bug 32308: Use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - 58343cf2 by hackademix at 2025-01-28T10:31:59+01:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - 8d051ea0 by hackademix at 2025-01-28T10:31:59+01:00 Bug 41918: Option to reuse last window size when letterboxing is enabled. - - - - - e7614671 by hackademix at 2025-01-28T10:31:59+01:00 Bug 41916: Letterboxing preferences UI - - - - - ce38297f by hackademix at 2025-01-28T10:32:00+01:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 5948679d by hackademix at 2025-01-28T10:32:00+01:00 Bug 42443: Shrink window to match letterboxing size when the emtpy area is clicked. - - - - - 73451029 by Henry Wilkes at 2025-01-28T10:32:01+01:00 Bug 42528: Don't leak system scrollbar size on windows. - - - - - b2b43967 by Henry Wilkes at 2025-01-28T10:32:01+01: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.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - 8ae5bd46 by Kathy Brade at 2025-01-28T10:32:01+01: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. - - - - - fd4377df by Pier Angelo Vendrame at 2025-01-28T10:32:02+01:00 Bug 42061: Create an alpha update channel. - - - - - a99f14ee by Nicolas Vigier at 2025-01-28T10:32:02+01:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 51230d9d by Pier Angelo Vendrame at 2025-01-28T10:32:02+01: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/. - - - - - b65561b9 by Pier Angelo Vendrame at 2025-01-28T10:32:03+01: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 - - - - - 5fb76f19 by Pier Angelo Vendrame at 2025-01-28T10:32:03+01:00 Bug 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - bd539261 by Alex Catarineu at 2025-01-28T10:32:06+01:00 Bug 40069: Add helpers for message passing with extensions - - - - - 3d40d5e5 by Matthew Finkel at 2025-01-28T10:32:06+01:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 37846a64 by Henry Wilkes at 2025-01-28T10:32:06+01:00 Bug 41736: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - c4e8446c by hackademix at 2025-01-28T10:32:07+01:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 393049d3 by Pier Angelo Vendrame at 2025-01-28T10:32:07+01: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 - - - - - 3c279894 by Pier Angelo Vendrame at 2025-01-28T10:32:07+01:00 Bug 40926: Implemented the New Identity feature - - - - - 1dc7a5eb by Henry Wilkes at 2025-01-28T10:32:08+01:00 Bug 41736: Customize toolbar for base-browser. - - - - - 82fa7998 by Pier Angelo Vendrame at 2025-01-28T10:32:08+01:00 Bug 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 022a9570 by Henry Wilkes at 2025-01-28T10:32:08+01:00 Bug 42583: Modify moz-support-link for Base Browser. - - - - - 15af6f57 by Henry Wilkes at 2025-01-28T10:32:09+01:00 Bug 42308: Create README for tor-browser. We drop the README.txt that comes from Mozilla Firefox and add README.md for tor-browser. - - - - - 8c1aa1e6 by Richard Pospesel at 2025-01-28T10:32:09+01:00 Bug 41649: Create rebase and security backport gitlab issue templates - - - - - 31508d56 by Beatriz Rizental at 2025-01-28T10:32:10+01:00 Add CI for Tor Browser - - - - - 59a52a9d by Richard Pospesel at 2025-01-28T10:32:10+01:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - a154744f by Henry Wilkes at 2025-01-28T10:32:10+01:00 Bug 41803: Add some developer tools for working on tor-browser. - - - - - c4cc63e4 by Kathy Brade at 2025-01-28T10:32:11+01: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. - - - - - a34869bb by Alex Catarineu at 2025-01-28T10:32:11+01:00 Add TorStrings module for localization - - - - - 578fa885 by Henry Wilkes at 2025-01-28T10:32:11+01:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - 72c41b3a by Henry Wilkes at 2025-01-28T10:32:12+01:00 Tor Browser localization migration scripts. - - - - - 050b8a40 by Henry Wilkes at 2025-01-28T10:32:12+01:00 Bug 42305: Add script to combine translation files across versions. - - - - - 915501ee by Mike Perry at 2025-01-28T10:32:12+01: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 Bug 42088: New application icons (used in-app and on linux). Bug 42087: New application icons (windows). - - - - - ae764f96 by Henry Wilkes at 2025-01-28T10:32:13+01:00 Bug 43087: Add onion-pattern to be used on Tor pages. - - - - - b25ebc8f by hackademix at 2025-01-28T10:32:13+01:00 Bug 41917: Tor brand-specific styles. - - - - - b528fcce by Henry Wilkes at 2025-01-28T10:32:14+01:00 Bug 41817: tor-browser semantic colors. - - - - - 76bba288 by Henry Wilkes at 2025-01-28T10:32:14+01:00 Add purple tor version of the loading APNG. - - - - - 3f2921d7 by Henry Wilkes at 2025-01-28T10:32:14+01:00 Bug 42583: Modify moz-support-link for Tor Browser. - - - - - 9855a05a by sanketh at 2025-01-28T10:32:15+01: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 - - - - - 692a14e5 by Mike Perry at 2025-01-28T10:32:15+01: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 - - - - - 68b5811e by Henry Wilkes at 2025-01-28T10:32:15+01:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - faba0c9b by Pier Angelo Vendrame at 2025-01-28T10:32:16+01: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. - - - - - b2d6e4ca by Pier Angelo Vendrame at 2025-01-28T10:32:16+01: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. - - - - - f0482161 by Pier Angelo Vendrame at 2025-01-28T10:32:17+01:00 Bug 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - a58d30f9 by Cecylia Bocovich at 2025-01-28T10:32:17+01:00 Lox integration - - - - - 0607987f by Richard Pospesel at 2025-01-28T10:32:17+01: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 - - - - - f85b9a02 by Arthur Edelstein at 2025-01-28T10:32:18+01: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 - - - - - f6d6eaad by Henry Wilkes at 2025-01-28T10:32:18+01:00 Bug 41600: Add a tor circuit display panel. - - - - - afad0a2c by Pier Angelo Vendrame at 2025-01-28T10:32:18+01:00 Bug 42247: Android helpers for the TorProvider GeckoView is missing some API we use on desktop for the integration with the tor daemon, such as subprocess. Therefore, we need to implement them in Java and plumb the data back and forth between JS and Java. - - - - - 79074f1e by hackademix at 2025-01-28T10:32:19+01:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 26b3828e by Matthew Finkel at 2025-01-28T10:32:19+01: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. - - - - - 2d29edac by Kathy Brade at 2025-01-28T10:32:19+01: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. - - - - - 0ddd19d2 by Pier Angelo Vendrame at 2025-01-28T10:32:20+01:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - 35678fa5 by Richard Pospesel at 2025-01-28T10:32:22+01: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 - - - - - dcb93574 by Richard Pospesel at 2025-01-28T10:32:23+01:00 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. - - - - - 4c5ffbc9 by Pier Angelo Vendrame at 2025-01-28T10:32:23+01:00 Temporary changes to about:torconnect for Android. We are planning of tempoorarily using about:torconnect on Android, until the native UX is ready. - - - - - 310cd0a3 by Henry Wilkes at 2025-01-28T10:32:23+01:00 Bug 7494: Create local home page for TBB. Bug 41333: Update about:tor to new design. Including: + make the favicon match the branding icon. + make the location bar show a search icon. - - - - - d3518927 by Pier Angelo Vendrame at 2025-01-28T10:32:24+01: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. - - - - - ef0f6815 by Kathy Brade at 2025-01-28T10:32:24+01:00 Bug 12647: Support symlinks in the updater. - - - - - 95ae0200 by Kathy Brade at 2025-01-28T10:32:25+01: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. - - - - - 66fbb3ca by Georg Koppen at 2025-01-28T10:32:25+01: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 - - - - - e62df6ab by Pier Angelo Vendrame at 2025-01-28T10:32:25+01:00 Bug 42891: Set the bundled search engine for Tor Browser. After upstream changes between Firefox 115 and 128, we had to completely rework the way in which we define our search engines. This commit replaces the old "Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing". With that commit, we customized a list of addons IDs to ship as built-in search engines, but then upsteam moved to using only RemoteSettings. The configuration has many more fields, and it would be quite long to include it in the source code. Therefore, we use some local JSON files and load the settings from them. - - - - - 50c7ce05 by Alex Catarineu at 2025-01-28T10:32:26+01: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. - - - - - 124a7fd5 by Henry Wilkes at 2025-01-28T10:32:26+01:00 Bug 41906: Hide DNS over HTTPS preferences. - - - - - 4867ccbb by Richard Pospesel at 2025-01-28T10:32:26+01: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. - - - - - fa6ca8c3 by Kathy Brade at 2025-01-28T10:32:27+01: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. - - - - - fbe4117e by Alex Catarineu at 2025-01-28T10:32:27+01: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. - - - - - b3507b42 by Pier Angelo Vendrame at 2025-01-28T10:32:27+01: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. - - - - - 87052d6f by Pier Angelo Vendrame at 2025-01-28T10:32:28+01: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. - - - - - a91209ae by Pier Angelo Vendrame at 2025-01-28T10:32:28+01: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. - - - - - 943347f9 by Henry Wilkes at 2025-01-28T10:32:29+01:00 Bug 42110: Add TorUIUtils module for common tor component methods. - - - - - 39ebebe0 by Dan Ballard at 2025-01-28T10:32:29+01:00 Bug 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 7afac519 by Henry Wilkes at 2025-01-28T10:32:29+01:00 Bug 41736: Customize toolbar for tor-browser. - - - - - 9fc33ec5 by hackademix at 2025-01-28T10:32:30+01:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 767a2521 by Henry Wilkes at 2025-01-28T10:32:30+01:00 Customize moz-toggle for tor-browser. - - - - - 81575431 by Richard Pospesel at 2025-01-28T10:32:30+01:00 Bug 41822: Unconditionally disable default browser UX in about:preferences - - - - - d014be11 by Cecylia Bocovich at 2025-01-28T10:32:31+01:00 Temporary commit: manually place generated wasm files These files are built reproducibly using tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… We're manually adding them here while working on the interface, but eventually these should be placed in the right location using tor-browser-build. - - - - - fea24e0b by Matthew Finkel at 2025-01-28T10:32:31+01:00 Bug 40005: [android] Modify Default toolbar menu - - - - - a9cded7a by Alex Catarineu at 2025-01-28T10:32:31+01:00 Bug 40007: [android] Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 5cad6c9c by Alex Catarineu at 2025-01-28T10:32:32+01:00 Bug 40002: [android] Ensure system download manager is not used Bug 40075: Support scoped storage to enable downloads on API < 29 - in android-components!7, we blocked all usage of Scoped Storage in an attempt to block usage of Android's DownloadManager, which is known to cause proxy bypasses - as of Android API 29, downloads will not work without Scoped Storage, causing all downlaods to fail (see: fenix##40192) - here, we enable usage of scoped storage for API >= 29, but block calls to DownloadManager on API < 29 - - - - - aceb113f by Alex Catarineu at 2025-01-28T10:32:32+01:00 Bug 40009: [android] Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. Bug 40062: Update DuckDuckGo onion search plugin - - - - - fa528ca7 by Alex Catarineu at 2025-01-28T10:32:33+01:00 [android] Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - b97325db by Georg Koppen at 2025-01-28T10:32:33+01:00 Bug 40013: [android] Add option do overwrite timestamp in extension version - - - - - 92800219 by Alex Catarineu at 2025-01-28T10:32:33+01:00 Bug 40015: [android] Port padlock states for .onion services - - - - - f260e2d6 by Matthew Finkel at 2025-01-28T10:32:34+01:00 [android] Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - 3b1267aa by Matthew Finkel at 2025-01-28T10:32:34+01:00 Bug 40023: [android] Stop PrivateNotificationService - - - - - a4ca5f5a by Matthew Finkel at 2025-01-28T10:32:34+01:00 [android] Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android Bug 41394: Expose privacy.prioritizeonions.enabled to Android. - - - - - 9eeca041 by Matthew Finkel at 2025-01-28T10:32:35+01:00 [android] Disable features and functionality Bug 33594: Disable data collection by default (Glean) Bug 40019: Adjust is disabled on Release when data collection is disabled Bug 34338: Disable the crash reporter Bug 40014: Neuter Google Advertising ID Bug 40018: Disable Push service Bug 40034: Disable PWA onboading Bug 40072: Disable Tracking Protection Bug 40061: Do not show "Send to device" in sharing menu Bug 40109: Reduce requested permissions Exclude LOCATION and NETWORK_STATE - - - - - 170db8ac by Matthew Finkel at 2025-01-28T10:32:35+01:00 [android] Rename as Tor Browser Bug 40020: Change applicationId Bug 40020: Change app name Bug 40020: Change deeplink scheme Bug 40020: Change App icons Bug 40073: Use correct branding on About page Bug 40088: Use Tor Browser logo in migration screen - - - - - c6ccae62 by Georg Koppen at 2025-01-28T10:32:35+01:00 [android] Modify build system Bug 40083: Make locale ordering in BuildConfig deterministic Bug 40042: Add option do overwrite timestamp in extension version Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. Bug 40067: Fix reproducibility issue in classes2.dex We make sure our MOZ_BUILD_DATE gets used as a source for showing date related information on the Fenix about page. Bug 40071: Show only supported locales Bug 40064: Use Gecko Beta for Nightly and Debug variants Bug 40123: Allow building the instrumented tests apks for variants other than debug This allows to specify the variant of the instrumented tests via a `testBuildType` gradle argument. It also applies a workaround for a R8 issue from https://issuetracker.google.com/issues/140851070. Bug 40143: Use deterministic date in Test apk The build config was using Date() when generating the Test apk's versionName. - - - - - 892be32d by Matthew Finkel at 2025-01-28T10:32:36+01:00 Bug 40185: [android] Use NimbusDisabled - - - - - 5cd8f494 by Matthew Finkel at 2025-01-28T10:32:36+01:00 [android] Add Tor integration and UI Bug 40001: Start Tor as part of the Fenix initialization Bug 40028: Implement Tor Service controller Bug 40028: Integrate Tor Controller into HomeFragment Bug 40028: Implement Tor connect and logger screens Bug 40028: Implement Tor Onboarding Bug 40028: Implement new home screen Bug 40028: Define bootstrapping events and Quick Start Bug 40041: Implement Tor Network Settings Bug 40041: Integrate Tor Network Settings Bug 40179: Show Snowflake bridge option on Release Bug 40176: Re-render Home fragment on resume Bug 41394: Implement a setting to always prioritize Onion sites. - - - - - d0f4fc3d by Alex Catarineu at 2025-01-28T10:32:37+01:00 [android] Modify UI/UX Bug 40015: Modify Home menu Bug 40016: Hide unwanted Settings Bug 40016: Modify Default toolbar menu Bug 40016: Add Donate settings button Bug 40016: Move Allow Screenshots under Advanced Bug 40016: Don't install WebCompat webext Bug 40016: Don't onboard Search Suggestions Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment Bug 40095: Hide "Sign in to sync" in bookmarks Bug 40031: Hide Mozilla-specific items on About page Bug 40032: Set usesCleartextTraffic as false Bug 40063: Do not sort search engines alphabetically Bug 34378: Port external helper app prompting With the corresponding android-components patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. Bug 34403: Disable Normal mode by default Bug 40087: Implement a switch for english locale spoofing Bug 40144: Hide Download Manager Bug 40141: Hide EME site permission Bug 40166: Hide "Normal" tab (again) and Sync tab in TabTray Bug 40167: Hide "Save to Collection" in menu Bug 40172: Find the Quit button Bug 40186: Hide Credit Cards in Settings Bug 40198: Spoof English toggle now overlaps with locale list - - - - - 84a35ce6 by hackademix at 2025-01-28T10:32:39+01:00 [android] Modify add-on support Bug 41160: One-time ultimate switch Tor Browser Android to HTTPS-Only. Bug 41159: Remove HTTPS-Everywhere extension from Tor Browser Android. Bug 41094: Enable HTTPS-Only Mode by default in Tor Browser Android. Turn shouldUseHttpsOnly's default to true. Bug 40225: Bundled extensions don't get updated with Android Tor Browser updates. Bug 40030: Install NoScript addon on startup. Also 40070: Consider storing the list of recommended addons This implements our own AddonsProvider, which loads the list of available addons from assets instead of fetching it from an endpoint. Also, we hide the uninstall button for builtin addons. Bug 40058: Hide option for disallowing addon in private mode - - - - - 3382fe92 by Dan Ballard at 2025-01-28T10:32:39+01:00 [android] Add Security Level UI Bug 40026: Implement Security Level settings Bug 40026: Integrate Security Level settings - - - - - 44baf32a by Dan Ballard at 2025-01-28T10:32:40+01:00 Bug 41972: [android] Disable mozilla onboarding - - - - - 21b97536 by Dan Ballard at 2025-01-28T10:32:40+01:00 Bug 41878: [android] Add standalone Tor Bootstrap - - - - - fba516d7 by clairehurst at 2025-01-28T10:32:41+01:00 Bug 42089: [android] Remove ability to submit site support requests - - - - - f4127cb9 by clairehurst at 2025-01-28T10:32:41+01:00 [android] fixup! Modify UI/UX and Remove ability to submit site support requests - - - - - d1564d9d by clairehurst at 2025-01-28T10:32:41+01:00 [android] Enable the connect assist experiments on alpha - - - - - dcc5e5d6 by hackademix at 2025-01-28T10:32:42+01:00 Bug 42191: [android] Temporary StrictMode relaxation to clear the thumbnail cache. - - - - - 4d316056 by clairehurst at 2025-01-28T10:32:42+01:00 [android] Delete unused media - - - - - 07305a2a by clairehurst at 2025-01-28T10:32:42+01:00 Bug 42195: [android] Fix "Whats new URL" - - - - - b90b8964 by clairehurst at 2025-01-28T10:32:43+01:00 [android] Implement Android-native Connection Assist UI - - - - - ad3e7274 by Pier Angelo Vendrame at 2025-01-28T10:32:43+01:00 Bug 42652: [android] Pass the list of supported languages to GeckoView. It will be used to prevent leaks about regional preferences. - - - - - 89b32f79 by Dan Ballard at 2025-01-28T10:32:44+01:00 Bug 42660: Disable ProxySelector.openConnectionWithProxy and NOPify CrashReporter.sendCrashReport - - - - - e2e7a71a by Dan Ballard at 2025-01-28T10:32:44+01:00 Bug 43006: Disable RFP for Font Visibility on Android - - - - - 1910 changed files: - .eslintignore - .gitignore - + .gitlab-ci.yml - + .gitlab/ci/docker/base/Dockerfile - + .gitlab/ci/lint.yml - + .gitlab/ci/mixins.yml - + .gitlab/ci/scripts/helpers.py - + .gitlab/ci/update-translations.yml - + .gitlab/issue_templates/Backport Android Security Fixes.md - + .gitlab/issue_templates/Emergency Security Issue.md - + .gitlab/issue_templates/QA - Android.md - + .gitlab/issue_templates/QA - Desktop.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - .prettierignore - + README.md - − README.txt - + browser/actors/AboutTBUpdateChild.sys.mjs - + browser/actors/AboutTBUpdateParent.sys.mjs - + browser/actors/CryptoSafetyChild.sys.mjs - + browser/actors/CryptoSafetyParent.sys.mjs - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - 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/aboutDialogTor.css - + 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-addons.js - browser/base/content/browser-context.inc - browser/base/content/browser-init.js - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - 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.js.globals - browser/base/content/browser.xhtml - browser/base/content/default-bookmarks.html - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/pageinfo/security.js - browser/base/content/popup-notifications.inc - browser/base/content/test/general/browser_private_browsing_window.js - browser/base/content/utilityOverlay.js - browser/base/jar.mn - browser/base/moz.build - browser/branding/branding-common.mozbuild - + browser/branding/tb-alpha/VisualElements_150.png - + browser/branding/tb-alpha/VisualElements_70.png - + browser/branding/tb-alpha/configure.sh - + browser/branding/tb-alpha/content/about-logo.png - + browser/branding/tb-alpha/content/about-logo.svg - + browser/branding/tb-alpha/content/about-logo(a)2x.png - + browser/branding/tb-alpha/content/about-wordmark.svg - + browser/branding/tb-alpha/content/about.png - + browser/branding/tb-alpha/content/aboutDialog.css - + browser/branding/tb-alpha/content/firefox-wordmark.svg - + browser/branding/tb-alpha/content/jar.mn - + browser/branding/tb-alpha/content/moz.build - + browser/branding/tb-alpha/default128.png - + browser/branding/tb-alpha/default16.png - + browser/branding/tb-alpha/default22.png - + browser/branding/tb-alpha/default24.png - + browser/branding/tb-alpha/default256.png - + browser/branding/tb-alpha/default32.png - + browser/branding/tb-alpha/default48.png - + browser/branding/tb-alpha/default64.png - + browser/branding/tb-alpha/document.icns - + browser/branding/tb-alpha/document.ico - + browser/branding/tb-alpha/document_pdf.ico - + browser/branding/tb-alpha/firefox.VisualElementsManifest.xml - + browser/branding/tb-alpha/firefox.icns - + browser/branding/tb-alpha/firefox.ico - + browser/branding/tb-alpha/locales/jar.mn - + browser/branding/tb-alpha/locales/moz.build - + browser/branding/tb-alpha/moz.build - + browser/branding/tb-alpha/newtab.ico - + browser/branding/tb-alpha/newwindow.ico - + browser/branding/tb-alpha/pbmode.ico - + browser/branding/tb-alpha/pref/firefox-branding.js - + browser/branding/tb-nightly/VisualElements_150.png - + browser/branding/tb-nightly/VisualElements_70.png - + browser/branding/tb-nightly/configure.sh - + browser/branding/tb-nightly/content/about-logo.png - + browser/branding/tb-nightly/content/about-logo.svg - + browser/branding/tb-nightly/content/about-logo(a)2x.png - + browser/branding/tb-nightly/content/about-wordmark.svg - + browser/branding/tb-nightly/content/about.png - + browser/branding/tb-nightly/content/aboutDialog.css - + browser/branding/tb-nightly/content/firefox-wordmark.svg - + browser/branding/tb-nightly/content/jar.mn - + browser/branding/tb-nightly/content/moz.build - + browser/branding/tb-nightly/default128.png - + browser/branding/tb-nightly/default16.png - + browser/branding/tb-nightly/default22.png - + browser/branding/tb-nightly/default24.png - + browser/branding/tb-nightly/default256.png - + browser/branding/tb-nightly/default32.png - + browser/branding/tb-nightly/default48.png - + browser/branding/tb-nightly/default64.png - + browser/branding/tb-nightly/document.icns - + browser/branding/tb-nightly/document.ico - + browser/branding/tb-nightly/document_pdf.ico - + browser/branding/tb-nightly/firefox.VisualElementsManifest.xml - + browser/branding/tb-nightly/firefox.icns - + browser/branding/tb-nightly/firefox.ico - + browser/branding/tb-nightly/locales/jar.mn - + browser/branding/tb-nightly/locales/moz.build - + browser/branding/tb-nightly/moz.build - + browser/branding/tb-nightly/newtab.ico - + browser/branding/tb-nightly/newwindow.ico - + browser/branding/tb-nightly/pbmode.ico - + browser/branding/tb-nightly/pref/firefox-branding.js - + browser/branding/tb-release/VisualElements_150.png - + browser/branding/tb-release/VisualElements_70.png - + browser/branding/tb-release/configure.sh - + browser/branding/tb-release/content/about-logo.png - + browser/branding/tb-release/content/about-logo.svg - + browser/branding/tb-release/content/about-logo(a)2x.png - + browser/branding/tb-release/content/about-wordmark.svg - + browser/branding/tb-release/content/about.png - + browser/branding/tb-release/content/aboutDialog.css - + browser/branding/tb-release/content/firefox-wordmark.svg - + browser/branding/tb-release/content/jar.mn - + browser/branding/tb-release/content/moz.build - + browser/branding/tb-release/default128.png - + browser/branding/tb-release/default16.png - + browser/branding/tb-release/default22.png - + browser/branding/tb-release/default24.png - + browser/branding/tb-release/default256.png - + browser/branding/tb-release/default32.png - + browser/branding/tb-release/default48.png - + browser/branding/tb-release/default64.png - + browser/branding/tb-release/document.icns - + browser/branding/tb-release/document.ico - + browser/branding/tb-release/document_pdf.ico - + browser/branding/tb-release/firefox.VisualElementsManifest.xml - + browser/branding/tb-release/firefox.icns - + browser/branding/tb-release/firefox.ico - + browser/branding/tb-release/locales/jar.mn - + browser/branding/tb-release/locales/moz.build - + browser/branding/tb-release/moz.build - + browser/branding/tb-release/newtab.ico - + browser/branding/tb-release/newwindow.ico - + browser/branding/tb-release/pbmode.ico - + browser/branding/tb-release/pref/firefox-branding.js - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/aboutlogins/AboutLoginsParent.sys.mjs - browser/components/aboutlogins/content/aboutLogins.css - browser/components/aboutlogins/content/aboutLogins.mjs - browser/components/aboutlogins/content/components/fxaccounts-button.css - + browser/components/abouttor/AboutTorChild.sys.mjs - + browser/components/abouttor/AboutTorMessage.sys.mjs - + browser/components/abouttor/AboutTorParent.sys.mjs - + browser/components/abouttor/HomepageOverride.sys.mjs - + browser/components/abouttor/content/1f4e3-megaphone.svg - + browser/components/abouttor/content/26a1-high-voltage.svg - + browser/components/abouttor/content/2728-sparkles.svg - + browser/components/abouttor/content/2764-red-heart.svg - + browser/components/abouttor/content/aboutTor.css - + browser/components/abouttor/content/aboutTor.html - + browser/components/abouttor/content/aboutTor.js - + browser/components/abouttor/content/dax-logo.svg - + browser/components/abouttor/jar.mn - + browser/components/abouttor/moz.build - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/customizableui/content/panelUI.inc.xhtml - browser/components/downloads/DownloadSpamProtection.sys.mjs - + browser/components/downloads/DownloadsTorWarning.sys.mjs - browser/components/downloads/content/contentAreaDownloadsView.js - browser/components/downloads/content/contentAreaDownloadsView.xhtml - browser/components/downloads/content/downloads.css - browser/components/downloads/content/downloads.js - browser/components/downloads/content/downloadsPanel.inc.xhtml - browser/components/downloads/moz.build - browser/components/extensions/parent/ext-browserAction.js - browser/components/extensions/schemas/chrome_settings_overrides.json - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs - browser/components/moz.build - + browser/components/newidentity/content/newIdentityDialog.css - + browser/components/newidentity/content/newIdentityDialog.js - + browser/components/newidentity/content/newIdentityDialog.xhtml - + browser/components/newidentity/content/newidentity.js - + browser/components/newidentity/jar.mn - + browser/components/newidentity/moz.build - browser/components/newtab/AboutNewTabService.sys.mjs - + browser/components/onionservices/OnionAliasStore.sys.mjs - + browser/components/onionservices/OnionLocationChild.sys.mjs - + browser/components/onionservices/OnionLocationParent.sys.mjs - + browser/components/onionservices/TorRequestWatch.sys.mjs - + browser/components/onionservices/content/authNotificationIcon.inc.xhtml - + browser/components/onionservices/content/authPopup.inc.xhtml - + browser/components/onionservices/content/authPreferences.css - + browser/components/onionservices/content/authPreferences.inc.xhtml - + browser/components/onionservices/content/authPreferences.js - + browser/components/onionservices/content/authPrompt.js - + browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml - + browser/components/onionservices/content/onionlocation.css - + browser/components/onionservices/content/onionservices.css - + browser/components/onionservices/content/savedKeysDialog.js - + browser/components/onionservices/content/savedKeysDialog.xhtml - + browser/components/onionservices/jar.mn - + browser/components/onionservices/moz.build - browser/components/places/PlacesUIUtils.sys.mjs - browser/components/places/content/controller.js - browser/components/places/content/places.css - browser/components/places/content/places.js - browser/components/places/content/places.xhtml - browser/components/places/content/placesContextMenu.inc.xhtml - browser/components/places/tests/browser/browser_bookmark_context_menu_contents.js - browser/components/places/tests/browser/head.js - browser/components/preferences/home.inc.xhtml - browser/components/preferences/home.js - browser/components/preferences/jar.mn - + browser/components/preferences/letterboxing-middle-dark.svg - + browser/components/preferences/letterboxing-middle-light.svg - + browser/components/preferences/letterboxing-top-dark.svg - + browser/components/preferences/letterboxing-top-light.svg - + browser/components/preferences/letterboxing.css - + browser/components/preferences/letterboxing.inc.xhtml - + browser/components/preferences/letterboxing.js - browser/components/preferences/main.inc.xhtml - browser/components/preferences/main.js - browser/components/preferences/preferences.js - browser/components/preferences/preferences.xhtml - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js - browser/components/resistfingerprinting/test/browser/browser_navigator.js - browser/components/resistfingerprinting/test/browser/browser_navigator_iframes.js - + browser/components/rulesets/RulesetsChild.sys.mjs - + browser/components/rulesets/RulesetsParent.sys.mjs - + browser/components/rulesets/content/aboutRulesets.css - + browser/components/rulesets/content/aboutRulesets.html - + browser/components/rulesets/content/aboutRulesets.js - + browser/components/rulesets/content/securedrop.svg - + browser/components/rulesets/jar.mn - + browser/components/rulesets/moz.build - browser/components/search/SearchSERPTelemetry.sys.mjs - + browser/components/search/extensions/ddg-onion/favicon.ico - + browser/components/search/extensions/ddg-onion/manifest.json - browser/components/search/extensions/ddg/manifest.json - + browser/components/search/extensions/startpage-onion/favicon.png - + browser/components/search/extensions/startpage-onion/manifest.json - + browser/components/search/extensions/startpage/favicon.png - + browser/components/search/extensions/startpage/manifest.json - + browser/components/securitylevel/content/securityLevel.js - + browser/components/securitylevel/content/securityLevelButton.css - + browser/components/securitylevel/content/securityLevelButton.inc.xhtml - + browser/components/securitylevel/content/securityLevelIcon.svg - + browser/components/securitylevel/content/securityLevelPanel.css - + browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - + browser/components/securitylevel/content/securityLevelPreferences.css - + browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - + browser/components/securitylevel/jar.mn - + browser/components/securitylevel/moz.build - browser/components/shopping/jar.mn - browser/components/shopping/moz.build - browser/components/tabbrowser/content/tabbrowser.js - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e6-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e7-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e8-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1e9-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ea-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1eb-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ec-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ed-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ee-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ef-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f0-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f1-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f2-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f5.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f3-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f4-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f5-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f6-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f7-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fd.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f8-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1e9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ed.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ef.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f1.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f4.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f7.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1fb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1f9-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1fe.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fa-1f1ff.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1e8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ec.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1ee.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1f3.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fb-1f1fa.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fc-1f1eb.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fc-1f1f8.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fd-1f1f0.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fe-1f1ea.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1fe-1f1f9.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1e6.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1f2.svg - + browser/components/torcircuit/content/tor-circuit-flags/1f1ff-1f1fc.svg - + browser/components/torcircuit/content/tor-circuit-flags/README.txt - + browser/components/torcircuit/content/tor-circuit-icon-mask.svg - + browser/components/torcircuit/content/tor-circuit-node-end.svg - + browser/components/torcircuit/content/tor-circuit-node-middle.svg - + browser/components/torcircuit/content/tor-circuit-node-relays.svg - + browser/components/torcircuit/content/tor-circuit-node-start.svg - + browser/components/torcircuit/content/tor-circuit-redirect.svg - + browser/components/torcircuit/content/torCircuitPanel.css - + browser/components/torcircuit/content/torCircuitPanel.inc.xhtml - + browser/components/torcircuit/content/torCircuitPanel.js - + browser/components/torcircuit/jar.mn - + browser/components/torcircuit/moz.build - + browser/components/torpreferences/content/bridge-bot.svg - + browser/components/torpreferences/content/bridge-qr.svg - + browser/components/torpreferences/content/bridge.svg - + browser/components/torpreferences/content/bridgeQrDialog.js - + browser/components/torpreferences/content/bridgeQrDialog.xhtml - + browser/components/torpreferences/content/bridgemoji/BridgeEmoji.js - + browser/components/torpreferences/content/bridgemoji/annotations.json - + browser/components/torpreferences/content/bridgemoji/bridge-emojis.json - + browser/components/torpreferences/content/bridgemoji/svgs/1f300.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f308.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f30a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f30b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f319.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f31f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f321.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f32d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f32e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f332.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f333.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f334.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f335.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f336.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f337.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f339.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f33f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f341.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f344.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f345.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f346.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f347.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f348.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f349.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f34f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f350.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f351.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f352.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f353.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f354.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f355.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f368.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f369.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f36d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f37f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f380.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f381.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f382.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f383.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f388.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f389.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f38f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f392.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f399.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f39f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3a8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ac.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3af.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3b8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ba.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3bb.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3be.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3c8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3d5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3dd.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3e1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3ee.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f3f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f40d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f417.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f418.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f419.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f41f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f420.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f422.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f425.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f426.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f428.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f42f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f430.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f431.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f432.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f433.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f434.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f435.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f436.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f437.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f43f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f441.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f451.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f455.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f457.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f45f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f47d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f484.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f488.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f48d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f48e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f490.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4a1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4a7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4b3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4bf.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4cc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4ce.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4d5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4e1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4e2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f4fb.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f50b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f511.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f525.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f526.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f52e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f54a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f58c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f58d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f5ff.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f680.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f681.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f686.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f68b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f68d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f695.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f697.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f69a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f69c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6a4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f8.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6fa.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f6fc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f916.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f93f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f941.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f94c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f94f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f950.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f951.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f955.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f956.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f95e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f965.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f966.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f968.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f96f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f980.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f981.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f984.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f986.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f987.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f988.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f989.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98b.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f98f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f992.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f993.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f994.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f995.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f998.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f999.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99a.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99c.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99d.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f99e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a4.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9a9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ad.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c1.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c3.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c7.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9c9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9d9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9da.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9dc.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9e9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ea.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ec.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ed.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9ee.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1f9f9.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa73.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa80.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa81.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa83.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa90.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa91.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa95.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fa97.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fab6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/1fad6.svg - + browser/components/torpreferences/content/bridgemoji/svgs/23f0.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2600.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2602.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2604.svg - + browser/components/torpreferences/content/bridgemoji/svgs/260e.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2693.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2696.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26bd.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26f2.svg - + browser/components/torpreferences/content/bridgemoji/svgs/26f5.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2708.svg - + browser/components/torpreferences/content/bridgemoji/svgs/270f.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2728.svg - + browser/components/torpreferences/content/bridgemoji/svgs/2744.svg - + browser/components/torpreferences/content/bridgemoji/svgs/README.txt - + browser/components/torpreferences/content/builtinBridgeDialog.js - + browser/components/torpreferences/content/builtinBridgeDialog.xhtml - + browser/components/torpreferences/content/connectionCategory.inc.xhtml - + browser/components/torpreferences/content/connectionPane.js - + browser/components/torpreferences/content/connectionPane.xhtml - + browser/components/torpreferences/content/connectionSettingsDialog.js - + browser/components/torpreferences/content/connectionSettingsDialog.xhtml - + browser/components/torpreferences/content/lox-bridge-icon.svg - + browser/components/torpreferences/content/lox-bridge-pass.svg - + browser/components/torpreferences/content/lox-complete-ring.svg - + browser/components/torpreferences/content/lox-invite-icon.svg - + browser/components/torpreferences/content/lox-progress-ring.svg - + browser/components/torpreferences/content/lox-success.svg - + browser/components/torpreferences/content/loxInviteDialog.js - + browser/components/torpreferences/content/loxInviteDialog.xhtml - + browser/components/torpreferences/content/mail.svg - + browser/components/torpreferences/content/network-broken.svg - + browser/components/torpreferences/content/network.svg - + browser/components/torpreferences/content/provideBridgeDialog.js - + browser/components/torpreferences/content/provideBridgeDialog.xhtml - + browser/components/torpreferences/content/requestBridgeDialog.js - + browser/components/torpreferences/content/requestBridgeDialog.xhtml - + browser/components/torpreferences/content/telegram-logo.svg - + browser/components/torpreferences/content/torLogDialog.js - + browser/components/torpreferences/content/torLogDialog.xhtml - + browser/components/torpreferences/content/torPreferences.css - + browser/components/torpreferences/jar.mn - + browser/components/torpreferences/moz.build - browser/components/urlbar/UrlbarInput.sys.mjs - browser/components/urlbar/UrlbarProvidersManager.sys.mjs - browser/components/urlbar/UrlbarUtils.sys.mjs - browser/components/urlbar/moz.build - + browser/config/mozconfigs/base-browser - + browser/config/mozconfigs/base-browser-android - + browser/config/mozconfigs/tor-browser - + browser/config/mozconfigs/tor-browser-android - browser/confvars.sh - browser/extensions/moz.build - browser/installer/Makefile.in - browser/installer/package-manifest.in - browser/installer/windows/nsis/shared.nsh - browser/locales/Makefile.in - − browser/locales/en-US/chrome/overrides/appstrings.properties - browser/locales/jar.mn - browser/modules/BrowserWindowTracker.sys.mjs - browser/modules/HomePage.sys.mjs - browser/modules/LaterRun.sys.mjs - + browser/modules/TorUIUtils.sys.mjs - browser/modules/URILoadingHelper.sys.mjs - browser/modules/moz.build - browser/moz.build - browser/moz.configure - browser/themes/shared/addons/unified-extensions.css - browser/themes/shared/browser-shared.css - browser/themes/shared/controlcenter/panel.css - browser/themes/shared/downloads/contentAreaDownloadsView.css - + browser/themes/shared/icons/new_circuit.svg - + browser/themes/shared/icons/new_identity.svg - browser/themes/shared/identity-block/identity-block.css - browser/themes/shared/jar.inc.mn - browser/themes/shared/notification-icons.css - browser/themes/shared/preferences/preferences.css - browser/themes/shared/tabbrowser/tabs.css - browser/themes/shared/toolbarbutton-icons.css - + browser/themes/shared/tor-branding.css - + browser/themes/shared/tor-urlbar-button.css - build/application.ini.in - build/moz.build - build/moz.configure/init.configure - build/moz.configure/rust.configure - build/moz.configure/update-programs.configure - build/variables.py - config/createprecomplete.py - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/netmonitor/src/components/SecurityState.js - devtools/client/themes/images/aboutdebugging-firefox-logo.svg - docshell/base/BrowsingContext.cpp - docshell/base/BrowsingContext.h - docshell/base/URIFixup.sys.mjs - docshell/base/nsAboutRedirector.cpp - docshell/base/nsDocShell.cpp - docshell/build/components.conf - dom/base/ContentAreaDropListener.sys.mjs - dom/base/Document.cpp - dom/base/Document.h - dom/base/ScreenOrientation.cpp - dom/base/nsContentUtils.cpp - dom/base/nsContentUtils.h - dom/base/nsCopySupport.cpp - dom/base/nsGlobalWindowInner.cpp - dom/base/nsGlobalWindowOuter.cpp - dom/base/nsNodeInfoManager.cpp - dom/base/test/chrome/bug418986-1.js - dom/canvas/CanvasRenderingContext2D.cpp - dom/canvas/ClientWebGLContext.cpp - dom/ipc/BrowserParent.cpp - dom/ipc/BrowserParent.h - dom/ipc/PBrowser.ipdl - dom/ipc/WindowGlobalActor.cpp - dom/ipc/WindowGlobalChild.cpp - dom/ipc/WindowGlobalParent.cpp - dom/locales/moz.build - dom/media/eme/MediaKeySystemAccess.cpp - dom/media/mediacapabilities/MediaCapabilities.cpp - dom/media/mediasource/MediaSource.cpp - dom/media/mediasource/MediaSource.h - dom/media/mediasource/SourceBuffer.cpp - dom/media/systemservices/video_engine/desktop_device_info.cc - dom/media/webrtc/libwebrtcglue/VideoConduit.cpp - dom/media/webrtc/sdp/RsdparsaSdpAttributeList.cpp - dom/media/webrtc/transport/nrinterfaceprioritizer.cpp - dom/media/webrtc/transport/sigslot.h - dom/media/webrtc/transport/test/ice_unittest.cpp - dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.c - dom/media/webrtc/transport/third_party/nICEr/src/net/local_addr.h - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-win32.c - dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs.c - dom/media/webrtc/transport/third_party/nrappkit/src/log/r_log.c - dom/media/webrtc/transport/third_party/nrappkit/src/registry/registry.c - dom/security/nsContentSecurityUtils.cpp - dom/security/nsMixedContentBlocker.cpp - dom/security/test/https-only/browser.toml - + dom/security/test/https-only/browser_iframe_buttons.js - + dom/security/test/https-only/file_iframe_buttons.html - dom/webidl/Document.webidl - dom/websocket/WebSocket.cpp - dom/xslt/xslt/txMozillaXSLTProcessor.cpp - dom/xslt/xslt/txXSLTMsgsURL.h - extensions/auth/nsHttpNegotiateAuth.cpp - gfx/layers/apz/src/APZInputBridge.cpp - gfx/layers/apz/src/APZPublicUtils.cpp - gfx/layers/apz/src/GenericScrollAnimation.cpp - gfx/layers/apz/src/WheelScrollAnimation.cpp - gfx/thebes/StandardFonts-win10.inc - gfx/thebes/gfxDWriteFontList.cpp - gfx/thebes/gfxDWriteFontList.h - gfx/thebes/gfxFcPlatformFontList.cpp - gfx/thebes/gfxGDIFontList.cpp - gfx/thebes/gfxPlatformFontList.cpp - hal/android/AndroidHal.cpp - image/test/browser/browser.toml - + image/test/browser/browser_bug1899180.js - + image/test/browser/helper1899180.html - intl/l10n/Localization.h - intl/locale/LocaleService.cpp - intl/strres/nsIStringBundle.idl - intl/strres/nsStringBundle.cpp - js/src/gc/Zone.cpp - + js/src/jit-test/tests/debug/bug-1904011.js - js/src/old-configure.in - js/xpconnect/src/xpc.msg - layout/base/nsLayoutUtils.cpp - layout/xul/nsSliderFrame.cpp - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorage.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepository.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt - mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt - mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/cookiebanners/GeckoCookieBannersStorageTest.kt - mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/cookiebanners/ReportSiteDomainsRepositoryTest.kt - mobile/android/android-components/components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - mobile/android/android-components/components/browser/thumbnails/src/main/java/mozilla/components/browser/thumbnails/utils/ThumbnailDiskCache.kt - mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - mobile/android/android-components/components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - mobile/android/android-components/components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - mobile/android/android-components/components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - mobile/android/android-components/components/browser/toolbar2/src/main/java/mozilla/components/browser/toolbar2/display/DisplayToolbar.kt - mobile/android/android-components/components/browser/toolbar2/src/main/java/mozilla/components/browser/toolbar2/display/SiteSecurityIconView.kt - mobile/android/android-components/components/browser/toolbar2/src/main/res/drawable/mozac_ic_site_security.xml - mobile/android/android-components/components/browser/toolbar2/src/main/res/values/attrs_browser_toolbar.xml - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/cookiehandling/CookieBannersStorage.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt - mobile/android/android-components/components/concept/engine/src/test/java/mozilla/components/concept/engine/SettingsTest.kt - mobile/android/android-components/components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - mobile/android/android-components/components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - mobile/android/android-components/components/feature/accounts/build.gradle - mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt - mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AMOAddonsProvider.kt - mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - mobile/android/android-components/components/feature/app-links/build.gradle - mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/SimpleRedirectDialogFragment.kt - mobile/android/android-components/components/feature/app-links/src/test/java/mozilla/components/feature/app/links/SimpleRedirectDialogFragmentTest.kt - mobile/android/android-components/components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadsFeatureTest.kt - mobile/android/android-components/components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt - mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/PromptFeature.kt - + mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/dialog/FullScreenNotification.kt - − mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/dialog/FullScreenNotificationDialog.kt - + mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/dialog/GestureNavUtils.kt - + mobile/android/android-components/components/feature/prompts/src/test/java/mozilla/components/feature/prompts/dialog/FullScreenNotificationTest.kt - mobile/android/android-components/components/feature/search/build.gradle - mobile/android/android-components/components/feature/search/src/main/assets/search/list.json - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg-onion.xml - mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/ddg.xml - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/startpage-onion.xml - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/startpage.xml - + mobile/android/android-components/components/feature/search/src/main/assets/searchplugins/yahoo.xml - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/ext/SearchEngine.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/internal/SearchUrlBuilder.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/storage/SearchEngineReader.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepository.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/BaseSearchTelemetryTest.kt - mobile/android/android-components/components/feature/search/src/test/java/mozilla/components/feature/search/telemetry/SerpTelemetryRepositoryTest.kt - mobile/android/android-components/components/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt - mobile/android/android-components/components/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt - mobile/android/android-components/components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt - mobile/android/android-components/components/service/glean/src/main/java/mozilla/components/service/glean/private/MetricAliases.kt - mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingController.kt - mobile/android/android-components/components/service/nimbus/src/main/java/mozilla/components/service/nimbus/messaging/NimbusMessagingStorage.kt - mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.kt - mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/kotlin/String.kt - mobile/android/android-components/components/support/ktx/src/test/java/mozilla/components/support/ktx/kotlin/StringTest.kt - mobile/android/android-components/components/support/remotesettings/src/main/java/mozilla/components/support/remotesettings/RemoteSettingsClient.kt - + mobile/android/android-components/components/support/utils/src/main/java/mozilla/components/support/utils/TorUtils.kt - mobile/android/android-components/components/support/webextensions/src/main/java/mozilla/components/support/webextensions/WebExtensionSupport.kt - + mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_onion.xml - mobile/android/android-components/docs/changelog.md - mobile/android/android-components/plugins/config/src/main/java/ConfigPlugin.kt - mobile/android/android-components/samples/browser/src/main/res/layout/activity_installed_add_on_details.xml - + mobile/android/app/000-tor-browser-android.js - mobile/android/app/geckoview-prefs.js - mobile/android/app/moz.build - + mobile/android/basebrowser.configure - mobile/android/branding/beta/locales/jar.mn - mobile/android/branding/nightly/locales/jar.mn - mobile/android/branding/official/locales/jar.mn - mobile/android/branding/unofficial/locales/jar.mn - mobile/android/confvars.sh - mobile/android/exoplayer2/src/main/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java - mobile/android/fenix/.buildconfig.yml - mobile/android/fenix/app/build.gradle - mobile/android/fenix/app/lint-baseline.xml - mobile/android/fenix/app/onboarding.fml.yaml - mobile/android/fenix/app/proguard-rules.pro - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/CrashReportingTest.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt - + mobile/android/fenix/app/src/beta/ic_launcher-playstore.png - + mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/beta/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_background.xml - − mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_foreground.xml - + mobile/android/fenix/app/src/beta/res/drawable/ic_launcher_monochrome_foreground.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml → mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/beta/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/beta/res/values/static_strings.xml - mobile/android/fenix/app/src/beta/res/xml/shortcuts.xml - − mobile/android/fenix/app/src/debug/ic_launcher-web.webp - + mobile/android/fenix/app/src/debug/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/debug/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_background.xml - − mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_foreground.xml - + mobile/android/fenix/app/src/debug/res/drawable/ic_launcher_monochrome_foreground.xml - + mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/debug/res/values/colors.xml - + mobile/android/fenix/app/src/debug/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/debug/res/xml/shortcuts.xml - mobile/android/fenix/app/src/main/AndroidManifest.xml - + mobile/android/fenix/app/src/main/assets/common/torrc-defaults - − mobile/android/fenix/app/src/main/assets/searchplugins/reddit.xml - − mobile/android/fenix/app/src/main/assets/searchplugins/youtube.xml - − mobile/android/fenix/app/src/main/ic_launcher-web.webp - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/BrowserDirection.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Analytics.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NimbusComponents.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NotificationManager.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/UseCases.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/middleware/MenuNavigationMiddleware.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserMenuSignIn.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/PoweredByNotification.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/experiments/view/ResearchSurfaceSurvey.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Activity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessor.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/pocket/PocketStoriesComposables.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/view/RecentSyncedTab.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/PrivateBrowsingDescriptionViewHolder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/PagerIndicator.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSites.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicroSurveyHeader.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyCompleted.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/microsurvey/ui/MicrosurveyRequestPrompt.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/ReEngagementNotificationWorker.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingScreen.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/UpgradeOnboarding.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HttpsOnlyFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorBridgeConfigFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/account/AccountUiView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/view/SavedLoginsListView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/ProtectionsView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerDetailsInteractor.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsView.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannersStorageExt.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/SaveToPDFMiddleware.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/ShareController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/ShareFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/shopping/ui/NoAnalysis.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/shopping/ui/ReviewQualityCheckContextualOnboarding.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabLayoutMediator.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayBanner.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsList.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/ConnectAssistUiState.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/QuickStartPreference.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorBridgeTransports.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorController.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsComposeFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsViewModel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/trackingprotection/ProtectionsStore.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/NotificationBase.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - mobile/android/fenix/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt - + mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/main/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-hdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-mdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-hdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-hdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-mdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-mdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xhdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xxhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xxhdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xxxhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-night-xxxhdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-night/onboarding_ctd_default_browser.xml - mobile/android/fenix/app/src/main/res/drawable-v23/splash_screen.xml - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-xhdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-xxhdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/shopping_no_analysis.webp - − mobile/android/fenix/app/src/main/res/drawable-xxxhdpi/shopping_onboarding.webp - − mobile/android/fenix/app/src/main/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/main/res/drawable/browser_location.xml - + mobile/android/fenix/app/src/main/res/drawable/connect.xml - + mobile/android/fenix/app/src/main/res/drawable/connect_broken.xml - + mobile/android/fenix/app/src/main/res/drawable/globe_broken.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_account.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_account_warning.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_favorite.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_firefox.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_fx_accounts_avatar.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_launcher_foreground.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_launcher_monochrome.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_notification_permission.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_key_features.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_key_features_icons_only.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_search_widget.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_sync.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_onboarding_welcome.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_onion_pattern.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_pocket.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_scan.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_screenshot.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_sign_in.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_signed_out.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_status_logo.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_sync_disconnected.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_synced_tabs.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_tor_config_bridge.xml - + mobile/android/fenix/app/src/main/res/drawable/ic_tor_network_settings.xml - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_logo.webp - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_text_normal.webp - − mobile/android/fenix/app/src/main/res/drawable/ic_wordmark_text_private.webp - − mobile/android/fenix/app/src/main/res/drawable/microsurvey_success.xml - + mobile/android/fenix/app/src/main/res/drawable/new_circuit.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_default_browser.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_notification.xml - − mobile/android/fenix/app/src/main/res/drawable/onboarding_ctd_sync.xml - − mobile/android/fenix/app/src/main/res/drawable/pocket_vector.xml - mobile/android/fenix/app/src/main/res/drawable/progress_gradient.xml - mobile/android/fenix/app/src/main/res/drawable/pager_dot.xml → mobile/android/fenix/app/src/main/res/drawable/rounded_corners.xml - mobile/android/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml → mobile/android/fenix/app/src/main/res/drawable/tor_bootstrap_background_gradient.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml → mobile/android/fenix/app/src/main/res/drawable/tor_onboarding_donate_gradient.xml - mobile/android/fenix/app/src/main/res/drawable/onboarding_popup_shape.xml → mobile/android/fenix/app/src/main/res/drawable/tor_onboarding_donate_rounded_corners.xml - mobile/android/fenix/app/src/main/res/layout/component_cookie_banner_details_panel.xml - mobile/android/fenix/app/src/main/res/layout/component_tabstray2.xml - mobile/android/fenix/app/src/main/res/layout/fragment_about.xml - mobile/android/fenix/app/src/main/res/layout/fragment_create_shortcut.xml - mobile/android/fenix/app/src/main/res/layout/fragment_home.xml - mobile/android/fenix/app/src/main/res/layout/fragment_locale_settings.xml - + mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml - mobile/android/fenix/app/src/main/res/layout/fragment_turn_on_sync.xml - − mobile/android/fenix/app/src/main/res/layout/full_screen_notification_dialog.xml - mobile/android/fenix/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml - mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private.xml → mobile/android/fenix/app/src/main/res/layout/preference_quick_start.xml - mobile/android/fenix/app/src/main/res/layout/quicksettings_permissions.xml - mobile/android/fenix/app/src/main/res/layout/quicksettings_protections_panel.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v1.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_extra_small_v2.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_large.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_medium.xml - mobile/android/fenix/app/src/main/res/layout/search_widget_small.xml - mobile/android/fenix/app/src/main/res/layout/sign_in_preference.xml - − mobile/android/fenix/app/src/main/res/mipmap-anydpi-v26/ic_launcher_private_round.xml - − mobile/android/fenix/app/src/main/res/mipmap-hdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-mdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp - − mobile/android/fenix/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml - mobile/android/fenix/app/src/main/res/values-be/strings.xml - mobile/android/fenix/app/src/main/res/values-bg/strings.xml - mobile/android/fenix/app/src/main/res/values-bs/strings.xml - mobile/android/fenix/app/src/main/res/values-ca/strings.xml - mobile/android/fenix/app/src/main/res/values-co/strings.xml - mobile/android/fenix/app/src/main/res/values-cs/strings.xml - mobile/android/fenix/app/src/main/res/values-cy/strings.xml - mobile/android/fenix/app/src/main/res/values-da/strings.xml - mobile/android/fenix/app/src/main/res/values-de/strings.xml - mobile/android/fenix/app/src/main/res/values-dsb/strings.xml - mobile/android/fenix/app/src/main/res/values-el/strings.xml - mobile/android/fenix/app/src/main/res/values-en-rCA/strings.xml - mobile/android/fenix/app/src/main/res/values-en-rGB/strings.xml - mobile/android/fenix/app/src/main/res/values-es-rAR/strings.xml - mobile/android/fenix/app/src/main/res/values-es-rCL/strings.xml - mobile/android/fenix/app/src/main/res/values-es-rMX/strings.xml - mobile/android/fenix/app/src/main/res/values-eu/strings.xml - mobile/android/fenix/app/src/main/res/values-fi/strings.xml - mobile/android/fenix/app/src/main/res/values-fr/strings.xml - mobile/android/fenix/app/src/main/res/values-fur/strings.xml - mobile/android/fenix/app/src/main/res/values-fy-rNL/strings.xml - mobile/android/fenix/app/src/main/res/values-gl/strings.xml - mobile/android/fenix/app/src/main/res/values-hsb/strings.xml - mobile/android/fenix/app/src/main/res/values-hy-rAM/strings.xml - mobile/android/fenix/app/src/main/res/values-ia/strings.xml - mobile/android/fenix/app/src/main/res/values-is/strings.xml - mobile/android/fenix/app/src/main/res/values-it/strings.xml - mobile/android/fenix/app/src/main/res/values-iw/strings.xml - mobile/android/fenix/app/src/main/res/values-ja/strings.xml - mobile/android/fenix/app/src/main/res/values-kab/strings.xml - mobile/android/fenix/app/src/main/res/values-kk/strings.xml - mobile/android/fenix/app/src/main/res/values-ko/strings.xml - mobile/android/fenix/app/src/main/res/values-nb-rNO/strings.xml - mobile/android/fenix/app/src/main/res/values-night-v27/styles.xml - mobile/android/fenix/app/src/main/res/values-night/styles.xml - mobile/android/fenix/app/src/main/res/values-nl/strings.xml - mobile/android/fenix/app/src/main/res/values-nn-rNO/strings.xml - mobile/android/fenix/app/src/main/res/values-oc/strings.xml - mobile/android/fenix/app/src/main/res/values-pa-rIN/strings.xml - mobile/android/fenix/app/src/main/res/values-pl/strings.xml - mobile/android/fenix/app/src/main/res/values-pt-rBR/strings.xml - mobile/android/fenix/app/src/main/res/values-pt-rPT/strings.xml - mobile/android/fenix/app/src/main/res/values-rm/strings.xml - mobile/android/fenix/app/src/main/res/values-ru/strings.xml - mobile/android/fenix/app/src/main/res/values-sat/strings.xml - mobile/android/fenix/app/src/main/res/values-si/strings.xml - mobile/android/fenix/app/src/main/res/values-sk/strings.xml - mobile/android/fenix/app/src/main/res/values-sl/strings.xml - mobile/android/fenix/app/src/main/res/values-sq/strings.xml - mobile/android/fenix/app/src/main/res/values-sv-rSE/strings.xml - mobile/android/fenix/app/src/main/res/values-tg/strings.xml - mobile/android/fenix/app/src/main/res/values-th/strings.xml - mobile/android/fenix/app/src/main/res/values-tr/strings.xml - mobile/android/fenix/app/src/main/res/values-ug/strings.xml - mobile/android/fenix/app/src/main/res/values-v24/styles.xml - mobile/android/fenix/app/src/main/res/values-v27/styles.xml - mobile/android/fenix/app/src/main/res/values-vi/strings.xml - mobile/android/fenix/app/src/main/res/values-zh-rCN/strings.xml - mobile/android/fenix/app/src/main/res/values-zh-rTW/strings.xml - mobile/android/fenix/app/src/main/res/values/attrs.xml - mobile/android/fenix/app/src/main/res/values/colors.xml - + mobile/android/fenix/app/src/main/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/main/res/values/preference_keys.xml - mobile/android/fenix/app/src/main/res/values/static_strings.xml - mobile/android/fenix/app/src/main/res/values/strings.xml - mobile/android/fenix/app/src/main/res/values/styles.xml - + mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - mobile/android/fenix/app/src/main/res/xml/logins_preferences.xml - mobile/android/fenix/app/src/main/res/xml/preferences.xml - mobile/android/fenix/app/src/main/res/xml/private_browsing_preferences.xml - mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml - mobile/android/fenix/app/src/main/res/xml/shortcuts.xml - mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml - mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml - mobile/android/fenix/app/src/main/res/xml/sync_problem.xml - + mobile/android/fenix/app/src/main/res/xml/tor_bridge_config_preferences.xml - + mobile/android/fenix/app/src/main/res/xml/tor_security_level_preferences.xml - + mobile/android/fenix/app/src/nightly/ic_launcher-playstore.png - + mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable-xxxhdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/nightly/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_background.xml - − mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_foreground.xml - + mobile/android/fenix/app/src/nightly/res/drawable/ic_launcher_monochrome_foreground.xml - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_logo.webp - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_normal.webp - − mobile/android/fenix/app/src/nightly/res/drawable/ic_wordmark_text_private.webp - − mobile/android/fenix/app/src/nightly/res/ic_launcher-web.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/nightly/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/nightly/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/nightly/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/nightly/res/values/static_strings.xml - mobile/android/fenix/app/src/nightly/res/xml/shortcuts.xml - + mobile/android/fenix/app/src/release/ic_launcher-playstore.png - + mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.png - − mobile/android/fenix/app/src/release/res/drawable-hdpi/fenix_search_widget.webp - − mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_normal.webp - − mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_logo_wordmark_private.webp - − mobile/android/fenix/app/src/release/res/drawable/animated_splash_screen.xml - + mobile/android/fenix/app/src/release/res/drawable/ic_launcher_background.xml - − mobile/android/fenix/app/src/release/res/drawable/ic_launcher_foreground.xml - + mobile/android/fenix/app/src/release/res/drawable/ic_launcher_monochrome_foreground.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_monochrome.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_monochrome_round.xml - + mobile/android/fenix/app/src/release/res/mipmap-anydpi-v26/ic_launcher_round.xml - mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-hdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-mdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxhdpi/ic_launcher_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_foreground.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome.webp - + mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_monochrome_round.webp - mobile/android/fenix/app/src/release/res/mipmap-xxxhdpi/ic_launcher_round.webp - + mobile/android/fenix/app/src/release/res/values/ic_launcher_monochrome_background.xml - mobile/android/fenix/app/src/release/res/values/static_strings.xml - mobile/android/fenix/app/src/release/res/xml/shortcuts.xml - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/MenuNavigationMiddlewareTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/ext/ContextTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingPageUiDataTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/ProtectionsViewTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragmentTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/CookieBannerHandlingDetailsViewTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/DefaultCookieBannerDetailsControllerTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/share/viewholders/AppViewHolderTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/trackingprotection/ProtectionsStoreTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt - mobile/android/fenix/build.gradle - mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt - + mobile/android/fenix/tools/tba-fetch-deps.sh - + mobile/android/fenix/tools/tba-sign-devbuilds.sh - mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/FullScreenIntegration.kt - mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.kt - − mobile/android/focus-android/app/src/main/res/layout/dialog_full_screen_notification.xml - mobile/android/focus-android/app/src/main/res/values/strings.xml - mobile/android/focus-android/app/src/test/java/org/mozilla/focus/browser/integration/FullScreenIntegrationTest.kt - mobile/android/geckoview/api.txt - mobile/android/geckoview/build.gradle - − mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/VideoCaptureTest.kt - mobile/android/geckoview/src/main/AndroidManifest.xml - mobile/android/geckoview/src/main/java/org/mozilla/gecko/Clipboard.java - mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java - mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/CrashReporter.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoInputConnection.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorSettings.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebExtensionController.java - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/Prefs.java - + mobile/android/geckoview/src/main/java/org/mozilla/geckoview/androidlegacysettings/TorLegacyAndroidSettings.java - mobile/android/gradle/with_gecko_binaries.gradle - mobile/android/installer/package-manifest.in - mobile/android/moz.configure - mobile/android/shared-settings.gradle - mobile/shared/chrome/geckoview/geckoview.js - mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs - mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs - mobile/shared/modules/geckoview/GeckoViewProgress.sys.mjs - mobile/shared/modules/geckoview/GeckoViewWebExtension.sys.mjs - modules/libpref/Preferences.cpp - modules/libpref/init/StaticPrefList.yaml - modules/libpref/init/all.js - moz.configure - + mozconfig-android-aarch64 - + mozconfig-android-all - + mozconfig-android-armv7 - + mozconfig-android-x86 - + mozconfig-android-x86_64 - + mozconfig-linux-aarch64 - + mozconfig-linux-arm - + mozconfig-linux-i686 - + mozconfig-linux-x86_64 - + mozconfig-linux-x86_64-asan - + mozconfig-linux-x86_64-dev - + mozconfig-macos - + mozconfig-macos-dev - + mozconfig-windows-i686 - + mozconfig-windows-x86_64 - netwerk/base/nsNetUtil.cpp - netwerk/base/nsSocketTransport2.cpp - netwerk/build/components.conf - netwerk/build/nsNetCID.h - + netwerk/dns/IOnionAliasService.idl - + netwerk/dns/OnionAliasService.cpp - + netwerk/dns/OnionAliasService.h - netwerk/dns/effective_tld_names.dat - netwerk/dns/moz.build - netwerk/protocol/http/HttpBaseChannel.cpp - netwerk/protocol/http/nsHttpHandler.cpp - netwerk/protocol/http/nsHttpNTLMAuth.cpp - netwerk/sctp/src/moz.build - netwerk/sctp/src/netinet/sctp_cc_functions.c - netwerk/sctp/src/netinet/sctp_indata.c - netwerk/sctp/src/netinet/sctp_input.c - netwerk/sctp/src/netinet/sctp_output.c - netwerk/sctp/src/netinet/sctp_usrreq.c - netwerk/sctp/src/netinet/sctputil.c - netwerk/sctp/src/user_mbuf.c - netwerk/sctp/src/user_socket.c - netwerk/socket/nsSOCKSIOLayer.cpp - netwerk/system/android/nsAndroidNetworkLinkService.cpp - netwerk/system/linux/nsNetworkLinkService.cpp - netwerk/system/mac/nsNetworkLinkService.mm - netwerk/system/netlink/NetlinkService.cpp - netwerk/system/win32/nsNotifyAddrListener.cpp - netwerk/url-classifier/UrlClassifierFeatureBase.cpp - netwerk/url-classifier/components.conf - old-configure.in - python/mozbuild/mozbuild/artifacts.py - python/mozbuild/mozbuild/mach_commands.py - python/mozlint/mozlint/cli.py - security/certverifier/CertVerifier.cpp - security/manager/ssl/NSSSocketControl.cpp - security/manager/ssl/RemoteSecuritySettings.sys.mjs - security/manager/ssl/SSLServerCertVerification.cpp - security/manager/ssl/SSLServerCertVerification.h - security/manager/ssl/StaticHPKPins.h - security/manager/ssl/nsSecureBrowserUI.cpp - security/moz.build - security/nss/lib/certhigh/ocsp.c - security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c - security/nss/lib/mozpkix/include/pkix/Result.h - security/nss/lib/mozpkix/include/pkix/pkixnss.h - security/nss/lib/ssl/Makefile - security/sandbox/common/SandboxUtils.sys.mjs - services/settings/Attachments.sys.mjs - services/settings/IDBHelpers.sys.mjs - services/settings/RemoteSettingsClient.sys.mjs - services/settings/dumps/gen_last_modified.py - services/settings/dumps/main/moz.build - services/settings/remote-settings.sys.mjs - services/settings/servicesSettings.manifest - services/settings/static-dumps/main/moz.build - + services/settings/static-dumps/main/query-stripping.json - services/sync/components.conf - servo/components/style/properties/cascade.rs - servo/components/style/properties/properties.mako.rs - servo/components/style/values/computed/box.rs - servo/components/style/values/specified/length.rs - servo/ports/geckolib/glue.rs - + testing/web-platform/tests/css/css-viewport/zoom/canvas-ref.html - + testing/web-platform/tests/css/css-viewport/zoom/canvas.html - + testing/web-platform/tests/css/css-viewport/zoom/textarea-very-small-zoom-crash.html - third_party/libwebrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h - third_party/libwebrtc/modules/desktop_capture/desktop_capture_types.h - third_party/libwebrtc/modules/desktop_capture/win/desktop_capture_utils.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.cc - third_party/libwebrtc/modules/desktop_capture/win/wgc_capturer_win.h - third_party/libwebrtc/modules/video_capture/windows/device_info_ds.h - third_party/libwebrtc/rtc_base/platform_thread_types.cc - third_party/libwebrtc/rtc_base/socket.h - third_party/libwebrtc/rtc_base/system/file_wrapper.cc - third_party/libwebrtc/rtc_base/win/create_direct3d_device.h - third_party/sipcc/cpr_win_types.h - third_party/sipcc/sdp_token.c - toolkit/.eslintrc.js - toolkit/actors/AboutHttpsOnlyErrorParent.sys.mjs - + toolkit/actors/FilesFilterChild.sys.mjs - + toolkit/actors/FilesFilterParent.sys.mjs - toolkit/actors/NetErrorChild.sys.mjs - toolkit/actors/NetErrorParent.sys.mjs - toolkit/actors/moz.build - toolkit/components/antitracking/StoragePrincipalHelper.cpp - toolkit/components/antitracking/antitracking.manifest - toolkit/components/antitracking/components.conf - toolkit/components/downloads/DownloadCore.sys.mjs - toolkit/components/downloads/DownloadIntegration.sys.mjs - toolkit/components/extensions/Extension.sys.mjs - toolkit/components/extensions/ExtensionParent.sys.mjs - toolkit/components/httpsonlyerror/content/errorpage.html - toolkit/components/httpsonlyerror/content/errorpage.js - + toolkit/components/lox/Lox.sys.mjs - + toolkit/components/lox/content/lox_wasm_bg.wasm - + toolkit/components/lox/jar.mn - + toolkit/components/lox/lox_wasm.jsm - + toolkit/components/lox/moz.build - toolkit/components/moz.build - toolkit/components/places/PlacesUtils.sys.mjs - toolkit/components/remotebrowserutils/RemoteWebNavigation.sys.mjs - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs - toolkit/components/resistfingerprinting/nsRFPService.cpp - toolkit/components/resistfingerprinting/nsRFPService.h - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/content/duckduckgo.ico - + toolkit/components/search/content/startpage.png - + toolkit/components/search/content/torBrowserSearchEngineIcons.json - + toolkit/components/search/content/torBrowserSearchEngines.json - + toolkit/components/search/content/wikipedia.ico - + toolkit/components/search/jar.mn - toolkit/components/search/moz.build - + toolkit/components/securitylevel/SecurityLevel.manifest - + toolkit/components/securitylevel/SecurityLevel.sys.mjs - + toolkit/components/securitylevel/components.conf - + toolkit/components/securitylevel/moz.build - toolkit/components/shopping/jar.mn - toolkit/components/telemetry/app/TelemetrySend.sys.mjs - toolkit/components/telemetry/moz.build - + toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs - + toolkit/components/tor-launcher/TorControlPort.sys.mjs - + toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs - + toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - + toolkit/components/tor-launcher/TorParsers.sys.mjs - + toolkit/components/tor-launcher/TorProcess.sys.mjs - + toolkit/components/tor-launcher/TorProcessAndroid.sys.mjs - + toolkit/components/tor-launcher/TorProvider.sys.mjs - + toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs - + toolkit/components/tor-launcher/TorStartupService.sys.mjs - + toolkit/components/tor-launcher/components.conf - + toolkit/components/tor-launcher/moz.build - + toolkit/components/tor-launcher/tor-launcher.manifest - + toolkit/components/torconnect/TorConnectChild.sys.mjs - + toolkit/components/torconnect/TorConnectParent.sys.mjs - + toolkit/components/torconnect/content/aboutTorConnect.css - + toolkit/components/torconnect/content/aboutTorConnect.html - + toolkit/components/torconnect/content/aboutTorConnect.js - + toolkit/components/torconnect/content/arrow-right.svg - + toolkit/components/torconnect/content/bridge.svg - + toolkit/components/torconnect/content/connection-failure.svg - + toolkit/components/torconnect/content/connection-location.svg - + toolkit/components/torconnect/content/tor-connect-broken.svg - + toolkit/components/torconnect/content/tor-connect.svg - + toolkit/components/torconnect/content/tor-not-connected-to-connected-animated.svg - + toolkit/components/torconnect/content/torConnectTitlebarStatus.css - + toolkit/components/torconnect/content/torConnectTitlebarStatus.js - + toolkit/components/torconnect/content/torConnectUrlbarButton.js - + toolkit/components/torconnect/jar.mn - + toolkit/components/torconnect/moz.build - toolkit/components/windowwatcher/nsWindowWatcher.cpp - toolkit/content/.eslintrc.js - toolkit/content/aboutNetError.html - toolkit/content/aboutNetError.mjs - toolkit/content/jar.mn - toolkit/content/license.html - + toolkit/content/pt_config.json - toolkit/content/widgets/infobar.css - toolkit/content/widgets/moz-message-bar/moz-message-bar.mjs - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - toolkit/content/widgets/moz-toggle/moz-toggle.mjs - toolkit/content/widgets/notificationbox.js - + toolkit/locales-preview/base-browser-no-translate.ftl - + toolkit/locales-preview/tor-browser-no-translate.ftl - toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties - toolkit/locales/en-US/toolkit/about/aboutHttpsOnlyError.ftl - + toolkit/locales/en-US/toolkit/global/base-browser.ftl - + toolkit/locales/en-US/toolkit/global/tor-browser.ftl - toolkit/locales/jar.mn - toolkit/modules/ActorManagerParent.sys.mjs - toolkit/modules/AppConstants.sys.mjs - + toolkit/modules/Bech32Decode.sys.mjs - + toolkit/modules/BridgeDB.sys.mjs - + toolkit/modules/DomainFrontedRequests.sys.mjs - + toolkit/modules/DragDropFilter.sys.mjs - toolkit/modules/FinderParent.sys.mjs - toolkit/modules/LogManager.sys.mjs - + toolkit/modules/Moat.sys.mjs - toolkit/modules/PopupNotifications.sys.mjs - + toolkit/modules/QRCode.sys.mjs - toolkit/modules/RemotePageAccessManager.sys.mjs - + toolkit/modules/TorAndroidIntegration.sys.mjs - + toolkit/modules/TorConnect.sys.mjs - + toolkit/modules/TorSettings.sys.mjs - + toolkit/modules/TorStrings.sys.mjs - toolkit/modules/UpdateUtils.sys.mjs - toolkit/modules/moz.build - toolkit/moz.build - toolkit/mozapps/extensions/AddonManager.sys.mjs - toolkit/mozapps/extensions/components.conf - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js - toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs - toolkit/mozapps/extensions/internal/XPIInstall.sys.mjs - toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs - toolkit/mozapps/extensions/test/browser/head.js - toolkit/mozapps/extensions/test/xpcshell/head_addons.js - toolkit/mozapps/update/UpdateService.sys.mjs - toolkit/mozapps/update/UpdateServiceStub.sys.mjs - toolkit/mozapps/update/common/updatehelper.cpp - toolkit/mozapps/update/tests/data/sharedUpdateXML.js - + toolkit/mozapps/update/tests/unit_aus_update/mixedUnsupported.js - toolkit/mozapps/update/tests/unit_aus_update/xpcshell.toml - toolkit/mozapps/update/updater/launchchild_osx.mm - toolkit/mozapps/update/updater/moz.build - toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der - toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der - toolkit/mozapps/update/updater/release_primary.der - toolkit/mozapps/update/updater/release_secondary.der - toolkit/mozapps/update/updater/updater.cpp - toolkit/profile/nsToolkitProfileService.cpp - toolkit/profile/nsToolkitProfileService.h - toolkit/themes/shared/aboutNetError.css - toolkit/themes/shared/desktop-jar.inc.mn - toolkit/themes/shared/findbar.css - + toolkit/themes/shared/icons/onion-site.svg - + toolkit/themes/shared/icons/onion-slash.svg - + toolkit/themes/shared/icons/onion-warning.svg - + toolkit/themes/shared/icons/tor-dark-loading.png - + toolkit/themes/shared/icons/tor-dark-loading(a)2x.png - + toolkit/themes/shared/icons/tor-light-loading.png - + toolkit/themes/shared/icons/tor-light-loading(a)2x.png - + toolkit/themes/shared/onion-pattern.css - + toolkit/themes/shared/onion-pattern.svg - + toolkit/themes/shared/tor-colors.css - + toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd - + toolkit/torbutton/chrome/locale/en-US/brand.properties - + toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl - + toolkit/torbutton/chrome/locale/en-US/onionLocation.properties - + toolkit/torbutton/chrome/locale/en-US/settings.properties - + toolkit/torbutton/chrome/locale/en-US/torConnect.properties - + toolkit/torbutton/chrome/locale/en-US/torbutton.properties - + toolkit/torbutton/chrome/locale/en-US/torlauncher.properties - + toolkit/torbutton/jar.mn - + toolkit/torbutton/moz.build - toolkit/xre/LauncherRegistryInfo.cpp - toolkit/xre/MacLaunchHelper.h - toolkit/xre/MacLaunchHelper.mm - toolkit/xre/MacRunFromDmgUtils.mm - toolkit/xre/dllservices/mozglue/WindowsDllBlocklist.cpp - toolkit/xre/nsAppRunner.cpp - toolkit/xre/nsIXREDirProvider.idl - toolkit/xre/nsUpdateDriver.cpp - toolkit/xre/nsXREDirProvider.cpp - toolkit/xre/nsXREDirProvider.h - + tools/base-browser/git-rebase-fixup-preprocessor - + tools/base-browser/tb-dev - + tools/geckoview/.gitignore - + tools/geckoview/Makefile - + tools/geckoview/android-env-linux-template.sh - + tools/geckoview/android-env-macos-template.sh - + tools/geckoview/build-fenix.sh - + tools/geckoview/build-geckoview.sh - + tools/geckoview/clobber.sh - + tools/geckoview/config.sh - + tools/geckoview/jslint.sh - tools/lint/fluent-lint/exclusions.yml - + tools/torbrowser/Makefile - + tools/torbrowser/browser-self-sign-macos.sh - + tools/torbrowser/build.sh - + tools/torbrowser/clobber.sh - + tools/torbrowser/config.sh - + tools/torbrowser/deploy.sh - + tools/torbrowser/fetch.sh - + tools/torbrowser/generate-bugzilla-triage-csv.sh - + tools/torbrowser/generate_tor_loading_png.py - + tools/torbrowser/ide.sh - + tools/torbrowser/jslint.sh - + tools/torbrowser/l10n/combine-translation-versions.py - + tools/torbrowser/l10n/combine/__init__.py - + tools/torbrowser/l10n/combine/combine.py - + tools/torbrowser/l10n/combine/tests/README - + tools/torbrowser/l10n/combine/tests/__init__.py - + tools/torbrowser/l10n/combine/tests/test_android.py - + tools/torbrowser/l10n/combine/tests/test_dtd.py - + tools/torbrowser/l10n/combine/tests/test_fluent.py - + tools/torbrowser/l10n/combine/tests/test_properties.py - + tools/torbrowser/l10n/migrate.py - + tools/torbrowser/l10n/migrations/__init__.py - + tools/torbrowser/l10n/migrations/bug-41333-new-about-tor.py - + tools/torbrowser/l10n/migrations/bug-41622-neterror.py - + tools/torbrowser/l10n/migrations/bug-41820-moz-message-bar-download-warning.py - + tools/torbrowser/l10n/migrations/bug-42202-crypto-safety.py - + tools/torbrowser/l10n/migrations/bug-42203-about-dialog.py - + tools/torbrowser/l10n/migrations/bug-42206-rulesets.py - + tools/torbrowser/l10n/migrations/bug-42207-settings.py - + tools/torbrowser/l10n/migrations/bug-42209-tor-circuit.py - + tools/torbrowser/l10n/migrations/bug-42210-download-warning.py - + tools/torbrowser/l10n/migrations/bug-42211-new-identity.py - + tools/torbrowser/l10n/migrations/bug-42212-onion-services.py - + tools/torbrowser/l10n/migrations/bug-42214-security-level.py - + tools/torbrowser/update_emojis.py - tools/update-packaging/common.sh - tools/update-packaging/make_full_update.sh - tools/update-packaging/make_incremental_update.sh - uriloader/base/nsDocLoader.cpp - uriloader/base/nsURILoader.cpp - uriloader/exthandler/nsExternalHelperAppService.cpp - widget/ScrollbarDrawingWin.cpp - widget/ScrollbarDrawingWin11.cpp - widget/android/WebExecutorSupport.cpp - widget/android/nsClipboard.cpp - widget/cocoa/nsChildView.mm - widget/gtk/MPRISServiceHandler.cpp - widget/gtk/WidgetUtilsGtk.cpp - widget/gtk/nsWindow.cpp - widget/windows/WinTaskbar.cpp - widget/windows/nsDataObj.cpp - xpcom/base/ErrorList.py - xpcom/ds/StaticAtoms.py - xpcom/io/CocoaFileUtils.mm - xpcom/io/nsAppFileLocationProvider.cpp - xpfe/appshell/AppWindow.cpp The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/377a94… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/377a94… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] 2 commits: fixup! TB 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 28 Jan '25

28 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 169cebe0 by Henry Wilkes at 2025-01-28T10:06:19+00:00 fixup! TB 40597: Implement TorSettings module TB 43254: Allow some DomainFrontedRequests to be cancelled. This is used by some of the Moat calls to stop abandoned requests running in the background: 1. Cancelled AutoBootstraps. 2. Cancelled CAPTCHA request/submissions. - - - - - 400e4ab1 by Henry Wilkes at 2025-01-28T10:06:20+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43254: Cancel Moat requests when the CAPTHCA dialog is closed. - - - - - 6 changed files: - browser/app/profile/000-tor-browser.js - browser/components/torpreferences/content/requestBridgeDialog.js - toolkit/modules/BridgeDB.sys.mjs - toolkit/modules/DomainFrontedRequests.sys.mjs - toolkit/modules/Moat.sys.mjs - toolkit/modules/TorConnect.sys.mjs Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -143,6 +143,7 @@ pref("browser.tor_provider.cp_log_level", "Warn"); pref("lox.log_level", "Warn"); pref("torbrowser.bootstrap.log_level", "Info"); pref("browser.torsettings.log_level", "Warn"); +pref("browser.torMoat.loglevel", "Warn"); pref("browser.tordomainisolator.loglevel", "Warn"); pref("browser.torcircuitpanel.loglevel", "Log"); pref("browser.tor_android.log_level", "Info"); ===================================== browser/components/torpreferences/content/requestBridgeDialog.js ===================================== @@ -119,6 +119,9 @@ const gRequestBridgeDialog = { }, _setcaptchaImage(uri) { + if (!uri) { + return; + } if (uri != this._captchaImage.src) { this._captchaImage.src = uri; this._dialogHeader.setAttribute( ===================================== toolkit/modules/BridgeDB.sys.mjs ===================================== @@ -13,6 +13,16 @@ export var BridgeDB = { _challenge: null, _image: null, _bridges: null, + /** + * A collection of controllers to abort any ongoing Moat requests if the + * dialog is closed. + * + * NOTE: We do not expect this set to ever contain more than one instance. + * However the public API has no assurances to prevent multiple calls. + * + * @type {Set<AbortController>} + */ + _moatAbortControllers: new Set(), get currentCaptchaImage() { return this._image; @@ -28,13 +38,18 @@ export var BridgeDB = { await this._moatRPC.init(); } - const response = await this._moatRPC.check( - "obfs4", - this._challenge, - solution, - false - ); - this._bridges = response?.bridges; + const abortController = new AbortController(); + this._moatAbortControllers.add(abortController); + try { + this._bridges = await this._moatRPC.check( + "obfs4", + this._challenge, + solution, + abortController.signal + ); + } finally { + this._moatAbortControllers.delete(abortController); + } return this._bridges; }, @@ -45,10 +60,20 @@ export var BridgeDB = { await this._moatRPC.init(); } - const response = await this._moatRPC.fetch(["obfs4"]); - this._challenge = response.challenge; - this._image = - "data:image/jpeg;base64," + encodeURIComponent(response.image); + const abortController = new AbortController(); + this._moatAbortControllers.add(abortController); + let response; + try { + response = await this._moatRPC.fetch(["obfs4"], abortController.signal); + } finally { + this._moatAbortControllers.delete(abortController); + } + if (response) { + // Not cancelled. + this._challenge = response.challenge; + this._image = + "data:image/jpeg;base64," + encodeURIComponent(response.image); + } } catch (err) { console.error("Could not request a captcha image", err); } @@ -56,6 +81,11 @@ export var BridgeDB = { }, close() { + // Abort any ongoing requests. + for (const controller of this._moatAbortControllers) { + controller.abort(); + } + this._moatAbortControllers.clear(); this._moatRPC?.uninit(); this._moatRPC = null; this._challenge = null; ===================================== toolkit/modules/DomainFrontedRequests.sys.mjs ===================================== @@ -377,6 +377,15 @@ export class DomainFrontRequestResponseError extends Error { } } +/** + * Thrown when the caller cancels the request. + */ +export class DomainFrontRequestCancelledError extends Error { + constructor(url) { + super(`Cancelled request to ${url}`); + } +} + /** * Callback object to promisify the XPCOM request. */ @@ -397,8 +406,12 @@ class ResponseListener { }); } - // callers wait on this for final response - response() { + /** + * A promise that resolves to the response body from the request. + * + * @type {Promise<string>} + */ + get response() { return this.#responsePromise; } @@ -530,24 +543,74 @@ export class DomainFrontRequestBuilder { * @param {string} args.method The request method. * @param {string} args.body The request body. * @param {string} args.contentType The "Content-Type" header to set. - * @returns {string} The response body. + * @param {AbortSignal} [signal] args.signal An optional means of cancelling + * the request early. Will throw DomainFrontRequestCancelledError if + * aborted. + * @returns {Promise<string>} A promise that resolves to the response body. */ - async buildRequest(url, args) { - const ch = this.buildHttpHandler(url); - - const inStream = Cc["@mozilla.org/io/string-input-stream;1"].createInstance( - Ci.nsIStringInputStream - ); - inStream.setData(args.body, args.body.length); - const upChannel = ch.QueryInterface(Ci.nsIUploadChannel); - upChannel.setUploadStream(inStream, args.contentType, args.body.length); - ch.requestMethod = args.method; + buildRequest(url, args) { + // Pre-fetch the argument values from `args` so the caller cannot change the + // parameters mid-call. + const { body, method, contentType, signal } = args; + let cancel = null; + const promise = new Promise((resolve, reject) => { + if (signal?.aborted) { + // Unexpected, cancel immediately. + reject(new DomainFrontRequestCancelledError(url)); + return; + } - // Make request - const listener = new ResponseListener(); - await ch.asyncOpen(listener, ch); + let ch = null; + + if (signal) { + cancel = () => { + // Reject prior to calling cancel, since we want to ignore any error + // responses from ResponseListener. + // NOTE: In principle we could let ResponseListener throw this error + // when it receives NS_ERROR_ABORT, but that would rely on mozilla + // never calling this error either. + reject(new DomainFrontRequestCancelledError(url)); + ch?.cancel(Cr.NS_ERROR_ABORT); + }; + signal.addEventListener("abort", cancel); + } - // wait for response - return listener.response(); + ch = this.buildHttpHandler(url); + + const inStream = Cc[ + "@mozilla.org/io/string-input-stream;1" + ].createInstance(Ci.nsIStringInputStream); + inStream.setData(body, body.length); + const upChannel = ch.QueryInterface(Ci.nsIUploadChannel); + upChannel.setUploadStream(inStream, contentType, body.length); + ch.requestMethod = method; + + // Make request + const listener = new ResponseListener(); + ch.asyncOpen(listener); + listener.response.then( + body => { + resolve(body); + }, + error => { + reject(error); + } + ); + }); + // Clean up. Do not return this `Promise.finally` since the caller should + // not depend on it. + // We pre-catch and suppress all errors for this `.finally` to stop the + // errors from being duplicated in the console log. + promise + .catch(() => {}) + .finally(() => { + // Remove the callback for the AbortSignal so that it doesn't hold onto + // our channel reference if the caller continues to hold a reference to + // AbortSignal. + if (cancel) { + signal.removeEventListener("abort", cancel); + } + }); + return promise; } } ===================================== toolkit/modules/Moat.sys.mjs ===================================== @@ -5,13 +5,15 @@ const lazy = {}; const log = console.createInstance({ - maxLogLevel: "Warn", prefix: "Moat", + maxLogLevelPref: "browser.torMoat.loglevel", }); ChromeUtils.defineESModuleGetters(lazy, { DomainFrontRequestBuilder: "resource://gre/modules/DomainFrontedRequests.sys.mjs", + DomainFrontRequestCancelledError: + "resource://gre/modules/DomainFrontedRequests.sys.mjs", TorBridgeSource: "resource://gre/modules/TorSettings.sys.mjs", }); @@ -91,6 +93,19 @@ class InternetTestResponseListener { * @property {string} [country] - The detected country (region). */ +/** + * @typedef {Object} CaptchaChallenge + * + * The details for a captcha challenge. + * + * @property {string} transport - The transport type selected by the Moat + * server. + * @property {string} image - A base64 encoded jpeg with the captcha to + * complete. + * @property {string} challenge - A nonce/cookie string associated with this + * request. + */ + /** * Constructs JSON objects and sends requests over Moat. * The documentation about the JSON schemas to use are available at @@ -122,17 +137,51 @@ export class MoatRPC { this.#requestBuilder = null; } - async #makeRequest(procedure, args) { + /** + * @typedef {Object} MoatResult + * + * The result of a Moat request. + * + * @property {any} response - The parsed JSON response from the Moat server, + * or `undefined` if the request was cancelled. + * @property {boolean} cancelled - Whether the request was cancelled. + */ + + /** + * Make a request to Moat. + * + * @param {string} procedure - The name of the procedure. + * @param {object} args - The arguments to pass in as a JSON string. + * @param {AbortSignal} [abortSignal] - An optional signal to be able to abort + * the request early. + * @returns {MoatResult} - The result of the request. + */ + async #makeRequest(procedure, args, abortSignal) { const procedureURIString = `${Services.prefs.getStringPref( TorLauncherPrefs.moat_service )}/${procedure}`; - return JSON.parse( - await this.#requestBuilder.buildRequest(procedureURIString, { - method: "POST", - contentType: "application/vnd.api+json", - body: JSON.stringify(args), - }) - ); + log.info(`Making request to ${procedureURIString}:`, args); + let response = undefined; + let cancelled = false; + try { + response = JSON.parse( + await this.#requestBuilder.buildRequest(procedureURIString, { + method: "POST", + contentType: "application/vnd.api+json", + body: JSON.stringify(args), + signal: abortSignal, + }) + ); + log.info(`Response to ${procedureURIString}:`, response); + } catch (e) { + if (abortSignal && e instanceof lazy.DomainFrontRequestCancelledError) { + log.info(`Request to ${procedureURIString} cancelled`); + cancelled = true; + } else { + throw e; + } + } + return { response, cancelled }; } async testInternetConnection() { @@ -147,15 +196,16 @@ export class MoatRPC { return listener.status; } - // Receive a CAPTCHA challenge, takes the following parameters: - // - transports: array of transport strings available to us eg: ["obfs4", "meek"] - // - // returns an object with the following fields: - // - transport: a transport string the moat server decides it will send you selected - // from the list of provided transports - // - image: a base64 encoded jpeg with the captcha to complete - // - challenge: a nonce/cookie string associated with this request - async fetch(transports) { + /** + * Request a CAPTCHA challenge. + * + * @param {string[]} transports - List of transport strings available to us + * eg: ["obfs4", "meek"]. + * @param {AbortSignal} abortSignal - A signal to abort the request early. + * @returns {?CaptchaChallenge} - The captcha challenge, or `null` if the + * request was aborted by the caller. + */ + async fetch(transports, abortSignal) { if ( // ensure this is an array Array.isArray(transports) && @@ -173,7 +223,15 @@ export class MoatRPC { }, ], }; - const response = await this.#makeRequest("fetch", args); + const { response, cancelled } = await this.#makeRequest( + "fetch", + args, + abortSignal + ); + if (cancelled) { + return null; + } + if ("errors" in response) { const code = response.errors[0].code; const detail = response.errors[0].detail; @@ -189,18 +247,17 @@ export class MoatRPC { throw new Error("MoatRPC: fetch() expects a non-empty array of strings"); } - // Submit an answer for a CAPTCHA challenge and get back bridges, takes the following - // parameters: - // - transport: the transport string associated with a previous fetch request - // - challenge: the nonce string associated with the fetch request - // - solution: solution to the CAPTCHA associated with the fetch request - // - qrcode: true|false whether we want to get back a qrcode containing the bridge strings - // - // returns an object with the following fields: - // - bridges: an array of bridge line strings - // - qrcode: base64 encoded jpeg of bridges if requested, otherwise null - // if the provided solution is incorrect, returns an empty object - async check(transport, challenge, solution, qrcode) { + /** + * Submit an answer for a previous CAPTCHA fetch to get bridges. + * + * @param {string} transport - The transport associated with the fetch. + * @param {string} challenge - The nonce string associated with the fetch. + * @param {string} solution - The solution to the CAPTCHA. + * @param {AbortSignal} abortSignal - A signal to abort the request early. + * @returns {?string[]} - The bridge lines for a correct solution, or `null` + * if the solution was incorrect or the request was aborted by the caller. + */ + async check(transport, challenge, solution, abortSignal) { const args = { data: [ { @@ -210,25 +267,30 @@ export class MoatRPC { transport, challenge, solution, - qrcode: qrcode ? "true" : "false", + qrcode: "false", }, ], }; - const response = await this.#makeRequest("check", args); + const { response, cancelled } = await this.#makeRequest( + "check", + args, + abortSignal + ); + if (cancelled) { + return null; + } + if ("errors" in response) { const code = response.errors[0].code; const detail = response.errors[0].detail; if (code == 419 && detail === "The CAPTCHA solution was incorrect.") { - return {}; + return null; } throw new Error(`MoatRPC: ${detail} (${code})`); } - const bridges = response.data[0].bridges; - const qrcodeImg = qrcode ? response.data[0].qrcode : null; - - return { bridges, qrcode: qrcodeImg }; + return response.data[0].bridges; } /** @@ -296,15 +358,24 @@ export class MoatRPC { * @param {?string} country - The region to request bridges for, as an * ISO 3166-1 alpha-2 region code, or `null` to have the server * automatically determine the region. + * @param {AbortSignal} abortSignal - A signal to abort the request early. * @returns {?MoatSettings} - The returned settings from the server, or `null` - * if the region could not be determined by the server. + * if the region could not be determined by the server or the caller + * cancelled the request. */ - async circumvention_settings(transports, country) { + async circumvention_settings(transports, country, abortSignal) { const args = { transports: transports ? transports : [], country, }; - const response = await this.#makeRequest("circumvention/settings", args); + const { response, cancelled } = await this.#makeRequest( + "circumvention/settings", + args, + abortSignal + ); + if (cancelled) { + return null; + } let settings = {}; if ("errors" in response) { const code = response.errors[0].code; @@ -334,7 +405,11 @@ export class MoatRPC { // settings for. async circumvention_countries() { const args = {}; - return this.#makeRequest("circumvention/countries", args); + const { response } = await this.#makeRequest( + "circumvention/countries", + args + ); + return response; } // Request a copy of the builtin bridges, takes the following parameters: @@ -347,7 +422,7 @@ export class MoatRPC { const args = { transports: transports ? transports : [], }; - const response = await this.#makeRequest("circumvention/builtin", args); + const { response } = await this.#makeRequest("circumvention/builtin", args); if ("errors" in response) { const code = response.errors[0].code; const detail = response.errors[0].detail; @@ -366,13 +441,22 @@ export class MoatRPC { * Request a copy of the default/fallback bridge settings. * * @param {string[]} transports - A list of transports we support. - * @returns {MoatBridges[]} - The list of bridges found. + * @param {AbortSignal} abortSignal - A signal to abort the request early. + * @returns {?MoatBridges[]} - The list of bridges found, or `null` if the + * caller cancelled the request. */ - async circumvention_defaults(transports) { + async circumvention_defaults(transports, abortSignal) { const args = { transports: transports ? transports : [], }; - const response = await this.#makeRequest("circumvention/defaults", args); + const { response, cancelled } = await this.#makeRequest( + "circumvention/defaults", + args, + abortSignal + ); + if (cancelled) { + return null; + } if ("errors" in response) { const code = response.errors[0].code; const detail = response.errors[0].detail; ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -570,6 +570,7 @@ class AutoBootstrapAttempt { return; } + let moatAbortController = new AbortController(); // For now, throw any errors we receive from the backend, except when it // was unable to detect user's country/region. // If we use specialized error objects, we could pass the original errors @@ -577,11 +578,20 @@ class AutoBootstrapAttempt { const maybeSettings = await Promise.race([ moat.circumvention_settings( [...lazy.TorSettings.builtinBridgeTypes, "vanilla"], - options.regionCode === "automatic" ? null : options.regionCode + options.regionCode === "automatic" ? null : options.regionCode, + moatAbortController.signal ), // This might set maybeSettings to undefined. this.#cancelledPromise, ]); + if (this.#cancelled) { + // Ended early due to being cancelled. Abort the ongoing Moat request so + // that it does not continue unnecessarily in the background. + // NOTE: We do not care about circumvention_settings return value or + // errors at this point. Nor do we need to await its return. We just + // want it to resolve quickly. + moatAbortController.abort(); + } if (this.#cancelled || this.#resolved) { return; } @@ -591,15 +601,25 @@ class AutoBootstrapAttempt { if (maybeSettings?.bridgesList?.length) { this.#bridgesList = maybeSettings.bridgesList; } else { + // In principle we could reuse the existing moatAbortController + // instance, since its abort method has not been called. But it is + // cleaner to use a new instance to avoid triggering any potential + // lingering callbacks attached to the AbortSignal. + moatAbortController = new AbortController(); // Keep consistency with the other call. this.#bridgesList = await Promise.race([ - moat.circumvention_defaults([ - ...lazy.TorSettings.builtinBridgeTypes, - "vanilla", - ]), + moat.circumvention_defaults( + [...lazy.TorSettings.builtinBridgeTypes, "vanilla"], + moatAbortController.signal + ), // This might set this.#bridgesList to undefined. this.#cancelledPromise, ]); + if (this.#cancelled) { + // Ended early due to being cancelled. Abort the ongoing Moat request + // so that it does not continue in the background. + moatAbortController.abort(); + } } } finally { // Do not await the uninit. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4d3353… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4d3353… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.0-1] 2 commits: fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 28 Jan '25

28 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: bcebcebd by Beatriz Rizental at 2025-01-28T10:30:06+01:00 fixup! Add CI for Base Browser - - - - - 7938e825 by Beatriz Rizental at 2025-01-28T10:30:07+01:00 fixup! Add CI for Base Browser - - - - - 3 changed files: - .gitlab-ci.yml - .gitlab/ci/lint.yml - + .gitlab/ci/mixins.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -6,4 +6,5 @@ variables: LOCAL_REPO_PATH: /srv/apps-repos/tor-browser.git include: + - local: '.gitlab/ci/mixins.yml' - local: '.gitlab/ci/lint.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,11 +1,10 @@ .base: + extends: .with-local-repo-bash stage: lint image: $IMAGE_PATH interruptible: true variables: MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" - # A copy of the repository already is available in the runner. - GIT_STRATEGY: "none" cache: paths: - node_modules @@ -17,19 +16,6 @@ tags: # Run these jobs in the browser dedicated runners. - firefox - before_script: - - git init - - git remote add local "$LOCAL_REPO_PATH" - - git fetch --depth 500 local - - git remote add origin "$CI_REPOSITORY_URL" - - | - if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then - echo "No branch specified. Stopping the pipeline." - exit 1 - fi - - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} eslint: extends: .base ===================================== .gitlab/ci/mixins.yml ===================================== @@ -0,0 +1,47 @@ +.with-local-repo-bash: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local "$LOCAL_REPO_PATH" + - git fetch --depth 500 local + - git remote add origin "$CI_REPOSITORY_URL" + - | + if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then + echo "No branch specified. Stopping the pipeline." + exit 1 + fi + - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + - | + if ! git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; then + echo -e "\e[31mFetching failed for branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} from $CI_REPOSITORY_URL.\e[0m" + echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" + fi + - git checkout FETCH_HEAD + +.with-local-repo-pwsh: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local $env:LOCAL_REPO_PATH + - git fetch --depth 500 local + - git remote add origin $env:CI_REPOSITORY_URL + - | + $branchName = $env:CI_COMMIT_BRANCH + if ([string]::IsNullOrEmpty($branchName)) { + $branchName = $env:CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + } + if ([string]::IsNullOrEmpty($branchName)) { + Write-Output "No branch specified. Stopping the pipeline." + exit 1 + } + - Write-Output "Fetching from remote branch $branchName" + - | + if (! git fetch origin $branchName) { + Write-Output "Fetching failed for branch $branchName from $env:CI_REPOSITORY_URL." + Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" + } + - git checkout FETCH_HEAD View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/77… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/77… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.6.0esr-14.0-1] 2 commits: fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 28 Jan '25

28 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: db3a0f8a by Beatriz Rizental at 2025-01-28T10:29:07+01:00 fixup! Add CI for Base Browser - - - - - 7fe488e0 by Beatriz Rizental at 2025-01-28T10:29:14+01:00 fixup! Add CI for Base Browser - - - - - 3 changed files: - .gitlab-ci.yml - .gitlab/ci/lint.yml - + .gitlab/ci/mixins.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -6,4 +6,5 @@ variables: LOCAL_REPO_PATH: /srv/apps-repos/tor-browser.git include: + - local: '.gitlab/ci/mixins.yml' - local: '.gitlab/ci/lint.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,11 +1,10 @@ .base: + extends: .with-local-repo-bash stage: lint image: $IMAGE_PATH interruptible: true variables: MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" - # A copy of the repository already is available in the runner. - GIT_STRATEGY: "none" cache: paths: - node_modules @@ -17,19 +16,6 @@ tags: # Run these jobs in the browser dedicated runners. - firefox - before_script: - - git init - - git remote add local "$LOCAL_REPO_PATH" - - git fetch --depth 500 local - - git remote add origin "$CI_REPOSITORY_URL" - - | - if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then - echo "No branch specified. Stopping the pipeline." - exit 1 - fi - - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} eslint: extends: .base ===================================== .gitlab/ci/mixins.yml ===================================== @@ -0,0 +1,47 @@ +.with-local-repo-bash: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local "$LOCAL_REPO_PATH" + - git fetch --depth 500 local + - git remote add origin "$CI_REPOSITORY_URL" + - | + if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then + echo "No branch specified. Stopping the pipeline." + exit 1 + fi + - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + - | + if ! git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; then + echo -e "\e[31mFetching failed for branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} from $CI_REPOSITORY_URL.\e[0m" + echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" + fi + - git checkout FETCH_HEAD + +.with-local-repo-pwsh: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local $env:LOCAL_REPO_PATH + - git fetch --depth 500 local + - git remote add origin $env:CI_REPOSITORY_URL + - | + $branchName = $env:CI_COMMIT_BRANCH + if ([string]::IsNullOrEmpty($branchName)) { + $branchName = $env:CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + } + if ([string]::IsNullOrEmpty($branchName)) { + Write-Output "No branch specified. Stopping the pipeline." + exit 1 + } + - Write-Output "Fetching from remote branch $branchName" + - | + if (! git fetch origin $branchName) { + Write-Output "Fetching failed for branch $branchName from $env:CI_REPOSITORY_URL." + Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" + } + - git checkout FETCH_HEAD View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/37b7d0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/37b7d0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

28 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 80bd6af4 by Beatriz Rizental at 2025-01-28T10:20:41+01:00 fixup! Add CI for Base Browser - - - - - 9fb2aed6 by Beatriz Rizental at 2025-01-28T10:21:23+01:00 fixup! Add CI for Base Browser - - - - - 3 changed files: - .gitlab-ci.yml - .gitlab/ci/lint.yml - + .gitlab/ci/mixins.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -7,5 +7,6 @@ variables: LOCAL_REPO_PATH: /srv/apps-repos/tor-browser.git include: + - local: '.gitlab/ci/mixins.yml' - local: '.gitlab/ci/lint.yml' - local: '.gitlab/ci/update-translations.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,11 +1,10 @@ .base: + extends: .with-local-repo-bash stage: lint image: $IMAGE_PATH interruptible: true variables: MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" - # A copy of the repository already is available in the runner. - GIT_STRATEGY: "none" cache: paths: - node_modules @@ -17,19 +16,6 @@ tags: # Run these jobs in the browser dedicated runners. - firefox - before_script: - - git init - - git remote add local "$LOCAL_REPO_PATH" - - git fetch --depth 500 local - - git remote add origin "$CI_REPOSITORY_URL" - - | - if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then - echo "No branch specified. Stopping the pipeline." - exit 1 - fi - - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} eslint: extends: .base ===================================== .gitlab/ci/mixins.yml ===================================== @@ -0,0 +1,47 @@ +.with-local-repo-bash: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local "$LOCAL_REPO_PATH" + - git fetch --depth 500 local + - git remote add origin "$CI_REPOSITORY_URL" + - | + if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then + echo "No branch specified. Stopping the pipeline." + exit 1 + fi + - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + - | + if ! git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; then + echo -e "\e[31mFetching failed for branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} from $CI_REPOSITORY_URL.\e[0m" + echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" + fi + - git checkout FETCH_HEAD + +.with-local-repo-pwsh: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local $env:LOCAL_REPO_PATH + - git fetch --depth 500 local + - git remote add origin $env:CI_REPOSITORY_URL + - | + $branchName = $env:CI_COMMIT_BRANCH + if ([string]::IsNullOrEmpty($branchName)) { + $branchName = $env:CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + } + if ([string]::IsNullOrEmpty($branchName)) { + Write-Output "No branch specified. Stopping the pipeline." + exit 1 + } + - Write-Output "Fetching from remote branch $branchName" + - | + if (! git fetch origin $branchName) { + Write-Output "Fetching failed for branch $branchName from $env:CI_REPOSITORY_URL." + Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" + } + - git checkout FETCH_HEAD View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2ef0ee… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2ef0ee… 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-115.20.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed new branch tor-browser-115.20.0esr-13.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-128.7.0esr-14.5-1
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed new branch tor-browser-128.7.0esr-14.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-128.7.0esr-14.0-1
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

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

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_128_7_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_20_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed new tag FIREFOX_115_20_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 tag FIREFOX_128_7_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed new tag FIREFOX_128_7_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][tor-browser-128.6.0esr-14.5-1] 2 commits: TB 43243: [android] Implement Android launch test
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 10dd6fcb by Beatriz Rizental at 2025-01-27T19:10:37+01:00 TB 43243: [android] Implement Android launch test Also remove exit call from terminate function. It causes all espresso tests to crash on exit and otherwise doesn't do anything. - - - - - 4d3353ee by Beatriz Rizental at 2025-01-27T19:10:38+01:00 fixup! Add CI for Tor Browser Implement Nightly startup tests for Android - - - - - 4 changed files: - + .gitlab/ci/jobs/startup-test/startup-test-android.py - .gitlab/ci/jobs/startup-test/startup-test.yml - + mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/AppStartupTest.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt Changes: ===================================== .gitlab/ci/jobs/startup-test/startup-test-android.py ===================================== @@ -0,0 +1,231 @@ +#!/usr/bin/env python3 +import argparse +import json +import os +import sys +import time +from datetime import datetime, timedelta +from enum import Enum + +import requests + +""" +This script runs Android tests on BrowserStack using the BrowserStack App Automate Espresso API. + +Usage: + startup-test-android.py --devices <devices> [--tests <tests>] [--app_file_path <app_file_path>] [--test_file_path <test_file_path>] + +Arguments: + --devices: Comma-separated list of devices to test on (required). + --tests: Comma-separated list of tests to run (optional). If not provided, all tests will run. + --app_file_path: Path to the app file (optional). If not provided, yesterday's nightly will be downloaded. + --test_file_path: Path to the test file (optional). If not provided, yesterday's nightly will be downloaded. + +Environment Variables: + BROWSERSTACK_USERNAME: BrowserStack username (required). + BROWSERSTACK_API_KEY: BrowserStack API key (required). + +Description: + - If app and test file paths are not provided, the script downloads the latest nightly build from the Tor Project. + - Uploads the app and test files to BrowserStack. + - Triggers the test run on the specified devices. + - Polls for the test status until completion or timeout. + - Prints the test results and exits with an appropriate status code. +""" + +parser = argparse.ArgumentParser( + description="Run Android startup tests on BrowserStack." +) +parser.add_argument( + "--devices", + type=str, + help="Comma-separated list of devices to test on", + required=True, +) +parser.add_argument("--tests", type=str, help="Comma-separated list of tests to run") +parser.add_argument("--app_file_path", type=str, help="Path to the app file") +parser.add_argument("--test_file_path", type=str, help="Path to the test file") + +args = parser.parse_args() + +if args.app_file_path: + app_file_path = args.app_file_path + test_file_path = args.test_file_path + if not test_file_path: + print( + "\033[1;31mIf either app or test file paths are provided, both must be provided.\033[0m" + ) +else: + + def download_file(url, dest_path): + try: + response = requests.get(url, stream=True) + response.raise_for_status() + with open(dest_path, "wb") as f: + for chunk in response.iter_content(chunk_size=8192): + f.write(chunk) + except Exception as e: + print(f"\033[1;31mFailed to download file from {url}.\033[0m") + print(e) + sys.exit(1) + + yesterday = (datetime.now() - timedelta(days=1)).strftime("%Y.%m.%d") + download_url_base = f"https://nightlies.tbb.torproject.org/nightly-builds/tor-browser-builds/tbb-…" + print( + f"No file paths provided, downloading yesterday's nightly from {download_url_base}" + ) + + app_file_url = f"{download_url_base}/tor-browser-noopt-android-aarch64-tbb-nightly.{yesterday}.apk" + test_file_url = ( + f"{download_url_base}/tor-browser-tbb-nightly.{yesterday}-androidTest.apk" + ) + + # BrowserStack will fail if there are `.` in the file name other than before the extension. + yesterday = yesterday.replace(".", "-") + app_file_path = f"/tmp/nightly-{yesterday}.apk" + test_file_path = f"/tmp/nightly-test-{yesterday}.apk" + + download_file(app_file_url, app_file_path) + download_file(test_file_url, test_file_path) + +devices = [device.strip() for device in args.devices.split(",")] +tests = args.tests.split(",") if args.tests else [] + +browserstack_username = os.getenv("BROWSERSTACK_USERNAME") +browserstack_api_key = os.getenv("BROWSERSTACK_API_KEY") +if not browserstack_username or not browserstack_api_key: + print( + "\033[1;31mEnvironment variables BROWSERSTACK_USERNAME and BROWSERSTACK_API_KEY must be set.\033[0m" + ) + sys.exit(1) + +# Upload app file +with open(app_file_path, "rb") as app_file: + response = requests.post( + "https://api-cloud.browserstack.com/app-automate/espresso/v2/app", + auth=(browserstack_username, browserstack_api_key), + files={"file": app_file}, + ) + +if response.status_code != 200: + print("\033[1;31mFailed to upload app file.\033[0m") + print(response.text) + sys.exit(1) + +bs_app_url = response.json().get("app_url") +print("\033[1;32mSuccessfully uploaded app file.\033[0m") +print(f"App URL: {bs_app_url}") + +# Upload test file +with open(test_file_path, "rb") as test_file: + response = requests.post( + "https://api-cloud.browserstack.com/app-automate/espresso/v2/test-suite", + auth=(browserstack_username, browserstack_api_key), + files={"file": test_file}, + ) + +if response.status_code != 200: + print("\033[1;31mFailed to upload test file.\033[0m") + print(response.text) + sys.exit(1) + +bs_test_url = response.json().get("test_suite_url") +print("\033[1;32mSuccessfully uploaded test file.\033[0m") +print(f"Test URL: {bs_test_url}") + +# Trigger tests +test_params = { + "app": bs_app_url, + "testSuite": bs_test_url, + "devices": devices, + "class": tests, +} + +response = requests.post( + "https://api-cloud.browserstack.com/app-automate/espresso/v2/build", + auth=(browserstack_username, browserstack_api_key), + headers={"Content-Type": "application/json"}, + data=json.dumps(test_params), +) + +if response.status_code != 200: + print("\033[1;31mFailed to trigger test run.\033[0m") + print(response.text) + sys.exit(1) + +build_id = response.json().get("build_id") +print("\033[1;32mSuccessfully triggered test run.\033[0m") +print( + f"Test status also available at: https://app-automate.browserstack.com/builds/{build_id}\n===" +) + +# Poll for status +POLLING_TIMEOUT = 30 * 60 # 30min +POLLING_INTERVAL = 30 # 30s + + +class TestStatus(Enum): + QUEUED = "queued" + RUNNING = "running" + ERROR = "error" + FAILED = "failed" + PASSED = "passed" + TIMED_OUT = "timed out" + SKIPPED = "skipped" + + @classmethod + def from_string(cls, s): + try: + return cls[s.upper().replace(" ", "_")] + except KeyError: + raise ValueError(f"\033[1;31m'{s}' is not a valid test status.\033[0m") + + def is_terminal(self): + return self not in {TestStatus.QUEUED, TestStatus.RUNNING} + + def is_success(self): + return self in {TestStatus.PASSED, TestStatus.SKIPPED} + + def color_print(self): + if self == TestStatus.PASSED: + return f"\033[1;32m{self.value}\033[0m" + + if self in {TestStatus.ERROR, TestStatus.FAILED, TestStatus.TIMED_OUT}: + return f"\033[1;31m{self.value}\033[0m" + + if self == TestStatus.SKIPPED: + return f"\033[1;33m{self.value}\033[0m" + + return self.value + + +start_time = time.time() +elapsed_time = 0 +test_status = None +while elapsed_time <= POLLING_TIMEOUT: + response = requests.get( + f"https://api-cloud.browserstack.com/app-automate/espresso/v2/builds/{build_i…", + auth=(browserstack_username, browserstack_api_key), + ) + + if response.status_code != 200: + print("\033[1;31mFailed to get test status.\033[0m") + print(response.text) + sys.exit(1) + + test_status = TestStatus.from_string(response.json().get("status")) + if test_status.is_terminal(): + print(f"===\nTest finished. Result: {test_status.color_print()}") + break + else: + elapsed_time = time.time() - start_time + print(f"Test status: {test_status.value} ({elapsed_time:.2f}s)") + + if elapsed_time > POLLING_TIMEOUT: + print("===\n\033[1;33mWaited for tests for too long.\033[0m") + break + + time.sleep(POLLING_INTERVAL) + +if test_status is None or not test_status.is_success(): + sys.exit(1) ===================================== .gitlab/ci/jobs/startup-test/startup-test.yml ===================================== @@ -49,3 +49,15 @@ startup-test-linux: - ./mach python .gitlab/ci/jobs/startup-test/startup-test.py --platform linux --arch x86_64 --browser $BROWSER rules: - if: $CI_PIPELINE_SOURCE == "schedule" + +startup-test-android: + extends: .with-local-repo-bash + image: $IMAGE_PATH + stage: startup-test + interruptible: true + tags: + - firefox + script: + - ./mach python .gitlab/ci/jobs/startup-test/startup-test-android.py --devices "Samsung Galaxy S23-13.0, Samsung Galaxy S8-7.0" --tests org.mozilla.fenix.LaunchTest + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" ===================================== mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/AppStartupTest.kt ===================================== @@ -0,0 +1,40 @@ +package org.mozilla.fenix + +import androidx.test.ext.junit.rules.ActivityScenarioRule +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.UiDevice +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit + + +@RunWith(AndroidJUnit4::class) +class LaunchTest { + + @get:Rule + var rule: ActivityScenarioRule<HomeActivity> = ActivityScenarioRule(HomeActivity::class.java) + + @Test + fun appLaunchesWithoutCrash() { + val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) + device.waitForIdle() + + // Simulate a 30-second delay + val latch = CountDownLatch(1) + Thread { + try { + Thread.sleep(30_000) + latch.countDown() + } catch (e: InterruptedException) { + e.printStackTrace() + } + }.start() + + latch.await(30, TimeUnit.SECONDS) + + // If we got here, the app did not crash. Test passed. + } +} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt ===================================== @@ -192,7 +192,6 @@ open class FenixApplication : LocaleAwareApplication(), Provider { fun terminate() { onTerminate() - System.exit(0) } override fun onTerminate() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd21b7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cd21b7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 916dc515 by Beatriz Rizental at 2025-01-27T18:11:16+01:00 fixup! Add CI for Base Browser Fetch specific branch when prepopulating history from local repository. - - - - - 1 changed file: - .gitlab/ci/mixins.yml Changes: ===================================== .gitlab/ci/mixins.yml ===================================== @@ -4,7 +4,7 @@ before_script: - git init - git remote add local "$LOCAL_REPO_PATH" - - git fetch --depth 500 local + - git fetch --depth 500 local ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME} - git remote add origin "$CI_REPOSITORY_URL" - | if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then @@ -26,7 +26,12 @@ before_script: - git init - git remote add local $env:LOCAL_REPO_PATH - - git fetch --depth 500 local + - | + $branchName = $env:CI_COMMIT_BRANCH + if ([string]::IsNullOrEmpty($branchName)) { + $branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME + } + git fetch --depth 500 local $branchName - git remote add origin $env:CI_REPOSITORY_URL - | $branchName = $env:CI_COMMIT_BRANCH View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/916… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/916… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 2d391e80 by Beatriz Rizental at 2025-01-27T18:10:56+01:00 fixup! Add CI for Base Browser Fetch specific branch when prepopulating history from local repository. - - - - - 1 changed file: - .gitlab/ci/mixins.yml Changes: ===================================== .gitlab/ci/mixins.yml ===================================== @@ -4,7 +4,7 @@ before_script: - git init - git remote add local "$LOCAL_REPO_PATH" - - git fetch --depth 500 local + - git fetch --depth 500 local ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME} - git remote add origin "$CI_REPOSITORY_URL" - | if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then @@ -26,7 +26,12 @@ before_script: - git init - git remote add local $env:LOCAL_REPO_PATH - - git fetch --depth 500 local + - | + $branchName = $env:CI_COMMIT_BRANCH + if ([string]::IsNullOrEmpty($branchName)) { + $branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME + } + git fetch --depth 500 local $branchName - git remote add origin $env:CI_REPOSITORY_URL - | $branchName = $env:CI_COMMIT_BRANCH View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2d391e8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2d391e8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: cd21b741 by Beatriz Rizental at 2025-01-27T17:04:46+00:00 fixup! Add CI for Base Browser Fetch specific branch when prepopulating history from local repository. - - - - - 1 changed file: - .gitlab/ci/mixins.yml Changes: ===================================== .gitlab/ci/mixins.yml ===================================== @@ -4,7 +4,7 @@ before_script: - git init - git remote add local "$LOCAL_REPO_PATH" - - git fetch --depth 500 local + - git fetch --depth 500 local ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME} - git remote add origin "$CI_REPOSITORY_URL" - | if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then @@ -26,7 +26,12 @@ before_script: - git init - git remote add local $env:LOCAL_REPO_PATH - - git fetch --depth 500 local + - | + $branchName = $env:CI_COMMIT_BRANCH + if ([string]::IsNullOrEmpty($branchName)) { + $branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME + } + git fetch --depth 500 local $branchName - git remote add origin $env:CI_REPOSITORY_URL - | $branchName = $env:CI_COMMIT_BRANCH View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cd21b74… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cd21b74… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 4700859f by Beatriz Rizental at 2025-01-27T18:04:31+01:00 fixup! Add CI for Base Browser - - - - - 1 changed file: - .gitlab/ci/mixins.yml Changes: ===================================== .gitlab/ci/mixins.yml ===================================== @@ -18,7 +18,7 @@ echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" fi - - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} + - git checkout FETCH_HEAD .with-local-repo-pwsh: variables: @@ -44,4 +44,4 @@ Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" } - - git checkout origin/$branchName + - git checkout FETCH_HEAD View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4700859… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4700859… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 188baa6f by Beatriz Rizental at 2025-01-27T18:03:56+01:00 fixup! Add CI for Base Browser - - - - - 1 changed file: - .gitlab/ci/mixins.yml Changes: ===================================== .gitlab/ci/mixins.yml ===================================== @@ -18,7 +18,7 @@ echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" fi - - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} + - git checkout FETCH_HEAD .with-local-repo-pwsh: variables: @@ -44,4 +44,4 @@ Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" } - - git checkout origin/$branchName + - git checkout FETCH_HEAD View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/188… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/188… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 58c78829 by Beatriz Rizental at 2025-01-27T17:01:27+00:00 fixup! Add CI for Base Browser - - - - - 1 changed file: - .gitlab/ci/mixins.yml Changes: ===================================== .gitlab/ci/mixins.yml ===================================== @@ -18,7 +18,7 @@ echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" fi - - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} + - git checkout FETCH_HEAD .with-local-repo-pwsh: variables: @@ -44,4 +44,4 @@ Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" } - - git checkout origin/$branchName + - git checkout FETCH_HEAD View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/58c7882… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/58c7882… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: cc778f7c by Beatriz Rizental at 2025-01-27T17:42:14+01:00 fixup! Add CI for Base Browser - - - - - 3 changed files: - .gitlab-ci.yml - .gitlab/ci/jobs/lint/lint.yml - + .gitlab/ci/mixins.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -7,5 +7,6 @@ variables: LOCAL_REPO_PATH: /srv/apps-repos/tor-browser.git include: + - local: '.gitlab/ci/mixins.yml' - local: '.gitlab/ci/jobs/lint/lint.yml' - local: '.gitlab/ci/jobs/update-translations.yml' ===================================== .gitlab/ci/jobs/lint/lint.yml ===================================== @@ -1,11 +1,10 @@ .base: + extends: .with-local-repo-bash stage: lint image: $IMAGE_PATH interruptible: true variables: MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" - # A copy of the repository already is available in the runner. - GIT_STRATEGY: "none" cache: paths: - node_modules @@ -17,19 +16,6 @@ tags: # Run these jobs in the browser dedicated runners. - firefox - before_script: - - git init - - git remote add local "$LOCAL_REPO_PATH" - - git fetch --depth 500 local - - git remote add origin "$CI_REPOSITORY_URL" - - | - if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then - echo "No branch specified. Stopping the pipeline." - exit 1 - fi - - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} eslint: extends: .base ===================================== .gitlab/ci/mixins.yml ===================================== @@ -0,0 +1,47 @@ +.with-local-repo-bash: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local "$LOCAL_REPO_PATH" + - git fetch --depth 500 local + - git remote add origin "$CI_REPOSITORY_URL" + - | + if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then + echo "No branch specified. Stopping the pipeline." + exit 1 + fi + - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + - | + if ! git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; then + echo -e "\e[31mFetching failed for branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} from $CI_REPOSITORY_URL.\e[0m" + echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" + fi + - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} + +.with-local-repo-pwsh: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local $env:LOCAL_REPO_PATH + - git fetch --depth 500 local + - git remote add origin $env:CI_REPOSITORY_URL + - | + $branchName = $env:CI_COMMIT_BRANCH + if ([string]::IsNullOrEmpty($branchName)) { + $branchName = $env:CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + } + if ([string]::IsNullOrEmpty($branchName)) { + Write-Output "No branch specified. Stopping the pipeline." + exit 1 + } + - Write-Output "Fetching from remote branch $branchName" + - | + if (! git fetch origin $branchName) { + Write-Output "Fetching failed for branch $branchName from $env:CI_REPOSITORY_URL." + Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" + } + - git checkout origin/$branchName View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/cc7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/cc7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 24b648b3 by Beatriz Rizental at 2025-01-27T17:41:31+01:00 fixup! Add CI for Base Browser - - - - - 3 changed files: - .gitlab-ci.yml - .gitlab/ci/jobs/lint/lint.yml - + .gitlab/ci/mixins.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -7,5 +7,6 @@ variables: LOCAL_REPO_PATH: /srv/apps-repos/tor-browser.git include: + - local: '.gitlab/ci/mixins.yml' - local: '.gitlab/ci/jobs/lint/lint.yml' - local: '.gitlab/ci/jobs/update-translations.yml' ===================================== .gitlab/ci/jobs/lint/lint.yml ===================================== @@ -1,11 +1,10 @@ .base: + extends: .with-local-repo-bash stage: lint image: $IMAGE_PATH interruptible: true variables: MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" - # A copy of the repository already is available in the runner. - GIT_STRATEGY: "none" cache: paths: - node_modules @@ -17,19 +16,6 @@ tags: # Run these jobs in the browser dedicated runners. - firefox - before_script: - - git init - - git remote add local "$LOCAL_REPO_PATH" - - git fetch --depth 500 local - - git remote add origin "$CI_REPOSITORY_URL" - - | - if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then - echo "No branch specified. Stopping the pipeline." - exit 1 - fi - - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" - - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} eslint: extends: .base ===================================== .gitlab/ci/mixins.yml ===================================== @@ -0,0 +1,47 @@ +.with-local-repo-bash: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local "$LOCAL_REPO_PATH" + - git fetch --depth 500 local + - git remote add origin "$CI_REPOSITORY_URL" + - | + if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then + echo "No branch specified. Stopping the pipeline." + exit 1 + fi + - echo "Fetching from remote branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + - | + if ! git fetch origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; then + echo -e "\e[31mFetching failed for branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} from $CI_REPOSITORY_URL.\e[0m" + echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" + fi + - git checkout origin/${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} + +.with-local-repo-pwsh: + variables: + GIT_STRATEGY: "none" + before_script: + - git init + - git remote add local $env:LOCAL_REPO_PATH + - git fetch --depth 500 local + - git remote add origin $env:CI_REPOSITORY_URL + - | + $branchName = $env:CI_COMMIT_BRANCH + if ([string]::IsNullOrEmpty($branchName)) { + $branchName = $env:CI_MERGE_REQUEST_SOURCE_BRANCH_NAME + } + if ([string]::IsNullOrEmpty($branchName)) { + Write-Output "No branch specified. Stopping the pipeline." + exit 1 + } + - Write-Output "Fetching from remote branch $branchName" + - | + if (! git fetch origin $branchName) { + Write-Output "Fetching failed for branch $branchName from $env:CI_REPOSITORY_URL." + Write-Output "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork." + git fetch origin "merge-requests/$env:CI_MERGE_REQUEST_IID/head" + } + - git checkout origin/$branchName View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/24b648b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/24b648b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 2fc000c1 by Beatriz Rizental at 2025-01-27T16:52:37+01:00 fixup! Add CI for Tor Browser Revert changes that will not be part of the Base Browser commit - - - - - 99dc6926 by Beatriz Rizental at 2025-01-27T16:52:37+01:00 fixup! Add CI for Base Browser - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6c4d87… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6c4d87… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! TB 40458: Implement .tor.onion aliases
by Pier Angelo Vendrame (＠pierov) 27 Jan '25

27 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6c4d876b by Henry Wilkes at 2025-01-27T15:41:07+00:00 fixup! TB 40458: Implement .tor.onion aliases TB 41831: Add additional effective TLD for abc.au.securedrop.tor.onion exception. - - - - - 1 changed file: - netwerk/dns/effective_tld_names.dat Changes: ===================================== netwerk/dns/effective_tld_names.dat ===================================== @@ -5061,6 +5061,10 @@ pro.om onion tor.onion securedrop.tor.onion +// An additional TLD for abc.au.securedrop.tor.onion only. +// See tor-browser#41831. +// TODO: Remove once abc.au has migrated. See tor-browser#43443. +au.securedrop.tor.onion // org : https://www.iana.org/domains/root/db/org.html org View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6c4d876… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6c4d876… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

27 Jan '25

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

1 0

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

27 Jan '25

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

1 0

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

27 Jan '25

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

1 0

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

27 Jan '25

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

1 0

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

23 Jan '25

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

1 0

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

23 Jan '25

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

1 0

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

23 Jan '25

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

1 0

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

22 Jan '25

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

1 0

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

22 Jan '25

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

1 0

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

22 Jan '25

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

1 0

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

22 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 98f5c475 by Henry Wilkes at 2025-01-22T16:26:59+00:00 fixup! Add CI for Mullvad Browser MB 324: Remove trailing comma from translation JSON. - - - - - 1 changed file: - .gitlab/ci/jobs/update-translations.yml Changes: ===================================== .gitlab/ci/jobs/update-translations.yml ===================================== @@ -54,7 +54,7 @@ "name": "mullvad-browser.ftl", "branch": "mullvad-browser", "directory": "toolkit/toolkit/global" - }, + } ]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/98f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/98f… 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-135.0a1-15.0-1
by morgan (＠morgan) 22 Jan '25

22 Jan '25

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-134.0a1-15.0-1
by morgan (＠morgan) 22 Jan '25

22 Jan '25

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-133.0a1-15.0-1
by morgan (＠morgan) 22 Jan '25

22 Jan '25

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-132.0a1-15.0-1
by morgan (＠morgan) 22 Jan '25

22 Jan '25

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-131.0a1-15.0-1
by morgan (＠morgan) 22 Jan '25

22 Jan '25

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-130.0a1-15.0-1
by morgan (＠morgan) 22 Jan '25

22 Jan '25

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! TB 41649: Create rebase and security backport gitlab issue templates
by morgan (＠morgan) 22 Jan '25

22 Jan '25

morgan pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 4462e6b8 by Morgan at 2025-01-22T15:35:54+00:00 fixup! TB 41649: Create rebase and security backport gitlab issue templates - TB 43298: add rebase template for nightly-based Tor Browser Alpha and Bugzilla Triage Issue generation - TB 43341: Create Firefox Nightly Rebase Issue Template - - - - - 2 changed files: - + .gitlab/issue_templates/Bugzilla Triage.md - + .gitlab/issue_templates/Rebase Browser - Rapid.md Changes: ===================================== .gitlab/issue_templates/Bugzilla Triage.md ===================================== @@ -0,0 +1,51 @@ + # Bugzilla Triage + + **NOTE** This issue presumes the branches and tags for the next Firefox release have already been created in tor-browser.git + + - [ ] Generate Bugzilla triage CSV + - Run (from `tor-browser-build` root): + ```bash + ./tools/browser/generate-bugzilla-triage-csv ${FIREFOX_VERSION} ${PREVIOUS_NIGHTLY_TAG} ${NEXT_NIGHLTY_TAG} ${TRIAGE_ISSUE_NUMBER} ${REVIEWERS} > out.csv + ``` + - `${FIREFOX_VERSION}`: the major Firefox version of the nightly to review + - **Example**: 129 + - `${PREVIOUS_NIGHTLY_TAG}`: the nightly 'end' tag of the previous major Firefox version + - **Example**: `FIREFOX_NIGHTLY_128_END` + - `${NEXT_NIGHLTY_TAG}`: the nightly 'end' tag of the next major Firefox version we are reviewing + - **Example**: `FIREFOX_NIGHTLY_129_END` + - `${TRIAGE_ISSUE_NUMBER}`: this `tor-browser` issue + - **Example**: `43303` + - `${REVIEWERS}`: `morgan` and two additional devs to triage this Firefox version + - `boklm` + - `brizental` + - `clairehurst` + - `dan` + - `henry` + - `jwilde` + - `ma1` + - `pierov` + - **Example**: + ```bash + ./tools/browser/generate-bugzilla-triage-csv 129 FIREFOX_NIGHTLY_128_END FIREFOX_NIGHTLY_129_END 43303 morgan pierov henry > 129.csv + ``` + - [ ] Attach the generated CSV file to the triage isssue + - [ ] Import to Google Sheets ( https://sheets.google.com ) + - [ ] Create blank spreadsheet + - [ ] **Title**: `Bugzilla Triage ${VERSION}` + - [ ] Import CSV: File > Import > Upload + - **Import location**: "Replace spreadsheet" + - **Separator type**: "Comma" + - **Convert text to numbers, dates, and fomulas**: "✅" + - [ ] Convert 'Review' column's issue cells to check-boxes: + - Select relevant cells (i.e.: `A2:A1554` for in the 129 triage) + - Insert > Checkbox + - [ ] Convert 'Triaged by' cells to check-boxes + - [ ] Share Spreadsheet + - 🔒 Share > General access + - Change `Restricted` to `Anyone with the link` + - Post link in an internal note on this issue + - [ ] Page requested reviewers to this issue + - [ ] Triage Completed by: + - [ ] morgan + - [ ] reviewer 1  + - [ ] reviewer 2  ===================================== .gitlab/issue_templates/Rebase Browser - Rapid.md ===================================== @@ -0,0 +1,276 @@ +- **NOTE**: All examples in this template reference the rebase from Firefox 129.0a1 to 130.0a1 +- **TODO**: + - Documentation step for any difficulties or noteworthy things for each rapid rebase + +<details> + <summary>Explanation of Channels</summary> + + There are unfortunately some collisions between how we and Mozilla name our release channels which can make things confusing: + - **Firefox**: + - **Nightly**: \_START and \_END tags, version in the format `$(MAJOR).$(MINOR)a1` + - **Example**: Firefox Nightly 130 was `130.0a1` + - **Note**: Nightly is 2 major versions ahead of the current Release + - **Beta**: tagged each Monday, Wednesday, and Friday until release, version in the format `$(MAJOR).$(MINOR)b$(PATCH)` + - **Example**: the first Firefox Beta 130 was `130.0b1` + - **Note**: Beta is 1 major version ahead of the current Release, should be irrelevant to us + - **Release**: tagged monthly, version in the format `$(MAJOR).$(MINOR)` or `$(MAJOR).$(MINOR).$(PATCH)` + - **Example** Firefox Release 130 was `130.0` + - **ESR**: tagged monthly, version in the format `$(ESR_MAJOR).$(ESR_MINOR).$(ESR_PATCH)esr` + - **Example**: Firefox ESR 128.1 is `128.1.0esr` + - **Tor+Mullvad Browser**: + - **Rapid**: tagged monthly, based on the latest Firefox Nightly + - **Nightly**: not tagged, built nightly from our current Alpha branch's `HEAD` + - **Alpha**: tagged monthly, based on the latest Firefox ESR + - **Stable**: tagged monthly, based on oldest supported Firefox ESR + +</details> + +<details> + <summary>Branching Overview</summary> + + Rebasing Tor Browser Rapid onto the current Firefox Nightly is a bit more confusing/involved than rebasing Tor Browser Alpha or Stable from one minor ESR to the next minor ESR. + + The general process basically involves rebasing the previous Firefox Nightly-based Tor Browser Rapid onto the latest Firefox Nightly, and then cherry-picking all of the commits from the previous Firefox ESR-based Tor Browser Alpha after that channel's `build1` tag. This process presumes that the previous Tor Browser Alpha branch is locked and receiving no more changes. + + This diagram provides a high-level view of the overall code-flow for rebasing/cherry-picking commits from Tor Browser Alpha based on Firefox 128.1.0esr and Tor Browser Rapid based on Firefox 129.0a1 onto Firefox 130.0a1: + + ```mermaid +%%{init: { 'themeVariables': {'git0': '#0072b2', 'gitBranchLabel0': '#fff', 'git1': "#e69f00", 'gitBranchLabel1': '#fff', 'git2': '#009e73', 'gitBranchLabel2': '#fff', 'git3': '#cc79a7', 'gitBranchLabel3': '#fff'}, 'gitGraph': {'mainBranchName': 'tor-browser-128.1.0esr-14.5-1'}} }%% +gitGraph: + branch tor-browser-129.0a1-15.0-2 + branch tor-browser-130.0a1-15.0-1 + branch tor-browser-130.0a1-15.0-2 + + checkout tor-browser-128.1.0esr-14.5-1 + commit id: "FIREFOX_128_1_0esr_BUILD1" + commit id: "base-browser-128.1.0esr-14.5-1-build1" + commit id: "tor-browser-128.1.0esr-14.5-1-build1" + commit id: "tor-browser-128.1.0esr-14.5-1-build2" + + checkout tor-browser-129.0a1-15.0-2 + commit id: "FIREFOX_NIGHTLY_129_END" + %% commit id: "tor-browser-129.0a1-15.0-2-build1" + + checkout tor-browser-130.0a1-15.0-1 + commit id: "FIREFOX_NIGHTLY_130_END" + + checkout tor-browser-130.0a1-15.0-2 + commit id: "FIREFOX_NIGHTLY_130_END " + + checkout tor-browser-130.0a1-15.0-1 + merge tor-browser-129.0a1-15.0-2 + + checkout tor-browser-130.0a1-15.0-2 + merge tor-browser-130.0a1-15.0-1 + + + checkout tor-browser-129.0a1-15.0-2 + commit id: "tor-browser-129.0a1-15.0-2-build1" + + checkout tor-browser-130.0a1-15.0-1 + merge tor-browser-129.0a1-15.0-2 id: "tor-browser-130.0a1-15.0-1-build1" + + checkout tor-browser-130.0a1-15.0-2 + merge tor-browser-130.0a1-15.0-1 + + checkout tor-browser-130.0a1-15.0-1 + merge tor-browser-128.1.0esr-14.5-1 + + checkout tor-browser-130.0a1-15.0-2 + merge tor-browser-130.0a1-15.0-1 + + checkout tor-browser-128.1.0esr-14.5-1 + commit id: "tor-browser-128.1.0esr-14.5-1" + + checkout tor-browser-130.0a1-15.0-1 + merge tor-browser-128.1.0esr-14.5-1 id:"tor-browser-130.0a1-15.0-1-build2" + + checkout tor-browser-130.0a1-15.0-2 + + merge tor-browser-130.0a1-15.0-1 + commit id: "tor-browser-130.0a1-15.0-2-build1" + + ``` + + In this concrete example, the rebaser performs the following steps: + - create new `tor-browser-130.0a1-15.0-1`, and `tor-browser-130.0a1-15.0-2` branches from the `FIREFOX_NIGHTLY_130_END` tag. + - these will be the rebase review branches + - onto `tor-browser-130.0a1-15.0-1`, cherry-pick the range `FIREFOX_NIGHTLY_129_END..tor-browser-129.0a1-15.0-2-build1` (i.e. the Firefox Nightly 129-based Tor Browser Rapid commits) + - this updates the previous Tor Browser Rapid onto Firefox Nightly 130 + - cherry-pick the new alpha patches onto `tor-browser-130.0a1-15.0-1` (i.e. cherry-pick `tor-browser-128.1.0esr-14.5-1-build2..origin/tor-browser-128.1.0esr-14.5-1`) + - onto `tor-browser-130.0a1-15.0-2`, rebase and autosquash the `FIREFOX_NIGHTLY_130_END..tor-browser-130.0a1-15.0-2-build1` commit range + - onto `tor-browser-130.0a1-15.0-2`, cherry-pick the remaining commit range `tor-browser-130.0a1-15.0-2-build1..origin/tor-browser-130.0a1-15.0-2` + - re-order any remaining fixup! commits to be adjacent to their parents (i.e. the same rebase command queue as one would get from `git rebase --autosquash`, but with the `fixup!` commands replaced with `pick!` commands). + - this re-organises the branch in a nicely-bisectable way, and will ensure the rebase+autosquash step for the next release *should* succeed without any additional effort + +</details> + +<details> + <summary>Explanation of Variables</summary> + +- `$(NIGHTLY_VERSION)`: the Mozilla defined nightly version, used in various places for building tor-browser tags, labels, etc + - **Example**: `130.0a1` +- `$(NIGHTLY_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(NIGHTLY_VERSION)` + - **Example**: `FIREFOX_NIGHTLY_130_END` +- `$(NIGHTLY_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous nightly version when rebasing (ie, the nightly version we are rebasing from) + - **Example**: `FIREFOX_NIGHTLY_129_END` +- `$(BROWSER_VERSION)`: the browser version which will first be based on the next major ESR version this *Firefox* Nightly series is leading up to + - **Example**: `15` +- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch based off of the Firefox Nightly channel + - **Example**: `tor-browser-130.0a1-15.0-1` +- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch based off of the Firefox Nightly channel + - **Example**: `tor-browser-129.0a1-15.0-1` +</details> + +### Update Branch Protection Rules + +- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: + - [ ] Remove previous nightly `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) + - [ ] Create new `tor-browser` branch protection rule: + - **Branch**: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-*` + - **Example**: `tor-browser-130.0a1-15.0-*` + - **Allowed to merge**: `Maintainers` + - **Allowed to push and merge**: `Maintainers` + - **Allowed to force push**: `false` + - ⚠️ **IMPORTANT**: If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them! + +### **Create New Branches** + +- [ ] Find the Firefox mercurial tag `$(NIGHTLY_TAG)` + - Go to https://hg.mozilla.org/mozilla-central/tags + - Find and inspect the commit tagged with `$(NIGHTLY_TAG)` + - Tags are in yellow in the Mercurial web UI + - Find the equivalent commit in https://github.com/mozilla/gecko-dev/commits/master + - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/master` locally, instead + - Using the differential revision link is useful to quickly find the git commit + - Sign/Tag the `gecko-dev` commit: `git tag -as $(NIGHTLY_TAG) $(GIT_HASH) -m "Hg tag $(NIGHTLY_TAG)"` +- [ ] Create two new rapid `tor-browser` branches from Firefox mercurial tag + - Branch name in the form: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-${BRANCH_NUM}` + - **Example**: `tor-browser-130.0a1-15.0-1` and `tor-browser-130.0a1-15.0-2` +- [ ] Push new `tor-browser` branches and the `firefox` tag to `upstream` + +### **Rebase previous `-2` rapid branch's HEAD onto current `-1` rapid branch** + +- **Desired outcome**: + - An easy to review branch with the previous rapid branch rebased onto the latest Firefox Nighty tag + - It must be possible to run `git range-diff` between the previous `-2` and the new branch + - We want to see only the effects of the rebase + - No autosquash should happen at this point + - **Expected difficulties**: + - Conflicts with upstream developments + - Sometimes it will be hard to keep a feature working. It's fine to drop it, and create an issue to restore it after a deeper investigation. +- [ ] Checkout a new local branch for the first part of the `-1` rebase + - **Example**: `git checkout -b rapid-rebase-part1 origin/tor-browser-130.0a1-15.0-1` +- [ ] Firefox Nightly-based `tor-browser` rebase: + - [ ] cherry-pick previous Tor Browser Rapid `-2` branch to new `-1` rebase branch + - **Example**: `git cherry-pick FIREFOX_NIGHTLY_129_END..origin/tor-browser-129.0a1-15.0-2` +- [ ] Rebase Verification: + - [ ] Clean range-diff between the previous rapid branch and current rebase branch + - **Example**: + ```bash + git range-diff FIREFOX_NIGHTLY_129_END..origin/tor-browser-129.0a1-15.0-2 FIREFOX_NIGHTLY_130_END..rapid-rebase-part1 + ``` + - [ ] Optional: clean diff of diffs between previous rapid branch and current rebase branch + - **Example**: + ```bash + git diff FIREFOX_NIGHTLY_129_END origin/tor-browser-129.0a1-15.0-2 > 129.diff + git diff FIREFOX_NIGHTLY_130_END HEAD > 130.diff + # A two-column diff tool is suggested rather than plain-diff, e.g., meld on Linux. + meld 129.diff 130.diff + ``` + - **Note**: Only differences should be due to resolving merge conflicts with upstream changes from Firefox Nightly +- [ ] Open MR +- [ ] Merge +- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: + - In **tor-browser.git**, checkout the `-1` rapid `tor-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.torbrowser rapid build1 + ``` + - [ ] Push tag to `upstream` + +### **Port new alpha patches to `-1`** + +- **Desired outcome**: + - The previous release-cycle's new alpha patches cherry-picked to the end of the current nightly + - It must be possible to run `git range-diff ESR-build1..ESR NIGHTLY-build1..` + - **Expected difficulties**: + - Conflicts with upstream developments (similar to the previous part) + - The range might contain cherry-picked upstream commits, which will result in empty commits: it's fine to skip them + - **Note**: The Tor Browser Alpha branch should be closed at this point and not receiving any more MRs +- [ ] Checkout a new local branch for the second part of the `-1` rebase + - **Example**: `git checkout -b rapid-rebase-part2 origin/tor-browser-130.0a1-15.0-1` +- [ ] Cherry-pick the new `tor-browser` alpha commits (i.e. the new dangling commits which did not appear in the previous Tor Browser Alpha release): + - **Example** `git cherry-pick tor-browser-128.1.0esr-14.5-1-build1..origin/tor-browser-128.1.0esr-14.5-1` +- [ ] Rebase Verification + - [ ] Clean range-diff between the alpha patch set ranges + - **Example**: + ```bash + git range-diff tor-browser-128.1.0esr-14.5-1-build1..origin/tor-browser-128.1.0esr-14.5-1 origin/tor-browser-130.0a1-15.0-1..HEAD + ``` + - [ ] Clean diff of diffs between the alpha patch set ranges + - **Example**: + ```bash + git diff tor-browser-128.1.0esr-14.5-1-build1 origin/tor-browser-128.1.0esr-14.5-1 > 128.1.0esr.diff + git diff origin/tor-browser-130.0a1-15.0-1 HEAD > 130.diff + # A two-column diff tool is suggested rather than plain-diff, e.g., meld on Linux. + meld 128.1.0esr.diff 130.diff + ``` + - **Note**: Only differences should be due to resolving merge conflicts with upstream changes from Firefox Nightly +- [ ] Open MR +- [ ] Merge +- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: + - In **tor-browser.git**, checkout the `-1` rapid `tor-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.torbrowser rapid build2 + ``` + - [ ] Push tag to `upstream` + +### **Squash and Reorder tor-browser `-1` branch to new `-2` branch** +- **Desired outcome**: + - The rapid branch from the previous step prepared for the next nightly + - **Rationale**: + - We squash a lot of commits. We want to keep them a little bit longer rather than squashing them immediately for troubleshooting and documentation purposes. + - Doing this as a separate pass helps to separate errors due to upstream changes from errors due to processes created by our workflow. + - **Expected difficulties**: + - our patches aren't disjoint, therefore we might have conflicts when shuffling them around. +- [ ] Checkout a new local branch for the `-2` rebase, aligned to -1-build1 + - **Example**: `git checkout -b rapid-rebase-part3 tor-browser-130.0a1-15.0-1-build1` +- [ ] Rebase with autosquash. This step should be trivial and not involve any conflicts. + - **Example**: `git rebase -i --autosquash FIREFOX_NIGHTLY_130_END` +- [ ] Cherry-pick the remaining commits + - **Example**: `git cherry-pick tor-browser-130.0a1-15.0-1-build1..upstream/tor-browser-130.0a1-15.0-1` +- [ ] Create a branch for self-reviewing purposes, or take note of the current commit hash somewhere + - **Example**: `git branch rapid-rebase-part3-review` + - You do not need to publish this, and you can delete it at the end of the process (`git branch -D rapid-rebase-part3-review`) + - When you are a reviewer, it might be useful to repeat these steps locally. They should not involve mental overhead (and PieroV has a script to automate this) +- [ ] Rebase and reorder commits (i.e. replace `fixup `, `fixup -C ` and `squash ` with `pick ` commands) + - Notice the space at the end, to avoid replacing `fixup!` with `pick!` in the commit subject, even though git will probably not care of such changes +- [ ] Rebase Verification + - [ ] Clean range-diff between the temporary review branch and the final branch + - **Example**: + ```bash + git range-diff FIREFOX_NIGHTLY_130_END..rapid-rebase-part3-review FIREFOX_NIGHTLY_130_END..rapid-rebase-part3 + ``` + - If you are the reviewer, it should be trivial to create such a branch on your own, as no shuffling is involved + - [ ] Clean diff of diffs between rapid branches + - **Example**: + ```bash + git diff FIREFOX_NIGHTLY_130_END tor-browser-130.0a1-15.0-1-build2 > 130-1.diff + git diff FIREFOX_NIGHTLY_130_END HEAD > 130-2.diff + ``` + - [ ] Understandable range-diff (i.e. `fixup!` patches are distributed from end of branch next to their parent) + - **Example**: + ```bash + git range-diff FIREFOX_NIGHTLY_130_END..tor-browser-130.0a1-15.0-1-build2 FIREFOX_NIGHTLY_130_END..HEAD + ``` +- [ ] Open MR +- [ ] Merge +- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: + - In **tor-browser.git**, checkout the `-2` rapid `tor-browser` branch + - In **tor-browser-build.git**, run signing script: + ```bash + ./tools/browser/sign-tag.torbrowser rapid build1 + ``` + - [ ] Push tag to `upstream` View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4462e6b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4462e6b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.5-1] fixup! Adding issue and merge request templates
by morgan (＠morgan) 22 Jan '25

22 Jan '25

morgan pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 0d538394 by Pier Angelo Vendrame at 2025-01-22T15:20:41+00:00 fixup! Adding issue and merge request templates Remove "Emergency" from security updates as per today's meeting. Our policy usually is to backport (almost) all emergency fixes, sooner or later. The actual emergency can be inferred from the timeline. - - - - - 1 changed file: - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -34,12 +34,12 @@ #### Timeline - [ ] **No Backport (preferred)**: patchset for the next major stable -- [ ] **Immediate**: patchset needed as soon as possible +- [ ] **Immediate**: patchset needed as soon as possible (fixes CVEs, 0-days, etc) - [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport - [ ] **Eventually**: patchset that needs to be verified in alpha before backport #### (Optional) Justification -- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc +- [ ] **Security update**: patchset contains a security fix (be sure to select the correct item in _Timeline_) - [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality - [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc - [ ] **Sponsor required**: patchset required for sponsor View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/0d5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/0d5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.6.0esr-14.5-1] fixup! Adding issue and merge request templates
by morgan (＠morgan) 22 Jan '25

22 Jan '25

morgan pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 450569e5 by Pier Angelo Vendrame at 2025-01-22T15:17:54+00:00 fixup! Adding issue and merge request templates Remove "Emergency" from security updates as per today's meeting. Our policy usually is to backport (almost) all emergency fixes, sooner or later. The actual emergency can be inferred from the timeline. - - - - - 1 changed file: - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -35,12 +35,12 @@ #### Timeline - [ ] **No Backport (preferred)**: patchset for the next major stable -- [ ] **Immediate**: patchset needed as soon as possible +- [ ] **Immediate**: patchset needed as soon as possible (fixes CVEs, 0-days, etc) - [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport - [ ] **Eventually**: patchset that needs to be verified in alpha before backport #### (Optional) Justification -- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc +- [ ] **Security update**: patchset contains a security fix (be sure to select the correct item in _Timeline_) - [ ] **Censorship event**: patchset enables censorship circumvention - [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality - [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/450569e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/450569e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! Adding issue and merge request templates
by morgan (＠morgan) 22 Jan '25

22 Jan '25

morgan pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 5fd73855 by Pier Angelo Vendrame at 2025-01-22T15:07:58+00:00 fixup! Adding issue and merge request templates Remove "Emergency" from security updates as per today's meeting. Our policy usually is to backport (almost) all emergency fixes, sooner or later. The actual emergency can be inferred from the timeline. - - - - - 1 changed file: - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -35,12 +35,12 @@ #### Timeline - [ ] **No Backport (preferred)**: patchset for the next major stable -- [ ] **Immediate**: patchset needed as soon as possible +- [ ] **Immediate**: patchset needed as soon as possible (fixes CVEs, 0-days, etc) - [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport - [ ] **Eventually**: patchset that needs to be verified in alpha before backport #### (Optional) Justification -- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc +- [ ] **Security update**: patchset contains a security fix (be sure to select the correct item in _Timeline_) - [ ] **Censorship event**: patchset enables censorship circumvention - [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality - [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5fd7385… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5fd7385… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

22 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: fe2fa243 by Henry Wilkes at 2025-01-22T15:24:17+01:00 fixup! Add CI for Base Browser MB 324: Move update-translations from tor-browser to base-browser. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -8,3 +8,4 @@ variables: include: - local: '.gitlab/ci/jobs/lint/lint.yml' + - local: '.gitlab/ci/jobs/update-translations.yml' View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fe2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fe2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

22 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 048dcb76 by Henry Wilkes at 2025-01-22T15:23:52+01:00 fixup! Add CI for Base Browser MB 324: Move update-translations from tor-browser to base-browser. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -8,3 +8,4 @@ variables: include: - local: '.gitlab/ci/jobs/lint/lint.yml' + - local: '.gitlab/ci/jobs/update-translations.yml' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/048dcb7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/048dcb7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

22 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 7cffb14a by Henry Wilkes at 2025-01-22T13:59:46+00:00 fixup! Add CI for Tor Browser MB 324: Move update-translations from tor-browser to base-browser. Should be dropped at the next rebase. - - - - - dbca320b by Henry Wilkes at 2025-01-22T13:59:46+00:00 fixup! Add CI for Base Browser MB 324: Move update-translations from tor-browser to base-browser. - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2dfd29… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2dfd29… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.5-1] fixup! MB 1: Mullvad Browser branding
by morgan (＠morgan) 22 Jan '25

22 Jan '25

morgan pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 9db51048 by Pier Angelo Vendrame at 2025-01-22T13:47:45+00:00 fixup! MB 1: Mullvad Browser branding TB 43323: Add an asset for sanity tests. - - - - - 2 changed files: - + toolkit/themes/shared/icons/mullvadbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn Changes: ===================================== toolkit/themes/shared/icons/mullvadbrowser.png ===================================== Binary files /dev/null and b/toolkit/themes/shared/icons/mullvadbrowser.png differ ===================================== toolkit/themes/shared/minimal-toolkit.jar.inc.mn ===================================== @@ -45,3 +45,6 @@ toolkit.jar: # Text recognition widget skin/classic/global/media/textrecognition.css (../../shared/media/textrecognition.css) + +# For testing purposes + skin/classic/global/icons/mullvadbrowser.png (../../shared/icons/mullvadbrowser.png) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/9db… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/9db… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! TB 2176: Rebrand Firefox to TorBrowser
by morgan (＠morgan) 22 Jan '25

22 Jan '25

morgan pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 2dfd2952 by Pier Angelo Vendrame at 2025-01-22T13:28:45+00:00 fixup! TB 2176: Rebrand Firefox to TorBrowser TB 43323: Add an asset for sanity tests. - - - - - 2 changed files: - + toolkit/themes/shared/icons/torbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn Changes: ===================================== toolkit/themes/shared/icons/torbrowser.png ===================================== Binary files /dev/null and b/toolkit/themes/shared/icons/torbrowser.png differ ===================================== toolkit/themes/shared/minimal-toolkit.jar.inc.mn ===================================== @@ -45,3 +45,6 @@ toolkit.jar: # Text recognition widget skin/classic/global/media/textrecognition.css (../../shared/media/textrecognition.css) + +# For testing purposes + skin/classic/global/icons/torbrowser.png (../../shared/icons/torbrowser.png) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2dfd295… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2dfd295… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

22 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: d7762a48 by Henry Wilkes at 2025-01-22T11:32:35+00:00 fixup! Add CI for Base Browser MB 324: Move update-translations CI to base-browser. - - - - - e30c4e62 by Henry Wilkes at 2025-01-22T11:32:36+00:00 BB 42305: Add script to combine translation files across versions. - - - - - 7edacb63 by Henry Wilkes at 2025-01-22T11:32:36+00:00 Add CI for Mullvad Browser - - - - - 11 changed files: - .gitlab-ci.yml - + .gitlab/ci/jobs/update-translations.yml - + tools/base-browser/l10n/combine-translation-versions.py - + tools/base-browser/l10n/combine/__init__.py - + tools/base-browser/l10n/combine/combine.py - + tools/base-browser/l10n/combine/tests/README - + tools/base-browser/l10n/combine/tests/__init__.py - + tools/base-browser/l10n/combine/tests/test_android.py - + tools/base-browser/l10n/combine/tests/test_dtd.py - + tools/base-browser/l10n/combine/tests/test_fluent.py - + tools/base-browser/l10n/combine/tests/test_properties.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,5 +1,6 @@ stages: - lint + - update-translations variables: IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest ===================================== .gitlab/ci/jobs/update-translations.yml ===================================== @@ -0,0 +1,95 @@ +.update-translation-base: + stage: update-translations + rules: + - if: ($TRANSLATION_FILES != "" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push") + changes: + - "**/*.ftl" + - "**/*.properties" + - "**/*.dtd" + - "**/*strings.xml" + - "**/update-translations.yml" + - "**/l10n/combine/combine.py" + - "**/l10n/combine-translation-versions.py" + - if: ($TRANSLATION_FILES != "" && $FORCE_UPDATE_TRANSLATIONS == "true") + variables: + COMBINED_FILES_JSON: "combined-translation-files.json" + TRANSLATION_FILES: '[ + { + "name": "brand.ftl", + "where": ["browser/branding/mb-release"], + "branch": "mullvad-browser", + "directory": "browser/branding/mb-release" + }, + { + "name": "brand.properties", + "where": ["browser/branding/mb-release"], + "branch": "mullvad-browser", + "directory": "browser/branding/mb-release" + }, + { + "name": "brand.ftl", + "where": ["browser/branding/mb-alpha"], + "branch": "mullvad-browser", + "directory": "browser/branding/mb-alpha" + }, + { + "name": "brand.properties", + "where": ["browser/branding/mb-alpha"], + "branch": "mullvad-browser", + "directory": "browser/branding/mb-alpha" + }, + { + "name": "brand.ftl", + "where": ["browser/branding/mb-nightly"], + "branch": "mullvad-browser", + "directory": "browser/branding/mb-nightly" + }, + { + "name": "brand.properties", + "where": ["browser/branding/mb-nightly"], + "branch": "mullvad-browser", + "directory": "browser/branding/mb-nightly" + }, + { + "name": "mullvad-browser.ftl", + "branch": "mullvad-browser", + "directory": "toolkit/toolkit/global" + }, + ]' + + +combine-en-US-translations: + extends: .update-translation-base + needs: [] + image: python + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + cache: + paths: + - .cache/pip + # Artifact is for translation project job + artifacts: + paths: + - "$COMBINED_FILES_JSON" + expire_in: "60 min" + reports: + dotenv: job_id.env + # Don't load artifacts for this job. + dependencies: [] + script: + # Save this CI_JOB_ID to the dotenv file to be used in the variables for the + # push-en-US-translations job. + - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env + - pip install compare_locales + - python ./tools/base-browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON" + +push-en-US-translations: + extends: .update-translation-base + needs: + - job: combine-en-US-translations + variables: + COMBINED_FILES_JSON_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${COMBINED_FILES_JSON}" + trigger: + strategy: depend + project: tor-browser-translation-bot/translation + branch: tor-browser-ci ===================================== tools/base-browser/l10n/combine-translation-versions.py ===================================== @@ -0,0 +1,368 @@ +import argparse +import json +import logging +import os +import re +import subprocess + +from combine import combine_files + +arg_parser = argparse.ArgumentParser( + description="Combine a translation file across two different versions" +) + +arg_parser.add_argument( + "current_branch", metavar="<current-branch>", help="branch for the newest version" +) +arg_parser.add_argument( + "files", metavar="<files>", help="JSON specifying the translation files" +) +arg_parser.add_argument("outname", metavar="<json>", help="name of the json output") + +args = arg_parser.parse_args() + +logging.basicConfig() +logger = logging.getLogger("combine-translation-versions") +logger.setLevel(logging.INFO) + + +def in_pink(msg: str) -> str: + """Present a message as pink in the terminal output. + + :param msg: The message to wrap in pink. + :returns: The message to print to terminal. + """ + # Pink and bold. + return f"\x1b[1;38;5;212m{msg}\x1b[0m" + + +def git_run(git_args: list[str]) -> None: + """Run a git command. + + :param git_args: The arguments that should follow "git". + """ + # Add some text to give context to git's stderr appearing in log. + logger.info("Running: " + in_pink("git " + " ".join(git_args))) + subprocess.run(["git", *git_args], check=True) + + +def git_text(git_args: list[str]) -> str: + """Get the text output for a git command. + + :param git_args: The arguments that should follow "git". + :returns: The stdout of the command. + """ + logger.info("Running: " + in_pink("git " + " ".join(git_args))) + return subprocess.run( + ["git", *git_args], text=True, check=True, stdout=subprocess.PIPE + ).stdout + + +def git_lines(git_args: list[str]) -> list[str]: + """Get the lines from a git command. + + :param git_args: The arguments that should follow "git". + :returns: The non-empty lines from stdout of the command. + """ + return [line for line in git_text(git_args).split("\n") if line] + + +class TranslationFile: + """Represents a translation file.""" + + def __init__(self, path: str, content: str) -> None: + self.path = path + self.content = content + + +class BrowserBranch: + """Represents a browser git branch.""" + + def __init__(self, branch_name: str, is_head: bool = False) -> None: + """Create a new instance. + + :param branch_name: The branch's git name. + :param is_head: Whether the branch matches "HEAD". + """ + version_match = re.match( + r"(?P<prefix>[a-z]+\-browser)\-" + r"(?P<firefox>[0-9]+(?:\.[0-9]+){1,2})esr\-" + r"(?P<browser>[0-9]+\.[05])\-" + r"(?P<number>[0-9]+)$", + branch_name, + ) + + if not version_match: + raise ValueError(f"Unable to parse the version from the ref {branch_name}") + + self.name = branch_name + self.prefix = version_match.group("prefix") + self.browser_version = version_match.group("browser") + self._is_head = is_head + self._ref = "HEAD" if is_head else f"origin/{branch_name}" + + firefox_nums = [int(n) for n in version_match.group("firefox").split(".")] + if len(firefox_nums) == 2: + firefox_nums.append(0) + browser_nums = [int(n) for n in self.browser_version.split(".")] + branch_number = int(version_match.group("number")) + # Prioritise the firefox ESR version, then the browser version then the + # branch number. + self._ordered = ( + firefox_nums[0], + firefox_nums[1], + firefox_nums[2], + browser_nums[0], + browser_nums[1], + branch_number, + ) + + # Minor version for browser is only ever "0" or "5", so we can convert + # the version to an integer. + self._browser_int_version = int(2 * float(self.browser_version)) + + self._file_paths: list[str] | None = None + + def release_below(self, other: "BrowserBranch", num: int) -> bool: + """Determine whether another branch is within range of a previous + browser release. + + The browser versions are expected to increment by "0.5", and a previous + release branch's version is expected to be `num * 0.5` behind the + current one. + + :param other: The branch to compare. + :param num: The number of "0.5" releases behind to test with. + """ + return other._browser_int_version == self._browser_int_version - num + + def __lt__(self, other: "BrowserBranch") -> bool: + return self._ordered < other._ordered + + def __gt__(self, other: "BrowserBranch") -> bool: + return self._ordered > other._ordered + + def _matching_dirs(self, path: str, dir_list: list[str]) -> bool: + """Test that a path is contained in the list of dirs. + + :param path: The path to check. + :param dir_list: The list of directories to check against. + :returns: Whether the path matches. + """ + for dir_path in dir_list: + if os.path.commonpath([dir_path, path]) == dir_path: + return True + return False + + def get_file( + self, filename: str, search_dirs: list[str] | None + ) -> TranslationFile | None: + """Fetch the file content for the named file in this branch. + + :param filename: The name of the file to fetch the content for. + :param search_dirs: The directories to restrict the search to, or None + to search for the file anywhere. + :returns: The file, or `None` if no file could be found. + """ + if self._file_paths is None: + if not self._is_head: + # Minimal fetch of non-HEAD branch to get the file paths. + # Individual file blobs will be downloaded as needed. + git_run( + ["fetch", "--depth=1", "--filter=blob:none", "origin", self.name] + ) + self._file_paths = git_lines( + ["ls-tree", "-r", "--format=%(path)", self._ref] + ) + + matching = [ + path + for path in self._file_paths + if os.path.basename(path) == filename + and (search_dirs is None or self._matching_dirs(path, search_dirs)) + ] + if not matching: + return None + if len(matching) > 1: + raise Exception(f"Multiple occurrences of {filename}") + + path = matching[0] + + return TranslationFile( + path=path, content=git_text(["cat-file", "blob", f"{self._ref}:{path}"]) + ) + + +def get_stable_branch( + compare_version: BrowserBranch, +) -> tuple[BrowserBranch, BrowserBranch | None]: + """Find the most recent stable branch in the origin repository. + + :param compare_version: The development branch to compare against. + :returns: The stable and legacy branches. If no legacy branch is found, + `None` will be returned instead. + """ + # We search for build1 tags. These are added *after* the rebase of browser + # commits, so the corresponding branch should contain our strings. + # Moreover, we *assume* that the branch with the most recent ESR version + # with such a tag will be used in the *next* stable build in + # tor-browser-build. + tag_glob = f"{compare_version.prefix}-*-build1" + + # To speed up, only fetch the tags without blobs. + git_run( + ["fetch", "--depth=1", "--filter=object:type=tag", "origin", "tag", tag_glob] + ) + stable_branches = [] + legacy_branches = [] + stable_annotation_regex = re.compile(r"\bstable\b") + legacy_annotation_regex = re.compile(r"\blegacy\b") + tag_pattern = re.compile( + rf"^{re.escape(compare_version.prefix)}-[^-]+esr-[^-]+-[^-]+-build1$" + ) + + for build_tag, annotation in ( + line.split(" ", 1) for line in git_lines(["tag", "-n1", "--list", tag_glob]) + ): + if not tag_pattern.match(build_tag): + continue + is_stable = bool(stable_annotation_regex.search(annotation)) + is_legacy = bool(legacy_annotation_regex.search(annotation)) + if not is_stable and not is_legacy: + continue + try: + # Branch name is the same as the tag, minus "-build1". + branch = BrowserBranch(re.sub(r"-build1$", "", build_tag)) + except ValueError: + logger.warning(f"Could not read the version for {build_tag}") + continue + if branch.prefix != compare_version.prefix: + continue + if is_stable: + # Stable can be one release version behind. + # NOTE: In principle, when switching between versions there may be a + # window of time where the development branch has not yet progressed + # to the next "0.5" release, so has the same browser version as the + # stable branch. So we also allow for matching browser versions. + # NOTE: + # 1. The "Will be unused in" message will not make sense, but we do + # not expect string differences in this scenario. + # 2. We do not expect this scenario to last for long. + if not ( + compare_version.release_below(branch, 1) + or compare_version.release_below(branch, 0) + ): + continue + stable_branches.append(branch) + elif is_legacy: + # Legacy can be two release versions behind. + # We also allow for being just one version behind. + if not ( + compare_version.release_below(branch, 2) + or compare_version.release_below(branch, 1) + ): + continue + legacy_branches.append(branch) + + if not stable_branches: + raise Exception("No stable build1 branch found") + + return ( + # Return the stable branch with the highest version. + max(stable_branches), + max(legacy_branches) if legacy_branches else None, + ) + + +current_branch = BrowserBranch(args.current_branch, is_head=True) + +stable_branch, legacy_branch = get_stable_branch(current_branch) + +if os.environ.get("TRANSLATION_INCLUDE_LEGACY", "") != "true": + legacy_branch = None + +files_list = [] + +for file_dict in json.loads(args.files): + name = file_dict["name"] + where_dirs = file_dict.get("where", None) + current_file = current_branch.get_file(name, where_dirs) + stable_file = stable_branch.get_file(name, where_dirs) + + if current_file is None and stable_file is None: + # No file in either branch. + logger.warning(f"{name} does not exist in either the current or stable branch") + elif current_file is None: + logger.warning(f"{name} deleted in the current branch") + elif stable_file is None: + logger.warning(f"{name} does not exist in the stable branch") + elif current_file.path != stable_file.path: + logger.warning( + f"{name} has different paths in the current and stable branch. " + f"{current_file.path} : {stable_file.path}" + ) + + content = combine_files( + name, + None if current_file is None else current_file.content, + None if stable_file is None else stable_file.content, + f"Will be unused in Tor Browser {current_branch.browser_version}!", + ) + + if legacy_branch and not file_dict.get("exclude-legacy", False): + legacy_file = legacy_branch.get_file(name, where_dirs) + if legacy_file is not None and current_file is None and stable_file is None: + logger.warning(f"{name} still exists in the legacy branch") + elif legacy_file is None: + logger.warning(f"{name} does not exist in the legacy branch") + elif stable_file is not None and legacy_file.path != stable_file.path: + logger.warning( + f"{name} has different paths in the stable and legacy branch. " + f"{stable_file.path} : {legacy_file.path}" + ) + elif current_file is not None and legacy_file.path != current_file.path: + logger.warning( + f"{name} has different paths in the current and legacy branch. " + f"{current_file.path} : {legacy_file.path}" + ) + + content = combine_files( + name, + content, + legacy_file.content, + f"Unused in Tor Browser {stable_branch.browser_version}!", + ) + elif legacy_branch: + logger.info(f"Excluding legacy branch for {name}") + + files_list.append( + { + "name": name, + # If "directory" is unspecified, we place the file directly beneath + # en-US/ in the translation repository. i.e. "". + "directory": file_dict.get("directory", ""), + "branch": file_dict["branch"], + "content": content, + } + ) + + +ci_commit = os.environ.get("CI_COMMIT_SHA", "") +ci_url_base = os.environ.get("CI_PROJECT_URL", "") + +json_data = { + "commit": ci_commit, + "commit-url": f"{ci_url_base}/-/commit/{ci_commit}" + if (ci_commit and ci_url_base) + else "", + "project-path": os.environ.get("CI_PROJECT_PATH", ""), + "current-branch": current_branch.name, + "stable-branch": stable_branch.name, + "files": files_list, +} + +if legacy_branch: + json_data["legacy-branch"] = legacy_branch.name + +with open(args.outname, "w") as file: + json.dump(json_data, file) ===================================== tools/base-browser/l10n/combine/__init__.py ===================================== @@ -0,0 +1,3 @@ +# flake8: noqa + +from .combine import combine_files ===================================== tools/base-browser/l10n/combine/combine.py ===================================== @@ -0,0 +1,181 @@ +import re +from typing import TYPE_CHECKING, Any + +from compare_locales.parser import getParser +from compare_locales.parser.android import AndroidEntity, DocumentWrapper +from compare_locales.parser.base import Comment, Entity, Junk, Whitespace +from compare_locales.parser.dtd import DTDEntity +from compare_locales.parser.fluent import FluentComment, FluentEntity +from compare_locales.parser.properties import PropertiesEntity + +if TYPE_CHECKING: + from collections.abc import Iterable + + +def combine_files( + filename: str, + new_content: str | None, + old_content: str | None, + comment_prefix: str, +) -> str | None: + """Combine two translation files into one to include all strings from both. + The new content is presented first, and any strings only found in the old + content are placed at the end with an additional comment. + + :param filename: The filename for the file, determines the format. + :param new_content: The new content for the file, or None if it has been + deleted. + :param old_content: The old content for the file, or None if it did not + exist before. + :comment_prefix: A comment to include for any strings that are only found in + the old content. This will be placed before any other comments for the + string. + + :returns: The combined content, or None if both given contents are None. + """ + if new_content is None and old_content is None: + return None + + # getParser from compare_locale returns the same instance for the same file + # extension. + parser = getParser(filename) + + is_android = filename.endswith(".xml") + if new_content is None: + if is_android: + # File was deleted, add some document parts. + content_start = ( + '<?xml version="1.0" encoding="utf-8" standalone="yes"?>\n<resources>\n' + ) + content_end = "</resources>\n" + else: + # Treat as an empty file. + content_start = "" + content_end = "" + existing_keys = [] + else: + parser.readUnicode(new_content) + + # Start with the same content as the current file. + # For android strings, we want to keep the final "</resources>" until after. + if is_android: + closing_match = re.match( + r"^(.*)(</resources>\s*)$", parser.ctx.contents, re.DOTALL + ) + if not closing_match: + raise ValueError("Missing a final </resources>") + content_start = closing_match.group(1) + content_end = closing_match.group(2) + else: + content_start = parser.ctx.contents + content_end = "" + existing_keys = [entry.key for entry in parser.walk(only_localizable=True)] + + # For Fluent, we want to prefix the strings using GroupComments. + # On weblate this will cause all the strings that fall under the GroupComment's + # scope to have the prefix added to their "notes". + # We set up an initial GroupComment for the first string we find. This will also + # end the scope of the last GroupComment in the new translation file. + # This will be replaced with a the next GroupComment when it is found. + fluent_group_comment_prefix = f"\n## {comment_prefix}\n" + fluent_group_comment: str | None = fluent_group_comment_prefix + + # For other formats, we want to keep all the comment lines that come directly + # before the string. + # In compare_locales.parser, only the comment line directly before an Entity + # counts as the pre_comment for that Entity. I.e. only this line will be + # included in Entity.all + # However, in weblate every comment line that comes before the Entity is + # included as a comment. So we also want to keep these additional comments to + # preserve them for weblate. + # We gather these extra comments in stacked_comments, and clear them whenever we + # reach an Entity or a blank line (Whitespace is more than "\n"). + stacked_comments: list[str] = [] + + additions: list[str] = [] + + entry_iter: Iterable[Any] = () + # If the file does not exist in the old branch, don't make any additions. + if old_content is not None: + parser.readUnicode(old_content) + entry_iter = parser.walk(only_localizable=False) + for entry in entry_iter: + if isinstance(entry, Junk): + raise ValueError(f"Unexpected Junk: {entry.all}") + if isinstance(entry, Whitespace): + # Clear stacked comments if more than one empty line. + if entry.all != "\n": + stacked_comments.clear() + continue + if isinstance(entry, Comment): + if isinstance(entry, FluentComment): + # Don't stack Fluent comments. + # Only the comments included in Entity.pre_comment count towards + # that Entity's comment. + if entry.all.startswith("##"): + # A Fluent GroupComment + if entry.all == "##": + # Empty GroupComment. Used to end the scope of a previous + # GroupComment. + # Replace this with our prefix comment. + fluent_group_comment = fluent_group_comment_prefix + else: + # Prefix the group comment. + fluent_group_comment = ( + f"{fluent_group_comment_prefix}{entry.all}\n" + ) + else: + stacked_comments.append(entry.all) + continue + if isinstance(entry, DocumentWrapper): + # Not needed. + continue + + if not isinstance(entry, Entity): + raise ValueError(f"Unexpected type: {entry.__class__.__name__}") + + if entry.key in existing_keys: + # Already included this string in the new translation file. + # Drop the gathered comments for this Entity. + stacked_comments.clear() + continue + + if isinstance(entry, FluentEntity): + if fluent_group_comment is not None: + # We have a found GroupComment which has not been included yet. + # All following Entity's will be under its scope, until the next + # GroupComment. + additions.append(fluent_group_comment) + # Added GroupComment, so don't need to add again. + fluent_group_comment = None + elif isinstance(entry, DTDEntity): + # Include our additional comment before we print the rest for this + # Entity. + additions.append(f"") + elif isinstance(entry, PropertiesEntity): + additions.append(f"# {comment_prefix}") + elif isinstance(entry, AndroidEntity): + additions.append(f"") + else: + raise ValueError(f"Unexpected Entity type: {entry.__class__.__name__}") + + # Add any other comment lines that came directly before this Entity. + additions.extend(stacked_comments) + stacked_comments.clear() + additions.append(entry.all) + + content_middle = "" + + if additions: + # New line before and after the additions + additions.insert(0, "") + additions.append("") + if is_android: + content_middle = "\n ".join(additions) + else: + content_middle = "\n".join(additions) + + # Remove " " in otherwise blank lines. + content_middle = re.sub("^ +$", "", content_middle, flags=re.MULTILINE) + + return content_start + content_middle + content_end ===================================== tools/base-browser/l10n/combine/tests/README ===================================== @@ -0,0 +1,2 @@ +python tests to be run with pytest. +Requires the compare-locales package. ===================================== tools/base-browser/l10n/combine/tests/__init__.py ===================================== ===================================== tools/base-browser/l10n/combine/tests/test_android.py ===================================== @@ -0,0 +1,330 @@ +import textwrap + +from combine import combine_files + + +def wrap_in_xml(content): + if content is None: + return None + # Allow for indents to make the tests more readable. + content = textwrap.dedent(content) + return f"""\ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<resources> +{textwrap.indent(content, " ")}</resources> +""" + + +def assert_result(new_content, old_content, expect): + new_content = wrap_in_xml(new_content) + old_content = wrap_in_xml(old_content) + expect = wrap_in_xml(expect) + assert expect == combine_files( + "test_strings.xml", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + None, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + +  + <string name="string_1">First</string> +  + <string name="string_2">Second</string> + """, + ) + + +def test_no_change(): + content = """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_new">NEW</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_new">NEW</string> + <string name="string_2">Second</string> + """, + ) + + +def test_removed_string(): + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="removed">REMOVED</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + +  + <string name="removed">REMOVED</string> + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + <string name="new_1">New string</string> + <string name="string_1">First</string> + <string name="string_2">Second</string> + <string name="new_2">New string 2</string> + """, + """\ + <string name="string_1">First</string> + <string name="removed_1">First removed</string> + <string name="removed_2">Second removed</string> + <string name="string_2">Second</string> + <string name="removed_3">Third removed</string> + """, + """\ + <string name="new_1">New string</string> + <string name="string_1">First</string> + <string name="string_2">Second</string> + <string name="new_2">New string 2</string> + +  + <string name="removed_1">First removed</string> +  + <string name="removed_2">Second removed</string> +  + <string name="removed_3">Third removed</string> + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + <string name="changed_string">NEW</string> + """, + """\ + <string name="changed_string">OLD</string> + """, + """\ + <string name="changed_string">NEW</string> + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ +  + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + ) + # Comment added. + assert_result( + """\ +  + <string name="changed_string">string</string> + """, + """\ + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + ) + # Comment removed. + assert_result( + """\ + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + """\ + <string name="changed_string">string</string> + """, + ) + + # With file comments + assert_result( + """\ +  + +  + <string name="changed_string">string</string> + """, + """\ +  + +  + <string name="changed_string">string</string> + """, + """\ +  + +  + <string name="changed_string">string</string> + """, + ) + + +def test_reordered(): + # String was re_ordered. + assert_result( + """\ + <string name="string_1">value</string> + <string name="moved_string">move</string> + """, + """\ + <string name="moved_string">move</string> + <string name="string_1">value</string> + """, + """\ + <string name="string_1">value</string> + <string name="moved_string">move</string> + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ +  + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ +  + <string name="string_1">First</string> +  + <string name="removed">REMOVED</string> + <string name="string_2">Second</string> + """, + """\ +  + <string name="string_1">First</string> + <string name="string_2">Second</string> + +  +  + <string name="removed">REMOVED</string> + """, + ) + + # With file comments and multi-line. + # All comments prior to a removed string are moved with it, until another + # entity or blank line is reached. + assert_result( + """\ +  + +  +  + <string name="string_1">First</string> + +  +  + + <string name="string_2">Second</string> + """, + """\ +  + +  +  + <string name="string_1">First</string> + <string name="removed_1">First removed</string> +  + <string name="removed_2">Second removed</string> + +  + +  +  + <string name="removed_3">Third removed</string> + +  +  + + <string name="removed_4">Fourth removed</string> + <string name="string_2">Second</string> + """, + """\ +  + +  +  + <string name="string_1">First</string> + +  +  + + <string name="string_2">Second</string> + +  + <string name="removed_1">First removed</string> +  +  + <string name="removed_2">Second removed</string> +  +  +  + <string name="removed_3">Third removed</string> +  + <string name="removed_4">Fourth removed</string> + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_dtd.py ===================================== @@ -0,0 +1,325 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.dtd", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + None, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + +  + <!ENTITY string.1 "First"> +  + <!ENTITY string.2 "Second"> + """, + ) + + +def test_no_change(): + content = """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.new "NEW"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.new "NEW"> + <!ENTITY string.2 "Second"> + """, + ) + + +def test_removed_string(): + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY removed "REMOVED"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + +  + <!ENTITY removed "REMOVED"> + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + <!ENTITY new.1 "New string"> + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + <!ENTITY new.2 "New string 2"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY removed.1 "First removed"> + <!ENTITY removed.2 "Second removed"> + <!ENTITY string.2 "Second"> + <!ENTITY removed.3 "Third removed"> + """, + """\ + <!ENTITY new.1 "New string"> + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + <!ENTITY new.2 "New string 2"> + +  + <!ENTITY removed.1 "First removed"> +  + <!ENTITY removed.2 "Second removed"> +  + <!ENTITY removed.3 "Third removed"> + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + <!ENTITY changed.string "NEW"> + """, + """\ + <!ENTITY changed.string "OLD"> + """, + """\ + <!ENTITY changed.string "NEW"> + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ +  + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + ) + # Comment added. + assert_result( + """\ +  + <!ENTITY changed.string "string"> + """, + """\ + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + ) + # Comment removed. + assert_result( + """\ + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + """\ + <!ENTITY changed.string "string"> + """, + ) + + # With multiple comments + assert_result( + """\ +  + +  + <!ENTITY changed.string "string"> + """, + """\ +  + +  + <!ENTITY changed.string "string"> + """, + """\ +  + +  + <!ENTITY changed.string "string"> + """, + ) + + +def test_reordered(): + # String was re.ordered. + assert_result( + """\ + <!ENTITY string.1 "value"> + <!ENTITY moved.string "move"> + """, + """\ + <!ENTITY moved.string "move"> + <!ENTITY string.1 "value"> + """, + """\ + <!ENTITY string.1 "value"> + <!ENTITY moved.string "move"> + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ +  + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ +  + <!ENTITY string.1 "First"> +  + <!ENTITY removed "REMOVED"> + <!ENTITY string.2 "Second"> + """, + """\ +  + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + +  +  + <!ENTITY removed "REMOVED"> + """, + ) + + # With multiple lines of comments. + + assert_result( + """\ +  + +  +  + <!ENTITY string.1 "First"> + +  + + <!ENTITY string.2 "Second"> + """, + """\ +  + +  + <!ENTITY string.1 "First"> + <!ENTITY removed.1 "First removed"> +  + <!ENTITY removed.2 "Second removed"> + +  + +  +  + <!ENTITY removed.3 "Third removed"> + +  + + <!ENTITY removed.4 "Fourth removed"> + <!ENTITY string.2 "Second"> + """, + """\ +  + +  +  + <!ENTITY string.1 "First"> + +  + + <!ENTITY string.2 "Second"> + +  + <!ENTITY removed.1 "First removed"> +  +  + <!ENTITY removed.2 "Second removed"> +  +  +  + <!ENTITY removed.3 "Third removed"> +  + <!ENTITY removed.4 "Fourth removed"> + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_fluent.py ===================================== @@ -0,0 +1,344 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.ftl", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + string-1 = First + string-2 = Second + """, + None, + """\ + string-1 = First + string-2 = Second + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + string-1 = First + string-2 = Second + """, + """\ + + + ## REMOVED STRING + + string-1 = First + string-2 = Second + """, + ) + + +def test_no_change(): + content = """\ + string-1 = First + string-2 = Second + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + string-1 = First + string-new = NEW + string-2 = Second + """, + """\ + string-1 = First + string-2 = Second + """, + """\ + string-1 = First + string-new = NEW + string-2 = Second + """, + ) + + +def test_removed_string(): + assert_result( + """\ + string-1 = First + string-2 = Second + """, + """\ + string-1 = First + removed = REMOVED + string-2 = Second + """, + """\ + string-1 = First + string-2 = Second + + + ## REMOVED STRING + + removed = REMOVED + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + new-1 = New string + string-1 = + .attr = First + string-2 = Second + new-2 = + .title = New string 2 + """, + """\ + string-1 = + .attr = First + removed-1 = First removed + removed-2 = + .attr = Second removed + string-2 = Second + removed-3 = Third removed + """, + """\ + new-1 = New string + string-1 = + .attr = First + string-2 = Second + new-2 = + .title = New string 2 + + + ## REMOVED STRING + + removed-1 = First removed + removed-2 = + .attr = Second removed + removed-3 = Third removed + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + changed-string = NEW + """, + """\ + changed-string = OLD + """, + """\ + changed-string = NEW + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ + # NEW + changed-string = string + """, + """\ + # OLD + changed-string = string + """, + """\ + # NEW + changed-string = string + """, + ) + # Comment added. + assert_result( + """\ + # NEW + changed-string = string + """, + """\ + changed-string = string + """, + """\ + # NEW + changed-string = string + """, + ) + # Comment removed. + assert_result( + """\ + changed-string = string + """, + """\ + # OLD + changed-string = string + """, + """\ + changed-string = string + """, + ) + + # With group comments. + assert_result( + """\ + ## GROUP NEW + + # NEW + changed-string = string + """, + """\ + ## GROUP OLD + + # OLD + changed-string = string + """, + """\ + ## GROUP NEW + + # NEW + changed-string = string + """, + ) + + +def test_reordered(): + # String was re-ordered. + assert_result( + """\ + string-1 = value + moved-string = move + """, + """\ + moved-string = move + string-1 = value + """, + """\ + string-1 = value + moved-string = move + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ + # Comment for first. + string-1 = First + string-2 = Second + """, + """\ + # Comment for first. + string-1 = First + # Comment for removed. + removed = REMOVED + string-2 = Second + """, + """\ + # Comment for first. + string-1 = First + string-2 = Second + + + ## REMOVED STRING + + # Comment for removed. + removed = REMOVED + """, + ) + + # Group comments are combined with the "REMOVED STRING" comments. + # If strings have no group comment, then a single "REMOVED STRING" is + # included for them. + assert_result( + """\ + ## First Group comment + + # Comment for first. + string-1 = First + + ## + + no-group = No group comment + + ## Second + ## Group comment + + string-2 = Second + """, + """\ + ## First Group comment + + # Comment for first. + string-1 = First + removed-1 = First removed + # Comment for second removed. + removed-2 = Second removed + + ## + + no-group = No group comment + removed-3 = Third removed + + ## Second + ## Group comment + + removed-4 = Fourth removed + string-2 = Second + """, + """\ + ## First Group comment + + # Comment for first. + string-1 = First + + ## + + no-group = No group comment + + ## Second + ## Group comment + + string-2 = Second + + + ## REMOVED STRING + ## First Group comment + + removed-1 = First removed + # Comment for second removed. + removed-2 = Second removed + + ## REMOVED STRING + + removed-3 = Third removed + + ## REMOVED STRING + ## Second + ## Group comment + + removed-4 = Fourth removed + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_properties.py ===================================== @@ -0,0 +1,322 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.properties", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + string.1 = First + string.2 = Second + """, + None, + """\ + string.1 = First + string.2 = Second + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + string.1 = First + string.2 = Second + """, + """\ + + # REMOVED STRING + string.1 = First + # REMOVED STRING + string.2 = Second + """, + ) + + +def test_no_change(): + content = """\ + string.1 = First + string.2 = Second + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + string.1 = First + string.new = NEW + string.2 = Second + """, + """\ + string.1 = First + string.2 = Second + """, + """\ + string.1 = First + string.new = NEW + string.2 = Second + """, + ) + + +def test_removed_string(): + assert_result( + """\ + string.1 = First + string.2 = Second + """, + """\ + string.1 = First + removed = REMOVED + string.2 = Second + """, + """\ + string.1 = First + string.2 = Second + + # REMOVED STRING + removed = REMOVED + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + new.1 = New string + string.1 = First + string.2 = Second + new.2 = New string 2 + """, + """\ + string.1 = First + removed.1 = First removed + removed.2 = Second removed + string.2 = Second + removed.3 = Third removed + """, + """\ + new.1 = New string + string.1 = First + string.2 = Second + new.2 = New string 2 + + # REMOVED STRING + removed.1 = First removed + # REMOVED STRING + removed.2 = Second removed + # REMOVED STRING + removed.3 = Third removed + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + changed.string = NEW + """, + """\ + changed.string = OLD + """, + """\ + changed.string = NEW + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ + # NEW + changed.string = string + """, + """\ + # OLD + changed.string = string + """, + """\ + # NEW + changed.string = string + """, + ) + # Comment added. + assert_result( + """\ + # NEW + changed.string = string + """, + """\ + changed.string = string + """, + """\ + # NEW + changed.string = string + """, + ) + # Comment removed. + assert_result( + """\ + changed.string = string + """, + """\ + # OLD + changed.string = string + """, + """\ + changed.string = string + """, + ) + + # With file comments + assert_result( + """\ + # NEW file comment + + # NEW + changed.string = string + """, + """\ + # OLD file comment + + # OLD + changed.string = string + """, + """\ + # NEW file comment + + # NEW + changed.string = string + """, + ) + + +def test_reordered(): + # String was re.ordered. + assert_result( + """\ + string.1 = value + moved.string = move + """, + """\ + moved.string = move + string.1 = value + """, + """\ + string.1 = value + moved.string = move + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ + # Comment for first. + string.1 = First + string.2 = Second + """, + """\ + # Comment for first. + string.1 = First + # Comment for removed. + removed = REMOVED + string.2 = Second + """, + """\ + # Comment for first. + string.1 = First + string.2 = Second + + # REMOVED STRING + # Comment for removed. + removed = REMOVED + """, + ) + + # With file comments and multi-line. + # All comments prior to a removed string are moved with it, until another + # entity or blank line is reached. + assert_result( + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + + # Second + # File comment + + string.2 = Second + """, + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + removed.1 = First removed + # Comment for second removed. + removed.2 = Second removed + + # Removed file comment + + # Comment 1 for third removed + # Comment 2 for third removed + removed.3 = Third removed + + # Second + # File comment + + removed.4 = Fourth removed + string.2 = Second + """, + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + + # Second + # File comment + + string.2 = Second + + # REMOVED STRING + removed.1 = First removed + # REMOVED STRING + # Comment for second removed. + removed.2 = Second removed + # REMOVED STRING + # Comment 1 for third removed + # Comment 2 for third removed + removed.3 = Third removed + # REMOVED STRING + removed.4 = Fourth removed + """, + ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/76… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/76… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! TB 42247: Android helpers for the TorProvider
by Pier Angelo Vendrame (＠pierov) 22 Jan '25

22 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 1323ab5f by Pier Angelo Vendrame at 2025-01-22T12:11:01+01:00 fixup! TB 42247: Android helpers for the TorProvider Add a missing return to #getAllSettings(). - - - - - 1 changed file: - toolkit/modules/TorAndroidIntegration.sys.mjs Changes: ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -97,6 +97,7 @@ class TorAndroidIntegrationImpl { #getAllSettings() { const settings = lazy.TorSettings.getSettings(); settings.quickstart = { enabled: lazy.TorConnect.quickstart }; + return settings; } observe(subj, topic) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1323ab5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1323ab5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

22 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 5f316b25 by Henry Wilkes at 2025-01-22T12:13:24+01:00 fixup! Add CI for Base Browser MB 324: Move update-translations CI to base-browser. - - - - - 9fc48603 by Henry Wilkes at 2025-01-22T12:13:34+01:00 BB 42305: Add script to combine translation files across versions. - - - - - 11 changed files: - .gitlab-ci.yml - + .gitlab/ci/jobs/update-translations.yml - + tools/base-browser/l10n/combine-translation-versions.py - + tools/base-browser/l10n/combine/__init__.py - + tools/base-browser/l10n/combine/combine.py - + tools/base-browser/l10n/combine/tests/README - + tools/base-browser/l10n/combine/tests/__init__.py - + tools/base-browser/l10n/combine/tests/test_android.py - + tools/base-browser/l10n/combine/tests/test_dtd.py - + tools/base-browser/l10n/combine/tests/test_fluent.py - + tools/base-browser/l10n/combine/tests/test_properties.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,5 +1,6 @@ stages: - lint + - update-translations variables: IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest ===================================== .gitlab/ci/jobs/update-translations.yml ===================================== @@ -0,0 +1,53 @@ +.update-translation-base: + stage: update-translations + rules: + - if: ($TRANSLATION_FILES != "" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push") + changes: + - "**/*.ftl" + - "**/*.properties" + - "**/*.dtd" + - "**/*strings.xml" + - "**/update-translations.yml" + - "**/l10n/combine/combine.py" + - "**/l10n/combine-translation-versions.py" + - if: ($TRANSLATION_FILES != "" && $FORCE_UPDATE_TRANSLATIONS == "true") + variables: + COMBINED_FILES_JSON: "combined-translation-files.json" + TRANSLATION_FILES: '' + + +combine-en-US-translations: + extends: .update-translation-base + needs: [] + image: python + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + cache: + paths: + - .cache/pip + # Artifact is for translation project job + artifacts: + paths: + - "$COMBINED_FILES_JSON" + expire_in: "60 min" + reports: + dotenv: job_id.env + # Don't load artifacts for this job. + dependencies: [] + script: + # Save this CI_JOB_ID to the dotenv file to be used in the variables for the + # push-en-US-translations job. + - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env + - pip install compare_locales + - python ./tools/base-browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON" + +push-en-US-translations: + extends: .update-translation-base + needs: + - job: combine-en-US-translations + variables: + COMBINED_FILES_JSON_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${COMBINED_FILES_JSON}" + trigger: + strategy: depend + project: tor-browser-translation-bot/translation + branch: tor-browser-ci ===================================== tools/base-browser/l10n/combine-translation-versions.py ===================================== @@ -0,0 +1,368 @@ +import argparse +import json +import logging +import os +import re +import subprocess + +from combine import combine_files + +arg_parser = argparse.ArgumentParser( + description="Combine a translation file across two different versions" +) + +arg_parser.add_argument( + "current_branch", metavar="<current-branch>", help="branch for the newest version" +) +arg_parser.add_argument( + "files", metavar="<files>", help="JSON specifying the translation files" +) +arg_parser.add_argument("outname", metavar="<json>", help="name of the json output") + +args = arg_parser.parse_args() + +logging.basicConfig() +logger = logging.getLogger("combine-translation-versions") +logger.setLevel(logging.INFO) + + +def in_pink(msg: str) -> str: + """Present a message as pink in the terminal output. + + :param msg: The message to wrap in pink. + :returns: The message to print to terminal. + """ + # Pink and bold. + return f"\x1b[1;38;5;212m{msg}\x1b[0m" + + +def git_run(git_args: list[str]) -> None: + """Run a git command. + + :param git_args: The arguments that should follow "git". + """ + # Add some text to give context to git's stderr appearing in log. + logger.info("Running: " + in_pink("git " + " ".join(git_args))) + subprocess.run(["git", *git_args], check=True) + + +def git_text(git_args: list[str]) -> str: + """Get the text output for a git command. + + :param git_args: The arguments that should follow "git". + :returns: The stdout of the command. + """ + logger.info("Running: " + in_pink("git " + " ".join(git_args))) + return subprocess.run( + ["git", *git_args], text=True, check=True, stdout=subprocess.PIPE + ).stdout + + +def git_lines(git_args: list[str]) -> list[str]: + """Get the lines from a git command. + + :param git_args: The arguments that should follow "git". + :returns: The non-empty lines from stdout of the command. + """ + return [line for line in git_text(git_args).split("\n") if line] + + +class TranslationFile: + """Represents a translation file.""" + + def __init__(self, path: str, content: str) -> None: + self.path = path + self.content = content + + +class BrowserBranch: + """Represents a browser git branch.""" + + def __init__(self, branch_name: str, is_head: bool = False) -> None: + """Create a new instance. + + :param branch_name: The branch's git name. + :param is_head: Whether the branch matches "HEAD". + """ + version_match = re.match( + r"(?P<prefix>[a-z]+\-browser)\-" + r"(?P<firefox>[0-9]+(?:\.[0-9]+){1,2})esr\-" + r"(?P<browser>[0-9]+\.[05])\-" + r"(?P<number>[0-9]+)$", + branch_name, + ) + + if not version_match: + raise ValueError(f"Unable to parse the version from the ref {branch_name}") + + self.name = branch_name + self.prefix = version_match.group("prefix") + self.browser_version = version_match.group("browser") + self._is_head = is_head + self._ref = "HEAD" if is_head else f"origin/{branch_name}" + + firefox_nums = [int(n) for n in version_match.group("firefox").split(".")] + if len(firefox_nums) == 2: + firefox_nums.append(0) + browser_nums = [int(n) for n in self.browser_version.split(".")] + branch_number = int(version_match.group("number")) + # Prioritise the firefox ESR version, then the browser version then the + # branch number. + self._ordered = ( + firefox_nums[0], + firefox_nums[1], + firefox_nums[2], + browser_nums[0], + browser_nums[1], + branch_number, + ) + + # Minor version for browser is only ever "0" or "5", so we can convert + # the version to an integer. + self._browser_int_version = int(2 * float(self.browser_version)) + + self._file_paths: list[str] | None = None + + def release_below(self, other: "BrowserBranch", num: int) -> bool: + """Determine whether another branch is within range of a previous + browser release. + + The browser versions are expected to increment by "0.5", and a previous + release branch's version is expected to be `num * 0.5` behind the + current one. + + :param other: The branch to compare. + :param num: The number of "0.5" releases behind to test with. + """ + return other._browser_int_version == self._browser_int_version - num + + def __lt__(self, other: "BrowserBranch") -> bool: + return self._ordered < other._ordered + + def __gt__(self, other: "BrowserBranch") -> bool: + return self._ordered > other._ordered + + def _matching_dirs(self, path: str, dir_list: list[str]) -> bool: + """Test that a path is contained in the list of dirs. + + :param path: The path to check. + :param dir_list: The list of directories to check against. + :returns: Whether the path matches. + """ + for dir_path in dir_list: + if os.path.commonpath([dir_path, path]) == dir_path: + return True + return False + + def get_file( + self, filename: str, search_dirs: list[str] | None + ) -> TranslationFile | None: + """Fetch the file content for the named file in this branch. + + :param filename: The name of the file to fetch the content for. + :param search_dirs: The directories to restrict the search to, or None + to search for the file anywhere. + :returns: The file, or `None` if no file could be found. + """ + if self._file_paths is None: + if not self._is_head: + # Minimal fetch of non-HEAD branch to get the file paths. + # Individual file blobs will be downloaded as needed. + git_run( + ["fetch", "--depth=1", "--filter=blob:none", "origin", self.name] + ) + self._file_paths = git_lines( + ["ls-tree", "-r", "--format=%(path)", self._ref] + ) + + matching = [ + path + for path in self._file_paths + if os.path.basename(path) == filename + and (search_dirs is None or self._matching_dirs(path, search_dirs)) + ] + if not matching: + return None + if len(matching) > 1: + raise Exception(f"Multiple occurrences of {filename}") + + path = matching[0] + + return TranslationFile( + path=path, content=git_text(["cat-file", "blob", f"{self._ref}:{path}"]) + ) + + +def get_stable_branch( + compare_version: BrowserBranch, +) -> tuple[BrowserBranch, BrowserBranch | None]: + """Find the most recent stable branch in the origin repository. + + :param compare_version: The development branch to compare against. + :returns: The stable and legacy branches. If no legacy branch is found, + `None` will be returned instead. + """ + # We search for build1 tags. These are added *after* the rebase of browser + # commits, so the corresponding branch should contain our strings. + # Moreover, we *assume* that the branch with the most recent ESR version + # with such a tag will be used in the *next* stable build in + # tor-browser-build. + tag_glob = f"{compare_version.prefix}-*-build1" + + # To speed up, only fetch the tags without blobs. + git_run( + ["fetch", "--depth=1", "--filter=object:type=tag", "origin", "tag", tag_glob] + ) + stable_branches = [] + legacy_branches = [] + stable_annotation_regex = re.compile(r"\bstable\b") + legacy_annotation_regex = re.compile(r"\blegacy\b") + tag_pattern = re.compile( + rf"^{re.escape(compare_version.prefix)}-[^-]+esr-[^-]+-[^-]+-build1$" + ) + + for build_tag, annotation in ( + line.split(" ", 1) for line in git_lines(["tag", "-n1", "--list", tag_glob]) + ): + if not tag_pattern.match(build_tag): + continue + is_stable = bool(stable_annotation_regex.search(annotation)) + is_legacy = bool(legacy_annotation_regex.search(annotation)) + if not is_stable and not is_legacy: + continue + try: + # Branch name is the same as the tag, minus "-build1". + branch = BrowserBranch(re.sub(r"-build1$", "", build_tag)) + except ValueError: + logger.warning(f"Could not read the version for {build_tag}") + continue + if branch.prefix != compare_version.prefix: + continue + if is_stable: + # Stable can be one release version behind. + # NOTE: In principle, when switching between versions there may be a + # window of time where the development branch has not yet progressed + # to the next "0.5" release, so has the same browser version as the + # stable branch. So we also allow for matching browser versions. + # NOTE: + # 1. The "Will be unused in" message will not make sense, but we do + # not expect string differences in this scenario. + # 2. We do not expect this scenario to last for long. + if not ( + compare_version.release_below(branch, 1) + or compare_version.release_below(branch, 0) + ): + continue + stable_branches.append(branch) + elif is_legacy: + # Legacy can be two release versions behind. + # We also allow for being just one version behind. + if not ( + compare_version.release_below(branch, 2) + or compare_version.release_below(branch, 1) + ): + continue + legacy_branches.append(branch) + + if not stable_branches: + raise Exception("No stable build1 branch found") + + return ( + # Return the stable branch with the highest version. + max(stable_branches), + max(legacy_branches) if legacy_branches else None, + ) + + +current_branch = BrowserBranch(args.current_branch, is_head=True) + +stable_branch, legacy_branch = get_stable_branch(current_branch) + +if os.environ.get("TRANSLATION_INCLUDE_LEGACY", "") != "true": + legacy_branch = None + +files_list = [] + +for file_dict in json.loads(args.files): + name = file_dict["name"] + where_dirs = file_dict.get("where", None) + current_file = current_branch.get_file(name, where_dirs) + stable_file = stable_branch.get_file(name, where_dirs) + + if current_file is None and stable_file is None: + # No file in either branch. + logger.warning(f"{name} does not exist in either the current or stable branch") + elif current_file is None: + logger.warning(f"{name} deleted in the current branch") + elif stable_file is None: + logger.warning(f"{name} does not exist in the stable branch") + elif current_file.path != stable_file.path: + logger.warning( + f"{name} has different paths in the current and stable branch. " + f"{current_file.path} : {stable_file.path}" + ) + + content = combine_files( + name, + None if current_file is None else current_file.content, + None if stable_file is None else stable_file.content, + f"Will be unused in Tor Browser {current_branch.browser_version}!", + ) + + if legacy_branch and not file_dict.get("exclude-legacy", False): + legacy_file = legacy_branch.get_file(name, where_dirs) + if legacy_file is not None and current_file is None and stable_file is None: + logger.warning(f"{name} still exists in the legacy branch") + elif legacy_file is None: + logger.warning(f"{name} does not exist in the legacy branch") + elif stable_file is not None and legacy_file.path != stable_file.path: + logger.warning( + f"{name} has different paths in the stable and legacy branch. " + f"{stable_file.path} : {legacy_file.path}" + ) + elif current_file is not None and legacy_file.path != current_file.path: + logger.warning( + f"{name} has different paths in the current and legacy branch. " + f"{current_file.path} : {legacy_file.path}" + ) + + content = combine_files( + name, + content, + legacy_file.content, + f"Unused in Tor Browser {stable_branch.browser_version}!", + ) + elif legacy_branch: + logger.info(f"Excluding legacy branch for {name}") + + files_list.append( + { + "name": name, + # If "directory" is unspecified, we place the file directly beneath + # en-US/ in the translation repository. i.e. "". + "directory": file_dict.get("directory", ""), + "branch": file_dict["branch"], + "content": content, + } + ) + + +ci_commit = os.environ.get("CI_COMMIT_SHA", "") +ci_url_base = os.environ.get("CI_PROJECT_URL", "") + +json_data = { + "commit": ci_commit, + "commit-url": f"{ci_url_base}/-/commit/{ci_commit}" + if (ci_commit and ci_url_base) + else "", + "project-path": os.environ.get("CI_PROJECT_PATH", ""), + "current-branch": current_branch.name, + "stable-branch": stable_branch.name, + "files": files_list, +} + +if legacy_branch: + json_data["legacy-branch"] = legacy_branch.name + +with open(args.outname, "w") as file: + json.dump(json_data, file) ===================================== tools/base-browser/l10n/combine/__init__.py ===================================== @@ -0,0 +1,3 @@ +# flake8: noqa + +from .combine import combine_files ===================================== tools/base-browser/l10n/combine/combine.py ===================================== @@ -0,0 +1,181 @@ +import re +from typing import TYPE_CHECKING, Any + +from compare_locales.parser import getParser +from compare_locales.parser.android import AndroidEntity, DocumentWrapper +from compare_locales.parser.base import Comment, Entity, Junk, Whitespace +from compare_locales.parser.dtd import DTDEntity +from compare_locales.parser.fluent import FluentComment, FluentEntity +from compare_locales.parser.properties import PropertiesEntity + +if TYPE_CHECKING: + from collections.abc import Iterable + + +def combine_files( + filename: str, + new_content: str | None, + old_content: str | None, + comment_prefix: str, +) -> str | None: + """Combine two translation files into one to include all strings from both. + The new content is presented first, and any strings only found in the old + content are placed at the end with an additional comment. + + :param filename: The filename for the file, determines the format. + :param new_content: The new content for the file, or None if it has been + deleted. + :param old_content: The old content for the file, or None if it did not + exist before. + :comment_prefix: A comment to include for any strings that are only found in + the old content. This will be placed before any other comments for the + string. + + :returns: The combined content, or None if both given contents are None. + """ + if new_content is None and old_content is None: + return None + + # getParser from compare_locale returns the same instance for the same file + # extension. + parser = getParser(filename) + + is_android = filename.endswith(".xml") + if new_content is None: + if is_android: + # File was deleted, add some document parts. + content_start = ( + '<?xml version="1.0" encoding="utf-8" standalone="yes"?>\n<resources>\n' + ) + content_end = "</resources>\n" + else: + # Treat as an empty file. + content_start = "" + content_end = "" + existing_keys = [] + else: + parser.readUnicode(new_content) + + # Start with the same content as the current file. + # For android strings, we want to keep the final "</resources>" until after. + if is_android: + closing_match = re.match( + r"^(.*)(</resources>\s*)$", parser.ctx.contents, re.DOTALL + ) + if not closing_match: + raise ValueError("Missing a final </resources>") + content_start = closing_match.group(1) + content_end = closing_match.group(2) + else: + content_start = parser.ctx.contents + content_end = "" + existing_keys = [entry.key for entry in parser.walk(only_localizable=True)] + + # For Fluent, we want to prefix the strings using GroupComments. + # On weblate this will cause all the strings that fall under the GroupComment's + # scope to have the prefix added to their "notes". + # We set up an initial GroupComment for the first string we find. This will also + # end the scope of the last GroupComment in the new translation file. + # This will be replaced with a the next GroupComment when it is found. + fluent_group_comment_prefix = f"\n## {comment_prefix}\n" + fluent_group_comment: str | None = fluent_group_comment_prefix + + # For other formats, we want to keep all the comment lines that come directly + # before the string. + # In compare_locales.parser, only the comment line directly before an Entity + # counts as the pre_comment for that Entity. I.e. only this line will be + # included in Entity.all + # However, in weblate every comment line that comes before the Entity is + # included as a comment. So we also want to keep these additional comments to + # preserve them for weblate. + # We gather these extra comments in stacked_comments, and clear them whenever we + # reach an Entity or a blank line (Whitespace is more than "\n"). + stacked_comments: list[str] = [] + + additions: list[str] = [] + + entry_iter: Iterable[Any] = () + # If the file does not exist in the old branch, don't make any additions. + if old_content is not None: + parser.readUnicode(old_content) + entry_iter = parser.walk(only_localizable=False) + for entry in entry_iter: + if isinstance(entry, Junk): + raise ValueError(f"Unexpected Junk: {entry.all}") + if isinstance(entry, Whitespace): + # Clear stacked comments if more than one empty line. + if entry.all != "\n": + stacked_comments.clear() + continue + if isinstance(entry, Comment): + if isinstance(entry, FluentComment): + # Don't stack Fluent comments. + # Only the comments included in Entity.pre_comment count towards + # that Entity's comment. + if entry.all.startswith("##"): + # A Fluent GroupComment + if entry.all == "##": + # Empty GroupComment. Used to end the scope of a previous + # GroupComment. + # Replace this with our prefix comment. + fluent_group_comment = fluent_group_comment_prefix + else: + # Prefix the group comment. + fluent_group_comment = ( + f"{fluent_group_comment_prefix}{entry.all}\n" + ) + else: + stacked_comments.append(entry.all) + continue + if isinstance(entry, DocumentWrapper): + # Not needed. + continue + + if not isinstance(entry, Entity): + raise ValueError(f"Unexpected type: {entry.__class__.__name__}") + + if entry.key in existing_keys: + # Already included this string in the new translation file. + # Drop the gathered comments for this Entity. + stacked_comments.clear() + continue + + if isinstance(entry, FluentEntity): + if fluent_group_comment is not None: + # We have a found GroupComment which has not been included yet. + # All following Entity's will be under its scope, until the next + # GroupComment. + additions.append(fluent_group_comment) + # Added GroupComment, so don't need to add again. + fluent_group_comment = None + elif isinstance(entry, DTDEntity): + # Include our additional comment before we print the rest for this + # Entity. + additions.append(f"") + elif isinstance(entry, PropertiesEntity): + additions.append(f"# {comment_prefix}") + elif isinstance(entry, AndroidEntity): + additions.append(f"") + else: + raise ValueError(f"Unexpected Entity type: {entry.__class__.__name__}") + + # Add any other comment lines that came directly before this Entity. + additions.extend(stacked_comments) + stacked_comments.clear() + additions.append(entry.all) + + content_middle = "" + + if additions: + # New line before and after the additions + additions.insert(0, "") + additions.append("") + if is_android: + content_middle = "\n ".join(additions) + else: + content_middle = "\n".join(additions) + + # Remove " " in otherwise blank lines. + content_middle = re.sub("^ +$", "", content_middle, flags=re.MULTILINE) + + return content_start + content_middle + content_end ===================================== tools/base-browser/l10n/combine/tests/README ===================================== @@ -0,0 +1,2 @@ +python tests to be run with pytest. +Requires the compare-locales package. ===================================== tools/base-browser/l10n/combine/tests/__init__.py ===================================== ===================================== tools/base-browser/l10n/combine/tests/test_android.py ===================================== @@ -0,0 +1,330 @@ +import textwrap + +from combine import combine_files + + +def wrap_in_xml(content): + if content is None: + return None + # Allow for indents to make the tests more readable. + content = textwrap.dedent(content) + return f"""\ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<resources> +{textwrap.indent(content, " ")}</resources> +""" + + +def assert_result(new_content, old_content, expect): + new_content = wrap_in_xml(new_content) + old_content = wrap_in_xml(old_content) + expect = wrap_in_xml(expect) + assert expect == combine_files( + "test_strings.xml", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + None, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + +  + <string name="string_1">First</string> +  + <string name="string_2">Second</string> + """, + ) + + +def test_no_change(): + content = """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_new">NEW</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_new">NEW</string> + <string name="string_2">Second</string> + """, + ) + + +def test_removed_string(): + assert_result( + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="removed">REMOVED</string> + <string name="string_2">Second</string> + """, + """\ + <string name="string_1">First</string> + <string name="string_2">Second</string> + +  + <string name="removed">REMOVED</string> + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + <string name="new_1">New string</string> + <string name="string_1">First</string> + <string name="string_2">Second</string> + <string name="new_2">New string 2</string> + """, + """\ + <string name="string_1">First</string> + <string name="removed_1">First removed</string> + <string name="removed_2">Second removed</string> + <string name="string_2">Second</string> + <string name="removed_3">Third removed</string> + """, + """\ + <string name="new_1">New string</string> + <string name="string_1">First</string> + <string name="string_2">Second</string> + <string name="new_2">New string 2</string> + +  + <string name="removed_1">First removed</string> +  + <string name="removed_2">Second removed</string> +  + <string name="removed_3">Third removed</string> + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + <string name="changed_string">NEW</string> + """, + """\ + <string name="changed_string">OLD</string> + """, + """\ + <string name="changed_string">NEW</string> + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ +  + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + ) + # Comment added. + assert_result( + """\ +  + <string name="changed_string">string</string> + """, + """\ + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + ) + # Comment removed. + assert_result( + """\ + <string name="changed_string">string</string> + """, + """\ +  + <string name="changed_string">string</string> + """, + """\ + <string name="changed_string">string</string> + """, + ) + + # With file comments + assert_result( + """\ +  + +  + <string name="changed_string">string</string> + """, + """\ +  + +  + <string name="changed_string">string</string> + """, + """\ +  + +  + <string name="changed_string">string</string> + """, + ) + + +def test_reordered(): + # String was re_ordered. + assert_result( + """\ + <string name="string_1">value</string> + <string name="moved_string">move</string> + """, + """\ + <string name="moved_string">move</string> + <string name="string_1">value</string> + """, + """\ + <string name="string_1">value</string> + <string name="moved_string">move</string> + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ +  + <string name="string_1">First</string> + <string name="string_2">Second</string> + """, + """\ +  + <string name="string_1">First</string> +  + <string name="removed">REMOVED</string> + <string name="string_2">Second</string> + """, + """\ +  + <string name="string_1">First</string> + <string name="string_2">Second</string> + +  +  + <string name="removed">REMOVED</string> + """, + ) + + # With file comments and multi-line. + # All comments prior to a removed string are moved with it, until another + # entity or blank line is reached. + assert_result( + """\ +  + +  +  + <string name="string_1">First</string> + +  +  + + <string name="string_2">Second</string> + """, + """\ +  + +  +  + <string name="string_1">First</string> + <string name="removed_1">First removed</string> +  + <string name="removed_2">Second removed</string> + +  + +  +  + <string name="removed_3">Third removed</string> + +  +  + + <string name="removed_4">Fourth removed</string> + <string name="string_2">Second</string> + """, + """\ +  + +  +  + <string name="string_1">First</string> + +  +  + + <string name="string_2">Second</string> + +  + <string name="removed_1">First removed</string> +  +  + <string name="removed_2">Second removed</string> +  +  +  + <string name="removed_3">Third removed</string> +  + <string name="removed_4">Fourth removed</string> + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_dtd.py ===================================== @@ -0,0 +1,325 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.dtd", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + None, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + +  + <!ENTITY string.1 "First"> +  + <!ENTITY string.2 "Second"> + """, + ) + + +def test_no_change(): + content = """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.new "NEW"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.new "NEW"> + <!ENTITY string.2 "Second"> + """, + ) + + +def test_removed_string(): + assert_result( + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY removed "REMOVED"> + <!ENTITY string.2 "Second"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + +  + <!ENTITY removed "REMOVED"> + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + <!ENTITY new.1 "New string"> + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + <!ENTITY new.2 "New string 2"> + """, + """\ + <!ENTITY string.1 "First"> + <!ENTITY removed.1 "First removed"> + <!ENTITY removed.2 "Second removed"> + <!ENTITY string.2 "Second"> + <!ENTITY removed.3 "Third removed"> + """, + """\ + <!ENTITY new.1 "New string"> + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + <!ENTITY new.2 "New string 2"> + +  + <!ENTITY removed.1 "First removed"> +  + <!ENTITY removed.2 "Second removed"> +  + <!ENTITY removed.3 "Third removed"> + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + <!ENTITY changed.string "NEW"> + """, + """\ + <!ENTITY changed.string "OLD"> + """, + """\ + <!ENTITY changed.string "NEW"> + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ +  + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + ) + # Comment added. + assert_result( + """\ +  + <!ENTITY changed.string "string"> + """, + """\ + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + ) + # Comment removed. + assert_result( + """\ + <!ENTITY changed.string "string"> + """, + """\ +  + <!ENTITY changed.string "string"> + """, + """\ + <!ENTITY changed.string "string"> + """, + ) + + # With multiple comments + assert_result( + """\ +  + +  + <!ENTITY changed.string "string"> + """, + """\ +  + +  + <!ENTITY changed.string "string"> + """, + """\ +  + +  + <!ENTITY changed.string "string"> + """, + ) + + +def test_reordered(): + # String was re.ordered. + assert_result( + """\ + <!ENTITY string.1 "value"> + <!ENTITY moved.string "move"> + """, + """\ + <!ENTITY moved.string "move"> + <!ENTITY string.1 "value"> + """, + """\ + <!ENTITY string.1 "value"> + <!ENTITY moved.string "move"> + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ +  + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + """, + """\ +  + <!ENTITY string.1 "First"> +  + <!ENTITY removed "REMOVED"> + <!ENTITY string.2 "Second"> + """, + """\ +  + <!ENTITY string.1 "First"> + <!ENTITY string.2 "Second"> + +  +  + <!ENTITY removed "REMOVED"> + """, + ) + + # With multiple lines of comments. + + assert_result( + """\ +  + +  +  + <!ENTITY string.1 "First"> + +  + + <!ENTITY string.2 "Second"> + """, + """\ +  + +  + <!ENTITY string.1 "First"> + <!ENTITY removed.1 "First removed"> +  + <!ENTITY removed.2 "Second removed"> + +  + +  +  + <!ENTITY removed.3 "Third removed"> + +  + + <!ENTITY removed.4 "Fourth removed"> + <!ENTITY string.2 "Second"> + """, + """\ +  + +  +  + <!ENTITY string.1 "First"> + +  + + <!ENTITY string.2 "Second"> + +  + <!ENTITY removed.1 "First removed"> +  +  + <!ENTITY removed.2 "Second removed"> +  +  +  + <!ENTITY removed.3 "Third removed"> +  + <!ENTITY removed.4 "Fourth removed"> + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_fluent.py ===================================== @@ -0,0 +1,344 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.ftl", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + string-1 = First + string-2 = Second + """, + None, + """\ + string-1 = First + string-2 = Second + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + string-1 = First + string-2 = Second + """, + """\ + + + ## REMOVED STRING + + string-1 = First + string-2 = Second + """, + ) + + +def test_no_change(): + content = """\ + string-1 = First + string-2 = Second + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + string-1 = First + string-new = NEW + string-2 = Second + """, + """\ + string-1 = First + string-2 = Second + """, + """\ + string-1 = First + string-new = NEW + string-2 = Second + """, + ) + + +def test_removed_string(): + assert_result( + """\ + string-1 = First + string-2 = Second + """, + """\ + string-1 = First + removed = REMOVED + string-2 = Second + """, + """\ + string-1 = First + string-2 = Second + + + ## REMOVED STRING + + removed = REMOVED + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + new-1 = New string + string-1 = + .attr = First + string-2 = Second + new-2 = + .title = New string 2 + """, + """\ + string-1 = + .attr = First + removed-1 = First removed + removed-2 = + .attr = Second removed + string-2 = Second + removed-3 = Third removed + """, + """\ + new-1 = New string + string-1 = + .attr = First + string-2 = Second + new-2 = + .title = New string 2 + + + ## REMOVED STRING + + removed-1 = First removed + removed-2 = + .attr = Second removed + removed-3 = Third removed + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + changed-string = NEW + """, + """\ + changed-string = OLD + """, + """\ + changed-string = NEW + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ + # NEW + changed-string = string + """, + """\ + # OLD + changed-string = string + """, + """\ + # NEW + changed-string = string + """, + ) + # Comment added. + assert_result( + """\ + # NEW + changed-string = string + """, + """\ + changed-string = string + """, + """\ + # NEW + changed-string = string + """, + ) + # Comment removed. + assert_result( + """\ + changed-string = string + """, + """\ + # OLD + changed-string = string + """, + """\ + changed-string = string + """, + ) + + # With group comments. + assert_result( + """\ + ## GROUP NEW + + # NEW + changed-string = string + """, + """\ + ## GROUP OLD + + # OLD + changed-string = string + """, + """\ + ## GROUP NEW + + # NEW + changed-string = string + """, + ) + + +def test_reordered(): + # String was re-ordered. + assert_result( + """\ + string-1 = value + moved-string = move + """, + """\ + moved-string = move + string-1 = value + """, + """\ + string-1 = value + moved-string = move + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ + # Comment for first. + string-1 = First + string-2 = Second + """, + """\ + # Comment for first. + string-1 = First + # Comment for removed. + removed = REMOVED + string-2 = Second + """, + """\ + # Comment for first. + string-1 = First + string-2 = Second + + + ## REMOVED STRING + + # Comment for removed. + removed = REMOVED + """, + ) + + # Group comments are combined with the "REMOVED STRING" comments. + # If strings have no group comment, then a single "REMOVED STRING" is + # included for them. + assert_result( + """\ + ## First Group comment + + # Comment for first. + string-1 = First + + ## + + no-group = No group comment + + ## Second + ## Group comment + + string-2 = Second + """, + """\ + ## First Group comment + + # Comment for first. + string-1 = First + removed-1 = First removed + # Comment for second removed. + removed-2 = Second removed + + ## + + no-group = No group comment + removed-3 = Third removed + + ## Second + ## Group comment + + removed-4 = Fourth removed + string-2 = Second + """, + """\ + ## First Group comment + + # Comment for first. + string-1 = First + + ## + + no-group = No group comment + + ## Second + ## Group comment + + string-2 = Second + + + ## REMOVED STRING + ## First Group comment + + removed-1 = First removed + # Comment for second removed. + removed-2 = Second removed + + ## REMOVED STRING + + removed-3 = Third removed + + ## REMOVED STRING + ## Second + ## Group comment + + removed-4 = Fourth removed + """, + ) ===================================== tools/base-browser/l10n/combine/tests/test_properties.py ===================================== @@ -0,0 +1,322 @@ +import textwrap + +from combine import combine_files + + +def assert_result(new_content, old_content, expect): + # Allow for indents to make the tests more readable. + if new_content is not None: + new_content = textwrap.dedent(new_content) + if old_content is not None: + old_content = textwrap.dedent(old_content) + if expect is not None: + expect = textwrap.dedent(expect) + assert expect == combine_files( + "test.properties", new_content, old_content, "REMOVED STRING" + ) + + +def test_combine_empty(): + assert_result(None, None, None) + + +def test_combine_new_file(): + # New file with no old content. + assert_result( + """\ + string.1 = First + string.2 = Second + """, + None, + """\ + string.1 = First + string.2 = Second + """, + ) + + +def test_combine_removed_file(): + # Entire file was removed. + assert_result( + None, + """\ + string.1 = First + string.2 = Second + """, + """\ + + # REMOVED STRING + string.1 = First + # REMOVED STRING + string.2 = Second + """, + ) + + +def test_no_change(): + content = """\ + string.1 = First + string.2 = Second + """ + assert_result(content, content, content) + + +def test_added_string(): + assert_result( + """\ + string.1 = First + string.new = NEW + string.2 = Second + """, + """\ + string.1 = First + string.2 = Second + """, + """\ + string.1 = First + string.new = NEW + string.2 = Second + """, + ) + + +def test_removed_string(): + assert_result( + """\ + string.1 = First + string.2 = Second + """, + """\ + string.1 = First + removed = REMOVED + string.2 = Second + """, + """\ + string.1 = First + string.2 = Second + + # REMOVED STRING + removed = REMOVED + """, + ) + + +def test_removed_and_added(): + assert_result( + """\ + new.1 = New string + string.1 = First + string.2 = Second + new.2 = New string 2 + """, + """\ + string.1 = First + removed.1 = First removed + removed.2 = Second removed + string.2 = Second + removed.3 = Third removed + """, + """\ + new.1 = New string + string.1 = First + string.2 = Second + new.2 = New string 2 + + # REMOVED STRING + removed.1 = First removed + # REMOVED STRING + removed.2 = Second removed + # REMOVED STRING + removed.3 = Third removed + """, + ) + + +def test_updated(): + # String content was updated. + assert_result( + """\ + changed.string = NEW + """, + """\ + changed.string = OLD + """, + """\ + changed.string = NEW + """, + ) + + +def test_updated_comment(): + # String comment was updated. + assert_result( + """\ + # NEW + changed.string = string + """, + """\ + # OLD + changed.string = string + """, + """\ + # NEW + changed.string = string + """, + ) + # Comment added. + assert_result( + """\ + # NEW + changed.string = string + """, + """\ + changed.string = string + """, + """\ + # NEW + changed.string = string + """, + ) + # Comment removed. + assert_result( + """\ + changed.string = string + """, + """\ + # OLD + changed.string = string + """, + """\ + changed.string = string + """, + ) + + # With file comments + assert_result( + """\ + # NEW file comment + + # NEW + changed.string = string + """, + """\ + # OLD file comment + + # OLD + changed.string = string + """, + """\ + # NEW file comment + + # NEW + changed.string = string + """, + ) + + +def test_reordered(): + # String was re.ordered. + assert_result( + """\ + string.1 = value + moved.string = move + """, + """\ + moved.string = move + string.1 = value + """, + """\ + string.1 = value + moved.string = move + """, + ) + + +def test_removed_string_with_comment(): + assert_result( + """\ + # Comment for first. + string.1 = First + string.2 = Second + """, + """\ + # Comment for first. + string.1 = First + # Comment for removed. + removed = REMOVED + string.2 = Second + """, + """\ + # Comment for first. + string.1 = First + string.2 = Second + + # REMOVED STRING + # Comment for removed. + removed = REMOVED + """, + ) + + # With file comments and multi-line. + # All comments prior to a removed string are moved with it, until another + # entity or blank line is reached. + assert_result( + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + + # Second + # File comment + + string.2 = Second + """, + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + removed.1 = First removed + # Comment for second removed. + removed.2 = Second removed + + # Removed file comment + + # Comment 1 for third removed + # Comment 2 for third removed + removed.3 = Third removed + + # Second + # File comment + + removed.4 = Fourth removed + string.2 = Second + """, + """\ + # First File comment + + # Comment for first. + # Comment 2 for first. + string.1 = First + + # Second + # File comment + + string.2 = Second + + # REMOVED STRING + removed.1 = First removed + # REMOVED STRING + # Comment for second removed. + removed.2 = Second removed + # REMOVED STRING + # Comment 1 for third removed + # Comment 2 for third removed + removed.3 = Third removed + # REMOVED STRING + removed.4 = Fourth removed + """, + ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/186910… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/186910… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

22 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 4fd00231 by Henry Wilkes at 2025-01-22T11:06:59+00:00 fixup! Add CI for Tor Browser MB 324: Revert tor-browser changes that add update-translations CI. - - - - - f467154f by Henry Wilkes at 2025-01-22T11:06:59+00:00 Revert "TB 42305: Add script to combine translation files across versions." This reverts commit 3247633d3f6bf60be7feaf2e3515d9b7c2b1dad0. - - - - - 675287aa by Henry Wilkes at 2025-01-22T11:06:59+00:00 fixup! Add CI for Base Browser MB 324: Move update-translations CI to base-browser. - - - - - 4c57d159 by Henry Wilkes at 2025-01-22T11:06:59+00:00 BB 42305: Add script to combine translation files across versions. - - - - - e0847a5c by Henry Wilkes at 2025-01-22T11:06:59+00:00 fixup! Add CI for Tor Browser MB 324: Re-introduce tor-browser changes to update-translations - - - - - 10 changed files: - .gitlab/ci/jobs/update-translations.yml - tools/torbrowser/l10n/combine-translation-versions.py → tools/base-browser/l10n/combine-translation-versions.py - tools/torbrowser/l10n/combine/__init__.py → tools/base-browser/l10n/combine/__init__.py - tools/torbrowser/l10n/combine/combine.py → tools/base-browser/l10n/combine/combine.py - tools/torbrowser/l10n/combine/tests/README → tools/base-browser/l10n/combine/tests/README - tools/torbrowser/l10n/combine/tests/__init__.py → tools/base-browser/l10n/combine/tests/__init__.py - tools/torbrowser/l10n/combine/tests/test_android.py → tools/base-browser/l10n/combine/tests/test_android.py - tools/torbrowser/l10n/combine/tests/test_dtd.py → tools/base-browser/l10n/combine/tests/test_dtd.py - tools/torbrowser/l10n/combine/tests/test_fluent.py → tools/base-browser/l10n/combine/tests/test_fluent.py - tools/torbrowser/l10n/combine/tests/test_properties.py → tools/base-browser/l10n/combine/tests/test_properties.py Changes: ===================================== .gitlab/ci/jobs/update-translations.yml ===================================== @@ -1,7 +1,7 @@ .update-translation-base: stage: update-translations rules: - - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push") + - if: ($TRANSLATION_FILES != "" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push") changes: - "**/*.ftl" - "**/*.properties" @@ -10,17 +10,9 @@ - "**/update-translations.yml" - "**/l10n/combine/combine.py" - "**/l10n/combine-translation-versions.py" - - if: $FORCE_UPDATE_TRANSLATIONS == "true" + - if: ($TRANSLATION_FILES != "" && $FORCE_UPDATE_TRANSLATIONS == "true") variables: - TOR_BROWSER_COMBINED_FILES_JSON: "combined-translation-files.json" - - -combine-en-US-translations: - extends: .update-translation-base - needs: [] - image: python - variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + COMBINED_FILES_JSON: "combined-translation-files.json" TRANSLATION_FILES: '[ { "name": "brand.ftl", @@ -49,13 +41,21 @@ combine-en-US-translations: } ]' TRANSLATION_INCLUDE_LEGACY: "true" + + +combine-en-US-translations: + extends: .update-translation-base + needs: [] + image: python + variables: + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" cache: paths: - .cache/pip # Artifact is for translation project job artifacts: paths: - - "$TOR_BROWSER_COMBINED_FILES_JSON" + - "$COMBINED_FILES_JSON" expire_in: "60 min" reports: dotenv: job_id.env @@ -66,14 +66,14 @@ combine-en-US-translations: # push-en-US-translations job. - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env - pip install compare_locales - - python ./tools/torbrowser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$TOR_BROWSER_COMBINED_FILES_JSON" + - python ./tools/base-browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON" push-en-US-translations: extends: .update-translation-base needs: - job: combine-en-US-translations variables: - TOR_BROWSER_COMBINED_FILES_JSON_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${TOR_BROWSER_COMBINED_FILES_JSON}" + COMBINED_FILES_JSON_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${COMBINED_FILES_JSON}" trigger: strategy: depend project: tor-browser-translation-bot/translation ===================================== tools/torbrowser/l10n/combine-translation-versions.py → tools/base-browser/l10n/combine-translation-versions.py ===================================== ===================================== tools/torbrowser/l10n/combine/__init__.py → tools/base-browser/l10n/combine/__init__.py ===================================== ===================================== tools/torbrowser/l10n/combine/combine.py → tools/base-browser/l10n/combine/combine.py ===================================== ===================================== tools/torbrowser/l10n/combine/tests/README → tools/base-browser/l10n/combine/tests/README ===================================== ===================================== tools/torbrowser/l10n/combine/tests/__init__.py → tools/base-browser/l10n/combine/tests/__init__.py ===================================== ===================================== tools/torbrowser/l10n/combine/tests/test_android.py → tools/base-browser/l10n/combine/tests/test_android.py ===================================== ===================================== tools/torbrowser/l10n/combine/tests/test_dtd.py → tools/base-browser/l10n/combine/tests/test_dtd.py ===================================== ===================================== tools/torbrowser/l10n/combine/tests/test_fluent.py → tools/base-browser/l10n/combine/tests/test_fluent.py ===================================== ===================================== tools/torbrowser/l10n/combine/tests/test_properties.py → tools/base-browser/l10n/combine/tests/test_properties.py ===================================== View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ecdccd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ecdccd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] 2 commits: fixup! TB 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 21 Jan '25

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 266cf821 by Henry Wilkes at 2025-01-21T17:10:38+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Reset bootstrap stage when bridge settings change. In particular, this will cancel an autobootstrap when the user manually changes the bridge settings. However we apply this to all bootstrap attempts for consistency. By resetting to the Start stage, we also ensure that about:torconnect UI no longer shows the "Try bridges" pages when the user manually changes their bridges themselves. - - - - - ecdccd3f by Henry Wilkes at 2025-01-21T17:10:38+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Also show the "Connect" button for bridge dialogs when we have an ongoing bootstrap attempt. With the new behaviour, changing the settings while not bootstrapped will cancel any ongoing bootstrap. Therefore, we can start a new bootstrap using the new settings. - - - - - 6 changed files: - browser/components/torpreferences/content/builtinBridgeDialog.js - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/provideBridgeDialog.js - browser/components/torpreferences/content/requestBridgeDialog.js - toolkit/modules/TorConnect.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== browser/components/torpreferences/content/builtinBridgeDialog.js ===================================== @@ -4,9 +4,8 @@ const { TorSettings, TorBridgeSource } = ChromeUtils.importESModule( "resource://gre/modules/TorSettings.sys.mjs" ); -const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule( - "resource://gre/modules/TorConnect.sys.mjs" -); +const { TorConnect, TorConnectStage, TorConnectTopics } = + ChromeUtils.importESModule("resource://gre/modules/TorConnect.sys.mjs"); const gBuiltinBridgeDialog = { init() { @@ -96,7 +95,7 @@ const gBuiltinBridgeDialog = { }, onAcceptStateChange() { - const connect = TorConnect.canBeginBootstrap; + const connect = TorConnect.stageName !== TorConnectStage.Bootstrapped; this._result.connect = connect; this._acceptButton.setAttribute( "data-l10n-id", ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2257,6 +2257,8 @@ const gBridgeSettings = { } // Wait until the settings are applied before bootstrapping. + // NOTE: Saving the settings should also cancel any existing bootstrap + // attempt first. See tor-browser#41921. savedSettings.then(() => { // The bridge dialog button is "connect" when Tor is not // bootstrapped, so do the connect. ===================================== browser/components/torpreferences/content/provideBridgeDialog.js ===================================== @@ -3,9 +3,8 @@ const { TorSettings, TorBridgeSource, validateBridgeLines } = ChromeUtils.importESModule("resource://gre/modules/TorSettings.sys.mjs"); -const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule( - "resource://gre/modules/TorConnect.sys.mjs" -); +const { TorConnect, TorConnectStage, TorConnectTopics } = + ChromeUtils.importESModule("resource://gre/modules/TorConnect.sys.mjs"); const { TorParsers } = ChromeUtils.importESModule( "resource://gre/modules/TorParsers.sys.mjs" @@ -190,7 +189,7 @@ const gProvideBridgeDialog = { "user-provide-bridge-dialog-next-button" ); } else { - connect = TorConnect.canBeginBootstrap; + connect = TorConnect.stageName !== TorConnectStage.Bootstrapped; this._acceptButton.setAttribute( "data-l10n-id", connect ? "bridge-dialog-button-connect" : "bridge-dialog-button-accept" ===================================== browser/components/torpreferences/content/requestBridgeDialog.js ===================================== @@ -4,9 +4,8 @@ const { BridgeDB } = ChromeUtils.importESModule( "resource://gre/modules/BridgeDB.sys.mjs" ); -const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule( - "resource://gre/modules/TorConnect.sys.mjs" -); +const { TorConnect, TorConnectStage, TorConnectTopics } = + ChromeUtils.importESModule("resource://gre/modules/TorConnect.sys.mjs"); const log = console.createInstance({ maxLogLevel: "Warn", @@ -102,7 +101,7 @@ const gRequestBridgeDialog = { }, onAcceptStateChange() { - const connect = TorConnect.canBeginBootstrap; + const connect = TorConnect.stageName !== TorConnectStage.Bootstrapped; this._result.connect = connect; this._submitButton.setAttribute( "data-l10n-id", ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, { TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs", TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs", TorSettings: "resource://gre/modules/TorSettings.sys.mjs", + TorSettingsTopics: "resource://gre/modules/TorSettings.sys.mjs", }); const TorConnectPrefs = Object.freeze({ @@ -629,16 +630,6 @@ class AutoBootstrapAttempt { // Send the new settings directly to the provider. We will save them only // if the bootstrap succeeds. - // FIXME: We should somehow signal TorSettings users that we have set - // custom settings, and they should not apply theirs until we are done - // with trying ours. - // Otherwise, the new settings provided by the user while we were - // bootstrapping could be the ones that cause the bootstrap to succeed, - // but we overwrite them (unless we backup the original settings, and then - // save our new settings only if they have not changed). - // Another idea (maybe easier to implement) is to disable the settings - // UI while *any* bootstrap is going on. - // This is also documented in tor-browser#41921. await lazy.TorSettings.applyTemporaryBridges(bridges); if (this.#cancelled || this.#resolved) { @@ -1036,6 +1027,7 @@ export const TorConnect = { // register the Tor topics we always care about observeTopic(lazy.TorProviderTopics.ProcessExited); observeTopic(lazy.TorProviderTopics.HasWarnOrErr); + observeTopic(lazy.TorSettingsTopics.SettingsChanged); // NOTE: At this point, _requestedStage should still be `null`. this._setStage(TorConnectStage.Start); @@ -1070,8 +1062,32 @@ export const TorConnect = { Services.prefs.setBoolPref(TorConnectPrefs.prompt_at_startup, true); this._makeStageRequest(TorConnectStage.Start, true); break; - default: - // ignore + case lazy.TorSettingsTopics.SettingsChanged: + if ( + this._stageName !== TorConnectStage.Bootstrapped && + this._stageName !== TorConnectStage.Loading && + this._stageName !== TorConnectStage.Start && + subject.wrappedJSObject.changes.some(propertyName => + propertyName.startsWith("bridges.") + ) + ) { + // A change in bridge settings before we are bootstrapped, we reset + // the stage to Start to: + // + Cancel any ongoing bootstrap attempt. In particular, we + // definitely do not want to continue with an auto-bootstrap's + // temporary bridges if the settings have changed. + // + Reset the UI to be ready for normal bootstrapping in case the + // user returns to about:torconnect. + // See tor-browser#41921. + // NOTE: We do not reset in response to a change in the quickstart, + // firewall or proxy settings. + lazy.logger.warn( + "Resetting to Start stage since bridge settings changed" + ); + // Rather than cancel and return to the pre-bootstrap stage, we + // explicitly cancel and return to the start stage. + this._makeStageRequest(TorConnectStage.Start); + } break; } }, ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -953,6 +953,7 @@ class TorSettingsImpl { }; if ("bridges" in newValues) { + const changesLength = changes.length; if ("source" in newValues.bridges) { this.#fixupBridgeSettings(newValues.bridges); changeSetting("bridges", "source", newValues.bridges.source); @@ -982,6 +983,19 @@ class TorSettingsImpl { if ("enabled" in newValues.bridges) { changeSetting("bridges", "enabled", newValues.bridges.enabled); } + + if (this.#temporaryBridgeSettings && changes.length !== changesLength) { + // A change in the bridges settings. + // We want to clear the temporary bridge settings to ensure that they + // cannot be used to overwrite these user-provided settings. + // See tor-browser#41921. + // NOTE: This should also trigger TorConnect to cancel any ongoing + // AutoBootstrap that would have otherwise used these settings. + this.#temporaryBridgeSettings = null; + lazy.logger.warn( + "Cleared temporary bridges since bridge settings were changed" + ); + } } if ("proxy" in newValues) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0bb78c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0bb78c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! [android] Add standalone Tor Bootstrap
by Pier Angelo Vendrame (＠pierov) 21 Jan '25

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 0bb78caa by clairehurst at 2025-01-21T16:51:39+00:00 fixup! [android] Add standalone Tor Bootstrap Bug 43368: Add @Suppress for linting error "Overriding method should call super. onNewIntent" - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -4,6 +4,7 @@ package org.mozilla.fenix +import android.annotation.SuppressLint import android.app.assist.AssistContent import android.app.PendingIntent import android.content.Context @@ -710,6 +711,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn /** * Handles intents received when the activity is open. */ + @SuppressLint("MissingSuperCall") // super.onNewIntent is called in [onNewIntentInternal(intent)] final override fun onNewIntent(intent: Intent?) { if (intent?.action == ACTION_MAIN || components.torController.isConnected) { onNewIntentInternal(intent) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0bb78ca… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0bb78ca… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! [android] Add standalone Tor Bootstrap
by Pier Angelo Vendrame (＠pierov) 21 Jan '25

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: eabeaa5b by clairehurst at 2025-01-21T16:50:59+00:00 fixup! [android] Add standalone Tor Bootstrap Bug 43360: Replace custom variable isBeingRecreated with built-in isFinishing function - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -176,8 +176,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn private var isToolbarInflated = false - private var isBeingRecreated = false - private val webExtensionPopupObserver by lazy { WebExtensionPopupObserver(components.core.store, ::openPopup) } @@ -652,7 +650,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn stopMediaSession() } - if (!isBeingRecreated && !(application as FenixApplication).isTerminating()) { + if (isFinishing && !(application as FenixApplication).isTerminating()) { // We assume the Activity is being destroyed because the user // swiped away the app on the Recent screen. When this happens, // we assume the user expects the entire Application is destroyed @@ -686,8 +684,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn message = "recreate()", ) - isBeingRecreated = true - super.recreate() } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eabeaa5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eabeaa5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! [android] Implement Android-native Connection Assist UI
by Pier Angelo Vendrame (＠pierov) 21 Jan '25

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 8e5e2d5c by clairehurst at 2025-01-21T16:49:29+00:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43359: Improper handling of TorBootstrapChangeListener with respect to system onDestroy() calls for HomeActivity - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -659,12 +659,13 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn // and not only the top Activity/Task. Therefore we kill the // underlying Application, as well. (application as FenixApplication).terminate() - } - - val engine = components.core.engine - if (engine is GeckoEngine) { - val torIntegration = engine.getTorIntegrationController() - torIntegration.unregisterBootstrapStateChangeListener(this) + if (settings().useHtmlConnectionUi) { + val engine = components.core.engine + if (engine is GeckoEngine) { + val torIntegration = engine.getTorIntegrationController() + torIntegration.unregisterBootstrapStateChangeListener(this) + } + } } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8e5e2d5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8e5e2d5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] 4 commits: fixup! TB 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 21 Jan '25

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 4b7dc6cc by Henry Wilkes at 2025-01-21T15:54:08+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Do not wait for TorSettings to initialise before allowing a bootstrap. Instead, we wait for TorSettings as required: for preparing AutoBootstrap attempts, and TorBootstrapRequest should already wait for TorSettings before attempting to connect. - - - - - 34cfa54a by Henry Wilkes at 2025-01-21T15:54:13+00:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Ensure TorProviderBuilder.build can be called immediately after TorProviderBuilder.init returns (without await). We make sure that the `#provider` instance is created before any break in execution caused by an `await`. - - - - - 1dc47dd9 by Henry Wilkes at 2025-01-21T15:54:14+00:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Do not wait for TorProviderBuilder.init since it is no longer async. - - - - - fff7daea by Henry Wilkes at 2025-01-21T15:54:14+00:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Add a note to TorBootstrapRequest explaining the expectation that the TorProvider has already read from TorSettings before it connects. - - - - - 4 changed files: - toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs - toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorConnect.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorBootstrapRequest.sys.mjs ===================================== @@ -90,6 +90,11 @@ export class TorBootstrapRequest { // Wait for bootstrapping to begin and maybe handle error. // Notice that we do not resolve the promise here in case of success, but // we do it from the BootstrapStatus observer. + // NOTE: After TorProviderBuilder.build resolves, TorProvider.init will + // have completed. In particular, assuming no errors, the TorSettings will + // have been initialised and passed on to the provider via + // TorProvider.writeSettings. Therefore we should be safe to immediately + // call `connect` using the latest user settings. lazy.TorProviderBuilder.build() .then(provider => provider.connect()) .catch(err => { ===================================== toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs ===================================== @@ -54,14 +54,15 @@ export class TorProviderBuilder { /** * Initialize the provider of choice. - * Even though initialization is asynchronous, we do not expect the caller to - * await this method. The reason is that any call to build() will wait the - * initialization anyway (and re-throw any initialization error). */ - static async init() { + static init() { switch (this.providerType) { case TorProviders.tor: - await this.#initTorProvider(); + // Even though initialization of the initial TorProvider is + // asynchronous, we do not expect the caller to await it. The reason is + // that any call to build() will wait the initialization anyway (and + // re-throw any initialization error). + this.#initTorProvider(); break; case TorProviders.none: lazy.TorLauncherUtil.setProxyConfiguration( @@ -74,7 +75,12 @@ export class TorProviderBuilder { } } - static async #initTorProvider() { + /** + * Replace #provider with a new instance. + * + * @returns {Promise<TorProvider>} The new instance. + */ + static #initTorProvider() { if (!this.#exitObserver) { this.#exitObserver = this.#torExited.bind(this); Services.obs.addObserver( @@ -83,18 +89,39 @@ export class TorProviderBuilder { ); } + // NOTE: We need to ensure that the #provider is set as soon + // TorProviderBuilder.init is called. + // I.e. it should be safe to call + // TorProviderBuilder.init(); + // TorProviderBuilder.build(); + // without any await. + // + // Therefore, we await the oldProvider within the Promise rather than make + // #initTorProvider async. + // + // In particular, this is needed by TorConnect when the user has selected + // quickstart, in which case `TorConnect.init` will immediately request the + // provider. See tor-browser#41921. + this.#provider = this.#replaceTorProvider(this.#provider); + return this.#provider; + } + + /** + * Replace a TorProvider instance. Resolves once the TorProvider is + * initialised. + * + * @param {Promise<TorProvider>?} oldProvider - The previous's provider's + * promise, if any. + * @returns {TorProvider} The new TorProvider instance. + */ + static async #replaceTorProvider(oldProvider) { try { - const old = await this.#provider; - old?.uninit(); + // Uninitialise the old TorProvider, if there is any. + (await oldProvider)?.uninit(); } catch {} - this.#provider = new Promise((resolve, reject) => { - const provider = new lazy.TorProvider(); - provider - .init() - .then(() => resolve(provider)) - .catch(reject); - }); - await this.#provider; + const provider = new lazy.TorProvider(); + await provider.init(); + return provider; } static uninit() { ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -68,9 +68,12 @@ class TorAndroidIntegrationImpl { Services.obs.addObserver(this, lazy.TorSettingsTopics[topic]); } - lazy.TorProviderBuilder.init().finally(() => { - lazy.TorProviderBuilder.firstWindowLoaded(); - }); + lazy.TorProviderBuilder.init(); + // On Android immediately call firstWindowLoaded. This should be safe to + // call since it will await the initialisation of the TorProvider set up + // by TorProviderBuilder.init. + lazy.TorProviderBuilder.firstWindowLoaded(); + try { await lazy.TorSettings.init(); await lazy.TorConnect.init(); ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -10,7 +10,6 @@ ChromeUtils.defineESModuleGetters(lazy, { BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs", MoatRPC: "resource://gre/modules/Moat.sys.mjs", TorBootstrapRequest: "resource://gre/modules/TorBootstrapRequest.sys.mjs", - TorProviderBuilder: "resource://gre/modules/TorProviderBuilder.sys.mjs", TorProviderTopics: "resource://gre/modules/TorProviderBuilder.sys.mjs", TorLauncherUtil: "resource://gre/modules/TorLauncherUtil.sys.mjs", TorSettings: "resource://gre/modules/TorSettings.sys.mjs", @@ -436,15 +435,23 @@ class AutoBootstrapAttempt { return; } this.#resolved = true; - try { - // Run cleanup before we resolve the promise to ensure two instances - // of AutoBootstrapAttempt are not trying to change the settings at - // the same time. - if (arg.result !== "complete") { - await lazy.TorSettings.clearTemporaryBridges(); + + if (lazy.TorSettings.initialized) { + // If not initialized, then we won't have applied any settings. + try { + // Run cleanup before we resolve the promise to ensure two instances + // of AutoBootstrapAttempt are not trying to change the settings at + // the same time. + if (arg.result !== "complete") { + // Should do nothing if we never called applyTemporaryBridges. + await lazy.TorSettings.clearTemporaryBridges(); + } + } catch (error) { + lazy.logger.error( + "Unexpected error in auto-bootstrap cleanup", + error + ); } - } catch (error) { - lazy.logger.error("Unexpected error in auto-bootstrap cleanup", error); } if (arg.error) { reject(arg.error); @@ -483,6 +490,16 @@ class AutoBootstrapAttempt { * @param {BootstrapOptions} options - Options to apply to the bootstrap. */ async #runInternal(progressCallback, options) { + // Wait for TorSettings to be initialised, which is used for the + // AutoBootstrapping set up. + await Promise.race([ + lazy.TorSettings.initializedPromise, + this.#cancelledPromise, + ]); + if (this.#cancelled || this.#resolved) { + return; + } + await this.#fetchBridges(options); if (this.#cancelled || this.#resolved) { return; @@ -1016,19 +1033,20 @@ export const TorConnect = { lazy.logger.debug(`Observing topic '${addTopic}'`); }; - // Wait for TorSettings, as we will need it. - // We will wait for a TorProvider only after TorSettings is ready, - // because the TorProviderBuilder initialization might not have finished - // at this point, and TorSettings initialization is a prerequisite for - // having a provider. - // So, we prefer initializing TorConnect as soon as possible, so that - // the UI will be able to detect it is in the Initializing state and act - // consequently. - lazy.TorSettings.initializedPromise.then(() => this._settingsInitialized()); - // register the Tor topics we always care about observeTopic(lazy.TorProviderTopics.ProcessExited); observeTopic(lazy.TorProviderTopics.HasWarnOrErr); + + // NOTE: At this point, _requestedStage should still be `null`. + this._setStage(TorConnectStage.Start); + if ( + // Quickstart setting is enabled. + this.quickstart && + // And the previous bootstrap attempt must have succeeded. + !Services.prefs.getBoolPref(TorConnectPrefs.prompt_at_startup, true) + ) { + this.beginBootstrapping(); + } }, async observe(subject, topic) { @@ -1058,26 +1076,6 @@ export const TorConnect = { } }, - async _settingsInitialized() { - // TODO: Handle failures here, instead of the prompt to restart the - // daemon when it exits (tor-browser#21053, tor-browser#41921). - await lazy.TorProviderBuilder.build(); - - lazy.logger.debug("The TorProvider is ready, changing state."); - // NOTE: If the tor process exits before this point, then - // shouldQuickStart would be `false`. - // NOTE: At this point, _requestedStage should still be `null`. - this._setStage(TorConnectStage.Start); - if ( - // Quickstart setting is enabled. - this.quickstart && - // And the previous bootstrap attempt must have succeeded. - !Services.prefs.getBoolPref(TorConnectPrefs.prompt_at_startup, true) - ) { - this.beginBootstrapping(); - } - }, - /** * Set the user stage. * View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b5cd60… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b5cd60… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] 4 commits: fixup! TB 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 21 Jan '25

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 21b2be4c by Henry Wilkes at 2025-01-21T15:25:28+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - cfd39fb0 by Henry Wilkes at 2025-01-21T15:25:29+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - 62e7a81f by Henry Wilkes at 2025-01-21T15:25:30+00:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 41921: Move quickstart setting from TorSettings to TorConnect. This also means we no longer need to listen for TorSettingsTopics.Ready for the initial value. Also fix typo in signal name: "quickstart-changed" to "quickstart-change". - - - - - b5cd602f by Henry Wilkes at 2025-01-21T15:25:31+00:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Move quickstart setting from TorSettings to TorConnect. - - - - - 5 changed files: - browser/components/torpreferences/content/connectionPane.js - toolkit/components/torconnect/TorConnectParent.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorConnect.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2550,12 +2550,10 @@ const gConnectionPane = (function () { "torPreferences-quickstart-toggle" ); this._enableQuickstartCheckbox.addEventListener("command", () => { - TorSettings.changeSettings({ - quickstart: { enabled: this._enableQuickstartCheckbox.checked }, - }); + TorConnect.quickstart = this._enableQuickstartCheckbox.checked; }); - this._enableQuickstartCheckbox.checked = TorSettings.quickstart.enabled; - Services.obs.addObserver(this, TorSettingsTopics.SettingsChanged); + this._enableQuickstartCheckbox.checked = TorConnect.quickstart; + Services.obs.addObserver(this, TorConnectTopics.QuickstartChange); // Location { @@ -2667,7 +2665,7 @@ const gConnectionPane = (function () { gBridgeSettings.init(); gNetworkStatus.init(); - TorSettings.initializedPromise.then(() => this._populateXUL()); + this._populateXUL(); const onUnload = () => { window.removeEventListener("unload", onUnload); @@ -2681,7 +2679,7 @@ const gConnectionPane = (function () { gNetworkStatus.uninit(); // unregister our observer topics - Services.obs.removeObserver(this, TorSettingsTopics.SettingsChanged); + Services.obs.removeObserver(this, TorConnectTopics.QuickstartChange); Services.obs.removeObserver(this, TorConnectTopics.StageChange); }, @@ -2696,12 +2694,8 @@ const gConnectionPane = (function () { observe(subject, topic) { switch (topic) { - // triggered when a TorSettings param has changed - case TorSettingsTopics.SettingsChanged: { - if (subject.wrappedJSObject.changes.includes("quickstart.enabled")) { - this._enableQuickstartCheckbox.checked = - TorSettings.quickstart.enabled; - } + case TorConnectTopics.QuickstartChange: { + this._enableQuickstartCheckbox.checked = TorConnect.quickstart; break; } // triggered when tor connect state changes and we may @@ -2713,7 +2707,10 @@ const gConnectionPane = (function () { } }, - onAdvancedSettings() { + async onAdvancedSettings() { + // Ensure TorSettings is complete before loading the dialog, which reads + // from TorSettings. + await TorSettings.initializedPromise; gSubDialog.open( "chrome://browser/content/torpreferences/connectionSettingsDialog.xhtml", { features: "resizable=yes" } ===================================== toolkit/components/torconnect/TorConnectParent.sys.mjs ===================================== @@ -5,10 +5,6 @@ import { TorConnect, TorConnectTopics, } from "resource://gre/modules/TorConnect.sys.mjs"; -import { - TorSettings, - TorSettingsTopics, -} from "resource://gre/modules/TorSettings.sys.mjs"; const lazy = {}; @@ -47,15 +43,10 @@ export class TorConnectParent extends JSWindowActorParent { case TorConnectTopics.BootstrapProgress: self.sendAsyncMessage("torconnect:bootstrap-progress", obj); break; - case TorSettingsTopics.SettingsChanged: - if (!obj.changes.includes("quickstart.enabled")) { - break; - } - // eslint-disable-next-lined no-fallthrough - case TorSettingsTopics.Ready: + case TorConnectTopics.QuickstartChange: self.sendAsyncMessage( - "torconnect:quickstart-changed", - TorSettings.quickstart.enabled + "torconnect:quickstart-change", + TorConnect.quickstart ); break; } @@ -70,10 +61,9 @@ export class TorConnectParent extends JSWindowActorParent { this.torConnectObserver, TorConnectTopics.BootstrapProgress ); - Services.obs.addObserver(this.torConnectObserver, TorSettingsTopics.Ready); Services.obs.addObserver( this.torConnectObserver, - TorSettingsTopics.SettingsChanged + TorConnectTopics.QuickstartChange ); } @@ -88,11 +78,7 @@ export class TorConnectParent extends JSWindowActorParent { ); Services.obs.removeObserver( this.torConnectObserver, - TorSettingsTopics.Ready - ); - Services.obs.removeObserver( - this.torConnectObserver, - TorSettingsTopics.SettingsChanged + TorConnectTopics.QuickstartChange ); } @@ -104,7 +90,7 @@ export class TorConnectParent extends JSWindowActorParent { // If there are multiple home pages, just load the first one. return Promise.resolve(TorConnect.fixupURIs(lazy.HomePage.get())[0]); case "torconnect:set-quickstart": - TorSettings.changeSettings({ quickstart: { enabled: message.data } }); + TorConnect.quickstart = message.data; break; case "torconnect:open-tor-preferences": this.browsingContext.top.embedderElement.ownerGlobal.openPreferences( @@ -133,31 +119,16 @@ export class TorConnectParent extends JSWindowActorParent { case "torconnect:cancel-bootstrapping": TorConnect.cancelBootstrapping(); break; - case "torconnect:get-init-args": { + case "torconnect:get-init-args": // Called on AboutTorConnect.init(), pass down all state data it needs // to init. - - let quickstartEnabled = false; - - // Workaround for a race condition, but we should fix it asap. - // about:torconnect is loaded before TorSettings is actually initialized. - // The getter might throw and the page not loaded correctly as a result. - // Silence any warning for now, but we should really fix it. - // See also tor-browser#41921. - try { - quickstartEnabled = TorSettings.quickstart.enabled; - } catch (e) { - // Do not throw. - } - return { TorStrings, Direction: Services.locale.isAppLocaleRTL ? "rtl" : "ltr", CountryNames: TorConnect.countryNames, stage: TorConnect.stage, - quickstartEnabled, + quickstartEnabled: TorConnect.quickstart, }; - } case "torconnect:get-country-codes": return TorConnect.getCountryCodes(); } ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -79,6 +79,23 @@ class TorAndroidIntegrationImpl { } } + /** + * Combine the current TorSettings settings with the TorConnect settings. + * + * @returns {object} The TorSettings in an object, which also has a + * `quickstart.enabled` property. + */ + // This is added for backward compatibility with TorSettings.getSettings prior + // to tor-browser#41921, when it used to control the quickstart setting. + // TODO: Have android separate out the request for TorConnect.quickstart. In + // principle, this would allow android tor connect UI to be loaded before + // TorSettings has initialized (the SettingsReady signal), similar to desktop. + // See tor-browser#43408. + #getAllSettings() { + const settings = lazy.TorSettings.getSettings(); + settings.quickstart = { enabled: lazy.TorConnect.quickstart }; + } + observe(subj, topic) { switch (topic) { // TODO: Replace with StageChange. @@ -120,7 +137,7 @@ class TorAndroidIntegrationImpl { case lazy.TorSettingsTopics.Ready: lazy.EventDispatcher.instance.sendRequest({ type: EmittedEvents.settingsReady, - settings: lazy.TorSettings.getSettings(), + settings: this.#getAllSettings(), }); break; case lazy.TorSettingsTopics.SettingsChanged: @@ -129,7 +146,20 @@ class TorAndroidIntegrationImpl { lazy.EventDispatcher.instance.sendRequest({ type: EmittedEvents.settingsChanged, changes: subj.wrappedJSObject.changes ?? [], - settings: lazy.TorSettings.getSettings(), + settings: this.#getAllSettings(), + }); + break; + case lazy.TorConnectTopics.QuickstartChange: + // We also include the TorSettings, and a `changes` Array similar to + // SettingsChanged signal. This is for backward compatibility with + // TorSettings.getSettings prior to tor-browser#41921, when it used to + // control the quickstart setting. + // TODO: Have android separate out the request for TorConnect.quickstart. + // See tor-browser#43408. + lazy.EventDispatcher.instance.sendRequest({ + type: EmittedEvents.settingsChanged, + changes: ["quickstart.enabled"], + settings: this.#getAllSettings(), }); break; } @@ -140,9 +170,19 @@ class TorAndroidIntegrationImpl { try { switch (event) { case ListenedEvents.settingsGet: - callback?.onSuccess(lazy.TorSettings.getSettings()); + callback?.onSuccess(this.#getAllSettings()); return; case ListenedEvents.settingsSet: + // TODO: Set quickstart via a separate event. See tor-browser#43408. + // NOTE: Currently this may trigger GeckoView:Tor:SettingsChanged + // twice: once for quickstart.enabled, and again for the other + // settings. + if ( + "quickstart" in data.settings && + "enabled" in data.settings.quickstart + ) { + lazy.TorConnect.quickstart = data.settings.quickstart.enabled; + } // TODO: Handle setting throw? This can throw if data.settings is // incorrectly formatted, but more like it can throw when the settings // fail to be passed onto the TorProvider. tor-browser#43405. ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -22,6 +22,7 @@ const TorConnectPrefs = Object.freeze({ log_level: "torbrowser.bootstrap.log_level", /* prompt_at_startup now controls whether the quickstart can trigger. */ prompt_at_startup: "extensions.torlauncher.prompt_at_startup", + quickstart: "torbrowser.settings.quickstart.enabled", }); export const TorConnectState = Object.freeze({ @@ -80,6 +81,7 @@ export const TorConnectTopics = Object.freeze({ StageChange: "torconnect:stage-change", // TODO: Remove torconnect:state-change when pages have switched to stage. StateChange: "torconnect:state-change", + QuickstartChange: "torconnect:quickstart-change", BootstrapProgress: "torconnect:bootstrap-progress", BootstrapComplete: "torconnect:bootstrap-complete", // TODO: Remove torconnect:error when pages have switched to stage. @@ -1066,8 +1068,12 @@ export const TorConnect = { // shouldQuickStart would be `false`. // NOTE: At this point, _requestedStage should still be `null`. this._setStage(TorConnectStage.Start); - if (this.shouldQuickStart) { - // Quickstart + if ( + // Quickstart setting is enabled. + this.quickstart && + // And the previous bootstrap attempt must have succeeded. + !Services.prefs.getBoolPref(TorConnectPrefs.prompt_at_startup, true) + ) { this.beginBootstrapping(); } }, @@ -1120,6 +1126,25 @@ export const TorConnect = { return lazy.TorLauncherUtil.shouldStartAndOwnTor; }, + /** + * Whether bootstrapping can begin immediately once Tor Browser has been + * opened. + * + * @type {boolean} + */ + get quickstart() { + return Services.prefs.getBoolPref(TorConnectPrefs.quickstart, false); + }, + + set quickstart(enabled) { + enabled = Boolean(enabled); + if (enabled === this.quickstart) { + return; + } + Services.prefs.setBoolPref(TorConnectPrefs.quickstart, enabled); + Services.obs.notifyObservers(null, TorConnectTopics.QuickstartChange); + }, + get shouldShowTorConnect() { // TorBrowser must control the daemon return ( @@ -1163,15 +1188,6 @@ export const TorConnect = { ); }, - get shouldQuickStart() { - // quickstart must be enabled - return ( - lazy.TorSettings.quickstart.enabled && - // and the previous bootstrap attempt must have succeeded - !Services.prefs.getBoolPref(TorConnectPrefs.prompt_at_startup, true) - ); - }, - // TODO: Remove when all pages have switched to "stage". get state() { // There is no "Error" stage, but about:torconnect relies on receiving the ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -27,10 +27,8 @@ export const TorSettingsTopics = Object.freeze({ /* Prefs used to store settings in TorBrowser prefs */ const TorSettingsPrefs = Object.freeze({ - quickstart: { - /* bool: does tor connect automatically on launch */ - enabled: "torbrowser.settings.quickstart.enabled", - }, + // NOTE: torbrowser.settings.quickstart.enabled used to be managed by + // TorSettings but was moved to TorConnect.quickstart in tor-browser#41921. bridges: { /* bool: does tor use bridges */ enabled: "torbrowser.settings.bridges.enabled", @@ -173,9 +171,6 @@ class TorSettingsImpl { * @type {object} */ #settings = { - quickstart: { - enabled: false, - }, bridges: { /** * Whether the bridges are enabled or not. @@ -579,11 +574,6 @@ class TorSettingsImpl { #loadFromPrefs() { lazy.logger.debug("loadFromPrefs()"); - /* Quickstart */ - this.#settings.quickstart.enabled = Services.prefs.getBoolPref( - TorSettingsPrefs.quickstart.enabled, - false - ); /* Bridges */ const bridges = {}; bridges.enabled = Services.prefs.getBoolPref( @@ -691,11 +681,6 @@ class TorSettingsImpl { this.#checkIfInitialized(); - /* Quickstart */ - Services.prefs.setBoolPref( - TorSettingsPrefs.quickstart.enabled, - this.#settings.quickstart.enabled - ); /* Bridges */ Services.prefs.setBoolPref( TorSettingsPrefs.bridges.enabled, @@ -928,7 +913,6 @@ class TorSettingsImpl { * * It is possible to set all settings, or only some sections: * - * + quickstart.enabled can be set individually. * + bridges.enabled can be set individually. * + bridges.source can be set with a corresponding bridge specification for * the source (bridge_strings, lox_id, builtin_type). @@ -968,14 +952,6 @@ class TorSettingsImpl { changes.push(`${group}.${prop}`); }; - if ("quickstart" in newValues && "enabled" in newValues.quickstart) { - changeSetting( - "quickstart", - "enabled", - Boolean(newValues.quickstart.enabled) - ); - } - if ("bridges" in newValues) { if ("source" in newValues.bridges) { this.#fixupBridgeSettings(newValues.bridges); @@ -1048,11 +1024,7 @@ class TorSettingsImpl { // saved the preferences we send the new settings to TorProvider. // Some properties are unread by TorProvider. So if only these values change // there is no need to re-apply the settings. - const unreadProps = [ - "quickstart.enabled", - "bridges.builtin_type", - "bridges.lox_id", - ]; + const unreadProps = ["bridges.builtin_type", "bridges.lox_id"]; const shouldApply = changes.some(prop => !unreadProps.includes(prop)); if (shouldApply) { await this.#applySettings(true); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7a9894… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7a9894… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 1ad717fe by Henry Wilkes at 2025-01-21T14:56:40+00:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Ensure shouldStartAndOwnTor is constant per-session. TorConnect and TorSettings `enabled` properties depend on this value, and shouldn't change per session. - - - - - 8ae53510 by Henry Wilkes at 2025-01-21T14:56:41+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Tighten up TorSettings. We ensure TorSettings is enabled before certain operations. Also tidy up uninit to account for early calls (before init completes) or repeat calls. Also stop using "torbrowser.settings.enabled" preference, and read from the preferences for the first run. Also make TorSettings.initailizedPromise read-only. - - - - - a0c13700 by Henry Wilkes at 2025-01-21T14:56:41+00:00 fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js TB 41921: Set default TorSetting setting values in 000-tor-browser.js. - - - - - 7a98943f by Henry Wilkes at 2025-01-21T15:00:22+00:00 fixup! TB 41435: Add a Tor Browser migration function TB 41921: Clear out unused "torbrowser.settings.enabled" preference. - - - - - 4 changed files: - browser/app/profile/000-tor-browser.js - browser/components/BrowserGlue.sys.mjs - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -61,6 +61,31 @@ pref("browser.startup.homepage", "about:tor"); // tor-browser#40701: Add new download warning pref("browser.download.showTorWarning", true); + +// Tor connection setting preferences. + +pref("torbrowser.settings.quickstart.enabled", false); +pref("torbrowser.settings.bridges.enabled", false); +// TorBridgeSource. Initially TorBridgeSource.Invalid = -1. +pref("torbrowser.settings.bridges.source", -1); +pref("torbrowser.settings.bridges.lox_id", ""); +// obfs4|meek-azure|snowflake|etc. +pref("torbrowser.settings.bridges.builtin_type", ""); +// torbrowser.settings.bridges.bridge_strings.0 +// torbrowser.settings.bridges.bridge_strings.1 +// etc hold the bridge lines. +pref("torbrowser.settings.proxy.enabled", false); +// TorProxyType. Initially TorProxyType.Invalid = -1. +pref("torbrowser.settings.proxy.type", -1); +pref("torbrowser.settings.proxy.address", ""); +pref("torbrowser.settings.proxy.port", 0); +pref("torbrowser.settings.proxy.username", ""); +pref("torbrowser.settings.proxy.password", ""); +pref("torbrowser.settings.firewall.enabled", false); +// comma-delimited list of port numbers. +pref("torbrowser.settings.firewall.allowed_ports", ""); + + // This pref specifies an ad-hoc "version" for various pref update hacks we need to do pref("extensions.torbutton.pref_fixup_version", 0); ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -4822,7 +4822,9 @@ BrowserGlue.prototype = { // YouTube search engines (tor-browser#41835). // Version 5: Tor Browser 14.0a5: Clear user preference for CFR settings // since we hid the UI (tor-browser#43118). - const TBB_MIGRATION_VERSION = 5; + // Version 6: Tor Browser 14.5a3: Clear preference for TorSettings that is + // no longer used (tor-browser#41921). + const TBB_MIGRATION_VERSION = 6; const MIGRATION_PREF = "torbrowser.migration.version"; // If we decide to force updating users to pass through any version @@ -4904,6 +4906,10 @@ BrowserGlue.prototype = { } } + if (currentVersion < 6) { + Services.prefs.clearUserPref("torbrowser.settings.enabled"); + } + Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION); }, ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -17,8 +17,6 @@ const kPropBundleURI = "chrome://torbutton/locale/torlauncher.properties"; const kPropNamePrefix = "torlauncher."; const kIPCDirPrefName = "extensions.torlauncher.tmp_ipc_dir"; -let gStringBundle = null; - /** * This class allows to lookup for the paths of the various files that are * needed or can be used with the tor daemon, such as its configuration, the @@ -332,7 +330,7 @@ class TorFile { } } -export const TorLauncherUtil = Object.freeze({ +export const TorLauncherUtil = { get isAndroid() { return Services.appinfo.OS === "Android"; }, @@ -417,6 +415,8 @@ export const TorLauncherUtil = Object.freeze({ return this.showConfirm(null, s, defaultBtnLabel, cancelBtnLabel); }, + _stringBundle: null, + // Localized Strings // TODO: Switch to fluent also these ones. @@ -425,6 +425,9 @@ export const TorLauncherUtil = Object.freeze({ if (!aStringName) { return aStringName; } + if (!this._stringBundle) { + this._stringBundle = Services.strings.createBundle(kPropBundleURI); + } try { const key = kPropNamePrefix + aStringName; return this._stringBundle.GetStringFromName(key); @@ -587,7 +590,12 @@ export const TorLauncherUtil = Object.freeze({ Services.prefs.savePrefFile(null); }, - get shouldStartAndOwnTor() { + /** + * Determine the current value for whether we should start and own Tor. + * + * @returns {boolean} Whether we should start and own Tor. + */ + _getShouldStartAndOwnTor() { const kPrefStartTor = "extensions.torlauncher.start_tor"; try { const kBrowserToolboxPort = "MOZ_BROWSER_TOOLBOX_PORT"; @@ -610,6 +618,29 @@ export const TorLauncherUtil = Object.freeze({ return Services.prefs.getBoolPref(kPrefStartTor, true); }, + /** + * Cached value for shouldStartAndOwnTor, or `null` if not yet initialised. + * + * @type {boolean} + */ + _shouldStartAndOwnTor: null, + + /** + * Whether we should start and own Tor. + * + * The value should be constant per-session. + * + * @type {boolean} + */ + get shouldStartAndOwnTor() { + // Do not want this value to change within the same session, so always used + // the cached valued if it is available. + if (this._shouldStartAndOwnTor === null) { + this._shouldStartAndOwnTor = this._getShouldStartAndOwnTor(); + } + return this._shouldStartAndOwnTor; + }, + get shouldShowNetworkSettings() { try { const kEnvForceShowNetConfig = "TOR_FORCE_NET_CONFIG"; @@ -668,11 +699,4 @@ export const TorLauncherUtil = Object.freeze({ console.warn("Could not remove the IPC directory", e); } }, - - get _stringBundle() { - if (!gStringBundle) { - gStringBundle = Services.strings.createBundle(kPropBundleURI); - } - return gStringBundle; - }, -}); +}; ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -27,8 +27,6 @@ export const TorSettingsTopics = Object.freeze({ /* Prefs used to store settings in TorBrowser prefs */ const TorSettingsPrefs = Object.freeze({ - /* bool: are we pulling tor settings from the preferences */ - enabled: "torbrowser.settings.enabled", quickstart: { /* bool: does tor connect automatically on launch */ enabled: "torbrowser.settings.quickstart.enabled", @@ -245,6 +243,13 @@ class TorSettingsImpl { */ #builtinBridges = {}; + /** + * A promise that resolves once we are initialized, or throws if there was an + * initialization error. + * + * @type {Promise} + */ + #initializedPromise; /** * Resolve callback of the initializedPromise. */ @@ -261,8 +266,29 @@ class TorSettingsImpl { */ #initialized = false; + /** + * Whether uninit cleanup has been called. + * + * @type {boolean} + */ + #uninitCalled = false; + + /** + * Whether Lox was initialized. + * + * @type {boolean} + */ + #initializedLox = false; + + /** + * Whether observers were initialized. + * + * @type {boolean} + */ + #initializedObservers = false; + constructor() { - this.initializedPromise = new Promise((resolve, reject) => { + this.#initializedPromise = new Promise((resolve, reject) => { this.#initComplete = resolve; this.#initFailed = reject; }); @@ -378,12 +404,22 @@ class TorSettingsImpl { return this.#builtinBridges[pt] ?? []; } + /** + * Whether this module is enabled. + * + * @type {boolean} + */ + get enabled() { + return lazy.TorLauncherUtil.shouldStartAndOwnTor; + } + /** * Load or init our settings. */ async init() { if (this.#initialized) { lazy.logger.warn("Called init twice."); + await this.#initializedPromise; return; } try { @@ -402,6 +438,11 @@ class TorSettingsImpl { * it easier to update initializatedPromise. */ async #initInternal() { + if (!this.enabled || this.#uninitCalled) { + // Nothing to do. + return; + } + try { const req = await fetch("chrome://global/content/pt_config.json"); const config = await req.json(); @@ -419,26 +460,37 @@ class TorSettingsImpl { lazy.logger.error("Could not load the built-in PT config.", e); } + // `uninit` may have been called whilst we awaited pt_config. + if (this.#uninitCalled) { + lazy.logger.warn("unint was called before init completed."); + return; + } + // Initialize this before loading from prefs because we need Lox initialized // before any calls to Lox.getBridges(). if (!lazy.TorLauncherUtil.isAndroid) { try { + // Set as initialized before calling to ensure it is cleaned up by our + // `uninit` method. + this.#initializedLox = true; await lazy.Lox.init(); } catch (e) { lazy.logger.error("Could not initialize Lox.", e); } } - if ( - lazy.TorLauncherUtil.shouldStartAndOwnTor && - Services.prefs.getBoolPref(TorSettingsPrefs.enabled, false) - ) { - this.#loadFromPrefs(); - // We do not pass on the loaded settings to the TorProvider yet. Instead - // TorProvider will ask for these once it has initialised. + // `uninit` may have been called whilst we awaited Lox.init. + if (this.#uninitCalled) { + lazy.logger.warn("unint was called before init completed."); + return; } + this.#loadFromPrefs(); + // We do not pass on the loaded settings to the TorProvider yet. Instead + // TorProvider will ask for these once it has initialised. + Services.obs.addObserver(this, lazy.LoxTopics.UpdateBridges); + this.#initializedObservers = true; lazy.logger.info("Ready"); } @@ -447,8 +499,22 @@ class TorSettingsImpl { * Unload or uninit our settings. */ async uninit() { - Services.obs.removeObserver(this, lazy.LoxTopics.UpdateBridges); - await lazy.Lox.uninit(); + if (this.#uninitCalled) { + lazy.logger.warn("Called uninit twice"); + return; + } + + this.#uninitCalled = true; + // NOTE: We do not reset #initialized to false because we want it to remain + // in place for external callers, and we do not want `#initInternal` to be + // re-entered. + + if (this.#initializedObservers) { + Services.obs.removeObserver(this, lazy.LoxTopics.UpdateBridges); + } + if (this.#initializedLox) { + await lazy.Lox.uninit(); + } } observe(subject, topic) { @@ -473,10 +539,13 @@ class TorSettingsImpl { } /** - * Check whether the object has been successfully initialized, and throw if - * it has not. + * Check whether the module is enabled and successfully initialized, and throw + * if it is not. */ #checkIfInitialized() { + if (!this.enabled) { + throw new Error("TorSettings is not enabled"); + } if (!this.#initialized) { lazy.logger.trace("Not initialized code path."); throw new Error( @@ -494,6 +563,16 @@ class TorSettingsImpl { return this.#initialized; } + /** + * A promise that resolves once we are initialized, or throws if there was an + * initialization error. + * + * @type {Promise} + */ + get initializedPromise() { + return this.#initializedPromise; + } + /** * Load our settings from prefs. */ @@ -701,9 +780,6 @@ class TorSettingsImpl { } else { Services.prefs.clearUserPref(TorSettingsPrefs.firewall.allowed_ports); } - - // all tor settings now stored in prefs :) - Services.prefs.setBoolPref(TorSettingsPrefs.enabled, true); } /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/06cbcd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/06cbcd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6571ac7b by Henry Wilkes at 2025-01-21T14:15:40+00:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Move prompt_at_startup preference from TorProvider to TorConnect only. - - - - - fa81e56c by Henry Wilkes at 2025-01-21T14:15:40+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Move prompt_at_startup pref from TorProvider to TorConnect only. This simplifies the logic, where we set the preference any time we have a bootstrap error and clear it when we are bootstrapped. - - - - - 093e9483 by Henry Wilkes at 2025-01-21T14:15:41+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Move flushSettings call to TorSettings. The call in connectionPane will not necessarily run when the preference tab is closed, nor will it trigger for bridges added through auto-bootstrapping. - - - - - b50c1c9c by Henry Wilkes at 2025-01-21T14:15:42+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Flush TorSettings settings every time they are saved. - - - - - 06cbcd5d by Henry Wilkes at 2025-01-21T14:15:43+00:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Add a NOTE for future development ensuring that writeSettings is not subject to any races between sequential calls. - - - - - 5 changed files: - browser/components/torpreferences/content/connectionPane.js - toolkit/components/tor-launcher/TorControlPort.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/modules/TorConnect.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2545,19 +2545,6 @@ const gConnectionPane = (function () { // populate xul with strings and cache the relevant elements _populateXUL() { - // saves tor settings to disk when navigate away from about:preferences - window.addEventListener("blur", async () => { - try { - // Build a new provider each time because this might be called also - // when closing the browser (if about:preferences was open), maybe - // when the provider was already uninitialized. - const provider = await TorProviderBuilder.build(); - provider.flushSettings(); - } catch (e) { - console.warn("Could not save the tor settings.", e); - } - }); - // Quickstart this._enableQuickstartCheckbox = document.getElementById( "torPreferences-quickstart-toggle" ===================================== toolkit/components/tor-launcher/TorControlPort.sys.mjs ===================================== @@ -364,6 +364,9 @@ export class TorController { /** * The commands that need to be run or receive a response. * + * NOTE: This must be in the order with the last requested command at the end + * of the queue. + * * @type {Command[]} */ #commandQueue = []; @@ -947,6 +950,10 @@ export class TorController { * values will be automatically unrolled. */ async setConf(values) { + // NOTE: This is an async method. It must ensure that sequential calls to + // this method do not race against each other. I.e. the last call to this + // method must always be the last in #commandQueue. Otherwise a delayed + // earlier call could overwrite the configuration of a later call. const args = values .flatMap(([key, value]) => { if (value === undefined || value === null) { ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -70,7 +70,6 @@ const Preferences = Object.freeze({ ControlHost: "extensions.torlauncher.control_host", ControlPort: "extensions.torlauncher.control_port", MaxLogEntries: "extensions.torlauncher.max_tor_log_entries", - PromptAtStartup: "extensions.torlauncher.prompt_at_startup", }); /* Config Keys used to configure tor daemon */ @@ -335,6 +334,15 @@ export class TorProvider { } logger.debug("Mapped settings object", settings, torSettings); + + // Send settings to the tor process. + // NOTE: Since everything up to this point has been non-async, the order in + // which TorProvider.writeSettings is called should match the order in which + // the configuration is passed onto setConf. In turn, TorControlPort.setConf + // should similarly ensure that the configuration reaches the tor process in + // the same order. + // In particular, we do not want a race where an earlier call to + // TorProvider.writeSettings can be delayed and override a later call. await this.#controller.setConf(Array.from(torSettings)); } @@ -962,11 +970,6 @@ export class TorProvider { if (statusObj.PROGRESS === 100) { this.#isBootstrapDone = true; - try { - Services.prefs.setBoolPref(Preferences.PromptAtStartup, false); - } catch (e) { - logger.warn(`Cannot set ${Preferences.PromptAtStartup}`, e); - } return; } @@ -988,11 +991,6 @@ export class TorProvider { * @param {object} statusObj The bootstrap status object with the error */ #notifyBootstrapError(statusObj) { - try { - Services.prefs.setBoolPref(Preferences.PromptAtStartup, true); - } catch (e) { - logger.warn(`Cannot set ${Preferences.PromptAtStartup}`, e); - } logger.error("Tor bootstrap error", statusObj); if ( ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -16,15 +16,12 @@ ChromeUtils.defineESModuleGetters(lazy, { TorSettings: "resource://gre/modules/TorSettings.sys.mjs", }); -/* Relevant prefs used by tor-launcher */ -const TorLauncherPrefs = Object.freeze({ - prompt_at_startup: "extensions.torlauncher.prompt_at_startup", -}); - const TorConnectPrefs = Object.freeze({ censorship_level: "torbrowser.debug.censorship_level", allow_internet_test: "torbrowser.bootstrap.allow_internet_test", log_level: "torbrowser.bootstrap.log_level", + /* prompt_at_startup now controls whether the quickstart can trigger. */ + prompt_at_startup: "extensions.torlauncher.prompt_at_startup", }); export const TorConnectState = Object.freeze({ @@ -1050,7 +1047,7 @@ export const TorConnect = { lazy.logger.info("Starting again since the tor process exited"); // Treat a failure as a possibly broken configuration. // So, prevent quickstart at the next start. - Services.prefs.setBoolPref(TorLauncherPrefs.prompt_at_startup, true); + Services.prefs.setBoolPref(TorConnectPrefs.prompt_at_startup, true); this._makeStageRequest(TorConnectStage.Start, true); break; default: @@ -1171,7 +1168,7 @@ export const TorConnect = { return ( lazy.TorSettings.quickstart.enabled && // and the previous bootstrap attempt must have succeeded - !Services.prefs.getBoolPref(TorLauncherPrefs.prompt_at_startup, true) + !Services.prefs.getBoolPref(TorConnectPrefs.prompt_at_startup, true) ); }, @@ -1451,6 +1448,8 @@ export const TorConnect = { this._tryAgain = false; this._potentiallyBlocked = false; this._errorDetails = null; + // Re-enable quickstart for future sessions. + Services.prefs.setBoolPref(TorConnectPrefs.prompt_at_startup, false); if (requestedStage) { lazy.logger.warn( @@ -1491,6 +1490,8 @@ export const TorConnect = { this._tryAgain = true; this._potentiallyBlocked = true; + // Disable quickstart until we have a successful bootstrap. + Services.prefs.setBoolPref(TorConnectPrefs.prompt_at_startup, true); this._signalError(error); ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -711,10 +711,15 @@ class TorSettingsImpl { * * Even though this introduces a circular depdency, it makes the API nicer for * frontend consumers. + * + * @param {boolean} flush - Whether to also flush the settings to disk. */ - async #applySettings() { + async #applySettings(flush) { const provider = await lazy.TorProviderBuilder.build(); await provider.writeSettings(); + if (flush) { + provider.flushSettings(); + } } /** @@ -974,7 +979,7 @@ class TorSettingsImpl { ]; const shouldApply = changes.some(prop => !unreadProps.includes(prop)); if (shouldApply) { - await this.#applySettings(); + await this.#applySettings(true); } } @@ -1042,7 +1047,8 @@ class TorSettingsImpl { // After checks are complete, we commit them. this.#temporaryBridgeSettings = bridgeSettings; - await this.#applySettings(); + // Do not flush the temporary bridge settings until they are saved. + await this.#applySettings(false); } /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/909f72… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/909f72… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] 2 commits: fixup! TB 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 21 Jan '25

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: b64f4aad by Henry Wilkes at 2025-01-21T11:50:20+01:00 fixup! TB 40597: Implement TorSettings module TB 41921: Make the TorSettings properties read-only outside of the TorSettings modules. Within TorSettings we make all post initialisation changes in changeSettings. This means we can simplify the class and move all the setter logic into one place. - - - - - 909f72ff by Henry Wilkes at 2025-01-21T11:50:24+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Pass in the BridgeDB bridge_strings as an Array to TorSettings. - - - - - 3 changed files: - browser/components/torpreferences/content/connectionPane.js - toolkit/modules/DomainFrontedRequests.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2319,7 +2319,7 @@ const gBridgeSettings = { bridges: { enabled: true, source: TorBridgeSource.BridgeDB, - bridge_strings: result.bridges.join("\n"), + bridge_strings: result.bridges, }, }); } ===================================== toolkit/modules/DomainFrontedRequests.sys.mjs ===================================== @@ -130,7 +130,7 @@ class MeekTransport { TOR_PT_CLIENT_TRANSPORTS: meekTransport, }; if (lazy.TorSettings.proxy.enabled) { - envAdditions.TOR_PT_PROXY = lazy.TorSettings.proxy.uri; + envAdditions.TOR_PT_PROXY = lazy.TorSettings.proxyUri; } const opts = { ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -179,10 +179,34 @@ class TorSettingsImpl { enabled: false, }, bridges: { + /** + * Whether the bridges are enabled or not. + * + * @type {boolean} + */ enabled: false, source: TorBridgeSource.Invalid, + /** + * The lox id is used with the Lox "source", and remains set with the + * stored value when other sources are used. + * + * @type {string} + */ lox_id: "", + /** + * The built-in type to use when using the BuiltIn "source", or empty when + * using any other source. + * + * @type {string} + */ builtin_type: "", + /** + * The current bridge strings. + * + * Can only be non-empty if the "source" is not Invalid. + * + * @type {Array<string>} + */ bridge_strings: [], }, proxy: { @@ -206,15 +230,6 @@ class TorSettingsImpl { */ #temporaryBridgeSettings = null; - /** - * Accumulated errors from trying to set settings. - * - * Only added to if not null. - * - * @type {Array<Error>?} - */ - #settingErrors = null; - /** * The recommended pluggable transport. * @@ -245,13 +260,6 @@ class TorSettingsImpl { * @type {boolean} */ #initialized = false; - /** - * During some phases of the initialization, allow calling setters and - * getters without throwing errors. - * - * @type {boolean} - */ - #allowUninitialized = false; constructor() { this.initializedPromise = new Promise((resolve, reject) => { @@ -259,347 +267,57 @@ class TorSettingsImpl { this.#initFailed = reject; }); - this.#addProperties("quickstart", { - enabled: {}, - }); - this.#addProperties("bridges", { - /** - * Whether the bridges are enabled or not. - * - * @type {boolean} - */ - enabled: {}, - /** - * The current bridge source. - * - * @type {integer} - */ - source: { - transform: (val, addError) => { - if (Object.values(TorBridgeSource).includes(val)) { - return val; - } - addError(`Not a valid bridge source: "${val}"`); - return TorBridgeSource.Invalid; - }, - }, - /** - * The current bridge strings. - * - * Can only be non-empty if the "source" is not Invalid. - * - * @type {Array<string>} - */ - bridge_strings: { - transform: val => { - if (Array.isArray(val)) { - return [...val]; - } - // Split the bridge strings, discarding empty. - return splitBridgeLines(val).filter(val => val); - }, - copy: val => [...val], - equal: (val1, val2) => this.#arrayEqual(val1, val2), - }, - /** - * The built-in type to use when using the BuiltIn "source", or empty when - * using any other source. - * - * @type {string} - */ - builtin_type: { - callback: (val, addError) => { - if (!val) { - return; - } - const bridgeStrings = this.getBuiltinBridges(val); - if (bridgeStrings.length) { - this.bridges.bridge_strings = bridgeStrings; - return; - } - - addError(`No built-in ${val} bridges found`); - // Set as invalid, which will make the builtin_type "" and set the - // bridge_strings to be empty at the next #cleanupSettings. - this.bridges.source = TorBridgeSource.Invalid; - }, - }, - /** - * The lox id is used with the Lox "source", and remains set with the stored value when - * other sources are used. - * - * @type {string} - */ - lox_id: { - callback: (val, addError) => { - if (!val) { - return; - } - let bridgeStrings; - try { - bridgeStrings = lazy.Lox.getBridges(val); - } catch (error) { - addError(`No bridges for lox_id ${val}: ${error?.message}`); - // Set as invalid, which will make the builtin_type "" and set the - // bridge_strings to be empty at the next #cleanupSettings. - this.bridges.source = TorBridgeSource.Invalid; - return; - } - this.bridges.bridge_strings = bridgeStrings; - }, - }, - }); - this.#addProperties("proxy", { - enabled: {}, - type: { - transform: (val, addError) => { - if (Object.values(TorProxyType).includes(val)) { - return val; - } - addError(`Not a valid proxy type: "${val}"`); - return TorProxyType.Invalid; - }, - }, - address: {}, - port: { - transform: (val, addError) => { - if (val === 0) { - // This is a valid value that "unsets" the port. - // Keep this value without giving a warning. - // NOTE: In contrast, "0" is not valid. - return 0; - } - // Unset to 0 if invalid null is returned. - return this.#parsePort(val, false, addError) ?? 0; - }, - }, - username: {}, - password: {}, - uri: { - getter: () => { - const { type, address, port, username, password } = this.proxy; - switch (type) { - case TorProxyType.Socks4: - return `socks4a://${address}:${port}`; - case TorProxyType.Socks5: - if (username) { - return `socks5://${username}:${password}@${address}:${port}`; - } - return `socks5://${address}:${port}`; - case TorProxyType.HTTPS: - if (username) { - return `http://${username}:${password}@${address}:${port}`; - } - return `http://${address}:${port}`; - } - return null; - }, - }, - }); - this.#addProperties("firewall", { - enabled: {}, - allowed_ports: { - transform: (val, addError) => { - if (!Array.isArray(val)) { - val = val === "" ? [] : val.split(","); - } - // parse and remove duplicates - const portSet = new Set( - val.map(p => this.#parsePort(p, true, addError)) - ); - // parsePort returns null for failed parses, so remove it. - portSet.delete(null); - return [...portSet]; - }, - copy: val => [...val], - equal: (val1, val2) => this.#arrayEqual(val1, val2), - }, - }); - } - - /** - * Clean the setting values after making some changes, so that the values do - * not contradict each other. - */ - #cleanupSettings() { - this.#freezeNotifications(); - try { - if (this.bridges.source === TorBridgeSource.Invalid) { - this.bridges.enabled = false; - this.bridges.bridge_strings = []; + // Add some read-only getters for the #settings object. + // E.g. TorSetting.#settings.bridges.source is exposed publicly as + // TorSettings.bridges.source. + for (const groupname in this.#settings) { + const publicGroup = {}; + for (const name in this.#settings[groupname]) { + // Public group only has a getter for the property. + Object.defineProperty(publicGroup, name, { + get: () => { + this.#checkIfInitialized(); + return structuredClone(this.#settings[groupname][name]); + }, + set: () => { + throw new Error( + `TorSettings.${groupname}.${name} cannot be set directly` + ); + }, + }); } - if (!this.bridges.bridge_strings.length) { - this.bridges.enabled = false; - this.bridges.source = TorBridgeSource.Invalid; - } - if (this.bridges.source !== TorBridgeSource.BuiltIn) { - this.bridges.builtin_type = ""; - } - if (this.bridges.source !== TorBridgeSource.Lox) { - this.bridges.lox_id = ""; - } - if (!this.proxy.enabled) { - this.proxy.type = TorProxyType.Invalid; - this.proxy.address = ""; - this.proxy.port = 0; - this.proxy.username = ""; - this.proxy.password = ""; - } - if (!this.firewall.enabled) { - this.firewall.allowed_ports = []; - } - } finally { - this.#thawNotifications(); + // The group object itself should not be writable. + Object.preventExtensions(publicGroup); + Object.defineProperty(this, groupname, { + writable: false, + value: publicGroup, + }); } } /** - * The current number of freezes applied to the notifications. - * - * @type {integer} - */ - #freezeNotificationsCount = 0; - /** - * The queue for settings that have changed. To be broadcast in the - * notification when not frozen. - * - * @type {Set<string>} - */ - #notificationQueue = new Set(); - /** - * Send a notification if we have any queued and we are not frozen. - */ - #tryNotification() { - if (this.#freezeNotificationsCount || !this.#notificationQueue.size) { - return; - } - Services.obs.notifyObservers( - { changes: [...this.#notificationQueue] }, - TorSettingsTopics.SettingsChanged - ); - this.#notificationQueue.clear(); - } - /** - * Pause notifications for changes in setting values. This is useful if you - * need to make batch changes to settings. - * - * This should always be paired with a call to thawNotifications once - * notifications should be released. Usually you should wrap whatever - * changes you make with a `try` block and call thawNotifications in the - * `finally` block. - */ - #freezeNotifications() { - this.#freezeNotificationsCount++; - } - /** - * Release the hold on notifications so they may be sent out. - * - * Note, if some other method has also frozen the notifications, this will - * only release them once it has also called this method. - */ - #thawNotifications() { - this.#freezeNotificationsCount--; - this.#tryNotification(); - } - /** - * @typedef {object} TorSettingProperty + * The proxy URI for the current settings, or `null` if no proxy is + * configured. * - * @property {function} [getter] - A getter for the property. If this is - * given, the property cannot be set. - * @property {function} [transform] - Called in the setter for the property, - * with the new value given. Should transform the given value into the - * right type. - * @property {function} [equal] - Test whether two values for the property - * are considered equal. Otherwise uses `===`. - * @property {function} [callback] - Called whenever the property value - * changes, with the new value given. Should be used to trigger any other - * required changes for the new value. - * @property {function} [copy] - Called whenever the property is read, with - * the stored value given. Should return a copy of the value. Otherwise - * returns the stored value. + * @type {?string} */ - /** - * Add properties to the TorSettings instance, to be read or set. - * - * @param {string} groupname - The name of the setting group. The given - * settings will be accessible from the TorSettings property of the same - * name. - * @param {object.<string, TorSettingProperty>} propParams - An object that - * defines the settings to add to this group. The object property names - * will be mapped to properties of TorSettings under the given groupname - * property. Details about the setting should be described in the - * TorSettingProperty property value. - */ - #addProperties(groupname, propParams) { - // Create a new object to hold all these settings. - const group = {}; - for (const name in propParams) { - const { getter, transform, callback, copy, equal } = propParams[name]; - // Method for adding setting errors. - const addError = message => { - message = `TorSettings.${groupname}.${name}: ${message}`; - lazy.logger.error(message); - // Only add to #settingErrors if it is not null. - this.#settingErrors?.push(message); - }; - Object.defineProperty(group, name, { - get: getter - ? () => { - // Allow getting in loadFromPrefs before we are initialized. - if (!this.#allowUninitialized) { - this.#checkIfInitialized(); - } - return getter(); - } - : () => { - // Allow getting in loadFromPrefs before we are initialized. - if (!this.#allowUninitialized) { - this.#checkIfInitialized(); - } - let val = this.#settings[groupname][name]; - if (copy) { - val = copy(val); - } - // Assume string or number value. - return val; - }, - set: getter - ? undefined - : val => { - // Allow setting in loadFromPrefs before we are initialized. - if (!this.#allowUninitialized) { - this.#checkIfInitialized(); - } - const prevVal = this.#settings[groupname][name]; - this.#freezeNotifications(); - try { - if (transform) { - val = transform(val, addError); - } - const isEqual = equal ? equal(val, prevVal) : val === prevVal; - if (!isEqual) { - // Set before the callback. - this.#settings[groupname][name] = val; - this.#notificationQueue.add(`${groupname}.${name}`); - - if (callback) { - callback(val, addError); - } - } - } catch (e) { - addError(e.message); - } finally { - this.#thawNotifications(); - } - }, - }); + get proxyUri() { + const { type, address, port, username, password } = this.#settings.proxy; + switch (type) { + case TorProxyType.Socks4: + return `socks4a://${address}:${port}`; + case TorProxyType.Socks5: + if (username) { + return `socks5://${username}:${password}@${address}:${port}`; + } + return `socks5://${address}:${port}`; + case TorProxyType.HTTPS: + if (username) { + return `http://${username}:${password}@${address}:${port}`; + } + return `http://${address}:${port}`; } - // The group object itself should not be writable. - Object.preventExtensions(group); - Object.defineProperty(this, groupname, { - writable: false, - value: group, - }); + return null; } /** @@ -614,12 +332,11 @@ class TorSettingsImpl { * @param {string|integer} val - The value to parse. * @param {boolean} trim - Whether a string value can be stripped of * whitespace before parsing. - * @param {function} addError - Callback to add error messages to. * * @return {integer?} - The port number, or null if the given value was not * valid. */ - #parsePort(val, trim, addError) { + #parsePort(val, trim) { if (typeof val === "string") { if (trim) { val = val.trim(); @@ -628,13 +345,11 @@ class TorSettingsImpl { if (this.#portRegex.test(val)) { val = Number.parseInt(val, 10); } else { - addError(`Invalid port string "${val}"`); - return null; + throw new Error(`Invalid port string "${val}"`); } } if (!Number.isInteger(val) || val < 1 || val > 65535) { - addError(`Port out of range: ${val}`); - return null; + throw new Error(`Port out of range: ${val}`); } return val; } @@ -659,13 +374,8 @@ class TorSettingsImpl { * @param {string} pt The pluggable transport to return the lines for * @returns {string[]} The bridge lines in random order */ - getBuiltinBridges(pt) { - if (!this.#allowUninitialized) { - this.#checkIfInitialized(); - } - // Shuffle so that Tor Browser users do not all try the built-in bridges in - // the same order. - return arrayShuffle(this.#builtinBridges[pt] ?? []); + #getBuiltinBridges(pt) { + return this.#builtinBridges[pt] ?? []; } /** @@ -698,6 +408,13 @@ class TorSettingsImpl { lazy.logger.debug("Loaded pt_config.json", config); this.#recommendedPT = config.recommendedDefault; this.#builtinBridges = config.bridges; + for (const type in this.#builtinBridges) { + // Shuffle so that Tor Browser users do not all try the built-in bridges + // in the same order. + // Only do this once per session. In particular, we don't re-shuffle if + // changeSettings is called with the same bridges.builtin_type value. + this.#builtinBridges[type] = arrayShuffle(this.#builtinBridges[type]); + } } catch (e) { lazy.logger.error("Could not load the built-in PT config.", e); } @@ -716,18 +433,9 @@ class TorSettingsImpl { lazy.TorLauncherUtil.shouldStartAndOwnTor && Services.prefs.getBoolPref(TorSettingsPrefs.enabled, false) ) { - // Do not want notifications for initially loaded prefs. - this.#freezeNotifications(); - try { - this.#allowUninitialized = true; - this.#loadFromPrefs(); - // We do not pass on the loaded settings to the TorProvider yet. Instead - // TorProvider will ask for these once it has initialised. - } finally { - this.#allowUninitialized = false; - this.#notificationQueue.clear(); - this.#thawNotifications(); - } + this.#loadFromPrefs(); + // We do not pass on the loaded settings to the TorProvider yet. Instead + // TorProvider will ask for these once it has initialised. } Services.obs.addObserver(this, lazy.LoxTopics.UpdateBridges); @@ -746,16 +454,19 @@ class TorSettingsImpl { observe(subject, topic) { switch (topic) { case lazy.LoxTopics.UpdateBridges: - if (this.bridges.lox_id) { - // Fetch the newest bridges. - this.bridges.bridge_strings = lazy.Lox.getBridges( - this.bridges.lox_id - ); - // No need to save to prefs since bridge_strings is not stored for Lox - // source. But we do pass on the changes to TorProvider. + if ( + this.#settings.bridges.lox_id && + this.#settings.bridges.source === TorBridgeSource.Lox + ) { + // Re-trigger the call to lazy.Lox.getBridges. // FIXME: This can compete with TorConnect to reach TorProvider. // tor-browser#42316 - this.#applySettings(); + this.changeSettings({ + bridges: { + source: TorBridgeSource.Lox, + lox_id: this.#settings.bridges.lox_id, + }, + }); } break; } @@ -790,23 +501,24 @@ class TorSettingsImpl { lazy.logger.debug("loadFromPrefs()"); /* Quickstart */ - this.quickstart.enabled = Services.prefs.getBoolPref( + this.#settings.quickstart.enabled = Services.prefs.getBoolPref( TorSettingsPrefs.quickstart.enabled, false ); /* Bridges */ - this.bridges.enabled = Services.prefs.getBoolPref( + const bridges = {}; + bridges.enabled = Services.prefs.getBoolPref( TorSettingsPrefs.bridges.enabled, false ); - this.bridges.source = Services.prefs.getIntPref( + bridges.source = Services.prefs.getIntPref( TorSettingsPrefs.bridges.source, TorBridgeSource.Invalid ); - switch (this.bridges.source) { + switch (bridges.source) { case TorBridgeSource.BridgeDB: case TorBridgeSource.UserProvided: - this.bridges.bridge_strings = Services.prefs + bridges.bridge_strings = Services.prefs .getBranch(TorSettingsPrefs.bridges.bridge_strings) .getChildList("") .map(pref => @@ -817,60 +529,79 @@ class TorSettingsImpl { break; case TorBridgeSource.BuiltIn: // bridge_strings is set via builtin_type. - this.bridges.builtin_type = Services.prefs.getStringPref( + bridges.builtin_type = Services.prefs.getStringPref( TorSettingsPrefs.bridges.builtin_type, "" ); break; case TorBridgeSource.Lox: // bridge_strings is set via lox id. - this.bridges.lox_id = Services.prefs.getStringPref( + bridges.lox_id = Services.prefs.getStringPref( TorSettingsPrefs.bridges.lox_id, "" ); break; } + try { + this.#fixupBridgeSettings(bridges); + this.#settings.bridges = bridges; + } catch (error) { + lazy.logger.error("Loaded bridge preferences failed", error); + // Keep the default #settings.bridges. + } + /* Proxy */ - this.proxy.enabled = Services.prefs.getBoolPref( + const proxy = {}; + proxy.enabled = Services.prefs.getBoolPref( TorSettingsPrefs.proxy.enabled, false ); - if (this.proxy.enabled) { - this.proxy.type = Services.prefs.getIntPref( + if (proxy.enabled) { + proxy.type = Services.prefs.getIntPref( TorSettingsPrefs.proxy.type, TorProxyType.Invalid ); - this.proxy.address = Services.prefs.getStringPref( + proxy.address = Services.prefs.getStringPref( TorSettingsPrefs.proxy.address, "" ); - this.proxy.port = Services.prefs.getIntPref( - TorSettingsPrefs.proxy.port, - 0 - ); - this.proxy.username = Services.prefs.getStringPref( + proxy.port = Services.prefs.getIntPref(TorSettingsPrefs.proxy.port, 0); + proxy.username = Services.prefs.getStringPref( TorSettingsPrefs.proxy.username, "" ); - this.proxy.password = Services.prefs.getStringPref( + proxy.password = Services.prefs.getStringPref( TorSettingsPrefs.proxy.password, "" ); } + try { + this.#fixupProxySettings(proxy); + this.#settings.proxy = proxy; + } catch (error) { + lazy.logger.error("Loaded proxy preferences failed", error); + // Keep the default #settings.proxy. + } /* Firewall */ - this.firewall.enabled = Services.prefs.getBoolPref( + const firewall = {}; + firewall.enabled = Services.prefs.getBoolPref( TorSettingsPrefs.firewall.enabled, false ); - if (this.firewall.enabled) { - this.firewall.allowed_ports = Services.prefs.getStringPref( + if (firewall.enabled) { + firewall.allowed_ports = Services.prefs.getStringPref( TorSettingsPrefs.firewall.allowed_ports, "" ); } - - this.#cleanupSettings(); + try { + this.#fixupFirewallSettings(firewall); + this.#settings.firewall = firewall; + } catch (error) { + lazy.logger.error("Loaded firewall preferences failed", error); + // Keep the default #settings.firewall. + } } /** @@ -880,29 +611,28 @@ class TorSettingsImpl { lazy.logger.debug("saveToPrefs()"); this.#checkIfInitialized(); - this.#cleanupSettings(); /* Quickstart */ Services.prefs.setBoolPref( TorSettingsPrefs.quickstart.enabled, - this.quickstart.enabled + this.#settings.quickstart.enabled ); /* Bridges */ Services.prefs.setBoolPref( TorSettingsPrefs.bridges.enabled, - this.bridges.enabled + this.#settings.bridges.enabled ); Services.prefs.setIntPref( TorSettingsPrefs.bridges.source, - this.bridges.source + this.#settings.bridges.source ); Services.prefs.setStringPref( TorSettingsPrefs.bridges.builtin_type, - this.bridges.builtin_type + this.#settings.bridges.builtin_type ); Services.prefs.setStringPref( TorSettingsPrefs.bridges.lox_id, - this.bridges.lox_id + this.#settings.bridges.lox_id ); // erase existing bridge strings const bridgeBranchPrefs = Services.prefs @@ -915,10 +645,10 @@ class TorSettingsImpl { }); // write new ones if ( - this.bridges.source !== TorBridgeSource.Lox && - this.bridges.source !== TorBridgeSource.BuiltIn + this.#settings.bridges.source !== TorBridgeSource.Lox && + this.#settings.bridges.source !== TorBridgeSource.BuiltIn ) { - this.bridges.bridge_strings.forEach((string, index) => { + this.#settings.bridges.bridge_strings.forEach((string, index) => { Services.prefs.setStringPref( `${TorSettingsPrefs.bridges.bridge_strings}.${index}`, string @@ -928,22 +658,28 @@ class TorSettingsImpl { /* Proxy */ Services.prefs.setBoolPref( TorSettingsPrefs.proxy.enabled, - this.proxy.enabled + this.#settings.proxy.enabled ); - if (this.proxy.enabled) { - Services.prefs.setIntPref(TorSettingsPrefs.proxy.type, this.proxy.type); + if (this.#settings.proxy.enabled) { + Services.prefs.setIntPref( + TorSettingsPrefs.proxy.type, + this.#settings.proxy.type + ); Services.prefs.setStringPref( TorSettingsPrefs.proxy.address, - this.proxy.address + this.#settings.proxy.address + ); + Services.prefs.setIntPref( + TorSettingsPrefs.proxy.port, + this.#settings.proxy.port ); - Services.prefs.setIntPref(TorSettingsPrefs.proxy.port, this.proxy.port); Services.prefs.setStringPref( TorSettingsPrefs.proxy.username, - this.proxy.username + this.#settings.proxy.username ); Services.prefs.setStringPref( TorSettingsPrefs.proxy.password, - this.proxy.password + this.#settings.proxy.password ); } else { Services.prefs.clearUserPref(TorSettingsPrefs.proxy.type); @@ -955,12 +691,12 @@ class TorSettingsImpl { /* Firewall */ Services.prefs.setBoolPref( TorSettingsPrefs.firewall.enabled, - this.firewall.enabled + this.#settings.firewall.enabled ); - if (this.firewall.enabled) { + if (this.#settings.firewall.enabled) { Services.prefs.setStringPref( TorSettingsPrefs.firewall.allowed_ports, - this.firewall.allowed_ports.join(",") + this.#settings.firewall.allowed_ports.join(",") ); } else { Services.prefs.clearUserPref(TorSettingsPrefs.firewall.allowed_ports); @@ -977,11 +713,135 @@ class TorSettingsImpl { * frontend consumers. */ async #applySettings() { - this.#checkIfInitialized(); const provider = await lazy.TorProviderBuilder.build(); await provider.writeSettings(); } + /** + * Fixup the given bridges settings to fill in details, establish the correct + * types and clean up. + * + * May throw if there is an error in the given values. + * + * @param {Object} bridges - The bridges settings to fix up. + */ + #fixupBridgeSettings(bridges) { + if (!Object.values(TorBridgeSource).includes(bridges.source)) { + throw new Error(`Not a valid bridge source: "${bridges.source}"`); + } + + if ("enabled" in bridges) { + bridges.enabled = Boolean(bridges.enabled); + } + + // Set bridge_strings + switch (bridges.source) { + case TorBridgeSource.UserProvided: + case TorBridgeSource.BridgeDB: + // Only accept an Array for UserProvided and BridgeDB bridge_strings. + break; + case TorBridgeSource.BuiltIn: + bridges.builtin_type = String(bridges.builtin_type); + bridges.bridge_strings = this.#getBuiltinBridges(bridges.builtin_type); + break; + case TorBridgeSource.Lox: + bridges.lox_id = String(bridges.lox_id); + bridges.bridge_strings = lazy.Lox.getBridges(bridges.lox_id); + break; + case TorBridgeSource.Invalid: + bridges.bridge_strings = []; + break; + } + + if ( + !Array.isArray(bridges.bridge_strings) || + bridges.bridge_strings.some(str => typeof str !== "string") + ) { + throw new Error("bridge_strings should be an Array of strings"); + } + + if ( + bridges.source !== TorBridgeSource.Invalid && + !bridges.bridge_strings?.length + ) { + throw new Error( + `Missing bridge_strings for bridge source ${bridges.source}` + ); + } + + if (bridges.source !== TorBridgeSource.BuiltIn) { + bridges.builtin_type = ""; + } + if (bridges.source !== TorBridgeSource.Lox) { + bridges.lox_id = ""; + } + + if (bridges.source === TorBridgeSource.Invalid) { + bridges.enabled = false; + } + } + + /** + * Fixup the given proxy settings to fill in details, establish the correct + * types and clean up. + * + * May throw if there is an error in the given values. + * + * @param {Object} proxy - The proxy settings to fix up. + */ + #fixupProxySettings(proxy) { + proxy.enabled = Boolean(proxy.enabled); + if (!proxy.enabled) { + proxy.type = TorProxyType.Invalid; + proxy.address = ""; + proxy.port = 0; + proxy.username = ""; + proxy.password = ""; + return; + } + + if (!Object.values(TorProxyType).includes(proxy.type)) { + throw new Error(`Invalid proxy type: ${proxy.type}`); + } + proxy.port = this.#parsePort(proxy.port, false); + proxy.address = String(proxy.address); + proxy.username = String(proxy.username); + proxy.password = String(proxy.password); + } + + /** + * Fixup the given firewall settings to fill in details, establish the correct + * types and clean up. + * + * May throw if there is an error in the given values. + * + * @param {Object} firewall - The proxy settings to fix up. + */ + #fixupFirewallSettings(firewall) { + firewall.enabled = Boolean(firewall.enabled); + if (!firewall.enabled) { + firewall.allowed_ports = []; + return; + } + + let allowed_ports = firewall.allowed_ports; + if (!Array.isArray(allowed_ports)) { + allowed_ports = allowed_ports === "" ? [] : allowed_ports.split(","); + } + // parse and remove duplicates + const portSet = new Set(); + + for (const port of allowed_ports) { + try { + portSet.add(this.#parsePort(port, true)); + } catch (e) { + // Do not throw for individual ports. + lazy.logger.error(`Failed to parse the port ${port}. Ignoring.`, e); + } + } + firewall.allowed_ports = [...portSet]; + } + /** * Change the Tor settings in use. * @@ -994,101 +854,128 @@ class TorSettingsImpl { * + proxy settings can be set as a group. * + firewall settings can be set a group. * - * @param {object} settings - The settings object to set. + * @param {object} newValues - The new setting values, a subset of the + * complete settings that should be changed. */ - async changeSettings(settings) { - lazy.logger.debug("changeSettings()", settings); + async changeSettings(newValues) { + lazy.logger.debug("changeSettings()", newValues); this.#checkIfInitialized(); - const backup = this.getSettings(); - const backupNotifications = [...this.#notificationQueue]; - // Start collecting errors. - this.#settingErrors = []; - - // Hold off on lots of notifications until all settings are changed. - this.#freezeNotifications(); - try { - if ("quickstart" in settings && "enabled" in settings.quickstart) { - this.quickstart.enabled = !!settings.quickstart.enabled; + // Make a structured clone since we change the object and may adopt some of + // the Array values. + newValues = structuredClone(newValues); + + const completeSettings = structuredClone(this.#settings); + const changes = []; + + /** + * Change the given setting to a new value. Does nothing if the new value + * equals the old one, otherwise the change will be recorded in `changes`. + * + * @param {string} group - The group name for the property. + * @param {string} prop - The property name within the group. + * @param {any} value - The value to set. + * @param [Function?] equal - A method to test equality between the old and + * new value. Otherwise uses `===` to check equality. + */ + const changeSetting = (group, prop, value, equal = null) => { + const currentValue = this.#settings[group][prop]; + if (equal ? equal(currentValue, value) : currentValue === value) { + return; } + completeSettings[group][prop] = value; + changes.push(`${group}.${prop}`); + }; - if ("bridges" in settings) { - if ("enabled" in settings.bridges) { - this.bridges.enabled = !!settings.bridges.enabled; - } - if ("source" in settings.bridges) { - this.bridges.source = settings.bridges.source; - switch (settings.bridges.source) { - case TorBridgeSource.BridgeDB: - case TorBridgeSource.UserProvided: - this.bridges.bridge_strings = settings.bridges.bridge_strings; - break; - case TorBridgeSource.BuiltIn: - this.bridges.builtin_type = settings.bridges.builtin_type; - break; - case TorBridgeSource.Lox: - this.bridges.lox_id = settings.bridges.lox_id; - break; - case TorBridgeSource.Invalid: - break; - case undefined: - break; - } - } - } + if ("quickstart" in newValues && "enabled" in newValues.quickstart) { + changeSetting( + "quickstart", + "enabled", + Boolean(newValues.quickstart.enabled) + ); + } - if ("proxy" in settings) { - // proxy settings have to be set as a group. - this.proxy.enabled = !!settings.proxy.enabled; - if (this.proxy.enabled) { - this.proxy.type = settings.proxy.type; - this.proxy.address = settings.proxy.address; - this.proxy.port = settings.proxy.port; - this.proxy.username = settings.proxy.username; - this.proxy.password = settings.proxy.password; + if ("bridges" in newValues) { + if ("source" in newValues.bridges) { + this.#fixupBridgeSettings(newValues.bridges); + changeSetting("bridges", "source", newValues.bridges.source); + changeSetting( + "bridges", + "bridge_strings", + newValues.bridges.bridge_strings, + this.#arrayEqual + ); + changeSetting("bridges", "lox_id", newValues.bridges.lox_id); + changeSetting( + "bridges", + "builtin_type", + newValues.bridges.builtin_type + ); + } else if ("enabled" in newValues.bridges) { + // Don't need to fixup all the settings, just need to ensure that the + // enabled value is compatible with the current source. + newValues.bridges.enabled = Boolean(newValues.bridges.enabled); + if ( + newValues.bridges.enabled && + completeSettings.bridges.source === TorBridgeSource.Invalid + ) { + throw new Error("Cannot enable bridges without a bridge source."); } } - - if ("firewall" in settings) { - // firewall settings have to be set as a group. - this.firewall.enabled = !!settings.firewall.enabled; - if (this.firewall.enabled) { - this.firewall.allowed_ports = settings.firewall.allowed_ports; - } + if ("enabled" in newValues.bridges) { + changeSetting("bridges", "enabled", newValues.bridges.enabled); } + } - this.#cleanupSettings(); + if ("proxy" in newValues) { + // proxy settings have to be set as a group. + this.#fixupProxySettings(newValues.proxy); + changeSetting("proxy", "enabled", Boolean(newValues.proxy.enabled)); + changeSetting("proxy", "type", newValues.proxy.type); + changeSetting("proxy", "address", newValues.proxy.address); + changeSetting("proxy", "port", newValues.proxy.port); + changeSetting("proxy", "username", newValues.proxy.username); + changeSetting("proxy", "password", newValues.proxy.password); + } - if (this.#settingErrors.length) { - throw Error(this.#settingErrors.join("; ")); - } - this.#saveToPrefs(); - } catch (ex) { - // Restore the old settings without any new notifications generated from - // the above code. - // NOTE: Since the code that changes #settings is not async, it should not - // be possible for some other call to TorSettings to change anything - // whilst we are in this context (other than lower down in this call - // stack), so it is safe to discard all changes to settings and - // notifications. - this.#settings = backup; - this.#notificationQueue.clear(); - for (const notification of backupNotifications) { - this.#notificationQueue.add(notification); - } + if ("firewall" in newValues) { + // firewall settings have to be set as a group. + this.#fixupFirewallSettings(newValues.firewall); + changeSetting("firewall", "enabled", Boolean(newValues.firewall.enabled)); + changeSetting( + "firewall", + "allowed_ports", + newValues.firewall.allowed_ports, + this.#arrayEqual + ); + } + + // No errors so far, so save and commit. + this.#settings = completeSettings; + this.#saveToPrefs(); - throw ex; - } finally { - this.#thawNotifications(); - // Stop collecting errors. - this.#settingErrors = null; + if (changes.length) { + Services.obs.notifyObservers( + { changes }, + TorSettingsTopics.SettingsChanged + ); } - lazy.logger.debug("setSettings result", this.#settings); + lazy.logger.debug("setSettings result", this.#settings, changes); // After we have sent out the notifications for the changed settings and // saved the preferences we send the new settings to TorProvider. - await this.#applySettings(); + // Some properties are unread by TorProvider. So if only these values change + // there is no need to re-apply the settings. + const unreadProps = [ + "quickstart.enabled", + "bridges.builtin_type", + "bridges.lox_id", + ]; + const shouldApply = changes.some(prop => !unreadProps.includes(prop)); + if (shouldApply) { + await this.#applySettings(); + } } /** @@ -1147,29 +1034,11 @@ class TorSettingsImpl { const bridgeSettings = { enabled: true, source: bridges.source, + builtin_type: String(bridges.builtin_type), + bridge_strings: structuredClone(bridges.bridge_strings), }; - if (bridges.source === TorBridgeSource.BuiltIn) { - if (!bridges.builtin_type) { - throw Error("Missing a built-in type"); - } - bridgeSettings.builtin_type = String(bridges.builtin_type); - const bridgeStrings = this.getBuiltinBridges(bridgeSettings.builtin_type); - if (!bridgeStrings.length) { - throw new Error(`No builtin bridges for type ${bridges.builtin_type}`); - } - bridgeSettings.bridge_strings = bridgeStrings; - } else { - // BridgeDB. - if (!bridges.bridge_strings?.length) { - throw new Error("Missing bridges strings"); - } - // TODO: Can we safely verify the format of the bridge addresses sent from - // Moat? - bridgeSettings.bridge_strings = Array.from(bridges.bridge_strings, item => - String(item) - ); - } + this.#fixupBridgeSettings(bridgeSettings); // After checks are complete, we commit them. this.#temporaryBridgeSettings = bridgeSettings; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3dd180… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3dd180… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] 5 commits: fixup! TB 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 21 Jan '25

21 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: bd7602fe by Henry Wilkes at 2025-01-20T18:25:01+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. The granular methods have been made private. - - - - - e43836ca by Henry Wilkes at 2025-01-20T18:26:14+00:00 fixup! TB 42247: Android helpers for the TorProvider TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. We drop redundant arguments and unused methods from android integration. - - - - - 6864f8ab by Henry Wilkes at 2025-01-20T18:26:15+00:00 fixup! TB 41878: [android] Add standalone Tor Bootstrap TB 41921: Drop redundant arguments to getTorIntegration().setSettings. All calls to this method passed true for the last two arguments. - - - - - d6536e87 by Henry Wilkes at 2025-01-20T18:26:16+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. - - - - - 3dd18040 by Henry Wilkes at 2025-01-20T18:26:16+00:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 41921: Only use TorSettings.changeSettings to change the Tor settings and apply them in one method. - - - - - 7 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionSettingsDialog.js - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt - mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java - toolkit/components/torconnect/TorConnectParent.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -96,33 +96,6 @@ const Lox = { }; */ -/** - * Make changes to TorSettings and save them. - * - * Bulk changes will be frozen together. - * - * @param {Function} changes - Method to apply changes to TorSettings. - */ -async function setTorSettings(changes) { - if (!TorSettings.initialized) { - log.warning("Ignoring changes to uninitialized TorSettings"); - return; - } - TorSettings.freezeNotifications(); - try { - changes(); - // This will trigger TorSettings.#cleanupSettings() - TorSettings.saveToPrefs(); - try { - await TorSettings.applySettings(); - } catch (e) { - console.error("Failed to apply Tor settings", e); - } - } finally { - TorSettings.thawNotifications(); - } -} - /** * Get the ID/fingerprint of the bridge used in the most recent Tor circuit. * @@ -757,6 +730,7 @@ const gBridgeGrid = { }); removeItem.addEventListener("click", () => { const bridgeLine = row.bridgeLine; + const source = TorSettings.bridges.source; const strings = TorSettings.bridges.bridge_strings; const index = strings.indexOf(bridgeLine); if (index === -1) { @@ -764,8 +738,8 @@ const gBridgeGrid = { } strings.splice(index, 1); - setTorSettings(() => { - TorSettings.bridges.bridge_strings = strings; + TorSettings.changeSettings({ + bridges: { source, bridge_strings: strings }, }); }); }, @@ -1829,8 +1803,8 @@ const gBridgeSettings = { if (!this._haveBridges) { return; } - setTorSettings(() => { - TorSettings.bridges.enabled = this._toggleButton.pressed; + TorSettings.changeSettings({ + bridges: { enabled: this._toggleButton.pressed }, }); }); @@ -2215,10 +2189,10 @@ const gBridgeSettings = { return; } - setTorSettings(() => { + TorSettings.changeSettings({ // This should always have the side effect of disabling bridges as // well. - TorSettings.bridges.source = TorBridgeSource.Invalid; + bridges: { source: TorBridgeSource.Invalid }, }); }); @@ -2319,10 +2293,12 @@ const gBridgeSettings = { if (!result.type) { return null; } - return setTorSettings(() => { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.BuiltIn; - TorSettings.bridges.builtin_type = result.type; + return TorSettings.changeSettings({ + bridges: { + enabled: true, + source: TorBridgeSource.BuiltIn, + builtin_type: result.type, + }, }); } ); @@ -2339,10 +2315,12 @@ const gBridgeSettings = { if (!result.bridges?.length) { return null; } - return setTorSettings(() => { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.BridgeDB; - TorSettings.bridges.bridge_strings = result.bridges.join("\n"); + return TorSettings.changeSettings({ + bridges: { + enabled: true, + source: TorBridgeSource.BridgeDB, + bridge_strings: result.bridges.join("\n"), + }, }); } ); @@ -2363,16 +2341,15 @@ const gBridgeSettings = { if (!loxId && !result.addresses?.length) { return null; } - return setTorSettings(() => { - TorSettings.bridges.enabled = true; - if (loxId) { - TorSettings.bridges.source = TorBridgeSource.Lox; - TorSettings.bridges.lox_id = loxId; - } else { - TorSettings.bridges.source = TorBridgeSource.UserProvided; - TorSettings.bridges.bridge_strings = result.addresses; - } - }); + const bridges = { enabled: true }; + if (loxId) { + bridges.source = TorBridgeSource.Lox; + bridges.lox_id = loxId; + } else { + bridges.source = TorBridgeSource.UserProvided; + bridges.bridge_strings = result.addresses; + } + return TorSettings.changeSettings({ bridges }); } ); }, @@ -2586,9 +2563,9 @@ const gConnectionPane = (function () { "torPreferences-quickstart-toggle" ); this._enableQuickstartCheckbox.addEventListener("command", () => { - const checked = this._enableQuickstartCheckbox.checked; - TorSettings.quickstart.enabled = checked; - TorSettings.saveToPrefs().applySettings(); + TorSettings.changeSettings({ + quickstart: { enabled: this._enableQuickstartCheckbox.checked }, + }); }); this._enableQuickstartCheckbox.checked = TorSettings.quickstart.enabled; Services.obs.addObserver(this, TorSettingsTopics.SettingsChanged); ===================================== browser/components/torpreferences/content/connectionSettingsDialog.js ===================================== @@ -270,33 +270,34 @@ const gConnectionSettingsDialog = { const port = this._proxyPortTextbox.value; const username = this._proxyUsernameTextbox.value; const password = this._proxyPasswordTextbox.value; + const settings = { proxy: {}, firewall: {} }; switch (type) { case TorProxyType.Invalid: - TorSettings.proxy.enabled = false; + settings.proxy.enabled = false; break; case TorProxyType.Socks4: - TorSettings.proxy.enabled = true; - TorSettings.proxy.type = type; - TorSettings.proxy.address = address; - TorSettings.proxy.port = port; - TorSettings.proxy.username = ""; - TorSettings.proxy.password = ""; + settings.proxy.enabled = true; + settings.proxy.type = type; + settings.proxy.address = address; + settings.proxy.port = port; + settings.proxy.username = ""; + settings.proxy.password = ""; break; case TorProxyType.Socks5: - TorSettings.proxy.enabled = true; - TorSettings.proxy.type = type; - TorSettings.proxy.address = address; - TorSettings.proxy.port = port; - TorSettings.proxy.username = username; - TorSettings.proxy.password = password; + settings.proxy.enabled = true; + settings.proxy.type = type; + settings.proxy.address = address; + settings.proxy.port = port; + settings.proxy.username = username; + settings.proxy.password = password; break; case TorProxyType.HTTPS: - TorSettings.proxy.enabled = true; - TorSettings.proxy.type = type; - TorSettings.proxy.address = address; - TorSettings.proxy.port = port; - TorSettings.proxy.username = username; - TorSettings.proxy.password = password; + settings.proxy.enabled = true; + settings.proxy.type = type; + settings.proxy.address = address; + settings.proxy.port = port; + settings.proxy.username = username; + settings.proxy.password = password; break; } @@ -304,16 +305,15 @@ const gConnectionSettingsDialog = { ? this._allowedPortsTextbox.value : ""; if (portListString) { - TorSettings.firewall.enabled = true; - TorSettings.firewall.allowed_ports = portListString; + settings.firewall.enabled = true; + settings.firewall.allowed_ports = portListString; } else { - TorSettings.firewall.enabled = false; + settings.firewall.enabled = false; } - TorSettings.saveToPrefs(); // FIXME: What if this fails? Should we prevent the dialog to close and show // an error? - TorSettings.applySettings(); + TorSettings.changeSettings(settings); }, }; ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorControllerGV.kt ===================================== @@ -80,7 +80,7 @@ class TorControllerGV( set(value) { getTorSettings()?.let { it.quickstart = value - getTorIntegration().setSettings(it, true, true) + getTorIntegration().setSettings(it) } } @@ -110,7 +110,7 @@ class TorControllerGV( getTorSettings()?.let { if (!value || it.bridgesSource != BridgeSource.Invalid) { it.bridgesEnabled = value - getTorIntegration().setSettings(it, true, true) + getTorIntegration().setSettings(it) } } } @@ -150,7 +150,7 @@ class TorControllerGV( } it.bridgesBuiltinType = bbt } - getTorIntegration().setSettings(it, true, true) + getTorIntegration().setSettings(it) } } @@ -175,7 +175,7 @@ class TorControllerGV( val userProvidedLines: Array<String> = value?.split("\n")?.filter { it.length > 4 }?.toTypedArray() ?: arrayOf<String>() it.bridgesSource = BridgeSource.UserProvided it.bridgeBridgeStrings = userProvidedLines - getTorIntegration().setSettings(it, true, true) + getTorIntegration().setSettings(it) } } ===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java ===================================== @@ -48,8 +48,6 @@ public class TorIntegrationAndroid implements BundleEventListener { // Events we emit private static final String EVENT_SETTINGS_GET = "GeckoView:Tor:SettingsGet"; private static final String EVENT_SETTINGS_SET = "GeckoView:Tor:SettingsSet"; - private static final String EVENT_SETTINGS_APPLY = "GeckoView:Tor:SettingsApply"; - private static final String EVENT_SETTINGS_SAVE = "GeckoView:Tor:SettingsSave"; private static final String EVENT_BOOTSTRAP_BEGIN = "GeckoView:Tor:BootstrapBegin"; private static final String EVENT_BOOTSTRAP_BEGIN_AUTO = "GeckoView:Tor:BootstrapBeginAuto"; private static final String EVENT_BOOTSTRAP_CANCEL = "GeckoView:Tor:BootstrapCancel"; @@ -194,7 +192,7 @@ public class TorIntegrationAndroid implements BundleEventListener { protected void onPostExecute(TorSettings torSettings) { mSettings = torSettings; if (TorLegacyAndroidSettings.unmigrated()) { - setSettings(mSettings, true, true); + setSettings(mSettings); TorLegacyAndroidSettings.setMigrated(); } } @@ -657,10 +655,10 @@ public class TorIntegrationAndroid implements BundleEventListener { return mSettings; } - public void setSettings(final TorSettings settings, boolean save, boolean apply) { + public void setSettings(final TorSettings settings) { mSettings = settings; - emitSetSettings(settings, save, apply) + emitSetSettings(settings) .then( new GeckoResult.OnValueListener<Void, Void>() { public GeckoResult<Void> onValue(Void v) { @@ -677,22 +675,12 @@ public class TorIntegrationAndroid implements BundleEventListener { } private @NonNull GeckoResult<Void> emitSetSettings( - final TorSettings settings, boolean save, boolean apply) { - GeckoBundle bundle = new GeckoBundle(3); - bundle.putBoolean("save", save); - bundle.putBoolean("apply", apply); + final TorSettings settings) { + GeckoBundle bundle = new GeckoBundle(1); bundle.putBundle("settings", settings.asGeckoBundle()); return EventDispatcher.getInstance().queryVoid(EVENT_SETTINGS_SET, bundle); } - public @NonNull GeckoResult<Void> applySettings() { - return EventDispatcher.getInstance().queryVoid(EVENT_SETTINGS_APPLY); - } - - public @NonNull GeckoResult<Void> saveSettings() { - return EventDispatcher.getInstance().queryVoid(EVENT_SETTINGS_SAVE); - } - public @NonNull GeckoResult<Void> beginBootstrap() { return EventDispatcher.getInstance().queryVoid(EVENT_BOOTSTRAP_BEGIN); } ===================================== toolkit/components/torconnect/TorConnectParent.sys.mjs ===================================== @@ -104,8 +104,7 @@ export class TorConnectParent extends JSWindowActorParent { // If there are multiple home pages, just load the first one. return Promise.resolve(TorConnect.fixupURIs(lazy.HomePage.get())[0]); case "torconnect:set-quickstart": - TorSettings.quickstart.enabled = message.data; - TorSettings.saveToPrefs().applySettings(); + TorSettings.changeSettings({ quickstart: { enabled: message.data } }); break; case "torconnect:open-tor-preferences": this.browsingContext.top.embedderElement.ownerGlobal.openPreferences( ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -36,8 +36,6 @@ const ListenedEvents = Object.freeze({ settingsGet: "GeckoView:Tor:SettingsGet", // The data is passed directly to TorSettings. settingsSet: "GeckoView:Tor:SettingsSet", - settingsApply: "GeckoView:Tor:SettingsApply", - settingsSave: "GeckoView:Tor:SettingsSave", bootstrapBegin: "GeckoView:Tor:BootstrapBegin", // Optionally takes a countryCode, as data.countryCode. bootstrapBeginAuto: "GeckoView:Tor:BootstrapBeginAuto", @@ -145,20 +143,10 @@ class TorAndroidIntegrationImpl { callback?.onSuccess(lazy.TorSettings.getSettings()); return; case ListenedEvents.settingsSet: - // This does not throw, so we do not have any way to report the error! - lazy.TorSettings.setSettings(data.settings); - if (data.save) { - lazy.TorSettings.saveToPrefs(); - } - if (data.apply) { - await lazy.TorSettings.applySettings(); - } - break; - case ListenedEvents.settingsApply: - await lazy.TorSettings.applySettings(); - break; - case ListenedEvents.settingsSave: - await lazy.TorSettings.saveToPrefs(); + // TODO: Handle setting throw? This can throw if data.settings is + // incorrectly formatted, but more like it can throw when the settings + // fail to be passed onto the TorProvider. tor-browser#43405. + await lazy.TorSettings.changeSettings(data.settings); break; case ListenedEvents.bootstrapBegin: lazy.TorConnect.beginBootstrapping(); ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -422,7 +422,7 @@ class TorSettingsImpl { * not contradict each other. */ #cleanupSettings() { - this.freezeNotifications(); + this.#freezeNotifications(); try { if (this.bridges.source === TorBridgeSource.Invalid) { this.bridges.enabled = false; @@ -449,7 +449,7 @@ class TorSettingsImpl { this.firewall.allowed_ports = []; } } finally { - this.thawNotifications(); + this.#thawNotifications(); } } @@ -488,7 +488,7 @@ class TorSettingsImpl { * changes you make with a `try` block and call thawNotifications in the * `finally` block. */ - freezeNotifications() { + #freezeNotifications() { this.#freezeNotificationsCount++; } /** @@ -497,7 +497,7 @@ class TorSettingsImpl { * Note, if some other method has also frozen the notifications, this will * only release them once it has also called this method. */ - thawNotifications() { + #thawNotifications() { this.#freezeNotificationsCount--; this.#tryNotification(); } @@ -571,7 +571,7 @@ class TorSettingsImpl { this.#checkIfInitialized(); } const prevVal = this.#settings[groupname][name]; - this.freezeNotifications(); + this.#freezeNotifications(); try { if (transform) { val = transform(val, addError); @@ -589,7 +589,7 @@ class TorSettingsImpl { } catch (e) { addError(e.message); } finally { - this.thawNotifications(); + this.#thawNotifications(); } }, }); @@ -717,7 +717,7 @@ class TorSettingsImpl { Services.prefs.getBoolPref(TorSettingsPrefs.enabled, false) ) { // Do not want notifications for initially loaded prefs. - this.freezeNotifications(); + this.#freezeNotifications(); try { this.#allowUninitialized = true; this.#loadFromPrefs(); @@ -726,7 +726,7 @@ class TorSettingsImpl { } finally { this.#allowUninitialized = false; this.#notificationQueue.clear(); - this.thawNotifications(); + this.#thawNotifications(); } } @@ -755,7 +755,7 @@ class TorSettingsImpl { // source. But we do pass on the changes to TorProvider. // FIXME: This can compete with TorConnect to reach TorProvider. // tor-browser#42316 - this.applySettings(); + this.#applySettings(); } break; } @@ -876,7 +876,7 @@ class TorSettingsImpl { /** * Save our settings to prefs. */ - saveToPrefs() { + #saveToPrefs() { lazy.logger.debug("saveToPrefs()"); this.#checkIfInitialized(); @@ -968,8 +968,6 @@ class TorSettingsImpl { // all tor settings now stored in prefs :) Services.prefs.setBoolPref(TorSettingsPrefs.enabled, true); - - return this; } /** @@ -978,23 +976,28 @@ class TorSettingsImpl { * Even though this introduces a circular depdency, it makes the API nicer for * frontend consumers. */ - async applySettings() { + async #applySettings() { this.#checkIfInitialized(); const provider = await lazy.TorProviderBuilder.build(); await provider.writeSettings(); } /** - * Set blocks of settings at once from an object. + * Change the Tor settings in use. + * + * It is possible to set all settings, or only some sections: * - * It is possible to set all settings, or only some sections (e.g., only - * bridges), but if a key is present, its settings must make sense (e.g., if - * bridges are enabled, a valid source must be provided). + * + quickstart.enabled can be set individually. + * + bridges.enabled can be set individually. + * + bridges.source can be set with a corresponding bridge specification for + * the source (bridge_strings, lox_id, builtin_type). + * + proxy settings can be set as a group. + * + firewall settings can be set a group. * - * @param {object} settings The settings object to set + * @param {object} settings - The settings object to set. */ - setSettings(settings) { - lazy.logger.debug("setSettings()"); + async changeSettings(settings) { + lazy.logger.debug("changeSettings()", settings); this.#checkIfInitialized(); const backup = this.getSettings(); @@ -1003,38 +1006,39 @@ class TorSettingsImpl { this.#settingErrors = []; // Hold off on lots of notifications until all settings are changed. - this.freezeNotifications(); + this.#freezeNotifications(); try { - if ("quickstart" in settings) { + if ("quickstart" in settings && "enabled" in settings.quickstart) { this.quickstart.enabled = !!settings.quickstart.enabled; } if ("bridges" in settings) { - this.bridges.enabled = !!settings.bridges.enabled; - // Currently, disabling bridges in the UI does not remove the lines, - // because we call only the `enabled` setter. - // So, if the bridge source is undefined but bridges are disabled, - // do not force Invalid. Instead, keep the current source. - if (this.bridges.enabled || settings.bridges.source !== undefined) { - this.bridges.source = settings.bridges.source; + if ("enabled" in settings.bridges) { + this.bridges.enabled = !!settings.bridges.enabled; } - switch (settings.bridges.source) { - case TorBridgeSource.BridgeDB: - case TorBridgeSource.UserProvided: - this.bridges.bridge_strings = settings.bridges.bridge_strings; - break; - case TorBridgeSource.BuiltIn: - this.bridges.builtin_type = settings.bridges.builtin_type; - break; - case TorBridgeSource.Lox: - this.bridges.lox_id = settings.bridges.lox_id; - break; - case TorBridgeSource.Invalid: - break; + if ("source" in settings.bridges) { + this.bridges.source = settings.bridges.source; + switch (settings.bridges.source) { + case TorBridgeSource.BridgeDB: + case TorBridgeSource.UserProvided: + this.bridges.bridge_strings = settings.bridges.bridge_strings; + break; + case TorBridgeSource.BuiltIn: + this.bridges.builtin_type = settings.bridges.builtin_type; + break; + case TorBridgeSource.Lox: + this.bridges.lox_id = settings.bridges.lox_id; + break; + case TorBridgeSource.Invalid: + break; + case undefined: + break; + } } } if ("proxy" in settings) { + // proxy settings have to be set as a group. this.proxy.enabled = !!settings.proxy.enabled; if (this.proxy.enabled) { this.proxy.type = settings.proxy.type; @@ -1046,6 +1050,7 @@ class TorSettingsImpl { } if ("firewall" in settings) { + // firewall settings have to be set as a group. this.firewall.enabled = !!settings.firewall.enabled; if (this.firewall.enabled) { this.firewall.allowed_ports = settings.firewall.allowed_ports; @@ -1057,27 +1062,33 @@ class TorSettingsImpl { if (this.#settingErrors.length) { throw Error(this.#settingErrors.join("; ")); } + this.#saveToPrefs(); } catch (ex) { // Restore the old settings without any new notifications generated from // the above code. - // NOTE: Since this code is not async, it should not be possible for - // some other call to TorSettings to change anything whilst we are - // in this context (other than lower down in this call stack), so it is - // safe to discard all changes to settings and notifications. + // NOTE: Since the code that changes #settings is not async, it should not + // be possible for some other call to TorSettings to change anything + // whilst we are in this context (other than lower down in this call + // stack), so it is safe to discard all changes to settings and + // notifications. this.#settings = backup; this.#notificationQueue.clear(); for (const notification of backupNotifications) { this.#notificationQueue.add(notification); } - lazy.logger.error("setSettings failed", ex); + throw ex; } finally { - this.thawNotifications(); + this.#thawNotifications(); // Stop collecting errors. this.#settingErrors = null; } lazy.logger.debug("setSettings result", this.#settings); + + // After we have sent out the notifications for the changed settings and + // saved the preferences we send the new settings to TorProvider. + await this.#applySettings(); } /** @@ -1162,7 +1173,7 @@ class TorSettingsImpl { // After checks are complete, we commit them. this.#temporaryBridgeSettings = bridgeSettings; - await this.applySettings(); + await this.#applySettings(); } /** @@ -1174,10 +1185,9 @@ class TorSettingsImpl { lazy.logger.warn("No temporary bridges to save"); return; } - this.setSettings({ bridges: this.#temporaryBridgeSettings }); + const bridgeSettings = this.#temporaryBridgeSettings; this.#temporaryBridgeSettings = null; - this.saveToPrefs(); - await this.applySettings(); + await this.changeSettings({ bridges: bridgeSettings }); } /** @@ -1190,7 +1200,7 @@ class TorSettingsImpl { return; } this.#temporaryBridgeSettings = null; - await this.applySettings(); + await this.#applySettings(); } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6ea6bd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6ea6bd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41324: Improve build signing ergonomics
by ma1 (＠ma1) 21 Jan '25

21 Jan '25

ma1 pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 311a9672 by hackademix at 2025-01-21T09:48:21+01:00 Bug 41324: Improve build signing ergonomics - - - - - 2 changed files: - tools/signing/do-all-signing - + tools/signing/set-config.passwords Changes: ===================================== tools/signing/do-all-signing ===================================== @@ -3,29 +3,59 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" source "$script_dir/set-config.update-responses" - NON_INTERACTIVE=1 steps_dir="$signed_version_dir.steps" test -d "$steps_dir" || mkdir -p "$steps_dir" -test -f "$steps_dir/linux-signer-rcodesign-sign.done" || +function get_sekrit { + echo "$SEKRITS" | grep -A1 "$1:" | tail -n1 +} + +[ -f "$script_dir/set-config.passwords" ] && . "$script_dir/set-config.passwords" 2>/dev/null + +if [[ $1 = "-p" ]]; then + shift + passwords_gpg_file="$1" + shift +fi + +is_project torbrowser && nssdb=torbrowser-nssdb7 +is_project mullvadbrowser && nssdb=mullvadbrowser-nssdb1 + +if [ -f "$passwords_gpg_file" ]; then + echo "Reading passwords from $passwords_gpg_file" + SEKRITS=$(gpg --decrypt "$passwords_gpg_file") + RCODESIGN_PW=$(get_sekrit 'rcodesign') + NSSPASS=$(get_sekrit "$nssdb (mar signing)") + KSPASS=$(get_sekrit "android apk ($tbb_version_type)") + YUBIPASS=$(get_sekrit "windows authenticode") + GPG_PASS=$(get_sekrit "gpg") +else + echo "Rather than entering all the password manually, you may want to provide a gpg-encrypted file either on the command line (-p <filepath>) or in set-config.passwords." +fi + +test -f "$steps_dir/linux-signer-rcodesign-sign.done" || [ -n "$RCODESIGN_PW" ] || read -sp "Enter rcodesign passphrase for key-1: " RCODESIGN_PW echo -is_project torbrowser && nssdb=torbrowser-nssdb7 -is_project mullvadbrowser && nssdb=mullvadbrowser-nssdb-1 -test -f "$steps_dir/linux-signer-signmars.done" || + +test -f "$steps_dir/linux-signer-signmars.done" || [ -n "$NSSPASS" ] || read -sp "Enter $nssdb (mar signing) passphrase: " NSSPASS echo -test -f "$steps_dir/linux-signer-authenticode-signing.done" || +if is_project torbrowser; then + test -f "$steps_dir/linux-signer-sign-android-apks.done" || [ -n "$KSPASS" ] || + read -sp "Enter android apk signing password ($tbb_version_type): " KSPASS + echo +fi +test -f "$steps_dir/linux-signer-authenticode-signing.done" || [ -n "$YUBIPASS" ] || read -sp "Enter windows authenticode passphrase: " YUBIPASS echo -test -f "$steps_dir/linux-signer-gpg-sign.done" || +test -f "$steps_dir/linux-signer-gpg-sign.done" || [ -n "$GPG_PASS" ] || read -sp "Enter gpg passphrase: " GPG_PASS echo function set-time-on-signing-machine { - local current_time=$(date -u) + local current_time=$(date -u -Iseconds) ssh "$ssh_host_linux_signer" sudo /usr/bin/date -s "'$current_time'" } @@ -169,6 +199,10 @@ function do_step { echo "$(date -Iseconds) - Finished step: $1" } +function is_legacy { + [[ "$tbb_version" = 13.* ]] +} + export SIGNING_PROJECTNAME do_step set-time-on-signing-machine @@ -185,6 +219,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 +is_project torbrowser && ! is_legacy && \ + do_step linux-signer-sign-android-apks +is_project torbrowser && ! is_legacy && \ + do_step sync-after-sign-android-apks do_step linux-signer-authenticode-signing do_step sync-after-authenticode-signing do_step authenticode-timestamping @@ -197,6 +235,6 @@ do_step download-unsigned-sha256sums-gpg-signatures-from-people-tpo do_step sync-local-to-staticiforme do_step sync-scripts-to-staticiforme do_step staticiforme-prepare-cdn-dist-upload -is_project mullvadbrowser && \ +! is_legacy && do_step upload-update_responses-to-staticiforme do_step finished-signing-clean-linux-signer ===================================== tools/signing/set-config.passwords ===================================== @@ -0,0 +1,2 @@ +# Path to a gpg-encrypted cache of passwords not to be asked on each run +passwords_gpg_file=~/.tor-browser-signing/tor-browser-passwords.txt.gpg 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-14.0] Bug 41324: Improve build signing ergonomics
by ma1 (＠ma1) 21 Jan '25

21 Jan '25

ma1 pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: 27887a68 by hackademix at 2025-01-21T09:36:51+01:00 Bug 41324: Improve build signing ergonomics - - - - - 2 changed files: - tools/signing/do-all-signing - + tools/signing/set-config.passwords Changes: ===================================== tools/signing/do-all-signing ===================================== @@ -3,34 +3,59 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" source "$script_dir/set-config.update-responses" - NON_INTERACTIVE=1 steps_dir="$signed_version_dir.steps" test -d "$steps_dir" || mkdir -p "$steps_dir" -test -f "$steps_dir/linux-signer-rcodesign-sign.done" || +function get_sekrit { + echo "$SEKRITS" | grep -A1 "$1:" | tail -n1 +} + +[ -f "$script_dir/set-config.passwords" ] && . "$script_dir/set-config.passwords" 2>/dev/null + +if [[ $1 = "-p" ]]; then + shift + passwords_gpg_file="$1" + shift +fi + +is_project torbrowser && nssdb=torbrowser-nssdb7 +is_project mullvadbrowser && nssdb=mullvadbrowser-nssdb1 + +if [ -f "$passwords_gpg_file" ]; then + echo "Reading passwords from $passwords_gpg_file" + SEKRITS=$(gpg --decrypt "$passwords_gpg_file") + RCODESIGN_PW=$(get_sekrit 'rcodesign') + NSSPASS=$(get_sekrit "$nssdb (mar signing)") + KSPASS=$(get_sekrit "android apk ($tbb_version_type)") + YUBIPASS=$(get_sekrit "windows authenticode") + GPG_PASS=$(get_sekrit "gpg") +else + echo "Rather than entering all the password manually, you may want to provide a gpg-encrypted file either on the command line (-p <filepath>) or in set-config.passwords." +fi + +test -f "$steps_dir/linux-signer-rcodesign-sign.done" || [ -n "$RCODESIGN_PW" ] || read -sp "Enter rcodesign passphrase for key-1: " RCODESIGN_PW echo -is_project torbrowser && nssdb=torbrowser-nssdb7 -is_project mullvadbrowser && nssdb=mullvadbrowser-nssdb-1 -test -f "$steps_dir/linux-signer-signmars.done" || + +test -f "$steps_dir/linux-signer-signmars.done" || [ -n "$NSSPASS" ] || read -sp "Enter $nssdb (mar signing) passphrase: " NSSPASS echo if is_project torbrowser; then - test -f "$steps_dir/linux-signer-sign-android-apks.done" || + test -f "$steps_dir/linux-signer-sign-android-apks.done" || [ -n "$KSPASS" ] || read -sp "Enter android apk signing password ($tbb_version_type): " KSPASS echo fi -test -f "$steps_dir/linux-signer-authenticode-signing.done" || +test -f "$steps_dir/linux-signer-authenticode-signing.done" || [ -n "$YUBIPASS" ] || read -sp "Enter windows authenticode passphrase: " YUBIPASS echo -test -f "$steps_dir/linux-signer-gpg-sign.done" || +test -f "$steps_dir/linux-signer-gpg-sign.done" || [ -n "$GPG_PASS" ] || read -sp "Enter gpg passphrase: " GPG_PASS echo function set-time-on-signing-machine { - local current_time=$(date -u) + local current_time=$(date -u -Iseconds) ssh "$ssh_host_linux_signer" sudo /usr/bin/date -s "'$current_time'" } @@ -178,6 +203,10 @@ function do_step { echo "$(date -Iseconds) - Finished step: $1" } +function is_legacy { + [[ "$tbb_version" = 13.* ]] +} + export SIGNING_PROJECTNAME do_step set-time-on-signing-machine @@ -195,9 +224,9 @@ do_step sync-scripts-to-linux-signer do_step sync-before-linux-signer-signmars do_step linux-signer-signmars do_step sync-after-signmars -is_project torbrowser && \ +is_project torbrowser && ! is_legacy && \ do_step linux-signer-sign-android-apks -is_project torbrowser && \ +is_project torbrowser && ! is_legacy && \ do_step sync-after-sign-android-apks do_step linux-signer-authenticode-signing do_step sync-after-authenticode-signing @@ -211,5 +240,6 @@ do_step download-unsigned-sha256sums-gpg-signatures-from-people-tpo do_step sync-local-to-staticiforme do_step sync-scripts-to-staticiforme do_step staticiforme-prepare-cdn-dist-upload -do_step upload-update_responses-to-staticiforme +! is_legacy && + do_step upload-update_responses-to-staticiforme do_step finished-signing-clean-linux-signer ===================================== tools/signing/set-config.passwords ===================================== @@ -0,0 +1,2 @@ +# Path to a gpg-encrypted cache of passwords not to be asked on each run +passwords_gpg_file=~/.tor-browser-signing/tor-browser-passwords.txt.gpg View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41324: Improve build signing ergonomics
by ma1 (＠ma1) 20 Jan '25

20 Jan '25

ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3af0e5b3 by hackademix at 2025-01-20T18:16:36+01:00 Bug 41324: Improve build signing ergonomics - - - - - 7 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md - .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md - tools/signing/do-all-signing - + tools/signing/set-config.passwords Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -208,7 +208,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch ``` - **Subject** ``` - New build: Mullvad Browser ${MULLVAD_BROWSER_VERION} (signed) + New build: Mullvad Browser ${MULLVAD_BROWSER_VERSION} (signed) ``` - **Body** ``` @@ -219,6 +219,8 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - signed builds: https://dist.torproject.org/mullvadbrowser/${MULLVAD_BROWSER_VERSION} - update_response hashes: ${MULLVAD_UPDATE_RESPONSES_HASH} + * https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… + changelog: # paste changelog as quote here ... ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -208,7 +208,7 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS ``` - **Subject** ``` - New build: Mullvad Browser ${MULLVAD_BROWSER_VERION} (signed) + New build: Mullvad Browser ${MULLVAD_BROWSER_VERSION} (signed) ``` - **Body** ``` @@ -217,7 +217,9 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS Branch+Tags have been pushed to Mullvad's GitHub repo. - signed builds: https://dist.torproject.org/mullvadbrowser/${MULLVAD_BROWSER_VERSION} - - update_response hashes: ${MULLVAD_UPDATE_RESPONSES_HASH} + - update_response hashes: ${MULLVAD_UPDATE_RESPONSES_HASH}* + + * https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… changelog: # paste changelog as quote here ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -223,9 +223,9 @@ Tor Browser Alpha (and Nightly) are on the `main` branch ```bash # Point OSSLSIGNCODE to your osslsigncode binary -pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +pushd tor-browser-build/torbrowser/${channel}/signed/$TORBROWSER_VERSION OSSLSIGNCODE=/path/to/osslsigncode -../../../tools/authenticode_check.sh +../../../../tools/authenticode_check.sh popd ``` @@ -234,14 +234,15 @@ popd <summary>Check whether the MAR files got properly signed</summary> ```bash -# Point NSSDB to your nssdb containing the mar signing certificate +# Point NSS_DB_DIR to your nssdb dir containing the mar signing certificate +# (check tools/marsigning_check.sh source code for details) # Point SIGNMAR to your signmar binary # Point LD_LIBRARY_PATH to your mar-tools directory -pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +pushd tor-browser-build/torbrowser/${channel}/signed/$TORBROWSER_VERSION NSSDB=/path/to/nssdb SIGNMAR=/path/to/mar-tools/signmar LD_LIBRARY_PATH=/path/to/mar-tools/ -../../../tools/marsigning_check.sh +../../../../tools/marsigning_check.sh popd ``` ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md ===================================== @@ -203,9 +203,9 @@ Tor Browser Legacy is on the `maint-13.5` branch ```bash # Point OSSLSIGNCODE to your osslsigncode binary -pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +pushd tor-browser-build/torbrowser/${channel}/signed/$TORBROWSER_VERSION OSSLSIGNCODE=/path/to/osslsigncode -../../../tools/authenticode_check.sh +../../../../tools/authenticode_check.sh popd ``` @@ -217,11 +217,11 @@ popd # Point NSSDB to your nssdb containing the mar signing certificate # Point SIGNMAR to your signmar binary # Point LD_LIBRARY_PATH to your mar-tools directory -pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +pushd tor-browser-build/torbrowser/${channel}/signed/$TORBROWSER_VERSION NSSDB=/path/to/nssdb SIGNMAR=/path/to/mar-tools/signmar LD_LIBRARY_PATH=/path/to/mar-tools/ -../../../tools/marsigning_check.sh +../../../../tools/marsigning_check.sh popd ``` ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -228,9 +228,9 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b ```bash # Point OSSLSIGNCODE to your osslsigncode binary -pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +pushd tor-browser-build/torbrowser/${channel}/signed/$TORBROWSER_VERSION OSSLSIGNCODE=/path/to/osslsigncode -../../../tools/authenticode_check.sh +../../../../tools/authenticode_check.sh popd ``` @@ -242,11 +242,11 @@ popd # Point NSSDB to your nssdb containing the mar signing certificate # Point SIGNMAR to your signmar binary # Point LD_LIBRARY_PATH to your mar-tools directory -pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +pushd tor-browser-build/torbrowser/${channel}/signed/$TORBROWSER_VERSION NSSDB=/path/to/nssdb SIGNMAR=/path/to/mar-tools/signmar LD_LIBRARY_PATH=/path/to/mar-tools/ -../../../tools/marsigning_check.sh +../../../../tools/marsigning_check.sh popd ``` ===================================== tools/signing/do-all-signing ===================================== @@ -3,34 +3,59 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" source "$script_dir/set-config.update-responses" - NON_INTERACTIVE=1 steps_dir="$signed_version_dir.steps" test -d "$steps_dir" || mkdir -p "$steps_dir" -test -f "$steps_dir/linux-signer-rcodesign-sign.done" || +function get_sekrit { + echo "$SEKRITS" | grep -A1 "$1:" | tail -n1 +} + +[ -f "$script_dir/set-config.passwords" ] && . "$script_dir/set-config.passwords" 2>/dev/null + +if [[ $1 = "-p" ]]; then + shift + passwords_gpg_file="$1" + shift +fi + +is_project torbrowser && nssdb=torbrowser-nssdb7 +is_project mullvadbrowser && nssdb=mullvadbrowser-nssdb1 + +if [ -f "$passwords_gpg_file" ]; then + echo "Reading passwords from $passwords_gpg_file" + SEKRITS=$(gpg --decrypt "$passwords_gpg_file") + RCODESIGN_PW=$(get_sekrit 'rcodesign') + NSSPASS=$(get_sekrit "$nssdb (mar signing)") + KSPASS=$(get_sekrit "android apk ($tbb_version_type)") + YUBIPASS=$(get_sekrit "windows authenticode") + GPG_PASS=$(get_sekrit "gpg") +else + echo "Rather than entering all the password manually, you may want to provide a gpg-encrypted file either on the command line (-p <filepath>) or in set-config.passwords." +fi + +test -f "$steps_dir/linux-signer-rcodesign-sign.done" || [ -n "$RCODESIGN_PW" ] || read -sp "Enter rcodesign passphrase for key-1: " RCODESIGN_PW echo -is_project torbrowser && nssdb=torbrowser-nssdb7 -is_project mullvadbrowser && nssdb=mullvadbrowser-nssdb-1 -test -f "$steps_dir/linux-signer-signmars.done" || + +test -f "$steps_dir/linux-signer-signmars.done" || [ -n "$NSSPASS" ] || read -sp "Enter $nssdb (mar signing) passphrase: " NSSPASS echo if is_project torbrowser; then - test -f "$steps_dir/linux-signer-sign-android-apks.done" || + test -f "$steps_dir/linux-signer-sign-android-apks.done" || [ -n "$KSPASS" ] || read -sp "Enter android apk signing password ($tbb_version_type): " KSPASS echo fi -test -f "$steps_dir/linux-signer-authenticode-signing.done" || +test -f "$steps_dir/linux-signer-authenticode-signing.done" || [ -n "$YUBIPASS" ] || read -sp "Enter windows authenticode passphrase: " YUBIPASS echo -test -f "$steps_dir/linux-signer-gpg-sign.done" || +test -f "$steps_dir/linux-signer-gpg-sign.done" || [ -n "$GPG_PASS" ] || read -sp "Enter gpg passphrase: " GPG_PASS echo function set-time-on-signing-machine { - local current_time=$(date -u) + local current_time=$(date -u -Iseconds) ssh "$ssh_host_linux_signer" sudo /usr/bin/date -s "'$current_time'" } @@ -178,6 +203,10 @@ function do_step { echo "$(date -Iseconds) - Finished step: $1" } +function is_legacy { + [[ "$tbb_version" = 13.* ]] +} + export SIGNING_PROJECTNAME do_step set-time-on-signing-machine @@ -195,9 +224,9 @@ do_step sync-scripts-to-linux-signer do_step sync-before-linux-signer-signmars do_step linux-signer-signmars do_step sync-after-signmars -is_project torbrowser && \ +is_project torbrowser && ! is_legacy && \ do_step linux-signer-sign-android-apks -is_project torbrowser && \ +is_project torbrowser && ! is_legacy && \ do_step sync-after-sign-android-apks do_step linux-signer-authenticode-signing do_step sync-after-authenticode-signing @@ -211,5 +240,6 @@ do_step download-unsigned-sha256sums-gpg-signatures-from-people-tpo do_step sync-local-to-staticiforme do_step sync-scripts-to-staticiforme do_step staticiforme-prepare-cdn-dist-upload -do_step upload-update_responses-to-staticiforme +! is_legacy && + do_step upload-update_responses-to-staticiforme do_step finished-signing-clean-linux-signer ===================================== tools/signing/set-config.passwords ===================================== @@ -0,0 +1,2 @@ +# Path to a gpg-encrypted cache of passwords not to be asked on each run +passwords_gpg_file=~/.tor-browser-signing/tor-browser-passwords.txt.gpg 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][tor-browser-128.6.0esr-14.5-1] 3 commits: fixup! TB 40597: Implement TorSettings module
by Pier Angelo Vendrame (＠pierov) 20 Jan '25

20 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 0b42b720 by Henry Wilkes at 2025-01-20T17:57:59+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Return only the bridge settings from Moat. Rather than return { bridges: enabled: true, ... } from MoatRPC API, we just return the relevant parts. This should make it clearer that Moat can *only* change TorSettings.bridges, and nothing else. - - - - - 7129f408 by Henry Wilkes at 2025-01-20T17:57:59+00:00 fixup! TB 40597: Implement TorSettings module TB 41921: Have Moat bridges pass through TorSettings rather than using TorProvider directly. TorSettings should be the only caller to TorProvider.writeSettings, so we can establish more control over which bridges are in use at any given moment in one place. Also add some sanitation to the Moat response. - - - - - 6ea6bd74 by Henry Wilkes at 2025-01-20T17:57:59+00:00 fixup! TB 40933: Add tor-launcher functionality TB 41921: Use temporary bridges for TorProvider initialisation. It is unlikely that temporary bridges would be present when TorProvider is initialised, but it should be using whatever TorSettings.applySettings uses. - - - - - 4 changed files: - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/modules/Moat.sys.mjs - toolkit/modules/TorConnect.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -227,7 +227,7 @@ export class TorProvider { if (this.ownsTorDaemon) { try { await lazy.TorSettings.initializedPromise; - await this.writeSettings(lazy.TorSettings.getSettings()); + await this.writeSettings(); } catch (e) { logger.warn( "Failed to initialize TorSettings or to write our initial settings. Continuing the initialization anyway.", @@ -269,11 +269,13 @@ export class TorProvider { /** * Send settings to the tor daemon. * - * @param {object} settings A settings object, as returned by - * TorSettings.getSettings(). This allow to try settings without passing - * through TorSettings. + * This should only be called internally or by the TorSettings module. */ - async writeSettings(settings) { + async writeSettings() { + // Fetch the current settings. + // We set the useTemporary parameter since we want to apply temporary + // bridges if they are available. + const settings = lazy.TorSettings.getSettings(true); logger.debug("TorProvider.writeSettings", settings); const torSettings = new Map(); ===================================== toolkit/modules/Moat.sys.mjs ===================================== @@ -13,7 +13,6 @@ ChromeUtils.defineESModuleGetters(lazy, { DomainFrontRequestBuilder: "resource://gre/modules/DomainFrontedRequests.sys.mjs", TorBridgeSource: "resource://gre/modules/TorSettings.sys.mjs", - TorSettings: "resource://gre/modules/TorSettings.sys.mjs", }); const TorLauncherPrefs = Object.freeze({ @@ -73,6 +72,25 @@ class InternetTestResponseListener { } } +/** + * @typedef {Object} MoatBridges + * + * Bridge settings that can be passed to TorSettings.bridges. + * + * @property {number} source - The `TorBridgeSource` type. + * @property {string} [builtin_type] - The built-in bridge type. + * @property {string[]} [bridge_strings] - The bridge lines. + */ + +/** + * @typedef {Object} MoatSettings + * + * The settings returned by Moat. + * + * @property {MoatBridges[]} bridgesList - The list of bridges found. + * @property {string} [country] - The detected country (region). + */ + /** * Constructs JSON objects and sends requests over Moat. * The documentation about the JSON schemas to use are available at @@ -213,37 +231,31 @@ export class MoatRPC { return { bridges, qrcode: qrcodeImg }; } - // Convert received settings object to format used by TorSettings module. - #fixupSettings(settings) { + /** + * Extract bridges from the received Moat settings object. + * + * @param {Object} settings - The received settings. + * @return {MoatBridge} The extracted bridges. + */ + #extractBridges(settings) { if (!("bridges" in settings)) { throw new Error("Expected to find `bridges` in the settings object."); } - const retval = { - bridges: { - enabled: true, - }, - }; + const bridges = {}; switch (settings.bridges.source) { case "builtin": - retval.bridges.source = lazy.TorBridgeSource.BuiltIn; - retval.bridges.builtin_type = settings.bridges.type; - // TorSettings will ignore strings for built-in bridges, and use the - // ones it already knows, instead. However, when we try these settings - // in the connect assist, we skip TorSettings. Therefore, we set the - // lines also here (the ones we already know, not the ones we receive - // from Moat). This needs TorSettings to be initialized, which by now - // should have already happened (this method is used only by TorConnect, - // that needs TorSettings to be initialized). - // In any case, getBuiltinBridges will throw if the data is not ready, - // yet. - retval.bridges.bridge_strings = lazy.TorSettings.getBuiltinBridges( - settings.bridges.type - ); + bridges.source = lazy.TorBridgeSource.BuiltIn; + bridges.builtin_type = String(settings.bridges.type); + // Ignore the bridge_strings argument since we will use our built-in + // bridge strings instead. break; case "bridgedb": - retval.bridges.source = lazy.TorBridgeSource.BridgeDB; - if (settings.bridges.bridge_strings) { - retval.bridges.bridge_strings = settings.bridges.bridge_strings; + bridges.source = lazy.TorBridgeSource.BridgeDB; + if (settings.bridges.bridge_strings?.length) { + bridges.bridge_strings = Array.from( + settings.bridges.bridge_strings, + item => String(item) + ); } else { throw new Error( "Received no bridge-strings for BridgeDB bridge source" @@ -255,37 +267,38 @@ export class MoatRPC { `Unexpected bridge source '${settings.bridges.source}'` ); } - return retval; + return bridges; } - // Converts a list of settings objects received from BridgeDB to a list of - // settings objects understood by the TorSettings module. - // In the event of error, returns an empty list. - #fixupSettingsList(settingsList) { - const retval = []; + /** + * Extract a list of bridges from the received Moat settings object. + * + * @param {Object} settings - The received settings. + * @return {MoatBridge[]} The list of extracted bridges. + */ + #extractBridgesList(settingsList) { + const bridgesList = []; for (const settings of settingsList) { try { - retval.push(this.#fixupSettings(settings)); + bridgesList.push(this.#extractBridges(settings)); } catch (ex) { log.error(ex); } } - return retval; + return bridgesList; } - // Request tor settings for the user optionally based on their location - // (derived from their IP). Takes the following parameters: - // - transports: optional, an array of transports available to the client; if - // empty (or not given) returns settings using all working transports known - // to the server - // - country: optional, an ISO 3166-1 alpha-2 country code to request settings - // for; if not provided the country is determined by the user's IP address - // - // Returns an object with the detected country code and an array of settings - // in a format that can be passed to the TorSettings module. This array might - // be empty if the country has no associated settings. - // If the server cannot determine the user's country (and no country code is - // provided), then null is returned instead of the object. + /** + * Request tor settings for the user optionally based on their location + * (derived from their IP). Takes the following parameters: + * + * @param {string[]} transports - A list of transports we support. + * @param {?string} country - The region to request bridges for, as an + * ISO 3166-1 alpha-2 region code, or `null` to have the server + * automatically determine the region. + * @returns {?MoatSettings} - The returned settings from the server, or `null` + * if the region could not be determined by the server. + */ async circumvention_settings(transports, country) { const args = { transports: transports ? transports : [], @@ -306,7 +319,7 @@ export class MoatRPC { throw new Error(`MoatRPC: ${detail} (${code})`); } else if ("settings" in response) { - settings.settings = this.#fixupSettingsList(response.settings); + settings.bridgesList = this.#extractBridgesList(response.settings); } if ("country" in response) { settings.country = response.country; @@ -349,14 +362,12 @@ export class MoatRPC { return map; } - // Request a copy of the defaul/fallback bridge settings, takes the following - // parameters: - // - transports: optional, an array of transports available to the client; if - // empty (or not given) returns settings using all working transports known - // to the server - // - // returns an array of settings objects in roughly the same format as the - // _settings object on the TorSettings module + /** + * Request a copy of the default/fallback bridge settings. + * + * @param {string[]} transports - A list of transports we support. + * @returns {MoatBridges[]} - The list of bridges found. + */ async circumvention_defaults(transports) { const args = { transports: transports ? transports : [], @@ -367,7 +378,7 @@ export class MoatRPC { const detail = response.errors[0].detail; throw new Error(`MoatRPC: ${detail} (${code})`); } else if ("settings" in response) { - return this.#fixupSettingsList(response.settings); + return this.#extractBridgesList(response.settings); } return []; } ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -103,11 +103,12 @@ export const TorConnectTopics = Object.freeze({ * failing bootstrap. * @property {integer} [options.simulateDelay] - The delay in microseconds to * apply to simulated bootstraps. - * @property {object} [options.simulateMoatResponse] - Simulate a Moat response - * for circumvention settings. Should include a "settings" property, and - * optionally a "country" property. You may add a "simulateCensorship" - * property to some of the settings to make only their bootstrap attempts - * fail. + * @property {MoatSettings} [options.simulateMoatResponse] - Simulate a Moat + * response for circumvention settings. Should include a "bridgesList" + * property, and optionally a "country" property. The "bridgesList" property + * should be an Array of MoatBridges objects that match the bridge settings + * accepted by TorSettings.bridges, plus you may add a "simulateCensorship" + * property to make only their bootstrap attempts fail. * @property {boolean} [options.testInternet] - Whether to also test the * internet connection. * @property {boolean} [options.simulateOffline] - Whether to simulate an @@ -214,6 +215,14 @@ class BootstrapAttempt { return promise; } + /** + * Method to call just after the Bootstrapped stage is set in response to this + * bootstrap attempt. + */ + postBootstrapped() { + // Nothing to do. + } + /** * Run the attempt. * @@ -395,17 +404,11 @@ class AutoBootstrapAttempt { */ #cancelledPromise = null; /** - * The found settings from Moat. - * - * @type {?object[]} - */ - #settings = null; - /** - * The last settings that have been applied to the TorProvider, if any. + * The list of bridge configurations from Moat. * - * @type {?object} + * @type {?MoatBridges[]} */ - #changedSetting = null; + #bridgesList = null; /** * The detected region code returned by Moat, if any. * @@ -438,13 +441,8 @@ class AutoBootstrapAttempt { // Run cleanup before we resolve the promise to ensure two instances // of AutoBootstrapAttempt are not trying to change the settings at // the same time. - if (this.#changedSetting) { - if (arg.result === "complete") { - // Persist the current settings to preferences. - lazy.TorSettings.setSettings(this.#changedSetting); - lazy.TorSettings.saveToPrefs(); - } // else, applySettings will restore the current settings. - await lazy.TorSettings.applySettings(); + if (arg.result !== "complete") { + await lazy.TorSettings.clearTemporaryBridges(); } } catch (error) { lazy.logger.error("Unexpected error in auto-bootstrap cleanup", error); @@ -466,6 +464,15 @@ class AutoBootstrapAttempt { return promise; } + /** + * Method to call just after the Bootstrapped stage is set in response to this + * bootstrap attempt. + */ + postBootstrapped() { + // Persist the current settings to preferences. + lazy.TorSettings.saveTemporaryBridges(); + } + /** * Run the attempt. * @@ -477,12 +484,12 @@ class AutoBootstrapAttempt { * @param {BootstrapOptions} options - Options to apply to the bootstrap. */ async #runInternal(progressCallback, options) { - await this.#fetchSettings(options); + await this.#fetchBridges(options); if (this.#cancelled || this.#resolved) { return; } - if (!this.#settings?.length) { + if (!this.#bridgesList?.length) { this.#resolveRun({ error: new TorConnectError( options.regionCode === "automatic" && !this.detectedRegion @@ -493,14 +500,14 @@ class AutoBootstrapAttempt { } // Apply each of our settings and try to bootstrap with each. - for (const [index, currentSetting] of this.#settings.entries()) { + for (const [index, bridges] of this.#bridgesList.entries()) { lazy.logger.info( `Attempting Bootstrap with configuration ${index + 1}/${ - this.#settings.length + this.#bridgesList.length }` ); - await this.#trySetting(currentSetting, progressCallback, options); + await this.#tryBridges(bridges, progressCallback, options); if (this.#cancelled || this.#resolved) { return; @@ -518,7 +525,7 @@ class AutoBootstrapAttempt { * * @param {BootstrapOptions} options - Options to apply to the bootstrap. */ - async #fetchSettings(options) { + async #fetchBridges(options) { if (options.simulateMoatResponse) { await Promise.race([ new Promise(res => setTimeout(res, options.simulateDelay || 0)), @@ -530,7 +537,7 @@ class AutoBootstrapAttempt { } this.detectedRegion = options.simulateMoatResponse.country || null; - this.#settings = options.simulateMoatResponse.settings ?? null; + this.#bridgesList = options.simulateMoatResponse.bridgesList ?? null; return; } @@ -564,16 +571,16 @@ class AutoBootstrapAttempt { this.detectedRegion = maybeSettings?.country || null; - if (maybeSettings?.settings?.length) { - this.#settings = maybeSettings.settings; + if (maybeSettings?.bridgesList?.length) { + this.#bridgesList = maybeSettings.bridgesList; } else { // Keep consistency with the other call. - this.#settings = await Promise.race([ + this.#bridgesList = await Promise.race([ moat.circumvention_defaults([ ...lazy.TorSettings.builtinBridgeTypes, "vanilla", ]), - // This might set this.#settings to undefined. + // This might set this.#bridgesList to undefined. this.#cancelledPromise, ]); } @@ -586,21 +593,21 @@ class AutoBootstrapAttempt { /** * Try to apply the settings we fetched. * - * @param {object} setting - The setting to try. + * @param {MoatBridges} bridges - The bridges to try. * @param {ProgressCallback} progressCallback - The callback to invoke with * the bootstrap progress. * @param {BootstrapOptions} options - Options to apply to the bootstrap. */ - async #trySetting(setting, progressCallback, options) { + async #tryBridges(bridges, progressCallback, options) { if (this.#cancelled || this.#resolved) { return; } - if (options.simulateMoatResponse && setting.simulateCensorship) { + if (options.simulateMoatResponse && bridges.simulateCensorship) { // Move the simulateCensorship option to the options for the next // BootstrapAttempt. - setting = structuredClone(setting); - delete setting.simulateCensorship; + bridges = structuredClone(bridges); + delete bridges.simulateCensorship; options = { ...options, simulateCensorship: true }; } @@ -616,14 +623,7 @@ class AutoBootstrapAttempt { // Another idea (maybe easier to implement) is to disable the settings // UI while *any* bootstrap is going on. // This is also documented in tor-browser#41921. - const provider = await lazy.TorProviderBuilder.build(); - this.#changedSetting = setting; - // We need to merge with old settings, in case the user is using a proxy - // or is behind a firewall. - await provider.writeSettings({ - ...lazy.TorSettings.getSettings(), - ...setting, - }); + await lazy.TorSettings.applyTemporaryBridges(bridges); if (this.#cancelled || this.#resolved) { return; @@ -642,7 +642,7 @@ class AutoBootstrapAttempt { error instanceof TorConnectError && error.code === TorConnectError.BootstrapError ) { - lazy.logger.info("TorConnect setting failed", setting, error); + lazy.logger.info("TorConnect setting failed", bridges, error); // Try with the next settings. // NOTE: We do not restore the user settings in between these runs. // Instead we wait for #resolveRun callback to do so. @@ -1459,6 +1459,12 @@ export const TorConnect = { } this._setStage(TorConnectStage.Bootstrapped); Services.obs.notifyObservers(null, TorConnectTopics.BootstrapComplete); + + // Now call the postBootstrapped method. We do this after changing the + // stage to ensure that AutoBootstrapAttempt.postBootstrapped call to + // saveTemporaryBridges does not trigger SettingsChanged too early and + // cancel itself. + bootstrapAttempt.postBootstrapped(); return; } ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -198,6 +198,14 @@ class TorSettingsImpl { allowed_ports: [], }, }; + + /** + * Temporary bridge settings to apply instead of #settings.bridges. + * + * @type {?Object} + */ + #temporaryBridgeSettings = null; + /** * Accumulated errors from trying to set settings. * @@ -713,6 +721,8 @@ class TorSettingsImpl { try { this.#allowUninitialized = true; this.#loadFromPrefs(); + // We do not pass on the loaded settings to the TorProvider yet. Instead + // TorProvider will ask for these once it has initialised. } finally { this.#allowUninitialized = false; this.#notificationQueue.clear(); @@ -971,7 +981,7 @@ class TorSettingsImpl { async applySettings() { this.#checkIfInitialized(); const provider = await lazy.TorProviderBuilder.build(); - await provider.writeSettings(this.getSettings()); + await provider.writeSettings(); } /** @@ -1073,12 +1083,20 @@ class TorSettingsImpl { /** * Get a copy of all our settings. * + * @param {boolean} [useTemporary=false] - Whether the returned settings + * should use the temporary bridge settings, if any, instead. + * * @returns {object} A copy of the settings object */ - getSettings() { + getSettings(useTemporary = false) { lazy.logger.debug("getSettings()"); this.#checkIfInitialized(); - return structuredClone(this.#settings); + const settings = structuredClone(this.#settings); + if (useTemporary && this.#temporaryBridgeSettings) { + // Override the bridge settings with our temporary ones. + settings.bridges = structuredClone(this.#temporaryBridgeSettings); + } + return settings; } /** @@ -1097,6 +1115,83 @@ class TorSettingsImpl { } return types; } + + /** + * Apply some Moat bridges temporarily. + * + * These bridges will not yet be saved to settings. + * + * @param {MoatBridges} bridges - The bridges to apply. + */ + async applyTemporaryBridges(bridges) { + this.#checkIfInitialized(); + + if ( + bridges.source !== TorBridgeSource.BuiltIn && + bridges.source !== TorBridgeSource.BridgeDB + ) { + throw new Error(`Invalid bridge source ${bridges.source}`); + } + + const bridgeSettings = { + enabled: true, + source: bridges.source, + }; + + if (bridges.source === TorBridgeSource.BuiltIn) { + if (!bridges.builtin_type) { + throw Error("Missing a built-in type"); + } + bridgeSettings.builtin_type = String(bridges.builtin_type); + const bridgeStrings = this.getBuiltinBridges(bridgeSettings.builtin_type); + if (!bridgeStrings.length) { + throw new Error(`No builtin bridges for type ${bridges.builtin_type}`); + } + bridgeSettings.bridge_strings = bridgeStrings; + } else { + // BridgeDB. + if (!bridges.bridge_strings?.length) { + throw new Error("Missing bridges strings"); + } + // TODO: Can we safely verify the format of the bridge addresses sent from + // Moat? + bridgeSettings.bridge_strings = Array.from(bridges.bridge_strings, item => + String(item) + ); + } + + // After checks are complete, we commit them. + this.#temporaryBridgeSettings = bridgeSettings; + await this.applySettings(); + } + + /** + * Save to current temporary bridges to be permanent instead. + */ + async saveTemporaryBridges() { + this.#checkIfInitialized(); + if (!this.#temporaryBridgeSettings) { + lazy.logger.warn("No temporary bridges to save"); + return; + } + this.setSettings({ bridges: this.#temporaryBridgeSettings }); + this.#temporaryBridgeSettings = null; + this.saveToPrefs(); + await this.applySettings(); + } + + /** + * Clear the current temporary bridges. + */ + async clearTemporaryBridges() { + this.#checkIfInitialized(); + if (!this.#temporaryBridgeSettings) { + lazy.logger.debug("No temporary bridges to clear"); + return; + } + this.#temporaryBridgeSettings = null; + await this.applySettings(); + } } export const TorSettings = new TorSettingsImpl(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9e5f76… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9e5f76… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 20 Jan '25

20 Jan '25

Pier Angelo Vendrame pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 76d1293f by Pier Angelo Vendrame at 2025-01-20T18:42:58+01:00 fixup! Firefox preference overrides. BB 43402: set browser.startup.blankWindow false. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -454,6 +454,9 @@ pref("privacy.resistFingerprinting.letterboxing.gradient", true); pref("privacy.resistFingerprinting.letterboxing.rememberSize", false); // tor-browser#41695: How many warnings we show if user closes them without restoring the window size pref("privacy.resistFingerprinting.resizeWarnings", 3); +// tor-browser#43402: Avoid a resize from the skeleton to the newwin size. +// Should be fixed in ESR-140 with Bug 1448423. +pref("browser.startup.blankWindow", false); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/76d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/76d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.6.0esr-14.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 20 Jan '25

20 Jan '25

Pier Angelo Vendrame pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 186910c7 by Pier Angelo Vendrame at 2025-01-20T18:42:24+01:00 fixup! Firefox preference overrides. BB 43402: set browser.startup.blankWindow false. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -454,6 +454,9 @@ pref("privacy.resistFingerprinting.letterboxing.gradient", true); pref("privacy.resistFingerprinting.letterboxing.rememberSize", false); // tor-browser#41695: How many warnings we show if user closes them without restoring the window size pref("privacy.resistFingerprinting.resizeWarnings", 3); +// tor-browser#43402: Avoid a resize from the skeleton to the newwin size. +// Should be fixed in ESR-140 with Bug 1448423. +pref("browser.startup.blankWindow", false); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/186910c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/186910c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 20 Jan '25

20 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 9e5f7638 by Pier Angelo Vendrame at 2025-01-20T14:39:01+01:00 fixup! Firefox preference overrides. BB 43402: set browser.startup.blankWindow false. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -454,6 +454,9 @@ pref("privacy.resistFingerprinting.letterboxing.gradient", true); pref("privacy.resistFingerprinting.letterboxing.rememberSize", false); // tor-browser#41695: How many warnings we show if user closes them without restoring the window size pref("privacy.resistFingerprinting.resizeWarnings", 3); +// tor-browser#43402: Avoid a resize from the skeleton to the newwin size. +// Should be fixed in ESR-140 with Bug 1448423. +pref("browser.startup.blankWindow", false); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9e5f763… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9e5f763… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-14.0] Bug 41350: Increase timeout in rcodesign-notary-submit to 6000s
by boklm (＠boklm) 16 Jan '25

16 Jan '25

boklm pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: a4137090 by Nicolas Vigier at 2025-01-16T16:44:34+01:00 Bug 41350: Increase timeout in rcodesign-notary-submit to 6000s - - - - - 1 changed file: - tools/signing/rcodesign-notary-submit Changes: ===================================== tools/signing/rcodesign-notary-submit ===================================== @@ -21,7 +21,7 @@ display_name=$(display_name) tar -C "$tmpdir" -xf "$macos_rcodesign_signed_tar_dir/$(project-name)-macos-${tbb_version}-rcodesign-signed.tar.zst" -"$script_dir/../local/rcodesign-128/rcodesign" notary-submit --api-key-path "$appstoreconnect_api_key_path" --staple "$tmpdir/$display_name.app" +"$script_dir/../local/rcodesign-128/rcodesign" notary-submit --max-wait-seconds 6000 --api-key-path "$appstoreconnect_api_key_path" --staple "$tmpdir/$display_name.app" output_file="$(project-name)-${tbb_version}-notarized+stapled.tar.zst" tar -C "$tmpdir" -caf "$tmpdir/$output_file" "$display_name.app" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41350: Increase timeout in rcodesign-notary-submit to 6000s
by boklm (＠boklm) 16 Jan '25

16 Jan '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4e8172c9 by Nicolas Vigier at 2025-01-16T16:31:56+01:00 Bug 41350: Increase timeout in rcodesign-notary-submit to 6000s - - - - - 1 changed file: - tools/signing/rcodesign-notary-submit Changes: ===================================== tools/signing/rcodesign-notary-submit ===================================== @@ -21,7 +21,7 @@ display_name=$(display_name) tar -C "$tmpdir" -xf "$macos_rcodesign_signed_tar_dir/$(project-name)-macos-${tbb_version}-rcodesign-signed.tar.zst" -"$script_dir/../local/rcodesign-128/rcodesign" notary-submit --api-key-path "$appstoreconnect_api_key_path" --staple "$tmpdir/$display_name.app" +"$script_dir/../local/rcodesign-128/rcodesign" notary-submit --max-wait-seconds 6000 --api-key-path "$appstoreconnect_api_key_path" --staple "$tmpdir/$display_name.app" output_file="$(project-name)-${tbb_version}-notarized+stapled.tar.zst" tar -C "$tmpdir" -caf "$tmpdir/$output_file" "$display_name.app" 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][maint-14.0] Bug 41345: Set GOTOOLCHAIN=local
by boklm (＠boklm) 16 Jan '25

16 Jan '25

boklm pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: ff2c7ff4 by Nicolas Vigier at 2025-01-16T16:26:40+01:00 Bug 41345: Set GOTOOLCHAIN=local - - - - - 1 changed file: - projects/go/build Changes: ===================================== projects/go/build ===================================== @@ -51,6 +51,10 @@ cd /var/tmp/dist/go/src # so remove it to preserve reproducibility of the output. rm -rf /var/tmp/dist/go/pkg/obj/go-build/ +# Disable go autoupdates (tor-browser-build#41345) +# See https://go.dev/doc/toolchain +sed -i -e 's/^GOTOOLCHAIN=.*/GOTOOLCHAIN=local/' /var/tmp/dist/go/go.env + cd /var/tmp/dist [% c('tar', { tar_src => [ project ], 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-build][main] Bug 41345: Set GOTOOLCHAIN=local
by boklm (＠boklm) 16 Jan '25

16 Jan '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: bd681918 by Nicolas Vigier at 2025-01-16T16:25:25+01:00 Bug 41345: Set GOTOOLCHAIN=local - - - - - 1 changed file: - projects/go/build Changes: ===================================== projects/go/build ===================================== @@ -51,6 +51,10 @@ cd /var/tmp/dist/go/src # so remove it to preserve reproducibility of the output. rm -rf /var/tmp/dist/go/pkg/obj/go-build/ +# Disable go autoupdates (tor-browser-build#41345) +# See https://go.dev/doc/toolchain +sed -i -e 's/^GOTOOLCHAIN=.*/GOTOOLCHAIN=local/' /var/tmp/dist/go/go.env + cd /var/tmp/dist [% c('tar', { tar_src => [ project ], 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/mullvad-browser-update-responses][main] alpha: new version, 14.5a2
by ma1 (＠ma1) 15 Jan '25

15 Jan '25

ma1 pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: 5e153b0f by hackademix at 2025-01-15T19:45:07+01:00 alpha: new version, 14.5a2 - - - - - 29 changed files: - update_1/alpha/.htaccess - − update_1/alpha/14.0a10-14.5a1-linux-x86_64-ALL.xml - − update_1/alpha/14.0a10-14.5a1-macos-ALL.xml - − update_1/alpha/14.0a10-14.5a1-windows-x86_64-ALL.xml - + update_1/alpha/14.0a10-14.5a2-linux-x86_64-ALL.xml - + update_1/alpha/14.0a10-14.5a2-macos-ALL.xml - + update_1/alpha/14.0a10-14.5a2-windows-x86_64-ALL.xml - − update_1/alpha/14.0a8-14.5a1-linux-x86_64-ALL.xml - − update_1/alpha/14.0a8-14.5a1-macos-ALL.xml - − update_1/alpha/14.0a8-14.5a1-windows-x86_64-ALL.xml - − update_1/alpha/14.0a9-14.5a1-linux-x86_64-ALL.xml - − update_1/alpha/14.0a9-14.5a1-macos-ALL.xml - − update_1/alpha/14.0a9-14.5a1-windows-x86_64-ALL.xml - + update_1/alpha/14.0a9-14.5a2-linux-x86_64-ALL.xml - + update_1/alpha/14.0a9-14.5a2-macos-ALL.xml - + update_1/alpha/14.0a9-14.5a2-windows-x86_64-ALL.xml - + update_1/alpha/14.5a1-14.5a2-linux-x86_64-ALL.xml - + update_1/alpha/14.5a1-14.5a2-macos-ALL.xml - + update_1/alpha/14.5a1-14.5a2-windows-x86_64-ALL.xml - − update_1/alpha/14.5a1-linux-x86_64-ALL.xml - − update_1/alpha/14.5a1-macos-ALL.xml - − update_1/alpha/14.5a1-windows-x86_64-ALL.xml - + update_1/alpha/14.5a2-linux-x86_64-ALL.xml - + update_1/alpha/14.5a2-macos-ALL.xml - + update_1/alpha/14.5a2-windows-x86_64-ALL.xml - update_1/alpha/download-linux-x86_64.json - update_1/alpha/download-macos.json - update_1/alpha/download-windows-x86_64.json - update_1/alpha/downloads.json Changes: ===================================== update_1/alpha/.htaccess ===================================== @@ -1,22 +1,22 @@ RewriteEngine On -RewriteRule ^[^/]+/14.5a1/ no-update.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a10/ALL 14.0a10-14.5a1-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a8/ALL 14.0a8-14.5a1-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/14.0a9/ALL 14.0a9-14.5a1-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 14.5a1-linux-x86_64-ALL.xml [last] -RewriteRule ^Linux_x86_64-gcc3/ 14.5a1-linux-x86_64-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a10/ALL 14.0a10-14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a8/ALL 14.0a8-14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/14.0a9/ALL 14.0a9-14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_x86_64-gcc3/ 14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a10/ALL 14.0a10-14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a8/ALL 14.0a8-14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/14.0a9/ALL 14.0a9-14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 14.5a1-macos-ALL.xml [last] -RewriteRule ^Darwin_aarch64-gcc3/ 14.5a1-macos-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a10/ALL 14.0a10-14.5a1-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a8/ALL 14.0a8-14.5a1-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a9/ALL 14.0a9-14.5a1-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 14.5a1-windows-x86_64-ALL.xml [last] -RewriteRule ^WINNT_x86_64-gcc3-x64/ 14.5a1-windows-x86_64-ALL.xml [last] +RewriteRule ^[^/]+/14.5a2/ no-update.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.0a10/ALL 14.0a10-14.5a2-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.0a9/ALL 14.0a9-14.5a2-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/14.5a1/ALL 14.5a1-14.5a2-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/[^/]+/ALL 14.5a2-linux-x86_64-ALL.xml [last] +RewriteRule ^Linux_x86_64-gcc3/ 14.5a2-linux-x86_64-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.0a10/ALL 14.0a10-14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.0a9/ALL 14.0a9-14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/14.5a1/ALL 14.5a1-14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/[^/]+/ALL 14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_x86_64-gcc3/ 14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.0a10/ALL 14.0a10-14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.0a9/ALL 14.0a9-14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/14.5a1/ALL 14.5a1-14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/[^/]+/ALL 14.5a2-macos-ALL.xml [last] +RewriteRule ^Darwin_aarch64-gcc3/ 14.5a2-macos-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a10/ALL 14.0a10-14.5a2-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.0a9/ALL 14.0a9-14.5a2-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/14.5a1/ALL 14.5a1-14.5a2-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/[^/]+/ALL 14.5a2-windows-x86_64-ALL.xml [last] +RewriteRule ^WINNT_x86_64-gcc3-x64/ 14.5a2-windows-x86_64-ALL.xml [last] ===================================== update_1/alpha/14.0a10-14.5a1-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1_…" size="114201508" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64--14.0a1…" size="10719344" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a10-14.5a1-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1_ALL.mar" size="129310766" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos--14.0a10-14.5a…" size="15200549" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a10-14.5a1-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…" size="97655960" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64--14.0…" size="11109032" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a10-14.5a2-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64-14.5a2_…" size="114333352" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64--14.0a1…" size="11287432" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a10-14.5a2-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos-14.5a2_ALL.mar" size="129444826" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos--14.0a10-14.5a…" size="16169041" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a10-14.5a2-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64-14.5a…" size="97749356" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64--14.0…" size="11795240" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.5a1-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1_…" size="114201508" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64--14.0a8…" size="13246900" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.5a1-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1_ALL.mar" size="129310766" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos--14.0a8-14.5a1…" size="18726861" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a8-14.5a1-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…" size="97655960" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64--14.0…" size="17093460" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a1-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1_…" size="114201508" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64--14.0a9…" size="13241088" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a1-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1_ALL.mar" size="129310766" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos--14.0a9-14.5a1…" size="18706709" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a1-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…" size="97655960" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64--14.0…" size="17106048" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a2-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64-14.5a2_…" size="114333352" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64--14.0a9…" size="13533872" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a2-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos-14.5a2_ALL.mar" size="129444826" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos--14.0a9-14.5a2…" size="19049341" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.0a9-14.5a2-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64-14.5a…" size="97749356" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64--14.0…" size="17370808" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.5a1-14.5a2-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64-14.5a2_…" size="114333352" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64--14.5a1…" size="6787525" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.5a1-14.5a2-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos-14.5a2_ALL.mar" size="129444826" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos--14.5a1-14.5a2…" size="11557520" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.5a1-14.5a2-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64-14.5a…" size="97749356" type="complete"></patch><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64--14.5…" size="7252942" type="partial"></patch></update></updates> ===================================== update_1/alpha/14.5a1-linux-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1_…" size="114201508" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.5a1-macos-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1_ALL.mar" size="129310766" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.5a1-windows-x86_64-ALL.xml deleted ===================================== @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<updates><update type="minor" displayVersion="14.5a1" appVersion="14.5a1" platformVersion="128.5.0" buildID="20241125235826" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a1" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…" size="97655960" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.5a2-linux-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedInstructionSet="SSE2"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64-14.5a2_…" size="114333352" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.5a2-macos-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedOSVersion="19.0.0"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos-14.5a2_ALL.mar" size="129444826" type="complete"></patch></update></updates> ===================================== update_1/alpha/14.5a2-windows-x86_64-ALL.xml ===================================== @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<updates><update type="minor" displayVersion="14.5a2" appVersion="14.5a2" platformVersion="128.6.0" buildID="20250113190000" detailsURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" actions="showURL" openURL="https://github.com/mullvad/mullvad-browser/releases/14.5a2" minSupportedOSVersion="10.0"><patch URL="https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64-14.5a…" size="97749356" type="complete"></patch></update></updates> ===================================== update_1/alpha/download-linux-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1.…","git_tag":"mb-14.5a1-build1","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1.…","version":"14.5a1"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64-14.5a2.…","git_tag":"mb-14.5a2-build2","sig":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64-14.5a2.…","version":"14.5a2"} \ No newline at end of file ===================================== update_1/alpha/download-macos.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1.dmg","git_tag":"mb-14.5a1-build1","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1.dmg.asc","version":"14.5a1"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos-14.5a2.dmg","git_tag":"mb-14.5a2-build2","sig":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos-14.5a2.dmg.asc","version":"14.5a2"} \ No newline at end of file ===================================== update_1/alpha/download-windows-x86_64.json ===================================== @@ -1 +1 @@ -{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…","git_tag":"mb-14.5a1-build1","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…","version":"14.5a1"} \ No newline at end of file +{"binary":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64-14.5a…","git_tag":"mb-14.5a2-build2","sig":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64-14.5a…","version":"14.5a2"} \ No newline at end of file ===================================== update_1/alpha/downloads.json ===================================== @@ -1 +1 @@ -{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1.…","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-linux-x86_64-14.5a1.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1.dmg","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-macos-14.5a1.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…","sig":"https://cdn.mullvad.net/browser/14.5a1/mullvad-browser-windows-x86_64-14.5a…"}}},"tag":"mb-14.5a1-build1","version":"14.5a1"} \ No newline at end of file +{"downloads":{"linux-x86_64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64-14.5a2.…","sig":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-linux-x86_64-14.5a2.…"}},"macos":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos-14.5a2.dmg","sig":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-macos-14.5a2.dmg.asc"}},"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64-14.5a…","sig":"https://cdn.mullvad.net/browser/14.5a2/mullvad-browser-windows-x86_64-14.5a…"}}},"tag":"mb-14.5a2-build2","version":"14.5a2"} \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.5-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 15 Jan '25

15 Jan '25

morgan pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 701cc572 by Pier Angelo Vendrame at 2025-01-15T15:49:07+00:00 fixup! Firefox preference overrides. BB 41065: Hardcode the limit of storage quota. Currently, we return min(10GB, 0.2 * available space in the fs). This is bad for systems that have less than 50GB free, especially live systems, such as Tails. Set a pref to replace the available space with a hardcoded limit (5GiB). - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -87,6 +87,15 @@ pref("browser.sessionstore.privacy_level", 2); // Use the in-memory media cache and increase its maximum size (#29120) pref("browser.privatebrowsing.forceMediaMemoryCache", true); pref("media.memory_cache_max_size", 65536); +// tor-browser#41065: lie about the available quota. +// This value is in KiB, and will be divided by 5. Currently: 50GiB, to be +// coherent with Firefox's usual value. However, this might be too much for live +// systems. +// This will be the limit also after granting the persistent storage permission, +// but we are not interested in it, since we support only PBM. +// We can come back to it, and hardcode the two spaced differently, if we ever +// think we need it. +pref("dom.quotaManager.temporaryStorage.fixedLimit", 52428800); // Disable restore in case of crash (tor-browser#41503) // This should not be needed in PBM, but we added it anyway like other options. pref("browser.sessionstore.resume_from_crash", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/701… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/701… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.6.0esr-14.5-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 15 Jan '25

15 Jan '25

morgan pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 3a015664 by Pier Angelo Vendrame at 2025-01-15T15:47:59+00:00 fixup! Firefox preference overrides. BB 41065: Hardcode the limit of storage quota. Currently, we return min(10GB, 0.2 * available space in the fs). This is bad for systems that have less than 50GB free, especially live systems, such as Tails. Set a pref to replace the available space with a hardcoded limit (5GiB). - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -87,6 +87,15 @@ pref("browser.sessionstore.privacy_level", 2); // Use the in-memory media cache and increase its maximum size (#29120) pref("browser.privatebrowsing.forceMediaMemoryCache", true); pref("media.memory_cache_max_size", 65536); +// tor-browser#41065: lie about the available quota. +// This value is in KiB, and will be divided by 5. Currently: 50GiB, to be +// coherent with Firefox's usual value. However, this might be too much for live +// systems. +// This will be the limit also after granting the persistent storage permission, +// but we are not interested in it, since we support only PBM. +// We can come back to it, and hardcode the two spaced differently, if we ever +// think we need it. +pref("dom.quotaManager.temporaryStorage.fixedLimit", 52428800); // Disable restore in case of crash (tor-browser#41503) // This should not be needed in PBM, but we added it anyway like other options. pref("browser.sessionstore.resume_from_crash", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3a01566… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3a01566… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 15 Jan '25

15 Jan '25

morgan pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 3ee46ad9 by Pier Angelo Vendrame at 2025-01-15T14:13:53+00:00 fixup! Firefox preference overrides. BB 41065: Hardcode the limit of storage quota. Currently, we return min(10GB, 0.2 * available space in the fs). This is bad for systems that have less than 50GB free, especially live systems, such as Tails. Set a pref to replace the available space with a hardcoded limit (5GiB). - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -87,6 +87,15 @@ pref("browser.sessionstore.privacy_level", 2); // Use the in-memory media cache and increase its maximum size (#29120) pref("browser.privatebrowsing.forceMediaMemoryCache", true); pref("media.memory_cache_max_size", 65536); +// tor-browser#41065: lie about the available quota. +// This value is in KiB, and will be divided by 5. Currently: 50GiB, to be +// coherent with Firefox's usual value. However, this might be too much for live +// systems. +// This will be the limit also after granting the persistent storage permission, +// but we are not interested in it, since we support only PBM. +// We can come back to it, and hardcode the two spaced differently, if we ever +// think we need it. +pref("dom.quotaManager.temporaryStorage.fixedLimit", 52428800); // Disable restore in case of crash (tor-browser#41503) // This should not be needed in PBM, but we added it anyway like other options. pref("browser.sessionstore.resume_from_crash", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3ee46ad… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3ee46ad… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

15 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 583b1391 by Beatriz Rizental at 2025-01-14T19:49:35+01:00 fixup! Add CI for Tor Browser - - - - - 1 changed file: - .gitlab/ci/jobs/startup-test/startup-test.yml Changes: ===================================== .gitlab/ci/jobs/startup-test/startup-test.yml ===================================== @@ -11,7 +11,7 @@ # - x86-win11 # script: # - ./mach python testing/mozbase/setup_development.py -# - ./mach python .gitlab/ci/jobs/startup-test/startup-test.py --platform windows --arch x86_64 --browser tor +# - ./mach python .gitlab/ci/jobs/startup-test/startup-test.py --platform windows --arch x86_64 --browser $BROWSER # rules: # - if: $CI_PIPELINE_SOURCE == "schedule" @@ -28,7 +28,7 @@ # - x86-macos # script: # - ./mach python testing/mozbase/setup_development.py -# - ./mach python .gitlab/ci/jobs/startup-test/startup-test.py --platform macos --arch x86_64 --browser tor +# - ./mach python .gitlab/ci/jobs/startup-test/startup-test.py --platform macos --arch x86_64 --browser $BROWSER # rules: # - if: $CI_PIPELINE_SOURCE == "schedule" @@ -46,6 +46,6 @@ startup-test-linux: - Xvfb :99 -screen 0 1400x900x24 & - export DISPLAY=:99 - ./mach python testing/mozbase/setup_development.py - - ./mach python .gitlab/ci/jobs/startup-test/startup-test.py --platform linux --arch x86_64 --browser tor + - ./mach python .gitlab/ci/jobs/startup-test/startup-test.py --platform linux --arch x86_64 --browser $BROWSER rules: - if: $CI_PIPELINE_SOURCE == "schedule" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/583b139… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/583b139… 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, 14.5a2
by ma1 (＠ma1) 15 Jan '25

15 Jan '25

ma1 pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 7cda591f by hackademix at 2025-01-15T09:15:55+01:00 alpha: new version, 14.5a2 - - - - - 39 changed files: - update_3/alpha/.htaccess - − update_3/alpha/14.0a7-14.5a1-windows-i686-ALL.xml - − update_3/alpha/14.0a7-14.5a1-windows-x86_64-ALL.xml - − update_3/alpha/14.0a8-14.5a1-windows-i686-ALL.xml - − update_3/alpha/14.0a8-14.5a1-windows-x86_64-ALL.xml - update_3/alpha/14.0a7-14.5a1-linux-i686-ALL.xml → update_3/alpha/14.0a8-14.5a2-linux-i686-ALL.xml - update_3/alpha/14.0a9-14.5a1-linux-x86_64-ALL.xml → update_3/alpha/14.0a8-14.5a2-linux-x86_64-ALL.xml - update_3/alpha/14.0a8-14.5a1-macos-ALL.xml → update_3/alpha/14.0a8-14.5a2-macos-ALL.xml - + update_3/alpha/14.0a8-14.5a2-windows-i686-ALL.xml - + update_3/alpha/14.0a8-14.5a2-windows-x86_64-ALL.xml - − update_3/alpha/14.0a9-14.5a1-windows-i686-ALL.xml - − update_3/alpha/14.0a9-14.5a1-windows-x86_64-ALL.xml - update_3/alpha/14.0a9-14.5a1-linux-i686-ALL.xml → update_3/alpha/14.0a9-14.5a2-linux-i686-ALL.xml - update_3/alpha/14.0a7-14.5a1-linux-x86_64-ALL.xml → update_3/alpha/14.0a9-14.5a2-linux-x86_64-ALL.xml - update_3/alpha/14.0a9-14.5a1-macos-ALL.xml → update_3/alpha/14.0a9-14.5a2-macos-ALL.xml - + update_3/alpha/14.0a9-14.5a2-windows-i686-ALL.xml - + update_3/alpha/14.0a9-14.5a2-windows-x86_64-ALL.xml - update_3/alpha/14.0a8-14.5a1-linux-i686-ALL.xml → update_3/alpha/14.5a1-14.5a2-linux-i686-ALL.xml - update_3/alpha/14.0a8-14.5a1-linux-x86_64-ALL.xml → update_3/alpha/14.5a1-14.5a2-linux-x86_64-ALL.xml - update_3/alpha/14.0a7-14.5a1-macos-ALL.xml → update_3/alpha/14.5a1-14.5a2-macos-ALL.xml - + update_3/alpha/14.5a1-14.5a2-windows-i686-ALL.xml - + update_3/alpha/14.5a1-14.5a2-windows-x86_64-ALL.xml - − update_3/alpha/14.5a1-windows-i686-ALL.xml - − update_3/alpha/14.5a1-windows-x86_64-ALL.xml - update_3/alpha/14.5a1-linux-i686-ALL.xml → update_3/alpha/14.5a2-linux-i686-ALL.xml - update_3/alpha/14.5a1-linux-x86_64-ALL.xml → update_3/alpha/14.5a2-linux-x86_64-ALL.xml - update_3/alpha/14.5a1-macos-ALL.xml → update_3/alpha/14.5a2-macos-ALL.xml - + update_3/alpha/14.5a2-windows-i686-ALL.xml - + update_3/alpha/14.5a2-windows-x86_64-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 - update_3/alpha/downloads.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-128.6.0esr-14.5-1] [android] Bug_43351: Add function to disable forcing ALL CAPS for the fenix...
by Pier Angelo Vendrame (＠pierov) 14 Jan '25

14 Jan '25

Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 9891ea34 by clairehurst at 2025-01-14T18:24:40+00:00 [android] Bug_43351: Add function to disable forcing ALL CAPS for the fenix snackbar action button text This is needed because the default snackbar will force all caps, which can cause problems in some languages. See tor-browser#43351 and bugzilla bug 1935387. TODO: Remove once the forced all caps is removed by mozilla. - - - - - 2 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -1121,6 +1121,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn isDisplayedWithBrowserToolbar = true, ) .setText(getString(R.string.connection_assist_connect_to_tor_before_opening_links)) + .setAllCapsForActionButton(false) .setAction(getString(R.string.connection_assist_connect_to_tor_before_opening_links_confirmation)) { torConnectionAssistViewModel.handleConnect(searchTermOrURL) if (navHost.navController.previousBackStackEntry?.destination?.id == R.id.torConnectionAssistFragment) { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/FenixSnackbar.kt ===================================== @@ -100,6 +100,14 @@ class FenixSnackbar private constructor( } } + /** + * @param textAllCaps Present the text in ALL CAPS. This may use a small-caps form when available. + * Overwrites the default value set in fenix_snackbar.xml + */ + fun setAllCapsForActionButton(textAllCaps: Boolean) = this.apply { + binding.snackbarBtn.isAllCaps = textAllCaps + } + companion object { const val LENGTH_LONG = Snackbar.LENGTH_LONG const val LENGTH_SHORT = Snackbar.LENGTH_SHORT View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9891ea3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9891ea3… 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-14.5a2-build2
by Pier Angelo Vendrame (＠pierov) 14 Jan '25

14 Jan '25

Pier Angelo Vendrame pushed new tag mb-14.5a2-build2 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] Pushed new tag tbb-14.5a2-build2
by Pier Angelo Vendrame (＠pierov) 14 Jan '25

14 Jan '25

Pier Angelo Vendrame pushed new tag tbb-14.5a2-build2 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] 2 commits: Bug 41349: Fix var/copyright_year in Firefox.
by Pier Angelo Vendrame (＠pierov) 14 Jan '25

14 Jan '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3c1aed30 by Pier Angelo Vendrame at 2025-01-14T17:47:19+01:00 Bug 41349: Fix var/copyright_year in Firefox. GeckoView had the same problem, but the variable is not used anymore, so I removed the line rather than fix it. - - - - - 8880f6fa by Pier Angelo Vendrame at 2025-01-14T17:47:21+01:00 Bug 41349: Bump 14.5a2 to build2 for reproducibility issues. - - - - - 5 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox/config - projects/geckoview/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -21,7 +21,10 @@ Mullvad Browser 14.5a2 - January 14 2025 * All Platforms * Bug 43373: Do not run all CI jobs for scheduled jobs. [tor-browser] * Bug 41340: Update kick_devmole_build script with Mullvad's new GitHub workflow endpoint [tor-browser-build] + * Bug 41343: Add signing step to clean some files such as test artifacts [tor-browser-build] * Bug 40081: Support apt option for not installing recommended dependencies [rbm] + * Windows + macOS + * Bug 41349: Wrong copyright year makes build non-reproducible [tor-browser-build] * macOS * Bug 41325: Newer versions of 7z fail to extract our dmg files because of the /Applications symlink [tor-browser-build] * Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar [tor-browser-build] ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -41,7 +41,10 @@ Tor Browser 14.5a2 - January 14 2025 * Bug 43374: Run the `update-translations` jobs independent of others [tor-browser] * Bug 41326: Remove var/torbrowser_legacy_version from rbm.conf in alpha/nightly [tor-browser-build] * Bug 41340: Update kick_devmole_build script with Mullvad's new GitHub workflow endpoint [tor-browser-build] + * Bug 41343: Add signing step to clean some files such as test artifacts [tor-browser-build] * Bug 40081: Support apt option for not installing recommended dependencies [rbm] + * Windows + macOS + * Bug 41349: Wrong copyright year makes build non-reproducible [tor-browser-build] * macOS * Bug 41325: Newer versions of 7z fail to extract our dmg files because of the /Applications symlink [tor-browser-build] * Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar [tor-browser-build] ===================================== projects/firefox/config ===================================== @@ -21,7 +21,7 @@ var: browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' browser_build: 2 branding_directory_prefix: 'tb' - copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' + copyright_year: '[% exec("git show -s --format=%ci " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' 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 " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]' ===================================== projects/geckoview/config ===================================== @@ -22,7 +22,6 @@ var: browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' browser_build: 2 - copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]' deps: ===================================== rbm.conf ===================================== @@ -74,7 +74,7 @@ buildconf: var: torbrowser_version: '14.5a2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. browser_release_date: '2025/01/13 19:00:00' 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][base-browser-128.6.0esr-14.5-1] BB 43386: Use Firefox in the UA in RFP-exempt request.
by morgan (＠morgan) 14 Jan '25

14 Jan '25

morgan pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6702da42 by Pier Angelo Vendrame at 2025-01-14T12:56:03+00:00 BB 43386: Use Firefox in the UA in RFP-exempt request. XHR requests initiated by extensions are exempt from RFP. Therefore, they report the actual app name, instead of Firefox, and the actual Firefox minor version. This happens whenever the app name has been customized and does not match a hardcoded "Firefox". - - - - - 1 changed file: - netwerk/protocol/http/nsHttpHandler.cpp Changes: ===================================== netwerk/protocol/http/nsHttpHandler.cpp ===================================== @@ -863,7 +863,7 @@ void nsHttpHandler::BuildUserAgent() { mUserAgent += '/'; mUserAgent += mProductSub; - bool isFirefox = mAppName.EqualsLiteral("Firefox"); + bool isFirefox = true; if (isFirefox || mCompatFirefoxEnabled) { // "Firefox/x.y" (compatibility) app token mUserAgent += ' '; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6702da4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6702da4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.6.0esr-14.5-1] BB 43386: Use Firefox in the UA in RFP-exempt request.
by morgan (＠morgan) 14 Jan '25

14 Jan '25

morgan pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 25998bbb by Pier Angelo Vendrame at 2025-01-14T12:54:50+00:00 BB 43386: Use Firefox in the UA in RFP-exempt request. XHR requests initiated by extensions are exempt from RFP. Therefore, they report the actual app name, instead of Firefox, and the actual Firefox minor version. This happens whenever the app name has been customized and does not match a hardcoded "Firefox". - - - - - 1 changed file: - netwerk/protocol/http/nsHttpHandler.cpp Changes: ===================================== netwerk/protocol/http/nsHttpHandler.cpp ===================================== @@ -863,7 +863,7 @@ void nsHttpHandler::BuildUserAgent() { mUserAgent += '/'; mUserAgent += mProductSub; - bool isFirefox = mAppName.EqualsLiteral("Firefox"); + bool isFirefox = true; if (isFirefox || mCompatFirefoxEnabled) { // "Firefox/x.y" (compatibility) app token mUserAgent += ' '; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/25998bb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/25998bb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.5-1] BB 43386: Use Firefox in the UA in RFP-exempt request.
by morgan (＠morgan) 14 Jan '25

14 Jan '25

morgan pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 9d9fe343 by Pier Angelo Vendrame at 2025-01-14T12:37:59+00:00 BB 43386: Use Firefox in the UA in RFP-exempt request. XHR requests initiated by extensions are exempt from RFP. Therefore, they report the actual app name, instead of Firefox, and the actual Firefox minor version. This happens whenever the app name has been customized and does not match a hardcoded "Firefox". - - - - - 1 changed file: - netwerk/protocol/http/nsHttpHandler.cpp Changes: ===================================== netwerk/protocol/http/nsHttpHandler.cpp ===================================== @@ -863,7 +863,7 @@ void nsHttpHandler::BuildUserAgent() { mUserAgent += '/'; mUserAgent += mProductSub; - bool isFirefox = mAppName.EqualsLiteral("Firefox"); + bool isFirefox = true; if (isFirefox || mCompatFirefoxEnabled) { // "Firefox/x.y" (compatibility) app token mUserAgent += ' '; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/9d9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/9d9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-14.0] Bug 41343: Add clean-build-artifacts signing step
by boklm (＠boklm) 14 Jan '25

14 Jan '25

boklm pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build Commits: f3ce729e by Nicolas Vigier at 2025-01-14T12:15:55+01:00 Bug 41343: Add clean-build-artifacts signing step Add step to remove Android test artifacts (added in tor-browser-build#41342) that we don't need to publish on dist.tpo. - - - - - 2 changed files: - + tools/signing/clean-build-artifacts - tools/signing/do-all-signing Changes: ===================================== tools/signing/clean-build-artifacts ===================================== @@ -0,0 +1,13 @@ +#!/bin/bash + +# This script removes some files we don't need to publish on dist.tpo + +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "$script_dir/functions" + +cd "$signed_version_dir" + +# Remove Android test artifacts (tor-browser-build#41342) +rm -f -- *-androidTest.apk *-noopt-*.apk ===================================== tools/signing/do-all-signing ===================================== @@ -42,6 +42,10 @@ function sync-builder-unsigned-to-local-signed { "$script_dir/sync-builder-unsigned-to-local-signed" } +function clean-build-artifacts { + "$script_dir/clean-build-artifacts" +} + function sync-before-linux-signer-rcodesign-sign { "$script_dir/sync-local-to-linux-signer" } @@ -179,6 +183,7 @@ export SIGNING_PROJECTNAME do_step set-time-on-signing-machine do_step wait-for-finished-build do_step sync-builder-unsigned-to-local-signed +do_step clean-build-artifacts do_step sync-scripts-to-linux-signer do_step sync-before-linux-signer-rcodesign-sign do_step linux-signer-rcodesign-sign 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-build][main] Bug 41343: Add clean-build-artifacts signing step
by boklm (＠boklm) 14 Jan '25

14 Jan '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 400c857f by Nicolas Vigier at 2025-01-14T11:39:26+01:00 Bug 41343: Add clean-build-artifacts signing step Add step to remove Android test artifacts (added in tor-browser-build#41342) that we don't need to publish on dist.tpo. - - - - - 2 changed files: - + tools/signing/clean-build-artifacts - tools/signing/do-all-signing Changes: ===================================== tools/signing/clean-build-artifacts ===================================== @@ -0,0 +1,13 @@ +#!/bin/bash + +# This script removes some files we don't need to publish on dist.tpo + +set -e + +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +source "$script_dir/functions" + +cd "$signed_version_dir" + +# Remove Android test artifacts (tor-browser-build#41342) +rm -f -- *-androidTest.apk *-noopt-*.apk ===================================== tools/signing/do-all-signing ===================================== @@ -42,6 +42,10 @@ function sync-builder-unsigned-to-local-signed { "$script_dir/sync-builder-unsigned-to-local-signed" } +function clean-build-artifacts { + "$script_dir/clean-build-artifacts" +} + function sync-before-linux-signer-rcodesign-sign { "$script_dir/sync-local-to-linux-signer" } @@ -179,6 +183,7 @@ export SIGNING_PROJECTNAME do_step set-time-on-signing-machine do_step wait-for-finished-build do_step sync-builder-unsigned-to-local-signed +do_step clean-build-artifacts do_step sync-scripts-to-linux-signer do_step sync-before-linux-signer-rcodesign-sign do_step linux-signer-rcodesign-sign 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] Pushed new tag mb-14.5a2-build1
by Pier Angelo Vendrame (＠pierov) 14 Jan '25

14 Jan '25

Pier Angelo Vendrame pushed new tag mb-14.5a2-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] Pushed new tag tbb-14.5a2-build1
by Pier Angelo Vendrame (＠pierov) 14 Jan '25

14 Jan '25

Pier Angelo Vendrame pushed new tag tbb-14.5a2-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 41322, 41323: Prepare Tor,Mullvad Browser 14.5a2
by Pier Angelo Vendrame (＠pierov) 14 Jan '25

14 Jan '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 45418c66 by Pier Angelo Vendrame at 2025-01-13T21:57:38+01:00 Bug 41322, 41323: Prepare Tor,Mullvad Browser 14.5a2 - - - - - 10 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/tor/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,35 @@ +Mullvad Browser 14.5a2 - January 14 2025 + * All Platforms + * Updated Firefox to 128.6.0esr + * Updated NoScript to 12.1.1 + * Bug 389: Rebase Mullvad Browser alpha onto 128.6.0esr [mullvad-browser] + * Bug 43176: noscript-marker CSP warnings in the console [tor-browser] + * Bug 43269: NoScript localization issue [tor-browser] + * Bug 43282: Unable to click/tap/select anything adjacent the WebGL placeholders [tor-browser] + * Bug 43296: NoScript-blocked video content placeholder is not centered [tor-browser] + * Bug 43334: Developer Tools lacks data for Responsive Design Mode and Compatibility [tor-browser] + * Bug 43338: Custom zoom + "Zoom text only" breaks pdfjs [tor-browser] + * Bug 43340: Support linux-aarch64 dev builds [tor-browser] + * Bug 43352: Failing connection attempts to multicast IPv6 ff00:::443 logged during NoScript updates [tor-browser] + * Bug 43366: Do not use system accent color in inputs [tor-browser] + * Bug 43384: Backport security fixes from Firefox 134 [tor-browser] + * Linux + * Bug 43236: High refresh rate detectable by websites when Wayland (MOZ_ENABLE_WAYLAND=1) is used [tor-browser] + * Bug 43330: System fonts leak when emptying the allow list on Linux [tor-browser] + * Bug 41311: AppArmor profile fails on Debian stable [tor-browser-build] + * Build System + * All Platforms + * Bug 43373: Do not run all CI jobs for scheduled jobs. [tor-browser] + * Bug 41340: Update kick_devmole_build script with Mullvad's new GitHub workflow endpoint [tor-browser-build] + * Bug 40081: Support apt option for not installing recommended dependencies [rbm] + * macOS + * Bug 41325: Newer versions of 7z fail to extract our dmg files because of the /Applications symlink [tor-browser-build] + * Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar [tor-browser-build] + * Linux + * Bug 41329: Do not install python2.7-minimal in the linux-aarch64 firefox container [tor-browser-build] + * Bug 41331: Make update_responses find linux-aarch64 mar files [tor-browser-build] + * Bug 41335: linux-package project is not getting the channel target in testbuilds [tor-browser-build] + Mullvad Browser 14.5a1 - November 25 2024 * All Platforms * Updated Firefox to 128.5.0esr ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,56 @@ +Tor Browser 14.5a2 - January 14 2025 + * All Platforms + * Updated Tor to 0.4.9.1-alpha + * Updated NoScript to 12.1.1 + * Bug 43176: noscript-marker CSP warnings in the console [tor-browser] + * Bug 43282: Unable to click/tap/select anything adjacent the WebGL placeholders [tor-browser] + * Bug 43296: NoScript-blocked video content placeholder is not centered [tor-browser] + * Bug 43334: Developer Tools lacks data for Responsive Design Mode and Compatibility [tor-browser] + * Bug 43336: Move branding files out of torbutton [tor-browser] + * Bug 43337: Add branding files to translation CI [tor-browser] + * Bug 43338: Custom zoom + "Zoom text only" breaks pdfjs [tor-browser] + * Bug 43343: Remove YEC 2024 [tor-browser] + * Bug 43345: Translation CI: Exclude android strings from the legacy branch [tor-browser] + * Bug 43352: Failing connection attempts to multicast IPv6 ff00:::443 logged during NoScript updates [tor-browser] + * Bug 43366: Do not use system accent color in inputs [tor-browser] + * Bug 43384: Backport security fixes from Firefox 134 [tor-browser] + * Bug 43387: Rebase Tor Browser alpha onto 128.6.0esr [tor-browser] + * Bug 41328: Exclude tor dependencies from LD_LIBRARY_PATH [tor-browser-build] + * Bug 41333: Update STUN servers in Snowflake builtin bridges [tor-browser-build] + * Bug 41338: Add CDN77 meek bridge [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 128.6.0esr + * Bug 43269: NoScript localization issue [tor-browser] + * Bug 43312: Download popup panel progress bar overflows [tor-browser] + * Bug 43320: Improve how bridge settings appear in search results [tor-browser] + * Linux + * Bug 43236: High refresh rate detectable by websites when Wayland (MOZ_ENABLE_WAYLAND=1) is used [tor-browser] + * Bug 43326: Launching tor-browser on gentoo fails with "version `OPENSSL_3.2.0' not found" [tor-browser] + * Bug 43330: System fonts leak when emptying the allow list on Linux [tor-browser] + * Bug 41311: AppArmor profile fails on Debian stable [tor-browser-build] + * Android + * Updated GeckoView to 128.6.0esr + * Bug 42651: Finishing bootstrapping kicks the user out of settings, interupting whatever they were doing [tor-browser] + * Bug 43024: firefox-android 128.1 rebase TODOs and patchset health work [tor-browser] + * Bug 43229: Buttons that open links can be accessed before torbrowser is bootstrapped, leaving the app in a bad state [tor-browser] + * Bug 43350: Remove all caps comment from android string [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.22.10 + * Bug 43373: Do not run all CI jobs for scheduled jobs. [tor-browser] + * Bug 43374: Run the `update-translations` jobs independent of others [tor-browser] + * Bug 41326: Remove var/torbrowser_legacy_version from rbm.conf in alpha/nightly [tor-browser-build] + * Bug 41340: Update kick_devmole_build script with Mullvad's new GitHub workflow endpoint [tor-browser-build] + * Bug 40081: Support apt option for not installing recommended dependencies [rbm] + * macOS + * Bug 41325: Newer versions of 7z fail to extract our dmg files because of the /Applications symlink [tor-browser-build] + * Bug 41327: Print more logs when make_full_update.sh failed to generate mar file in dmg2mar [tor-browser-build] + * Linux + * Bug 41329: Do not install python2.7-minimal in the linux-aarch64 firefox container [tor-browser-build] + * Bug 41331: Make update_responses find linux-aarch64 mar files [tor-browser-build] + * Android + * Bug 42690: Add the commands to produce the APKs to tools/geckoview [tor-browser] + Tor Browser 14.5a1 - November 25 2024 * All Platforms * Updated NoScript to 11.5.2 ===================================== projects/browser/config ===================================== @@ -108,16 +108,16 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4379558/noscript-11.5.2.x… + - URL: https://addons.mozilla.org/firefox/downloads/file/4411102/noscript-12.1.1.x… name: noscript - sha256sum: 460aaa6484bf8422415dfe08260e8536866e3731ed5b8b7913cf4b7b1333493a + sha256sum: f9639e63ffcfc352036de00e4ff6694bb0ca65a0bb8fbd103bd08f32dc1ff31a - URL: https://addons.mozilla.org/firefox/downloads/file/4391011/ublock_origin-1.6… name: ublock-origin sha256sum: ee3a724a46ff32c17d1723077fecc6ede7fdab742154020b51fb6253ddcbba14 enable: '[% c("var/mullvad-browser") %]' - - URL: https://cdn.mullvad.net/browser-extension/0.9.3/mullvad-browser-extension-0… + - URL: https://cdn.mullvad.net/browser-extension/0.9.4/mullvad-browser-extension-0… name: mullvad-extension - sha256sum: fc6bc7c850adf8845fec15b7ea06324f65f843155e2cc5dbd8719e34436512af + sha256sum: c91fcf30fe9a998f45ddc92e083bca4cd7b6dbb24fc545391e155ed1ec13c8cb enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/firefox/config ===================================== @@ -14,12 +14,12 @@ container: use_container: 1 var: - firefox_platform_version: '128.5.0' + firefox_platform_version: '128.6.0' firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '14.5' - browser_rebase: 2 + browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 1 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' @@ -107,7 +107,7 @@ targets: gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' nightly_updates_publish_dir_prefix: mullvadbrowser- - browser_build: 2 + browser_build: 1 linux-x86_64: var: ===================================== projects/geckoview/config ===================================== @@ -16,12 +16,12 @@ container: build_apk: 1 var: - firefox_platform_version: '128.5.0' + firefox_platform_version: '128.6.0' geckoview_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '14.5' - browser_rebase: 2 + browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci" _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]' ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '1.22.9' +version: '1.22.10' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -126,7 +126,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: e81a362f51aee2125722b018e46714e6a055a1954283414c0f937e737013db22 + sha256sum: 1e94fd48be750d1fafb4d9b3b6dd31a6e9d2735d339bf2462bc97b64ca4c1037 - project: go-bootstrap name: go-bootstrap target_replace: ===================================== 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: 222718 +version: 227750 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -23,6 +23,6 @@ input_files: - project: container-image - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip' name: manual - sha256sum: 051174ba012fa2241e865cc604658a0af116d3bbf9d02474025277fff1b34636 + sha256sum: 3f80d2d1193042211ad2dc14b27d68aabfa1629472d5b2ad6fabc7b1e38b0580 - filename: packagemanual.py name: package_script ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.13 +version: 0.4.9.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: caa431bbea1a76d7ad61eeda94086a1513762605 + git_hash: 57493f98caf0e8f038ba1e72adf8c5fbd7adbc4f targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 4314d0a7ce780ffdf82b84e324bfbc437198f993 + git_hash: df2f5b9e4cc5a2ad16a8ed93e597dd88ede880d2 targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,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: 4c8637121e71699d2432069ad56a30ff77116000 + git_hash: b22346e7153552b81e5a6c533000deb44efb6e9c compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -73,19 +73,19 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '14.5a1' + torbrowser_version: '14.5a2' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/11/25 23:58:26' + browser_release_date: '2025/01/13 19:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 14.5a1 - '[% IF c("var/mullvad-browser") %]14.0a10[% END %]' - 14.0a9 - - 14.0a8 - - '[% IF c("var/tor-browser") %]14.0a7[% END %]' + - '[% IF c("var/tor-browser") %]14.0a8[% END %]' mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing 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] Pushed new tag tor-browser-128.6.0esr-14.5-1-build2
by Pier Angelo Vendrame (＠pierov) 14 Jan '25

14 Jan '25

Pier Angelo Vendrame pushed new tag tor-browser-128.6.0esr-14.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/mullvad-browser] Pushed new tag mullvad-browser-128.6.0esr-14.5-1-build1
by Pier Angelo Vendrame (＠pierov) 13 Jan '25

13 Jan '25

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

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.6.0esr-14.5-1] 23 commits: MB 38: Mullvad Browser configuration
by morgan (＠morgan) 13 Jan '25

13 Jan '25

morgan pushed to branch mullvad-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: a9e0fec9 by Pier Angelo Vendrame at 2025-01-13T15:52:09+01:00 MB 38: Mullvad Browser configuration - - - - - 9e8a72ef by Pier Angelo Vendrame at 2025-01-13T15:52:09+01:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - 19a5b307 by Henry Wilkes at 2025-01-13T15:52:10+01:00 Mullvad Browser strings This commit adds strings needed by the following Mullvad Browser patches. - - - - - d5eafa99 by Pier Angelo Vendrame at 2025-01-13T15:52:10+01:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 99ce0957 by Pier Angelo Vendrame at 2025-01-13T15:52:10+01:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 7132433a by Pier Angelo Vendrame at 2025-01-13T15:52:10+01:00 MB 37: Customization for the about dialog - - - - - 39d1ef8c by Henry Wilkes at 2025-01-13T15:52:11+01:00 MB 39: Add home page about:mullvad-browser - - - - - 23c6bbb4 by hackademix at 2025-01-13T15:52:11+01:00 MB 97: Remove UI cues to install new extensions. - - - - - cfcbe150 by hackademix at 2025-01-13T15:52:11+01:00 MB 47: uBlock Origin customization - - - - - 5920132b by Pier Angelo Vendrame at 2025-01-13T15:52:11+01:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 3c4eeeee by Pier Angelo Vendrame at 2025-01-13T15:52:12+01:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 4d1378c1 by Nicolas Vigier at 2025-01-13T15:52:12+01:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - 70c313ac by Pier Angelo Vendrame at 2025-01-13T15:52:12+01:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - 0c3761c8 by Pier Angelo Vendrame at 2025-01-13T15:52:12+01:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - 2a117cdf by hackademix at 2025-01-13T15:52:13+01:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - 70d09125 by Richard Pospesel at 2025-01-13T15:52:13+01:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - f7e4ba8e by rui hildt at 2025-01-13T15:52:13+01:00 MB 213: Customize the search engines list MB 328: Refactor the search engine patch. Upstream switched to a completely different search engine configuration between ESR 115 and ESR 128. We moved our configuration to a couple of JSON files that do not follow upstream's schemas, as they are overcomplicated for our needs. Also, we keep the old search engine extensions for now, as upstream also kept them, and planned of removing them with Bug 1885953. - - - - - 9dfee9fa by hackademix at 2025-01-13T15:52:13+01:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 477ecfc3 by Pier Angelo Vendrame at 2025-01-13T15:52:13+01:00 MB 80: Enable Mullvad Browser as a default browser - - - - - 6d17a7e1 by Pier Angelo Vendrame at 2025-01-13T15:52:14+01:00 MB 320: Temporarily disable WebRTC and WDBA on Windows. WebRTC should be re-enabled when tor-browser#42758 is resolved, and and the default browser agent when in general we make this feature work again. - - - - - 6a77de82 by Henry Wilkes at 2025-01-13T15:52:14+01:00 MB 329: Customize toolbar for mullvad-browser. - - - - - e47a84a9 by Kershaw Chang at 2025-01-13T15:59:02+01:00 Bug 1910593 - Don't prefetch HTTPS RR if proxyDNS is enabled, r=necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D219528 - - - - - 5fecfab2 by Pier Angelo Vendrame at 2025-01-13T15:59:07+01:00 fixup! Firefox preference overrides. BB 43236: Disable vsync on Wayland. Vsync leaks the monitor refresh rate, therefore it is already disabled on other platforms, including Linux/X11 and Windows. - - - - - 266 changed files: - .gitlab/issue_templates/Emergency Security Issue.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.js - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg - + browser/branding/mb-alpha/content/icon128.png - + browser/branding/mb-alpha/content/icon16.png - + browser/branding/mb-alpha/content/icon256.png - + browser/branding/mb-alpha/content/icon32.png - + browser/branding/mb-alpha/content/icon48.png - + browser/branding/mb-alpha/content/icon64.png - + browser/branding/mb-alpha/content/jar.mn - + browser/branding/mb-alpha/content/moz.build - + browser/branding/mb-alpha/default128.png - + browser/branding/mb-alpha/default16.png - + browser/branding/mb-alpha/default22.png - + browser/branding/mb-alpha/default24.png - + browser/branding/mb-alpha/default256.png - + browser/branding/mb-alpha/default32.png - + browser/branding/mb-alpha/default48.png - + browser/branding/mb-alpha/default64.png - + browser/branding/mb-alpha/document.icns - + browser/branding/mb-alpha/document.ico - + browser/branding/mb-alpha/document_pdf.ico - + browser/branding/mb-alpha/firefox.icns - + browser/branding/mb-alpha/firefox.ico - + browser/branding/mb-alpha/firefox.svg - + browser/branding/mb-alpha/locales/en-US/brand.ftl - + browser/branding/mb-alpha/locales/en-US/brand.properties - + browser/branding/mb-alpha/locales/jar.mn - + browser/branding/mb-alpha/locales/moz.build - + browser/branding/mb-alpha/moz.build - + browser/branding/mb-alpha/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-alpha/newtab.ico - + browser/branding/mb-alpha/newwindow.ico - + browser/branding/mb-alpha/pbmode.ico - + browser/branding/mb-alpha/pref/firefox-branding.js - + browser/branding/mb-nightly/VisualElements_150.png - + browser/branding/mb-nightly/VisualElements_70.png - + browser/branding/mb-nightly/configure.sh - + browser/branding/mb-nightly/content/about-logo.png - + browser/branding/mb-nightly/content/about-logo.svg - + browser/branding/mb-nightly/content/about-logo(a)2x.png - + browser/branding/mb-nightly/content/about-wordmark.svg - + browser/branding/mb-nightly/content/about.png - + browser/branding/mb-nightly/content/aboutDialog.css - + browser/branding/mb-nightly/content/firefox-wordmark.svg - + browser/branding/mb-nightly/content/icon128.png - + browser/branding/mb-nightly/content/icon16.png - + browser/branding/mb-nightly/content/icon256.png - + browser/branding/mb-nightly/content/icon32.png - + browser/branding/mb-nightly/content/icon48.png - + browser/branding/mb-nightly/content/icon64.png - + browser/branding/mb-nightly/content/jar.mn - + browser/branding/mb-nightly/content/moz.build - + browser/branding/mb-nightly/default128.png - + browser/branding/mb-nightly/default16.png - + browser/branding/mb-nightly/default22.png - + browser/branding/mb-nightly/default24.png - + browser/branding/mb-nightly/default256.png - + browser/branding/mb-nightly/default32.png - + browser/branding/mb-nightly/default48.png - + browser/branding/mb-nightly/default64.png - + browser/branding/mb-nightly/document.icns - + browser/branding/mb-nightly/document.ico - + browser/branding/mb-nightly/document_pdf.ico - + browser/branding/mb-nightly/firefox.icns - + browser/branding/mb-nightly/firefox.ico - + browser/branding/mb-nightly/firefox.svg - + browser/branding/mb-nightly/locales/en-US/brand.ftl - + browser/branding/mb-nightly/locales/en-US/brand.properties - + browser/branding/mb-nightly/locales/jar.mn - + browser/branding/mb-nightly/locales/moz.build - + browser/branding/mb-nightly/moz.build - + browser/branding/mb-nightly/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-nightly/newtab.ico - + browser/branding/mb-nightly/newwindow.ico - + browser/branding/mb-nightly/pbmode.ico - + browser/branding/mb-nightly/pref/firefox-branding.js - + browser/branding/mb-release/VisualElements_150.png - + browser/branding/mb-release/VisualElements_70.png - + browser/branding/mb-release/configure.sh - + browser/branding/mb-release/content/about-logo.png - + browser/branding/mb-release/content/about-logo.svg - + browser/branding/mb-release/content/about-logo(a)2x.png - + browser/branding/mb-release/content/about-wordmark.svg - + browser/branding/mb-release/content/about.png - + browser/branding/mb-release/content/aboutDialog.css - + browser/branding/mb-release/content/firefox-wordmark.svg - + browser/branding/mb-release/content/icon128.png - + browser/branding/mb-release/content/icon16.png - + browser/branding/mb-release/content/icon256.png - + browser/branding/mb-release/content/icon32.png - + browser/branding/mb-release/content/icon48.png - + browser/branding/mb-release/content/icon64.png - + browser/branding/mb-release/content/jar.mn - + browser/branding/mb-release/content/moz.build - + browser/branding/mb-release/default128.png - + browser/branding/mb-release/default16.png - + browser/branding/mb-release/default22.png - + browser/branding/mb-release/default24.png - + browser/branding/mb-release/default256.png - + browser/branding/mb-release/default32.png - + browser/branding/mb-release/default48.png - + browser/branding/mb-release/default64.png - + browser/branding/mb-release/document.icns - + browser/branding/mb-release/document.ico - + browser/branding/mb-release/document_pdf.ico - + browser/branding/mb-release/firefox.icns - + browser/branding/mb-release/firefox.ico - + browser/branding/mb-release/firefox.svg - + browser/branding/mb-release/locales/en-US/brand.ftl - + browser/branding/mb-release/locales/en-US/brand.properties - + browser/branding/mb-release/locales/jar.mn - + browser/branding/mb-release/locales/moz.build - + browser/branding/mb-release/moz.build - + browser/branding/mb-release/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-release/newtab.ico - + browser/branding/mb-release/newwindow.ico - + browser/branding/mb-release/pbmode.ico - + browser/branding/mb-release/pref/firefox-branding.js - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/moz.build - + browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs - + browser/components/mullvad-browser/content/2728-sparkles.svg - + browser/components/mullvad-browser/content/aboutMullvadBrowser.css - + browser/components/mullvad-browser/content/aboutMullvadBrowser.js - + browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml - + browser/components/mullvad-browser/content/mullvadBrowserFont.css - + browser/components/mullvad-browser/jar.mn - + browser/components/mullvad-browser/moz.build - browser/components/newtab/AboutNewTabService.sys.mjs - browser/components/preferences/home.inc.xhtml - browser/components/preferences/main.js - browser/components/preferences/preferences.xhtml - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - browser/components/preferences/search.inc.xhtml - + browser/components/search/extensions/brave/favicon.svg - + browser/components/search/extensions/brave/manifest.json - + browser/components/search/extensions/ddg-html/favicon.ico - + browser/components/search/extensions/ddg-html/manifest.json - browser/components/search/extensions/ddg/manifest.json - + browser/components/search/extensions/metager/favicon.ico - + browser/components/search/extensions/metager/manifest.json - + browser/components/search/extensions/mojeek/favicon.ico - + browser/components/search/extensions/mojeek/manifest.json - + browser/components/search/extensions/mullvad-leta/favicon.svg - + browser/components/search/extensions/mullvad-leta/manifest.json - + browser/components/search/extensions/startpage/favicon.png - + browser/components/search/extensions/startpage/manifest.json - browser/components/shell/ShellService.sys.mjs - browser/components/shell/WindowsDefaultBrowser.cpp - browser/components/shell/nsWindowsShellService.cpp - browser/config/mozconfigs/base-browser - + browser/config/mozconfigs/mullvad-browser - browser/confvars.sh - browser/installer/package-manifest.in - browser/installer/windows/nsis/updater_append.ini - browser/modules/HomePage.sys.mjs - browser/moz.build - config/create_rc.py - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/aboutdebugging/src/components/sidebar/Sidebar.js - devtools/client/jar.mn - devtools/client/themes/images/aboutdebugging-firefox-aurora.svg - devtools/client/themes/images/aboutdebugging-firefox-beta.svg - devtools/client/themes/images/aboutdebugging-firefox-logo.svg - devtools/client/themes/images/aboutdebugging-firefox-nightly.svg - devtools/client/themes/images/aboutdebugging-firefox-release.svg - + devtools/client/themes/images/aboutdebugging-mullvadbrowser-logo.svg - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - dom/chrome-webidl/NetDashboard.webidl - moz.configure - mozconfig-linux-aarch64 - mozconfig-linux-aarch64-dev - mozconfig-linux-x86_64 - mozconfig-linux-x86_64-asan - mozconfig-linux-x86_64-dev - mozconfig-macos - mozconfig-macos-dev - mozconfig-windows-x86_64 - netwerk/base/Dashboard.cpp - netwerk/base/DashboardTypes.h - netwerk/dns/nsHostResolver.cpp - netwerk/protocol/http/nsHttp.cpp - netwerk/protocol/http/nsHttp.h - netwerk/protocol/http/nsHttpChannel.cpp - netwerk/protocol/http/nsHttpChannel.h - netwerk/protocol/http/nsHttpConnectionInfo.h - netwerk/protocol/http/nsHttpConnectionMgr.cpp - netwerk/protocol/http/nsHttpHandler.cpp - netwerk/protocol/http/nsHttpHandler.h - + netwerk/test/unit/test_proxyDNS_leak.js - netwerk/test/unit/xpcshell.toml - + other-licenses/nsis/Contrib/ApplicationID/Makefile - + other-licenses/nsis/Contrib/CityHash/Makefile - toolkit/components/extensions/child/ext-storage.js - toolkit/components/extensions/parent/ext-storage.js - toolkit/components/passwordmgr/LoginHelper.sys.mjs - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/content/brave.svg - + toolkit/components/search/content/duckduckgo.ico - + toolkit/components/search/content/metager.ico - + toolkit/components/search/content/mojeek.ico - + toolkit/components/search/content/mullvad-leta.svg - + toolkit/components/search/content/mullvadBrowserSearchEngineIcons.json - + toolkit/components/search/content/mullvadBrowserSearchEngines.json - + toolkit/components/search/content/startpage.png - + toolkit/components/search/jar.mn - toolkit/components/search/moz.build - toolkit/components/securitylevel/SecurityLevel.sys.mjs - toolkit/content/aboutNetworking.js - + toolkit/content/aboutRightsMullvad.xhtml - + toolkit/content/aboutTelemetryMullvad.xhtml - toolkit/content/jar.mn - toolkit/content/license.html - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - + toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - toolkit/mozapps/defaultagent/EventLog.h - toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp - toolkit/mozapps/extensions/AddonManager.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.css - toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs - toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs - toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der - toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der - toolkit/mozapps/update/updater/release_primary.der - toolkit/mozapps/update/updater/release_secondary.der - toolkit/xre/nsAppRunner.cpp - tools/lint/fluent-lint/exclusions.yml - widget/windows/WinTaskbar.cpp - widget/windows/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/dc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/dc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41342 - Build test artifacts for Android
by Pier Angelo Vendrame (＠pierov) 13 Jan '25

13 Jan '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 47f3949c by Beatriz Rizental at 2025-01-13T16:21:37+01:00 Bug 41342 - Build test artifacts for Android - - - - - 4 changed files: - projects/browser/build.android - projects/geckoview/build_ac_fenix - projects/geckoview/config - projects/geckoview/gradle-dependencies-list.txt Changes: ===================================== projects/browser/build.android ===================================== @@ -4,19 +4,13 @@ tar -xf $rootdir/[% c('input_files_by_name/fenix') %] -assets_dir=assets -ext_dir=$assets_dir/extensions -qa_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-qa-[% c("var/osname") %]-[% c("version") %].apk -apk=$rootdir/geckoview/*-[% c("var/abi") %]-*.apk - -# tor-browser-build#40920 -sorted_baseline_apk=$(basename $apk .apk)_sorted_baseline.apk -$rootdir/sort-baseline.py --apk $apk $sorted_baseline_apk -mv $sorted_baseline_apk $apk - # Bundle our extension(s). +# # NoScript will be copied over to the profile folder # as a "regular" browser extension receiving regular AMO updates. +assets_dir=assets +ext_dir=$assets_dir/extensions + noscript_path="$ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %] @@ -34,43 +28,93 @@ popd [%IF c("var/tor-browser") -%] tar -xaf "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" tor/pluggable_transports/pt_config.json [% END -%] -unzip -j "$apk" assets/omni.ja -mkdir omni -pushd omni -unzip ../omni.ja -[%IF c("var/tor-browser") -%] - cp -a ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/pt_config.json -[% END -%] -[% c('zip', { + +# This function generates a signed APK from a given APK file. +# +# Arguments: +# $1 - The final APK file name. +# $2 - The input APK file. +# $3 - [Optional] The patch file for the unsigned APK. +# +# Steps: +# 1. Sort the baseline APK. +# 2. Extract the omni.ja file from the APK and modify its contents. +# 3. Repack the APK with the modified omni.ja file. +# 4. Align the APK using zipalign. +# 5. Sign the APK using apksigner. +# 6. [Optional] Generate a patch file for the unsigned APK using bsdiff. +function generate_apk { + local final_apk=$1 + local apk=$2 + + # tor-browser-build#40920 + sorted_baseline_apk=$(basename $apk .apk)_sorted_baseline.apk + $rootdir/sort-baseline.py --apk $apk $sorted_baseline_apk + mv $sorted_baseline_apk $apk + + unzip -j "$apk" assets/omni.ja + mkdir omni + pushd omni + unzip ../omni.ja + [%IF c("var/tor-browser") -%] + cp -an ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/pt_config.json + [% END -%] + [% c('zip', { zip_src => [ '.' ], zip_args => '-0 ../assets/omni.ja', }) %] -popd + popd -mkdir apk -pushd apk -7zz x "$apk" -cp -R ../assets ./ -find -type f -exec touch -m -t '[% USE date; date.format(pc("geckoview", "timestamp"), format = "%Y%m%d%H%M") %]' {} \; -find -type f ! -name resources.arsc -printf '%P\n' | sort > ../files.txt -7zz a -tzip -mx9 -mtc- -spf ../repacked.apk @../files.txt -# resources.arsc must not be compressed as per the APK specifications -7zz a -tzip -mm=Copy -mtc- ../repacked.apk resources.arsc -popd + mkdir apk + pushd apk + 7zz x "$apk" + cp -Rn ../assets ./ + find -type f -exec touch -m -t '[% USE date; date.format(pc("geckoview", "timestamp"), format = "%Y%m%d%H%M") %]' {} \; + find -type f ! -name resources.arsc -printf '%P\n' | sort > ../files.txt + 7zz a -tzip -mx9 -mtc- -spf ../repacked.apk @../files.txt + # resources.arsc must not be compressed as per the APK specifications + 7zz a -tzip -mm=Copy -mtc- ../repacked.apk resources.arsc + popd + + aligned_apk=$(basename $apk .apk)_aligned.apk + zipalign -vp 4 repacked.apk $aligned_apk -aligned_apk=$(basename $apk .apk)_aligned.apk -zipalign -vp 4 repacked.apk $aligned_apk + # Sign a QA build. This .apk is not a debug version and doesn't contain a debug + # flag in the manifest. + apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $final_apk --in $aligned_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android + + local unsign_patch=$3 + if [ -n "$unsign_patch" ]; then + bsdiff $final_apk $aligned_apk $unsign_patch + fi + + # Clean up + rm -rf omni + rm omni.ja + rm -rf apk + rm repacked.apk + rm $aligned_apk +} + +# Generate the QA APK and unsign patch. +qa_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-qa-[% c("var/osname") %]-[% c("version") %].apk +qa_unsign_patch="[% dest_dir %]/[% c('filename') %]/[% c('var/project-name') %]-qa-unsign-[% c('var/osname') %]-[% c('version') %].bspatch" +apk=$rootdir/geckoview/*-[% c("var/abi") %]-*.apk +generate_apk $qa_apk $apk $qa_unsign_patch -# Sign a QA build. This .apk is not a debug version and doesn't contain a debug -# flag in the manifest. -apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $aligned_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android +# Generate the non-optimized APK used for testing and its unsign patch. +noopt_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-noopt-[% c("var/osname") %]-[% c("version") %].apk +noopt_final_apk=$rootdir/geckoview/tests/*-[% c("var/abi") %]-*.apk +generate_apk $noopt_apk $noopt_final_apk -unsign_patch="[% dest_dir %]/[% c('filename') %]/[% c('var/project-name') %]-qa-unsign-[% c('var/osname') %]-[% c('version') %].bspatch" -bsdiff $qa_apk $aligned_apk $unsign_patch +# Copy and sign the Android test APK. +test_apk=[% dest_dir %]/[% c('filename') %]/[% c("var/project-name") %]-[% c("version") %]-androidTest.apk +cp $rootdir/geckoview/tests/*-androidTest.apk $test_apk +apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_apk --in $test_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android [%IF c("var/tor-browser") -%] - tor_expert_bundle_src="[% c('input_files_by_name/tor-expert-bundle') %]" - # strip off trailing "$buildid.tar.gz" - tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}.tar.gz - cp "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" [% dest_dir %]/[% c('filename') %]/$tor_expert_bundle_dest + tor_expert_bundle_src="[% c('input_files_by_name/tor-expert-bundle') %]" + # strip off trailing "$buildid.tar.gz" + tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}.tar.gz + cp "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" [% dest_dir %]/[% c('filename') %]/$tor_expert_bundle_dest [% END -%] ===================================== projects/geckoview/build_ac_fenix ===================================== @@ -45,12 +45,24 @@ echo 'ext.gleanBuildDate = "0"' >> app/build.gradle variant='[% c("var/variant") %]' version_name="[% c('var/torbrowser_version') %] ([% c('var/geckoview_version') %])" +echo "Building $variant Fenix APK" gradle $GRADLE_FLAGS -PversionName="$version_name" "assemble$variant" echo "Build finished, copying the APK(s) to the destination directory $(date)" - mkdir $distdir/[% project %] cp app/build/outputs/apk/fenix/$variant/*.apk $distdir/[% project %] +echo "Building non optimized $variant Fenix APK for testing" +gradle $GRADLE_FLAGS -PversionName="$version_name" -PdisableOptimization "assemble$variant" + +echo "Building Fenix instrumentation tests" +gradle $GRADLE_FLAGS -PversionName="$version_name" -PtestBuildType="$variant" -PdisableOptimization assembleAndroidTest + +echo "Test build finished, copying the APKs to the destination directory $(date)" + +mkdir $distdir/[% project %]/tests +cp app/build/outputs/apk/fenix/$variant/*.apk $distdir/[% project %]/tests +cp app/build/outputs/apk/androidTest/fenix/$variant/*.apk $distdir/[% project %]/tests + popd ===================================== projects/geckoview/config ===================================== @@ -36,7 +36,7 @@ var: - openjdk-17-jdk-headless # this should be updated when the list of gradle dependencies is changed # see doc/how-to-create-gradle-dependencies-list.txt - gradle_dependencies_version: 15 + gradle_dependencies_version: 16 gradle_version: 8.8 glean_parser: 14.0.1 variant: beta ===================================== projects/geckoview/gradle-dependencies-list.txt ===================================== @@ -2929,3 +2929,44 @@ e4ff4338999e1c6c9c724719f5d4aa7dd61bf6f545d5256a27a9d375df9f2330 | https://maven a9fb0b39a8360beef7bdc8f3953d4d78f3d85304fc80adac3c8eaf530d758050 | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel/2.6.2/lifec… f34831b6c71cd844e1d35d1be49d5e79447c5ab856346531b1e8676fda7374b1 | https://maven.google.com/androidx/lifecycle/lifecycle-common/2.6.2/lifecycl… 57304cdac4da289a6ecdd0738e16b1d8858f1ef8e9fabe2d65a963719fd81dba | https://maven.google.com/androidx/lifecycle/lifecycle-common/2.6.2/lifecycl… +caa72885d1ce7979c1d6c59a8b255c6097b770780d4d4da95d56979a348646cd | https://maven.google.com/androidx/activity/activity-compose/1.7.0/activity-… +85e1fe770ed673ecb8552eaadc23b96d8db0a14a10eaa7789518496e5d99362c | https://maven.google.com/androidx/arch/core/core-testing/2.2.0/core-testing… +89536d9f0763e268fc9504fffeada04d483b36fe46f8c6eff5ee64642e36539f | https://maven.google.com/androidx/arch/core/core-testing/2.2.0/core-testing… +9a4a6e4c9ed089619306f21853a82e7ceeefd38fa69534f2b45a931b2ec827ae | https://maven.google.com/androidx/compose/ui/ui-test-manifest/1.6.7/ui-test… +dd61a9738e9eea4691bd7ade9e2cb8acb4f0cb73e048d8611edaa118d032235a | https://maven.google.com/androidx/compose/ui/ui-test-manifest/1.6.7/ui-test… +ea66d01428a8c8f26a0ee2259a96d7763dd0d3aef5321730790f8e9cfbe28360 | https://maven.google.com/androidx/room/room-testing/2.6.1/room-testing-2.6.… +b39a4b9e96b9e5d51b06e4438b182d9ef0f1f91f9338abe1fd0aa45946929968 | https://maven.google.com/androidx/room/room-testing/2.6.1/room-testing-2.6.… +9e672028617979dab465678efdd1650b53c929634c399b1f5fef28252483684d | https://maven.google.com/androidx/test/espresso/espresso-core/3.5.0/espress… +34b0493f4e002f205d961e562add0c0c31bb0acc657e89d89d4b188ac13f242c | https://maven.google.com/androidx/test/espresso/espresso-core/3.5.0/espress… +109eec25d79146122fcdaea91d27ab6e437ccd1aec54eb8e4ac23b23f4011deb | https://maven.google.com/androidx/test/espresso/espresso-idling-resource/3.… +84fb8e2f5eda937771bee28582f5d2cfa61b0e9438d02041ca61b81e3dac3c87 | https://maven.google.com/androidx/test/espresso/espresso-idling-resource/3.… +b3c5aabd545b6c260528c8f4e7c98f73628614ea3d5df3a7a44af2136fd8720b | https://maven.google.com/androidx/test/runner/1.5.0/runner-1.5.0.aar +909882bb86a8618f307d439ead4545cf74f54d3dc6088c232e1bab4f9a97f6cc | https://maven.google.com/androidx/test/runner/1.5.0/runner-1.5.0.pom +914d8c83aa16455d431b5b3af306cef0eb0a0bfd6550d097e39ad475435bf56c | https://maven.google.com/androidx/tracing/tracing-ktx/1.1.0/tracing-ktx-1.1… +2f2ee5c58561d72cabe9207c43669fe92d6c1386f8c1c2624489e6ab367b121e | https://maven.google.com/androidx/tracing/tracing-perfetto-handshake/1.0.0/… +5b78e2c618fc10b3d14decc01df76158f15954ad746aacf0607766721da081f6 | https://maven.google.com/androidx/tracing/tracing/1.1.0/tracing-1.1.0.aar +f1db502b5d539d94dfb6c659deb76872b1e9d8266d7aa4083868a29c33c22917 | https://maven.google.com/androidx/tracing/tracing/1.1.0/tracing-1.1.0.pom +38c45cdaf993a7df6697703ca6ee00acbe376d3dade8d44daac3e33f039ca516 | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotation… +1faf214c94723ab9fbadfedd9af88ddc325faf669e68eab04688c3afcf59c037 | https://repo1.maven.org/maven2/com/google/guava/guava/28.2-android/guava-28… +b29c1c21e52ed6238cd3fed39d880a17ecf2360118604548cea8821be6801e1c | https://repo1.maven.org/maven2/com/jakewharton/android/repackaged/dalvik-dx… +7ed7862122ecff00f9c582a61a83397f549f92f347825eca8bb7ad94aef7e92d | https://repo1.maven.org/maven2/com/linkedin/dexmaker/dexmaker/2.28.3/dexmak… +90bb885e3f0a3546e4670ea2b66f291319dff0c6878e8aaead0abf3268934b5a | https://repo1.maven.org/maven2/com/squareup/leakcanary/leakcanary-android-i… +a901efac8b81a6f9fe6c970708e353bd4bd1da03b929dfac01a7617b2d4fea31 | https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/4.… +11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a | https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5… +164fe9728cf95a2cdea93e257d0dc3d5e29f29256b3cca900a8e619bc94d5b1f | https://repo1.maven.org/maven2/org/checkerframework/checker-qual/2.5.5/chec… +eaf537d98e033d0f0451cd1b8cc74e02d7b55ec882da63c88060d806ba89c348 | https://repo1.maven.org/maven2/org/conscrypt/conscrypt-openjdk-uber/2.5.2/c… +8a835f5176355083668aff0ed6eef5b3eb030e10e89679ed3eeb703fd2d5b900 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.9.10/k… +1f9b6f110f498bb5796cbe2cdd36a83ae242619c816821db23ed088a30347b4a | https://repo1.maven.org/maven2/org/jsoup/jsoup/1.12.2/jsoup-1.12.2.jar +1808ee87e0f718cd6e25f3b75afc17956ac8a3edc48c7e9bab9f19f9a79e3801 | https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-api/5.8.2/ju… +753b7726cdd158bb34cedb94c161e2291896f47832a1e9eda53d970020a8184e | https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-engine/5.8.2… +d1c22d6fe5483568c08c8913f34abd2303490c3480ce6c18a2ea31c65e44102a | https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter-params/5.8.2… +4f5c1cc6432244cd16e36aa0e02b74bce34a81ff95a13d63d50951ec4ce3f4bd | https://repo1.maven.org/maven2/org/junit/jupiter/junit-jupiter/5.8.2/junit-… +d2e015fca7130e79af2f4608dc54415e4b10b592d77333decb4b1a274c185050 | https://repo1.maven.org/maven2/org/junit/platform/junit-platform-commons/1.… +0b7d000f8c3e8e5f7d6b819649936e7b9938314e87c8f983805218ea57567e59 | https://repo1.maven.org/maven2/org/junit/platform/junit-platform-engine/1.8… +28028d70cc27d61442948fcb3d249d9df5b37c47aa0b82490a3d049094ff411f | https://repo1.maven.org/maven2/org/mockito/mockito-core/2.25.0/mockito-core… +5a841dd993e6fd310f08e62df4bdc3eddd9a25245a87650fac99fbff01607d3e | https://repo1.maven.org/maven2/org/mockito/mockito-core/2.25.0/mockito-core… +3825feca2a3c176400b063dec7c6b0643e2b5256bbbfd4e0a7c11e0dd0983baa | https://repo1.maven.org/maven2/org/objenesis/objenesis-parent/2.6/objenesis… +5e168368fbc250af3c79aa5fef0c3467a2d64e5a7bd74005f25d8399aeb0708d | https://repo1.maven.org/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.jar +4c1307909dc62df1bd91f075503f8bdef5ae445e13353f1752af9448bea1d3f1 | https://repo1.maven.org/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.pom +58812de60898d976fb81ef3b62da05c6604c18fd4a249f5044282479fc286af2 | https://repo1.maven.org/maven2/org/opentest4j/opentest4j/1.2.0/opentest4j-1… +5be3bd2a9d6cee0ea930fb3a92c4585c87524b2ae7871f381e8f5647736836dc | https://repo1.maven.org/maven2/org/robolectric/nativeruntime-dist-compat/1.… 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][base-browser-128.6.0esr-14.5-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 13 Jan '25

13 Jan '25

morgan pushed to branch base-browser-128.6.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 7a6a6796 by Pier Angelo Vendrame at 2025-01-13T14:47:07+00:00 fixup! Firefox preference overrides. BB 43236: Disable vsync on Wayland. Vsync leaks the monitor refresh rate, therefore it is already disabled on other platforms, including Linux/X11 and Windows. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -466,6 +466,8 @@ pref("browser.display.use_system_colors", false); // tor-browser#43366: do not use system accent color in inputs. // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1861362. pref("widget.non-native-theme.use-theme-accent", false); +// tor-browser#43236: Disable vsync on Wayland to prevent refresh rate leaks. +pref("widget.wayland.vsync.enabled", false); // tor-browser#41943: defense-in-depth, but do not lock anymore (enabled in Firefox 119, http://bugzil.la/1851162) pref("javascript.options.spectre.disable_for_isolated_content", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7a6a679… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7a6a679… You're receiving this email because of your account on gitlab.torproject.org.

1 0