tor-commits September 2023

tor-commits@lists.torproject.org

1 participants
178 discussions

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.2.1esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 12 Sep '23

12 Sep '23

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.2.1esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 12 Sep '23

12 Sep '23

Pier Angelo Vendrame pushed new tag base-browser-115.2.1esr-13.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-115.2.1esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 12 Sep '23

12 Sep '23

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.1esr-13.0-1] 168 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by Pier Angelo Vendrame (＠pierov) 12 Sep '23

12 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 1f2ef2be by Eitan Isaacson at 2023-09-12T19:23:43+02:00 Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie Differential Revision: https://phabricator.services.mozilla.com/D179737 - - - - - 9c6f30fb by Pier Angelo Vendrame at 2023-09-12T19:23:46+02:00 Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized Allow using NSS for checking MAR signatures also in platforms where OS-native APIs are used by default, i.e., macOS and Windows. Differential Revision: https://phabricator.services.mozilla.com/D177743 - - - - - 2d20f886 by Pier Angelo Vendrame at 2023-09-12T19:29:27+02:00 Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D186456 - - - - - 2b66a03f by Henry Wilkes at 2023-09-12T19:29:28+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - b8a8eaeb by Henry Wilkes at 2023-09-12T19:29:29+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 4e1d4326 by Pier Angelo Vendrame at 2023-09-12T19:29:29+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - ef3c53bb by Marco Simonelli at 2023-09-12T19:29:30+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - 249a3a7f by Marco Simonelli at 2023-09-12T19:29:30+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 5306feb9 by Marco Simonelli at 2023-09-12T19:29:31+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - e57f8eec by Marco Simonelli at 2023-09-12T19:29:31+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - ec601c13 by Marco Simonelli at 2023-09-12T19:29:32+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 5bff8e77 by Marco Simonelli at 2023-09-12T19:29:32+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 07899f8b by hackademix at 2023-09-12T19:29:32+02:00 Bug 41854: Allow overriding download spam protection. - - - - - 2c9bedcc by Gaba at 2023-09-12T19:29:33+02:00 Adding issue and merge request templates - - - - - f7fe4f74 by Pier Angelo Vendrame at 2023-09-12T19:29:33+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - 29cf4aba by clairehurst at 2023-09-12T19:54:34+02:00 fixup! Base Browser's .mozconfigs. Bug 42035: Update mozconfig for macos development - - - - - 0f802748 by Pier Angelo Vendrame at 2023-09-12T19:54:37+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - ac407e84 by Pier Angelo Vendrame at 2023-09-12T19:54:38+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - f37b925f by Dan Ballard at 2023-09-12T19:54:39+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - c661a0c0 by Matthew Finkel at 2023-09-12T19:54:40+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - f595ec6c by Matthew Finkel at 2023-09-12T19:54:40+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 6418640e by Mike Perry at 2023-09-12T19:54:41+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 06d1c80a by Alex Catarineu at 2023-09-12T19:54:42+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 74cab453 by Georg Koppen at 2023-09-12T19:54:43+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 1f2df7c8 by Kathy Brade at 2023-09-12T19:54:44+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 705d6cb4 by Kathy Brade at 2023-09-12T19:54:44+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 612c9305 by Alex Catarineu at 2023-09-12T19:54:45+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 8b20d375 by Kathy Brade at 2023-09-12T19:54:46+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - de919a01 by Arthur Edelstein at 2023-09-12T19:54:47+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 764eedf3 by Alex Catarineu at 2023-09-12T19:54:47+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 03d4bb78 by cypherpunks1 at 2023-09-12T19:54:48+02:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 56b61952 by Pier Angelo Vendrame at 2023-09-12T19:54:49+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 622316aa by Georg Koppen at 2023-09-12T19:54:50+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 03361822 by Alex Catarineu at 2023-09-12T19:54:50+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 9ff5348e by cypherpunks1 at 2023-09-12T19:54:51+02:00 Bug 41568: Disable LaterRun - - - - - 259a7c62 by cypherpunks1 at 2023-09-12T19:54:54+02:00 Bug 40717: Hide Windows SSO in settings - - - - - 0b6f555f by Pier Angelo Vendrame at 2023-09-12T19:54:55+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 9b50ac3f by cypherpunks1 at 2023-09-12T19:54:56+02:00 Bug 40175: Add origin attributes to about:reader top-level requests - - - - - 64159f8e by Mike Perry at 2023-09-12T19:54:56+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - eef65b78 by hackademix at 2023-09-12T19:54:57+02:00 fixup! Firefox preference overrides. Bug 42029 - Defense-in-depth: disable non-proxied UDP WebRTC - - - - - 526752a4 by cypherpunks1 at 2023-09-12T19:54:58+02:00 fixup! Firefox preference overrides. Bug 41876: Disable the Firefox View tab - - - - - 983f2646 by Pier Angelo Vendrame at 2023-09-12T19:54:58+02:00 fixup! Firefox preference overrides. Bug 42043: Enable media.devices.enumerate.legacy.enabled. - - - - - a146767c by Richard Pospesel at 2023-09-12T19:54:59+02:00 fixup! Firefox preference overrides. Bug 41774: Hide the 'Switching to a new device' hepl menu item - - - - - 260af3d3 by Pier Angelo Vendrame at 2023-09-12T19:55:00+02:00 fixup! Firefox preference overrides. Bug 41797: Lock RFP in release builds - - - - - 165d99d9 by Richard Pospesel at 2023-09-12T19:55:01+02:00 fixup! Firefox preference overrides. - - - - - 66d175ef by Richard Pospesel at 2023-09-12T19:55:01+02:00 fixup! Firefox preference overrides. - - - - - 9b6bf168 by Pier Angelo Vendrame at 2023-09-12T19:55:02+02:00 fixup! Firefox preference overrides. Bug 41675: Remove javascript.options.large_arraybuffers. It has been removed with MozBug 1703508 in Firefox 110. - - - - - fd970af0 by Richard Pospesel at 2023-09-12T19:55:03+02:00 fixup! Firefox preference overrides. Bug 42057: Disable GetIsTextRecognitionSupported by default - - - - - 47214ee7 by Richard Pospesel at 2023-09-12T19:55:04+02:00 fixup! Firefox preference overrides. - - - - - c4a26dd6 by Richard Pospesel at 2023-09-12T19:55:04+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - e5db63d4 by Pier Angelo Vendrame at 2023-09-12T19:55:05+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - a14a6aca by Alex Catarineu at 2023-09-12T19:55:06+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 83045d09 by Alex Catarineu at 2023-09-12T19:55:07+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 392321c1 by Alex Catarineu at 2023-09-12T19:55:07+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - b10db92d by Alex Catarineu at 2023-09-12T19:55:08+02:00 Bug 26345: Hide tracking protection UI - - - - - 65c7f0ab by Pier Angelo Vendrame at 2023-09-12T19:55:13+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - dcac7c04 by Alex Catarineu at 2023-09-12T19:55:14+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - d1853fcc by Mike Perry at 2023-09-12T19:55:14+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - e70be3d9 by Igor Oliveira at 2023-09-12T19:55:15+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height. - - - - - 449b1c5d by Pier Angelo Vendrame at 2023-09-12T19:55:16+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 7d357051 by Matthew Finkel at 2023-09-12T19:55:17+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - ab7a844b by cypherpunks1 at 2023-09-12T19:55:17+02:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - 99cf70ea by cypherpunks1 at 2023-09-12T19:55:18+02:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - bd6de947 by Pier Angelo Vendrame at 2023-09-12T19:55:19+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 23f9fc45 by Pier Angelo Vendrame at 2023-09-12T19:55:20+02:00 fixup! Base Browser strings Bug 41528: Added the version string for the about dialog - - - - - 7107925a by hackademix at 2023-09-12T19:55:20+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 0f75d822 by hackademix at 2023-09-12T19:55:21+02:00 Bug 41434: Letterboxing, improve logging. - - - - - ded4dc09 by hackademix at 2023-09-12T19:55:22+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 15ce1e22 by hackademix at 2023-09-12T19:55:23+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - abd69149 by hackademix at 2023-09-12T19:55:24+02:00 Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - 7aac7356 by hackademix at 2023-09-12T19:55:24+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - c45cc7c5 by Pier Angelo Vendrame at 2023-09-12T19:55:25+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 4de46bc4 by p13dz at 2023-09-12T19:55:26+02:00 Bug 40283: Workaround for the file upload bug - - - - - 7be80ce7 by Arthur Edelstein at 2023-09-12T19:55:27+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 08577edc by cypherpunks1 at 2023-09-12T19:55:29+02:00 fixup! Bug 18905: Hide unwanted items from help menu Bug 41642: Hide the new private window option only when autostart of PBM is enabled - - - - - 7ed92084 by cypherpunks1 at 2023-09-12T19:55:30+02:00 Bug 41740: Change the RFP value of devicePixelRatio to 2 - - - - - d4dd1d59 by Pier Angelo Vendrame at 2023-09-12T19:55:31+02:00 Bug 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - 7888e9b5 by cypherpunks1 at 2023-09-12T19:55:32+02:00 Bug 41881: Don't persist custom network requests on private windows - - - - - 1faf9479 by hackademix at 2023-09-12T19:55:32+02:00 Bug 42019: Empty browser's clipboard on browser shutdown - - - - - 7c73bbfd by hackademix at 2023-09-12T19:55:33+02:00 Bug 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - a9214f2e by Pier Angelo Vendrame at 2023-09-12T19:55:34+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - 129f9e7e by Henry Wilkes at 2023-09-12T19:55:35+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.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 - - - - - 0ba9475c by Kathy Brade at 2023-09-12T19:55:35+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - ecda6a80 by Pier Angelo Vendrame at 2023-09-12T19:55:36+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41528: Localized the version string in the about dialog - - - - - 6b62b92c by Pier Angelo Vendrame at 2023-09-12T19:55:37+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Move the alpha channel creation to a commit on its own - - - - - 68e130ca by Pier Angelo Vendrame at 2023-09-12T19:55:38+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Allow customizing the updater URL with config options. With this, we will not need sed hacks on tor-browser-build anymore. - - - - - a74a55f9 by Pier Angelo Vendrame at 2023-09-12T19:56:39+02:00 Bug 42061: Create an alpha update channel. - - - - - 18f58821 by Nicolas Vigier at 2023-09-12T19:56:40+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - fbfe9862 by hackademix at 2023-09-12T19:56:41+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 78de64b6 by Pier Angelo Vendrame at 2023-09-12T19:56:42+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 380c23d9 by Alex Catarineu at 2023-09-12T19:56:42+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - 42b6f1b7 by Matthew Finkel at 2023-09-12T19:56:43+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 211fb178 by hackademix at 2023-09-12T19:56:44+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - 3633aeda by Pier Angelo Vendrame at 2023-09-12T19:56:45+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 52022732 by Henry Wilkes at 2023-09-12T19:56:45+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 42046: Clean up XUL layout hack in security level panel. - - - - - 41ecfd6e by Pier Angelo Vendrame at 2023-09-12T19:56:46+02:00 Bug 40926: Implemented the New Identity feature - - - - - be304c72 by Henry Wilkes at 2023-09-12T19:56:47+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - e26e8f16 by Pier Angelo Vendrame at 2023-09-12T19:56:48+02:00 Bug 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 3e8a9243 by Richard Pospesel at 2023-09-12T19:56:48+02:00 Bug 41649: Create rebase and security backport gitlab issue templates - - - - - aa1ae158 by Richard Pospesel at 2023-09-12T19:56:49+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - f5190ac8 by clairehurst at 2023-09-12T19:56:50+02:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 42035: Update tools/torbrowser/ scripts to support macOS dev environment - - - - - d94fabe6 by Henry Wilkes at 2023-09-12T19:56:51+02:00 Bug 41803: Add some developer tools for working on tor-browser. - - - - - 7a1eb3d8 by Kathy Brade at 2023-09-12T19:56:51+02:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - e46ae778 by Alex Catarineu at 2023-09-12T19:56:52+02:00 Add TorStrings module for localization - - - - - 527309da by Henry Wilkes at 2023-09-12T19:56:53+02:00 fixup! Add TorStrings module for localization Bug 41333: Stop using aboutTor.dtd. No longer use aboutTBUpdate strings in about:tor. - - - - - ba24ca0b by Henry Wilkes at 2023-09-12T19:56:54+02:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - 441d82ff by Henry Wilkes at 2023-09-12T19:56:57+02:00 Tor Browser localization migration scripts. - - - - - 94455e02 by Mike Perry at 2023-09-12T19:56:57+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one - - - - - d04d6223 by Henry Wilkes at 2023-09-12T19:56:58+02:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41333: Add a branding svg logo. Copied from branding/tb-<version>/firefox.svg. - - - - - 226d4ffe by sanketh at 2023-09-12T19:56:59+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - adbdd0a9 by Mike Perry at 2023-09-12T19:57:00+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - 11aae900 by clairehurst at 2023-09-12T19:57:00+02:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 42035: update mozconfig for macos development - - - - - 4513efda by Henry Wilkes at 2023-09-12T19:57:01+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 4321a6a1 by Pier Angelo Vendrame at 2023-09-12T19:57:02+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - a2269326 by Henry Wilkes at 2023-09-12T19:57:03+02:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 41333: Remove TorCheckService. - - - - - e57fb406 by Richard Pospesel at 2023-09-12T19:57:04+02:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js - - - - - 1b87bbe4 by Pier Angelo Vendrame at 2023-09-12T19:57:04+02:00 Bug 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - 983d580a by Pier Angelo Vendrame at 2023-09-12T19:57:05+02:00 Bug 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - cf7c10ac by Henry Wilkes at 2023-09-12T19:57:06+02:00 fixup! fixup! Bug 40933: Add tor-launcher functionality Bug 41333: Remove TorCheckService. - - - - - a709619f by Richard Pospesel at 2023-09-12T19:57:07+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - 131e655b by Arthur Edelstein at 2023-09-12T19:57:07+02:00 Bug 3455: Add DomainIsolator, for isolating circuit by domain. Add an XPCOM component that registers a ProtocolProxyChannelFilter which sets the username/password for each web request according to url bar domain. Bug 9442: Add New Circuit button Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. Bug 19206: Clear out the domain isolator state on `New Identity`. Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes Bug 21745: Fix handling of catch-all circuit Bug 41741: Refactor the domain isolator and new circuit - - - - - b71a67b8 by cypherpunks1 at 2023-09-12T19:57:08+02:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. Bug 40175: Use first-party isolation on reader view - - - - - ee40cd27 by Henry Wilkes at 2023-09-12T19:57:09+02:00 Bug 41600: Add a tor circuit display panel. - - - - - 2796f78e by cypherpunks1 at 2023-09-12T19:57:10+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 40175: Support circuit display on about:reader - - - - - 6285b0f4 by Richard Pospesel at 2023-09-12T19:57:10+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41865: Use --text-color-deemphasized rather than --panel-description-color - - - - - 5bb5782a by Henry Wilkes at 2023-09-12T19:57:14+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 42045: Allow circuit panel to grow in width for long addresses. - - - - - 5ebb774e by Henry Wilkes at 2023-09-12T19:57:15+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41980: Center-align the circuit heading. - - - - - cfa0c9e5 by hackademix at 2023-09-12T19:57:16+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - b2ea00f0 by Amogh Pradeep at 2023-09-12T19:57:16+02:00 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review - - - - - 9a4f9369 by Matthew Finkel at 2023-09-12T19:57:17+02:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - acf9af01 by Kathy Brade at 2023-09-12T19:57:18+02:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - b47bb406 by Pier Angelo Vendrame at 2023-09-12T19:57:19+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - 904d38b3 by Richard Pospesel at 2023-09-12T19:57:19+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - 3b6ca157 by Richard Pospesel at 2023-09-12T19:57:20+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41977: Hide the 'Learn more' link in bridge cards - - - - - 6d436ea0 by Henry Wilkes at 2023-09-12T19:57:21+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41812: Stop using -moz-box-flex Fixes: Bug 41904: Connection settings now inputs at full width. Bug 41821: Tor logs now expand with dialog. - - - - - 77f29d5f by Henry Wilkes at 2023-09-12T19:57:22+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42047: Remove sizing hacks for tor dialogs. We can just wait until DOMContentLoaded to call _populateXUL. Then the subDialog code will take care of the sizing for us. - - - - - 6a5de6fb by Henry Wilkes at 2023-09-12T19:57:23+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41651: Use moz-toggle for enable-bridges switch. - - - - - f88c53d6 by Richard Pospesel at 2023-09-12T19:57:23+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha - - - - - 8f639e67 by Richard Pospesel at 2023-09-12T19:57:24+02: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. - - - - - c3bf4af5 by Henry Wilkes at 2023-09-12T19:59:53+02: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. - - - - - af781553 by Henry Wilkes at 2023-09-12T20:00:05+02:00 fixup! Bug 7494: Create local home page for TBB. Bug 41333: Remove TorCheckService. - - - - - 8dbe2e8e by Henry Wilkes at 2023-09-12T20:00:06+02:00 fixup! Bug 7494: Create local home page for TBB. Bug 42075: Increase inline margin for the message links in about:tor. Also increase the end margin of the emoji icon. - - - - - 472545da by Arthur Edelstein at 2023-09-12T20:00:06+02:00 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. - - - - - 9b08b51a by Pier Angelo Vendrame at 2023-09-12T20:00:07+02:00 Bug 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - 1cec9df1 by Kathy Brade at 2023-09-12T20:00:08+02:00 Bug 12647: Support symlinks in the updater. - - - - - 2d5bb859 by Kathy Brade at 2023-09-12T20:00:08+02:00 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - b39bda1d by Kathy Brade at 2023-09-12T20:00:09+02:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - fe8de42e by Pier Angelo Vendrame at 2023-09-12T20:00:09+02:00 fixup! Bug 16940: After update, load local change notes. Remove the doubled and unused aboutTBUpdate.dtd - - - - - 8530db9d by Georg Koppen at 2023-09-12T20:00:10+02:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - d1b18a08 by Mike Perry at 2023-09-12T20:00:10+02:00 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. - - - - - c81f6e41 by Alex Catarineu at 2023-09-12T20:00:11+02:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - 79ed1d1a by Richard Pospesel at 2023-09-12T20:00:12+02:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - 46d798bd by cypherpunks1 at 2023-09-12T20:00:12+02:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 41934: Treat unencrypted websocket connections to onion services as secure - - - - - 94ba430f by Kathy Brade at 2023-09-12T20:00:13+02:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - 2a68fa33 by Alex Catarineu at 2023-09-12T20:00:13+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - 9461ffc6 by Pier Angelo Vendrame at 2023-09-12T20:00:14+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 9a6e2288 by Richard Pospesel at 2023-09-12T20:00:14+02:00 fixup! Bug 40458: Implement .tor.onion aliases Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha - - - - - fdbd270f by Pier Angelo Vendrame at 2023-09-12T20:00:15+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 82ef4de1 by Henry Wilkes at 2023-09-12T20:00:20+02:00 fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser Bug 41333: Use fluent for manual menu entry since we're no longer using aboutTor.dtd. - - - - - 2f170f83 by Pier Angelo Vendrame at 2023-09-12T20:00:20+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 539abcb9 by Dan Ballard at 2023-09-12T20:00:21+02:00 Bug 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 58aa0c80 by Richard Pospesel at 2023-09-12T20:00:21+02:00 fixup! Bug 40701: Add security warning when downloading a file Bug 41971: Update Tails URL in downloads warning - - - - - c5c67e4d by Henry Wilkes at 2023-09-12T20:00:22+02:00 fixup! Bug 40701: Add security warning when downloading a file Bug 41886: Fix downloads panel warning size. - - - - - 3d7964d8 by Henry Wilkes at 2023-09-12T20:00:22+02:00 Bug 41736: Customize toolbar for tor-browser. - - - - - edd247f4 by hackademix at 2023-09-12T20:00:23+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - 9554eaa9 by Henry Wilkes at 2023-09-12T20:00:23+02:00 Customize moz-toggle for tor-browser. - - - - - 4786f6b5 by Henry Wilkes at 2023-09-12T20:00:24+02:00 fixup! Customize moz-toggle for tor-browser. Bug 41651: Use moz-toggle for enable-bridges switch. - - - - - faeaeb02 by Henry Wilkes at 2023-09-12T20:03:09+02:00 Bug 42072: 2023 year end campaign for about:tor. - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/Backport Android Security Fixes.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - accessible/android/SessionAccessibility.cpp - accessible/android/SessionAccessibility.h - accessible/ipc/DocAccessibleParent.cpp - accessible/ipc/DocAccessibleParent.h - accessible/ipc/moz.build - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - − 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/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3948f8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3948f8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Updated gitlab alpha build prep templates
by richard (＠richard) 12 Sep '23

12 Sep '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 600cbac2 by Richard Pospesel at 2023-09-12T17:36:15+00:00 Updated gitlab alpha build prep templates - fixed formatting - updated email templates - updated changelog steps - updated the build+reproducibility veificaiton workflow - added explicit list of valid taggers - added assign step for signers - added Sponsor 131 label for Mullvad Browser - various work-flows to match reality - - - - - 2 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -27,54 +27,79 @@ </details> **NOTE** It is assumed that the `tor-browser` alpha rebase and security backport tasks have been completed +**NOTE** This can/is often done in conjunction with the equivalent Tor Browser release prep issue <details> <summary>Building</summary> -### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git -Mullvad Browser Alpha (and Nightly) are on the `main` branch - -- [ ] Update `rbm.conf` - - [ ] `var/torbrowser_version` : update to next version - - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)` - - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version - - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail -- [ ] Update build configs - - [ ] Update `projects/firefox/config` - - [ ] `browser_build` : update to match `mullvad-browser` tag - - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation/config`: - - [ ] run `make list_translation_updates-alpha` to get updated hashes - - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch -- [ ] Update common build configs - - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` - - [ ] `URL` - - [ ] `sha256sum` - - [ ] Check for uBlock-origin updates here : https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/ - - [ ] ***(Optional)*** If new version available, update `ublock-origin` section of `input_files` in `projects/browser/config` - - [ ] `URL` - - [ ] `sha256sum` - - [ ] Check for Mullvad Privacy Companion updates here : https://github.com/mullvad/browser-extension/releases - - [ ] ***(Optional)*** If new version available, update `mullvad-extension` section of `input_files` in `projects/browser/config` - - [ ] `URL` - - [ ] `sha256sum` -- [ ] Open MR with above changes -- [ ] Merge -- [ ] Sign/Tag commit: `make mullvadbrowser-signtag-alpha` -- [ ] Push tag to `origin` -- [ ] Begin build on `$(BUILD_SERVER)` (fix any issues in subsequent MRs) -- [ ] **TODO** Submit build-tag to Mullvad build infra -- [ ] Ensure builders have matching builds + ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git + Mullvad Browser Alpha (and Nightly) are on the `main` branch + + - [ ] Update `rbm.conf` + - [ ] `var/torbrowser_version` : update to next version + - [ ] `var/torbrowser_build` : update to `$(MULLVAD_BROWSER_BUILD_N)` + - [ ] `var/torbrowser_incremental_from` : update to previous Desktop version + - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update + - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail + - [ ] Update build configs + - [ ] Update `projects/firefox/config` + - [ ] `browser_build` : update to match `mullvad-browser` tag + - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] Update `projects/translation/config`: + - [ ] run `make list_translation_updates-alpha` to get updated hashes + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/mullvad-browser/git_hash` : update with `HEAD` commit of project's `mullvad-browser` branch + - [ ] Update common build configs + - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript + - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` + - [ ] `URL` + - [ ] `sha256sum` + - [ ] Check for uBlock-origin updates here : https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/ + - [ ] ***(Optional)*** If new version available, update `ublock-origin` section of `input_files` in `projects/browser/config` + - [ ] `URL` + - [ ] `sha256sum` + - [ ] Check for Mullvad Privacy Companion updates here : https://github.com/mullvad/browser-extension/releases + - [ ] ***(Optional)*** If new version available, update `mullvad-extension` section of `input_files` in `projects/browser/config` + - [ ] `URL` + - [ ] `sha256sum` + - [ ] Update `ChangeLog-MB.txt` + - [ ] Ensure ChangeLog-MB.txt is sync'd between alpha and stable branches + - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones + - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'` + - Make sure you have `requests` installed (e.g., `apt install python3-requests`) + - The first time you run this script you will need to generate an access token; the script will guide you + - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and update its output + - [ ] Version + - [ ] Browser Name + - [ ] Release Date + - [ ] Under `All Platforms` include any version updates for: + - NoScript + - uBlock-origin + - Mullvad Browser Extension + - Firefox + - [ ] Open MR with above changes + - [ ] Build the MR after initial review on at least two of: + - [ ] Tor Project build machine + - [ ] Mullvad build machine + - [ ] Local developer machine + - [ ] Ensure builders have matching builds + - [ ] Merge + - [ ] Sign+Tag + - **NOTE** this must be done by one of: + - boklm + - dan + - ma1 + - pierov + - richard + - [ ] Run: `make mullvadbrowser-signtag-alpha` + - [ ] Push tag to `origin` </details> <details> <summary>QA</summary> -### send the build - + ### send the build - [ ] Email Mullvad QA: support(a)mullvad.net, rui(a)mullvad.net <details> <summary>email template</summary> @@ -83,7 +108,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (unsigned) Body: - unsigned builds: https://tb-build-05.torproject.org/~$(BUILDER)/builds/mullvadbrowser/releas… + unsigned builds: https://tb-build-05.torproject.org/~$(BUILDER)/builds/mullvadbrowser/alpha/… changelog: ... @@ -99,97 +124,106 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch <details> <summary>Signing</summary> -### signing -- [ ] On `$(STAGING_SERVER)`, ensure updated: - - [ ] `tor-browser-build/tools/signing/set-config.hosts` - - `ssh_host_builder` : ssh hostname of machine with unsigned builds - - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) - - `ssh_host_linux_signer` : ssh hostname of linux signing machine - - `ssh_host_macos_signer` : ssh hostname of macOS signing machine - - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization` - - `macos_notarization_user` : the email login for a mullvad notariser Apple Developer account - - [ ] `set-config.update-responses` - - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/mullvad-browser-update-responses.git` - - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` - - `tbb_version` : mullvad browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) - - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) - - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases -- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script: - - `cd tor-browser-build/tools/signing/` - - `./macos-signer-proxy` -- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 -- [ ] run do-all-signing script: - - `cd tor-browser-build/tools/signing/` - - `./do-all-signing.mullvadbrowser` -- **NOTE**: at this point the signed binaries should have been copied to `staticiforme` -- [ ] Update `staticiforme.torproject.org`: - - From `screen` session on `staticiforme.torproject.org`: - - [ ] Static update components : `static-update-component dist.torproject.org` - - [ ] Remove old release data from `/srv/dist-master.torproject.org/htdocs/mullvadbrowser` - - [ ] Static update components (again) : `static-update-component dist.torproject.org` + ### signing + - [ ] Assign this issue to the signer, one of: + - boklm + - richard + - [ ] On `$(STAGING_SERVER)`, ensure updated: + - [ ] `tor-browser-build/tools/signing/set-config.hosts` + - `ssh_host_builder` : ssh hostname of machine with unsigned builds + - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) + - `ssh_host_linux_signer` : ssh hostname of linux signing machine + - `ssh_host_macos_signer` : ssh hostname of macOS signing machine + - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization` + - `macos_notarization_user` : the email login for a mullvad notariser Apple Developer account + - [ ] `set-config.update-responses` + - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/mullvad-browser-update-responses.git` + - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` + - `tbb_version` : mullvad browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) + - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) + - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases + - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script: + - `cd tor-browser-build/tools/signing/` + - `./macos-signer-proxy` + - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 + - [ ] run do-all-signing script: + - `cd tor-browser-build/tools/signing/` + - `./do-all-signing.mullvadbrowser` + - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` + - [ ] Update `staticiforme.torproject.org`: + - From `screen` session on `staticiforme.torproject.org`: + - [ ] Static update components : `static-update-component dist.torproject.org` + - [ ] Remove old release data from `/srv/dist-master.torproject.org/htdocs/mullvadbrowser` + - [ ] Static update components (again) : `static-update-component dist.torproject.org` </details> <details> <summary>Publishing</summary> -### email - -- [ ] Email Mullvad with release information: support(a)mullvad.net, rui(a)mullvad.net - <details> - <summary>email template</summary> - - Subject: - New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (signed) - - Body: - signed builds: https://dist.torproject.org/mullvadbrowser/$(MULLVAD_BROWSER_VERSION) + ### mullvad-browser (github): https://github.com/mullvad/mullvad-browser/ + - [ ] Assign this issue to someone with mullvad commit access, one of: + - richard + - [ ] Push this release's associated `mullvad-browser.git` branch to github + - [ ] Push this release's associated tags to github: + - [ ] Firefox ESR tag + - **example** : `FIREFOX_102_12_0esr_BUILD1,` + - [ ] `base-browser` tag + - **example** : `base-browser-102.12.0esr-12.0-1-build1` + - [ ] `mullvad-browser` tag + - **example** : `mullvad-browser-102.12.0esr-12.0-1-build1` + - [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build: + - **Tag**: `$(MULLVAD_BROWSER_VERSION)` + - **example** : `12.5a7` + - **Message**: `$(ESR_VERSION)esr-based $(MULLVAD_BROWSER_VERSION)` + - **example** : `102.12.0esr-based 12.5a7` + - [ ] Push tag to github + + ### email + - [ ] Email Mullvad with release information: support(a)mullvad.net, rui(a)mullvad.net + <details> + <summary>email template</summary> - update_response hashes: $(MULLVAD_UPDATE_RESPONSES_HASH) + Subject: + New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (signed) - changelog: - ... + Body: + signed builds: https://dist.torproject.org/mullvadbrowser/$(MULLVAD_BROWSER_VERSION) - </details> + update_response hashes: $(MULLVAD_UPDATE_RESPONSES_HASH) -### mullvad-browser (github): https://github.com/mullvad/mullvad-browser/ -- [ ] Push this release's associated `mullvad-browser.git` branch to github -- [ ] Push this release's associated tags to github: - - [ ] Firefox ESR tag - - **example** : `FIREFOX_102_12_0esr_BUILD1,` - - [ ] `base-browser` tag - - **example** : `base-browser-102.12.0esr-12.0-1-build1` - - [ ] `mullvad-browser` tag - - **example** : `mullvad-browser-102.12.0esr-12.0-1-build1` -- [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build: - - **Tag**: `$(MULLVAD_BROWSER_VERSION)` - - **example** : `12.5a7` - - **Message**: `$(ESR_VERSION)esr-based $(MULLVAD_BROWSER_VERSION)` - - **example** : `102.12.0esr-based 12.5a7` - - [ ] Push tag to github + changelog: + ... + </details> </details> <details> <summary>Downstream</summary> -### notify packagers + ### notify packagers + + - [ ] **(Optional, Once Mullvad Updates their Github Releases Page)** Email downstream consumers: + - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of + <details> + <summary>email template</summary> + + Hello! -- [ ] **(Optional, Once Mullvad Updates their Github Releases Page)** Email downstream consumers: - <details> - <summary>email template</summary> + Mullvad-Browser $(MULLVAD_BROWSER_VERSION) packages are available, so you should all update your respective downstream packages. - ... + Release builds can be found here: - ... + - https://github.com/mullvad/mullvad-browser/releases/tag/$(MULLVAD_BROWSER_V… - </details> + </details> - - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of - - [ ] flathub package maintainer: proletarius101(a)protonmail.com - - [ ] arch package maintainer: bootctl(a)gmail.com - - [ ] nixOS package maintainer: dev(a)felschr.com + - flathub package maintainer: proletarius101(a)protonmail.com + - arch package maintainer: bootctl(a)gmail.com + - nixOS package maintainer: dev(a)felschr.com </details> /label ~"Release Prep" +/label ~"Sponsor 131" + ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -27,190 +27,208 @@ </details> **NOTE** It is assumed that the `tor-browser` stable rebase and security backport tasks have been completed +**NOTE** This can/is often done in conjunction with the equivalent Mullvad Browser release prep issue <details> <summary>Building</summary> -### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git -Tor Browser Alpha (and Nightly) are on the `main` branch - -- [ ] Update `rbm.conf` - - [ ] `var/torbrowser_version` : update to next version - - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version - - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail -- [ ] Update Desktop-specific build configs - - [ ] Update `projects/firefox/config` - - [ ] `browser_build` : update to match `tor-browser` tag - - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation/config`: - - [ ] run `make list_translation_updates-alpha` to get updated hashes - - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch - - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch -- [ ] Update Android-specific build configs - - [ ] Update `projects/geckoview/config` - - [ ] `browser_build` : update to match `tor-browser` tag - - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] ***(Optional)*** Update `projects/tor-android-service/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch - - [ ] ***(Optional)*** Update `projects/application-services/config`: - **NOTE** we don't currently have any of our own patches for this project - - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` - - [ ] ***(Optional)*** Update `projects/firefox-android/config`: - - [ ] `fenix_version` : update to match alpha `firefox-android` build tag - - [ ] `browser_branch` : update to match alpha `firefox-android` build tag - - [ ] Update allowed_addons.json by running (from `tor-browser-build` root): - - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` -- [ ] Update common build configs - - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript - - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` - - [ ] `URL` - - [ ] `sha256sum` - - [ ] Check for OpenSSL updates here : https://www.openssl.org/source/ - - [ ] ***(Optional)*** If new 3.0.X version available, update `projects/openssl/config` - - [ ] `version` : update to next 3.0.X version - - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball - - [ ] Check for zlib updates here: https://github.com/madler/zlib/releases - - [ ] **(Optional)** If new tag available, update `projects/zlib/config` - - [ ] `version` : update to next release tag - - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags - - [ ] ***(Optional)*** Update `projects/tor/config` - - [ ] `version` : update to latest `-alpha` tag or release tag if newer (ping dgoulet or ahf if unsure) - - [ ] Check for go updates here : https://golang.org/dl - - **NOTE** : Tor Browser Alpha uses the latest Stable major series go version - - [ ] ***(Optional)*** Update `projects/go/config` - - [ ] `version` : update go version - - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page) - - [ ] Check for manual updates by running (from `tor-browser-build` root): `./tools/fetch-manual.py` - - [ ] ***(Optional)*** If new version is available: - - [ ] Upload the downloaded `manual_$PIPELINEID.zip` file to people.tpo - - [ ] Update `projects/manual/config`: - - [ ] Change the `version` to `$PIPELINEID` - - [ ] Update `sha256sum` in the `input_files` section - - [ ] ***(Optional)*** Update the URL if you have uploaded to a different people.tpo home -- [ ] Update `ChangeLog.txt` - - [ ] Ensure ChangeLog.txt is sync'd between alpha and stable branches - - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones - - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'` - - Make sure you have `requests` installed (e.g., `apt install python3-requests`) - - The first time you run this script you will need to generate an access token; the script will guide you - - [ ] Copy the output of the script to the beginning of `ChangeLog.txt` and adjust its output - - **NOTE** : If you used the issue number, you will need to write the Tor Browser version manually - - [ ] ***(Optional)*** Under `All Platforms` include any version updates for: - - [ ] Translations - - [ ] OpenSSL - - [ ] NoScript - - [ ] zlib - - [ ] tor daemon - - [ ] ***(Optional)*** Under `Windows + macOS + Linux` include updates for: - - [ ] Firefox - - [ ] ***(Optional)*** Under `Android`, include updates for: - - [ ] Geckoview - - [ ] ***(Optional)*** Under `Build System/All Platforms` include updates for: - - [ ] Go -- [ ] Open MR with above changes -- [ ] Merge -- [ ] Sign/Tag commit: `make torbrowser-signtag-alpha` -- [ ] Push tag to `origin` -- [ ] Begin build on `$(BUILD_SERVER)` (fix any issues in subsequent MRs) -- [ ] **TODO** Submit build-tag to Mullvad build infra -- [ ] Ensure builders have matching builds + ### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git + Tor Browser Alpha (and Nightly) are on the `main` branch + + - [ ] Update `rbm.conf` + - [ ] `var/torbrowser_version` : update to next version + - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` + - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version + - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update + - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail + - [ ] Update Desktop-specific build configs + - [ ] Update `projects/firefox/config` + - [ ] `browser_build` : update to match `tor-browser` tag + - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] Update `projects/translation/config`: + - [ ] run `make list_translation_updates-alpha` to get updated hashes + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch + - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch + - [ ] Update Android-specific build configs + - [ ] Update `projects/geckoview/config` + - [ ] `browser_build` : update to match `tor-browser` tag + - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] ***(Optional)*** Update `projects/tor-android-service/config` + - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch + - [ ] ***(Optional)*** Update `projects/application-services/config`: + **NOTE** we don't currently have any of our own patches for this project + - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` + - [ ] ***(Optional)*** Update `projects/firefox-android/config`: + - [ ] `fenix_version` : update to match alpha `firefox-android` build tag + - [ ] `browser_branch` : update to match alpha `firefox-android` build tag + - [ ] Update allowed_addons.json by running (from `tor-browser-build` root): + - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` + - [ ] Update common build configs + - [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript + - [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config` + - [ ] `URL` + - [ ] `sha256sum` + - [ ] Check for OpenSSL updates here : https://www.openssl.org/source/ + - [ ] ***(Optional)*** If new 3.0.X version available, update `projects/openssl/config` + - [ ] `version` : update to next 3.0.X version + - [ ] `input_files/sha256sum` : update to sha256 sum of source tarball + - [ ] Check for zlib updates here: https://github.com/madler/zlib/releases + - [ ] **(Optional)** If new tag available, update `projects/zlib/config` + - [ ] `version` : update to next release tag + - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags + - [ ] ***(Optional)*** Update `projects/tor/config` + - [ ] `version` : update to latest `-alpha` tag or release tag if newer (ping dgoulet or ahf if unsure) + - [ ] Check for go updates here : https://golang.org/dl + - **NOTE** : Tor Browser Alpha uses the latest Stable major series go version + - [ ] ***(Optional)*** Update `projects/go/config` + - [ ] `version` : update go version + - [ ] `input_files/sha256sum` for `go` : update sha256sum of archive (sha256 sums are displayed on the go download page) + - [ ] Check for manual updates by running (from `tor-browser-build` root): `./tools/fetch-manual.py` + - [ ] ***(Optional)*** If new version is available: + - [ ] Upload the downloaded `manual_$PIPELINEID.zip` file to people.tpo + - [ ] Update `projects/manual/config`: + - [ ] Change the `version` to `$PIPELINEID` + - [ ] Update `sha256sum` in the `input_files` section + - [ ] ***(Optional)*** Update the URL if you have uploaded to a different people.tpo home + - [ ] Update `ChangeLog-TBB.txt` + - [ ] Ensure ChangeLog-TBB.txt is sync'd between alpha and stable branches + - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones + - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'` + - Make sure you have `requests` installed (e.g., `apt install python3-requests`) + - The first time you run this script you will need to generate an access token; the script will guide you + - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and update its output + - [ ] Version + - [ ] Browser Name + - [ ] Release Date + - [ ] Under `All Platforms` include any version updates for: + - NoScript + - tor + - OpenSSL + - lyrebird + - Snowflake + - [ ] Under `Windows + macOS + Linux` include any version updates for: + - Firefox + - [ ] Under `Android` include any version updates for: + - Geckoview + - [ ] Under `Windows + Android` include any version updates for: + - zlib + - [ ] Under `Build System/All Platforms` include any version updates for: + - Go + - [ ] Open MR with above changes + - [ ] Build the MR after initial review on at least two of: + - [ ] Tor Project build machine + - [ ] Mullvad build machine + - [ ] Local developer machine + - [ ] Ensure builders have matching builds + - [ ] Merge + - [ ] Sign_Tag + - **NOTE** this must be done by one of: + - boklm + - dan + - ma1 + - pierov + - richard + - [ ] Run: `make torbrowser-signtag-alpha` + - [ ] Push tag to `origin` </details> <details> <summary>Communications</summary> -### notify stakeholders + ### notify stakeholders - <details> - <summary>email template</summary> + - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org + <details> + <summary>email template</summary> - Subject: - Tor Browser $(TOR_BROWSER_VERION) (Android, Windows, macOS, Linux) + Subject: + Tor Browser $(TOR_BROWSER_VERION) (Android, Windows, macOS, Linux) - Body: - Hello All, + Body: + Hello All, - Unsigned Tor Browser $(TOR_BROWSER_VERSION) alpha candidate builds are now available for testing: + Unsigned Tor Browser $(TOR_BROWSER_VERSION) alpha candidate builds are now available for testing: - - https://tb-build-05.torproject.org/~$(BUILDER)/builds/release/unsigned/$(TO… + - https://tb-build-05.torproject.org/~$(BUILDER)/builds/alpha/unsigned/$(TOR_… - The full changelog can be found here: + The full changelog can be found here: - - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/blob/$(T… + - https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/raw/$(TB… - </details> + </details> -- [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - - ***(Optional)*** Additional information: - - [ ] Note any new functionality which needs testing - - [ ] Link to any known issues -- [ ] ***(Optional, only around build/packaging changes)*** Email packagers: - - Recipients: - - Tails dev mailing list: tails-dev(a)boum.org - - Guardian Project: nathan(a)guardianproject.info - - torbrowser-launcher: micah(a)micahflee.com - - FreeBSD port: freebsd(a)sysctl.cz  - - OpenBSD port: caspar(a)schutijser.com  - - [ ] Note any changes which may affect packaging/downstream integration -- [ ] Email external partners: - - ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com - - **NOTE** : We need to provide them with updated user agent string so they can update their internal machinery to prevent Tor Browser users from getting so many CAPTCHAs + - ***(Optional)*** Additional information: + - [ ] Note any new functionality which needs testing + - [ ] Link to any known issues + - [ ] ***(Optional, only around build/packaging changes)*** Email packagers: + - Recipients: + - Tails dev mailing list: tails-dev(a)boum.org + - Guardian Project: nathan(a)guardianproject.info + - torbrowser-launcher: micah(a)micahflee.com + - FreeBSD port: freebsd(a)sysctl.cz  + - OpenBSD port: caspar(a)schutijser.com  + - [ ] Note any changes which may affect packaging/downstream integration + - [ ] Email external partners: + - ***(Optional, after ESR migration)*** Cloudflare: ask-research(a)cloudflare.com + - **NOTE** : We need to provide them with updated user agent string so they can update their internal machinery to prevent Tor Browser users from getting so many CAPTCHAs </details> <details> <summary>Signing</summary> -### signing -- **NOTE** : In practice, it's most efficient to have the blog post and website updates ready to merge, since signing doesn't take very long -- [ ] On `$(STAGING_SERVER)`, ensure updated: - - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N) && git checkout tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N)` - - [ ] `tor-browser-build/tools/signing/set-config.hosts` - - `ssh_host_builder` : ssh hostname of machine with unsigned builds - - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) - - `ssh_host_linux_signer` : ssh hostname of linux signing machine - - `ssh_host_macos_signer` : ssh hostname of macOS signing machine - - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization` - - `macos_notarization_user` : the email login for a tor notariser Apple Developer account - - [ ] `set-config.update-responses` - - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git` - - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` - - `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) - - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) - - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases -- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script: - - `cd tor-browser-build/tools/signing/` - - `./macos-signer-proxy` -- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 -- [ ] run do-all-signing script: - - `cd tor-browser-build/tools/signing/` - - `./do-all-signing.torbrowser` -- **NOTE**: at this point the signed binaries should have been copied to `staticiforme` -- [ ] Update `staticiforme.torproject.org`: - - From `screen` session on `staticiforme.torproject.org`: - - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh` - - [ ] Remove old release data from following places: - - **NOTE** : Skip this step if we need to hold on to older versions for some reason (for example, this is an Andoid or Desktop-only release, or if we need to hold back installers in favor of build-to-build updates if there are signing issues, etc) - - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` - - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - - [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` -- [ ] Publish APKs to Google Play: - - Log into https://play.google.com/apps/publish - - Select `Tor Browser (Alpha)` app - - Navigate to `Release > Production` and click `Create new release` button: - - Upload the `*.multi.apk` APKs - - Update Release Name to Tor Browser version number - - Update Release Notes - - Next to 'Release notes', click `Copy from a previous release` - - Edit blog post url to point to most recent blog post - - Save, review, and configure rollout percentage - - [ ] 25% rollout when publishing a scheduled update - - [ ] 100% rollout when publishing a security-driven release - - [ ] Update rollout percentage to 100% after confirmed no major issues + ### signing + - **NOTE** : In practice, it's most efficient to have the blog post and website updates ready to merge, since signing doesn't take very long + - [ ] Assign this issue to the signer, one of: + - boklm + - richard + - [ ] On `$(STAGING_SERVER)`, ensure updated: + - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N) && git checkout tbb-$(TOR_BROWSER_VERSION)-$(TOR_BROWSER_BUILD_N)` + - [ ] `tor-browser-build/tools/signing/set-config.hosts` + - `ssh_host_builder` : ssh hostname of machine with unsigned builds + - **NOTE** : `tor-browser-build` is expected to be in the `$HOME` directory) + - `ssh_host_linux_signer` : ssh hostname of linux signing machine + - `ssh_host_macos_signer` : ssh hostname of macOS signing machine + - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization` + - `macos_notarization_user` : the email login for a tor notariser Apple Developer account + - [ ] `set-config.update-responses` + - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git` + - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` + - `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) + - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) + - `tbb_version_type` : either `alpha` for alpha releases or `release` for stable releases + - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script: + - `cd tor-browser-build/tools/signing/` + - `./macos-signer-proxy` + - [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050 + - [ ] run do-all-signing script: + - `cd tor-browser-build/tools/signing/` + - `./do-all-signing.torbrowser` + - **NOTE**: at this point the signed binaries should have been copied to `staticiforme` + - [ ] Update `staticiforme.torproject.org`: + - From `screen` session on `staticiforme.torproject.org`: + - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` + - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh` + - [ ] Remove old release data from following places: + - **NOTE** : Skip this step if we need to hold on to older versions for some reason (for example, this is an Andoid or Desktop-only release, or if we need to hold back installers in favor of build-to-build updates if there are signing issues, etc) + - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` + - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` + - [ ] Static update components (again) : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` + - [ ] Publish APKs to Google Play: + - Log into https://play.google.com/apps/publish + - Select `Tor Browser (Alpha)` app + - Navigate to `Release > Production` and click `Create new release` button: + - Upload the `*.multi.apk` APKs + - Update Release Name to Tor Browser version number + - Update Release Notes + - Next to 'Release notes', click `Copy from a previous release` + - Edit blog post url to point to most recent blog post + - Save, review, and configure rollout percentage + - [ ] 25% rollout when publishing a scheduled update + - [ ] 100% rollout when publishing a security-driven release + - [ ] Update rollout percentage to 100% after confirmed no major issues </details> @@ -219,83 +237,86 @@ Tor Browser Alpha (and Nightly) are on the `main` branch <details> <summary>Check whether the .exe files got properly signed and timestamped</summary> - ``` - # Point OSSLSIGNCODE to your osslsigncode binary - pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION - OSSLSIGNCODE=/path/to/osslsigncode - ../../../tools/authenticode_check.sh - popd - ``` + +```bash +# Point OSSLSIGNCODE to your osslsigncode binary +pushd tor-browser-build/${channel}/signed/$TORBROWSER_VERSION +OSSLSIGNCODE=/path/to/osslsigncode +../../../tools/authenticode_check.sh +popd +``` + </details> <details> <summary>Check whether the MAR files got properly signed</summary> - ``` - # 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 - NSSDB=/path/to/nssdb - SIGNMAR=/path/to/mar-tools/signmar - LD_LIBRARY_PATH=/path/to/mar-tools/ - ../../../tools/marsigning_check.sh - popd - ``` + +```bash +# 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 +NSSDB=/path/to/nssdb +SIGNMAR=/path/to/mar-tools/signmar +LD_LIBRARY_PATH=/path/to/mar-tools/ +../../../tools/marsigning_check.sh +popd +``` + </details> </details> <details> <summary>Publishing</summary> -### website: https://gitlab.torproject.org/tpo/web/tpo.git -- [ ] `databags/versions.ini` : Update the downloads versions - - `torbrowser-stable/version` : sort of a catch-all for latest stable version - - `torbrowser-alpha/version` : sort of a catch-all for latest stable version - - `torbrowser-*-stable/version` : platform-specific stable versions - - `torbrowser-*-alpha/version` : platform-specific alpha versions - - `tor-stable`,`tor-alpha` : set by tor devs, do not touch -- [ ] Push to origin as new branch, open 'Draft :' MR -- [ ] Remove `Draft:` from MR once signed-packages are uploaded -- [ ] Merge -- [ ] Publish after CI passes and builds are published - -### blog: https://gitlab.torproject.org/tpo/web/blog.git - -- [ ] Duplicate previous Stable or Alpha release blog post as appropriate to new directory under `content/blog/new-release-tor-browser-$(TOR_BROWSER_VERSION)` and update with info on release : - - [ ] Run `tools/signing/create-blog-post` which should create the new blog post from a template (edit set-config.blog to set you local blog directory) - - [ ] Update Tor Browser version numbers - - [ ] Note any ESR rebase - - [ ] Link to any Firefox security updates from ESR upgrade - - [ ] Link to any Android-specific security backports - - [ ] Note any updates to : - - tor - - OpenSSL - - NoScript - - [ ] Convert ChangeLog.txt to markdown format used here by : - - `tor-browser-build/tools/changelog-format-blog-post` -- [ ] Push to origin as new branch, open `Draft:` MR -- [ ] Remove `Draft:` from MR once signed-packages are uploaded -- [ ] Merge -- [ ] Publish after CI passes and website has been updated - -### tor-announce mailing list - <details> - <summary>email template</summary> - - Subject: - New Release: Tor Browser $(TOR_BROWSER_VERSION) (Android, Windows, macOS, Linux) - - Body: - Hi everyone, - - Tor Browser $(TOR_BROWSER_VERSION) has now been published for all platforms. For details please see our blog post: - - - $(BLOG_POST_URL) - - </details> - -- [ ] Email tor-announce mailing list: tor-announce(a)lists.torproject.org - - **(Optional)** Additional information: - - [ ] Link to any known issues + ### website: https://gitlab.torproject.org/tpo/web/tpo.git + - [ ] `databags/versions.ini` : Update the downloads versions + - `torbrowser-stable/version` : sort of a catch-all for latest stable version + - `torbrowser-alpha/version` : sort of a catch-all for latest stable version + - `torbrowser-*-stable/version` : platform-specific stable versions + - `torbrowser-*-alpha/version` : platform-specific alpha versions + - `tor-stable`,`tor-alpha` : set by tor devs, do not touch + - [ ] Push to origin as new branch, open 'Draft :' MR + - [ ] Remove `Draft:` from MR once signed-packages are uploaded + - [ ] Merge + - [ ] Publish after CI passes and builds are published + + ### blog: https://gitlab.torproject.org/tpo/web/blog.git + - [ ] Duplicate previous Stable or Alpha release blog post as appropriate to new directory under `content/blog/new-release-tor-browser-$(TOR_BROWSER_VERSION)` and update with info on release : + - [ ] Run `tools/signing/create-blog-post` which should create the new blog post from a template (edit set-config.blog to set you local blog directory) + - [ ] Update Tor Browser version numbers + - [ ] Note any ESR rebase + - [ ] Link to any Firefox security updates from ESR upgrade + - [ ] Link to any Android-specific security backports + - [ ] Note any updates to : + - tor + - OpenSSL + - NoScript + - [ ] Convert ChangeLog-TBB.txt to markdown format used here by : + - `tor-browser-build/tools/changelog-format-blog-post` + - [ ] Push to origin as new branch, open `Draft:` MR + - [ ] Remove `Draft:` from MR once signed-packages are uploaded + - [ ] Merge + - [ ] Publish after CI passes and website has been updated + + ### tor-announce mailing list + - [ ] Email tor-announce mailing list: tor-announce(a)lists.torproject.org + <details> + <summary>email template</summary> + + Subject: + New Release: Tor Browser $(TOR_BROWSER_VERSION) (Android, Windows, macOS, Linux) + + Body: + Hi everyone, + + Tor Browser $(TOR_BROWSER_VERSION) has now been published for all platforms. For details please see our blog post: + + - $(BLOG_POST_URL) + + </details> + + - **(Optional)** Additional information: + - [ ] Link to any known issues </details> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.2.1esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 12 Sep '23

12 Sep '23

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

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.0-1-build2
by Dan Ballard (＠dan) 12 Sep '23

12 Sep '23

Dan Ballard pushed new tag firefox-android-115.2.1-13.0-1-build2 at The Tor Project / Applications / firefox-android -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Disable features and functionality
by Dan Ballard (＠dan) 12 Sep '23

12 Sep '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: 2ed6053c by Dan Ballard at 2023-09-12T09:06:04-07:00 fixup! Disable features and functionality Bug 42001: Hide 'Open links in external app' settings option and force defaults - - - - - 5 changed files: - fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt - fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - fenix/app/src/main/res/navigation/nav_graph.xml - fenix/app/src/main/res/xml/preferences.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt ===================================== @@ -848,7 +848,7 @@ open class FenixApplication : LocaleAwareApplication(), Provider { clipboardSuggestionsEnabled.set(settings.shouldShowClipboardSuggestions) searchShortcutsEnabled.set(settings.shouldShowSearchShortcuts) voiceSearchEnabled.set(settings.shouldShowVoiceSearch) - openLinksInAppEnabled.set(settings.openLinksInExternalApp) + //openLinksInAppEnabled.set(settings.openLinksInExternalApp) signedInSync.set(settings.signedInFxaAccount) val syncedItems = SyncEnginesStorage(applicationContext).getStatus().entries.filter { ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -234,9 +234,11 @@ class SettingsFragment : PreferenceFragmentCompat() { getString(R.string.preferences_credit_cards) } + /* val openLinksInAppsSettingsPreference = requirePreference<Preference>(R.string.pref_key_open_links_in_apps) openLinksInAppsSettingsPreference.summary = context?.settings()?.getOpenLinksInAppsString() + */ // Hide "Delete browsing data on quit" when in Private Browsing-only mode deleteBrowsingDataPreference.isVisible = @@ -308,9 +310,11 @@ class SettingsFragment : PreferenceFragmentCompat() { Addons.openAddonsInSettings.record(mozilla.components.service.glean.private.NoExtras()) SettingsFragmentDirections.actionSettingsFragmentToAddonsFragment() } + /* resources.getString(R.string.pref_key_open_links_in_apps) -> { SettingsFragmentDirections.actionSettingsFragmentToOpenLinksInAppsFragment() } + */ resources.getString(R.string.pref_key_data_choices) -> { SettingsFragmentDirections.actionSettingsFragmentToDataChoicesFragment() } ===================================== fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -599,6 +599,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { /** * Get the display string for the current open links in apps setting */ + /* fun getOpenLinksInAppsString(): String = when (openLinksInExternalApp) { appContext.getString(R.string.pref_key_open_links_in_apps_always) -> { @@ -615,6 +616,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { appContext.getString(R.string.preferences_open_links_in_apps_never) } } + */ var shouldUseDarkTheme by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_dark_theme), @@ -1298,26 +1300,31 @@ class Settings(private val appContext: Context) : PreferencesHolder { /** * Check to see if we should open the link in an external app */ + @Suppress("UNUSED_PARAMETER") fun shouldOpenLinksInApp(isCustomTab: Boolean = false): Boolean { - return when (openLinksInExternalApp) { - appContext.getString(R.string.pref_key_open_links_in_apps_always) -> true - appContext.getString(R.string.pref_key_open_links_in_apps_ask) -> true + return false + //return when (openLinksInExternalApp) { + // appContext.getString(R.string.pref_key_open_links_in_apps_always) -> true + // appContext.getString(R.string.pref_key_open_links_in_apps_ask) -> true /* Some applications will not work if custom tab never open links in apps, return true if it's custom tab */ - appContext.getString(R.string.pref_key_open_links_in_apps_never) -> isCustomTab - else -> false - } + // appContext.getString(R.string.pref_key_open_links_in_apps_never) -> isCustomTab + //else -> false + //} } /** * Check to see if we need to prompt the user if the link can be opened in an external app */ fun shouldPromptOpenLinksInApp(): Boolean { + return true + /* return when (openLinksInExternalApp) { appContext.getString(R.string.pref_key_open_links_in_apps_always) -> false appContext.getString(R.string.pref_key_open_links_in_apps_ask) -> true appContext.getString(R.string.pref_key_open_links_in_apps_never) -> true else -> true } + */ } var openLinksInExternalApp by stringPreference( ===================================== fenix/app/src/main/res/navigation/nav_graph.xml ===================================== @@ -723,6 +723,7 @@ app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> +  <action android:id="@+id/action_settingsFragment_to_tabsSettingsFragment" app:destination="@id/tabsSettingsFragment" @@ -963,9 +965,11 @@ app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> </fragment> +  <fragment android:id="@+id/deleteBrowsingDataFragment" android:name="org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataFragment" ===================================== fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -180,12 +180,12 @@ android:key="@string/pref_key_override_amo_collection" app:iconSpaceReserved="false" android:title="@string/preferences_customize_amo_collection" /> - +  <androidx.preference.SwitchPreference android:defaultValue="false" android:key="@string/pref_key_external_download_manager" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2ed… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/2ed… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] 3 commits: fixup! Add Tor integration and UI
by Dan Ballard (＠dan) 12 Sep '23

12 Sep '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: a09967fd by Dan Ballard at 2023-09-12T08:52:55-07:00 fixup! Add Tor integration and UI Bug 41878: Remove bootstrap from `Add Tor integration and UI` - - - - - 40bf5511 by Dan Ballard at 2023-09-12T08:52:55-07:00 fixup! Add Tor integration and UI Bug 41878: Remove rest of onboarding from `Add Tor integration and UI` - - - - - d2a7dfa6 by Dan Ballard at 2023-09-12T08:52:55-07:00 Bug 41878: Add standalone Tor Bootstrap - - - - - 25 changed files: - fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/home/Mode.kt - fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt - fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt - fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt - − fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingDonateViewHolder.kt - − fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt - + fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt - + fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.kt - + fenix/app/src/main/java/org/mozilla/fenix/tor/controller/TorBootstrapController.kt - + fenix/app/src/main/java/org/mozilla/fenix/tor/interactor/TorBootstrapInteractor.kt - + fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapAdapter.kt - fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapConnectViewHolder.kt - fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapLoggerViewHolder.kt - fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/torbootstrap/BootstrapPagerAdapter.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapPagerAdapter.kt - fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapPagerViewHolder.kt - + fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapView.kt - − fenix/app/src/main/res/drawable/tor_onboarding_donate_gradient.xml - − fenix/app/src/main/res/drawable/tor_onboarding_donate_rounded_corners.xml - − fenix/app/src/main/res/layout/tor_onboarding_donate.xml - − fenix/app/src/main/res/layout/tor_onboarding_security_level.xml - fenix/app/src/main/res/navigation/nav_graph.xml - fenix/app/src/main/res/values/styles.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -34,6 +34,7 @@ import androidx.annotation.VisibleForTesting.Companion.PROTECTED import androidx.appcompat.app.ActionBar import androidx.appcompat.widget.Toolbar import androidx.core.app.NotificationManagerCompat +import androidx.core.content.ContentProviderCompat.requireContext import androidx.lifecycle.lifecycleScope import androidx.navigation.NavDestination import androidx.navigation.NavDirections @@ -285,6 +286,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { it.start() } + /* if (settings().shouldShowJunoOnboarding( hasUserBeenOnboarded = components.fenixOnboarding.userHasBeenOnboarded(), isLauncherIntent = intent.toSafeIntent().isLauncherIntent, @@ -295,6 +297,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { navHost.navController.navigate(NavGraphDirections.actionGlobalJunoOnboarding()) } } else { + */ lifecycleScope.launch(IO) { // showFullscreenMessageIfNeeded(applicationContext) } @@ -315,7 +318,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { } showNotificationPermissionPromptIfRequired() */ - } + //} Performance.processIntentIfPerformanceTest(intent, this) @@ -1158,13 +1161,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { } open fun navigateToHome() { - // if (components.fenixOnboarding.userHasBeenOnboarded()) { - navHost.navController.navigate(NavGraphDirections.actionStartupHome()) - /* - } else { - navHost.navController.navigate(NavGraphDirections.actionStartupOnboarding()) - } - */ + navHost.navController.navigate(NavGraphDirections.actionStartupTorbootstrap()) } override fun attachBaseContext(base: Context) { ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -113,6 +113,8 @@ import org.mozilla.fenix.perf.runBlockingIncrement import org.mozilla.fenix.search.toolbar.DefaultSearchSelectorController import org.mozilla.fenix.search.toolbar.SearchSelectorMenu import org.mozilla.fenix.tabstray.TabsTrayAccessPoint +import org.mozilla.fenix.tor.TorBootstrapFragmentDirections +import org.mozilla.fenix.tor.TorBootstrapStatus import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD import org.mozilla.fenix.utils.allowUndo @@ -200,9 +202,9 @@ class HomeFragment : Fragment() { private val recentBookmarksFeature = ViewBoundFeatureWrapper<RecentBookmarksFeature>() private val historyMetadataFeature = ViewBoundFeatureWrapper<RecentVisitsFeature>() private val searchSelectorBinding = ViewBoundFeatureWrapper<SearchSelectorBinding>() - private val searchSelectorMenuBinding = ViewBoundFeatureWrapper<SearchSelectorMenuBinding>() private val torQuickStart by lazy { TorQuickStart(requireContext()) } - private lateinit var currentMode: CurrentMode + private val searchSelectorMenuBinding = ViewBoundFeatureWrapper<SearchSelectorMenuBinding>() + private lateinit var torBootstrapStatus: TorBootstrapStatus override fun onCreate(savedInstanceState: Bundle?) { // DO NOT ADD ANYTHING ABOVE THIS getProfilerTime CALL! @@ -233,29 +235,27 @@ class HomeFragment : Fragment() { val activity = activity as HomeActivity val components = requireComponents - val currentWallpaperName = requireContext().settings().currentWallpaperName - applyWallpaper(wallpaperName = currentWallpaperName, orientationChange = false) - - currentMode = CurrentMode( - requireContext(), + torBootstrapStatus = TorBootstrapStatus( torQuickStart, !BuildConfig.DISABLE_TOR, components.torController, - browsingModeManager, ::dispatchModeChanges ) + val currentWallpaperName = requireContext().settings().currentWallpaperName + applyWallpaper(wallpaperName = currentWallpaperName, orientationChange = false) + // Splits by full stops or commas and puts the parts in different lines. // Ignoring separators at the end of the string, it is expected // that there are at most two parts (e.g. "Explore. Privately."). - val localBinding = binding; + val localBinding = binding binding.exploreprivately.text = localBinding .exploreprivately .text ?.replace(" *([.,。।]) *".toRegex(), "$1\n") ?.trim() - components.appStore.dispatch(AppAction.ModeChange(currentMode.getCurrentMode())) + components.appStore.dispatch(AppAction.ModeChange(Mode.fromBrowsingMode(browsingModeManager.mode))) lifecycleScope.launch(IO) { if (requireContext().settings().showPocketRecommendationsFeature) { @@ -378,10 +378,6 @@ class HomeFragment : Fragment() { registerCollectionStorageObserver = ::registerCollectionStorageObserver, removeCollectionWithUndo = ::removeCollectionWithUndo, showTabTray = ::openTabsTray, - handleTorBootstrapConnect = ::handleTorBootstrapConnect, - cancelTorBootstrap = ::cancelTorBootstrap, - initiateTorBootstrap = ::initiateTorBootstrap, - openTorNetworkSettings = ::openTorNetworkSettings ), recentTabController = DefaultRecentTabsController( selectTabUseCase = components.useCases.tabsUseCases.selectTab, @@ -447,9 +443,6 @@ class HomeFragment : Fragment() { FxNimbus.features.homescreen.recordExposure() - adjustHomeFragmentView(currentMode.getCurrentMode()) - showSessionControlView() - // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! requireComponents.core.engine.profiler?.addMarker( MarkersFragmentLifecycleCallbacks.MARKER_NAME, @@ -530,111 +523,6 @@ class HomeFragment : Fragment() { binding.homeAppBar.setExpanded(true) } - // This function should be paired with showSessionControlView() - @SuppressWarnings("ComplexMethod", "NestedBlockDepth", "LongMethod") - private fun adjustHomeFragmentView(mode: Mode) { - binding.sessionControlRecyclerView.apply { - visibility = View.INVISIBLE - } - - if (mode == Mode.Bootstrap) { - binding.sessionControlRecyclerView.apply { - setPadding(0, 0, 0, 0) - (layoutParams as ViewGroup.MarginLayoutParams).setMargins(0, 0, 0, 0) - } - binding.homeAppBar.apply { - visibility = View.GONE - - // Reset this as SCROLL in case it was previously set as NO_SCROLL after bootstrap - children.forEach { - (it.layoutParams as AppBarLayout.LayoutParams).scrollFlags = - AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL - } - } - binding.onionPatternImage.apply { - visibility = View.GONE - } - binding.toolbarLayout.apply { - visibility = View.GONE - } - } else { - // Keep synchronized with xml layout (somehow). - binding.sessionControlRecyclerView.apply { - setPadding( - SESSION_CONTROL_VIEW_PADDING, - SESSION_CONTROL_VIEW_PADDING, - SESSION_CONTROL_VIEW_PADDING, - SESSION_CONTROL_VIEW_PADDING - ) - // Default margin until it is re-set below (either set immediately or after Layout) - (layoutParams as ViewGroup.MarginLayoutParams).setMargins( - 0, - 0, - 0, - DEFAULT_ONBOARDING_FINISH_MARGIN - ) - } - binding.toolbarLayout.apply { - visibility = View.VISIBLE - // If the Layout rendering pass was completed, then we have a |height| value, - // if it wasn't completed then we have 0. - if (height == 0) { - // Set the bottom margin after the toolbar height is defined during Layout - doOnLayout { - val toolbarLayoutHeight = binding.toolbarLayout.height - binding.sessionControlRecyclerView.apply { - (layoutParams as ViewGroup.MarginLayoutParams).setMargins( - 0, - 0, - 0, - toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING - ) - } - } - } else { - binding.sessionControlRecyclerView.apply { - (layoutParams as ViewGroup.MarginLayoutParams).setMargins( - 0, - 0, - 0, - height - SESSION_CONTROL_VIEW_PADDING - ) - } - } - } - // Hide the onion pattern during Onboarding, too. - // With new onboarding HomeFragment is only reached once onboarding is complete - binding.onionPatternImage.apply { - visibility = if (currentMode.getCurrentMode() != Mode.Bootstrap) { - View.VISIBLE - } else { - View.GONE - } - - } - binding.homeAppBar.apply { - visibility = View.VISIBLE - - children.forEach { - (it.layoutParams as AppBarLayout.LayoutParams).scrollFlags = - if (currentMode.getCurrentMode() != Mode.Bootstrap) { - AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL - } else { - AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL - } - - } - } - } - } - - // This function should be paired with adjustHomeFragmentView() - private fun showSessionControlView() { - binding.sessionControlRecyclerView.apply { - visibility = View.VISIBLE - } - } - @Suppress("LongMethod", "ComplexMethod") override fun onViewCreated(view: View, savedInstanceState: Bundle?) { // DO NOT ADD ANYTHING ABOVE THIS getProfilerTime CALL! @@ -880,13 +768,14 @@ class HomeFragment : Fragment() { requireComponents.reviewPromptController.promptReview(requireActivity()) } } - - private fun dispatchModeChanges(mode: Mode) { - requireComponents.appStore.dispatch(AppAction.ModeChange(mode)) - adjustHomeFragmentView(mode) - updateSessionControlView() - showSessionControlView() + private fun dispatchModeChanges(isBootstrapping: Boolean) { + if (isBootstrapping) { + val directions = + TorBootstrapFragmentDirections + .actionStartupTorbootstrap() + findNavController().navigate(directions) + } } @VisibleForTesting @@ -912,21 +801,16 @@ class HomeFragment : Fragment() { override fun onStop() { super.onStop() - currentMode.unregisterTorListener() + torBootstrapStatus.unregisterTorListener() } override fun onResume() { super.onResume() + torBootstrapStatus.registerTorListener() if (browsingModeManager.mode == BrowsingMode.Private) { activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient) } - // fenix#40176: Ensure the Home fragment is rendered correctly when we resume. - val mode = currentMode.getCurrentMode() - adjustHomeFragmentView(mode) - updateSessionControlView() - showSessionControlView() - hideToolbar() // Whenever a tab is selected its last access timestamp is automatically updated by A-C. @@ -1113,25 +997,6 @@ class HomeFragment : Fragment() { } } - private fun handleTorBootstrapConnect() { - requireComponents.torController.onTorConnecting() - } - - private fun cancelTorBootstrap() { - requireComponents.torController.stopTor() - } - - private fun initiateTorBootstrap(withDebugLogging: Boolean = false) { - requireComponents.torController.initiateTorBootstrap(lifecycleScope, withDebugLogging) - } - - private fun openTorNetworkSettings() { - val directions = - HomeFragmentDirections - .actionHomeFragmentToTorNetworkSettingsFragment() - findNavController().navigate(directions) - } - companion object { const val ALL_NORMAL_TABS = "all_normal" const val ALL_PRIVATE_TABS = "all_private" @@ -1153,9 +1018,5 @@ class HomeFragment : Fragment() { // Elevation for undo toasts internal const val TOAST_ELEVATION = 80f - - // Layout - private const val DEFAULT_ONBOARDING_FINISH_MARGIN = 60 - private const val SESSION_CONTROL_VIEW_PADDING = 16 } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/Mode.kt ===================================== @@ -4,12 +4,7 @@ package org.mozilla.fenix.home -import android.content.Context -import org.mozilla.fenix.tor.TorController -import org.mozilla.fenix.tor.TorEvents -import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.browser.browsingmode.BrowsingMode -import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager /** * Describes various states of the home fragment UI. @@ -17,7 +12,6 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager sealed class Mode { object Normal : Mode() object Private : Mode() - object Bootstrap : Mode() companion object { fun fromBrowsingMode(browsingMode: BrowsingMode) = when (browsingMode) { @@ -26,48 +20,3 @@ sealed class Mode { } } } - -@SuppressWarnings("LongParameterList", "TooManyFunctions") -class CurrentMode( - private val context: Context, - private val torQuickStart: TorQuickStart, - private val shouldStartTor: Boolean, - private val torController: TorController, - private val browsingModeManager: BrowsingModeManager, - private val dispatchModeChanges: (mode: Mode) -> Unit -) : TorEvents { - - init { - torController.registerTorListener(this) - } - - fun getCurrentMode() = if (shouldStartTor && (!torQuickStart.quickStartTor() && !torController.isBootstrapped)) { - Mode.Bootstrap - } else { - Mode.fromBrowsingMode(browsingModeManager.mode) - } - - fun emitModeChanges() { - dispatchModeChanges(getCurrentMode()) - } - - @SuppressWarnings("EmptyFunctionBlock") - override fun onTorConnecting() { - } - - override fun onTorConnected() { - dispatchModeChanges(getCurrentMode()) - } - - override fun onTorStopped() { - dispatchModeChanges(getCurrentMode()) - } - - @SuppressWarnings("EmptyFunctionBlock") - override fun onTorStatusUpdate(entry: String?, status: String?) { - } - - fun unregisterTorListener() { - torController.unregisterTorListener(this) - } -} ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt ===================================== @@ -34,10 +34,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionHeaderViewHol import org.mozilla.fenix.home.sessioncontrol.viewholders.CustomizeHomeButtonViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder -import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.MessageCardViewHolder -import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.TorOnboardingSecurityLevelViewHolder -import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.TorOnboardingDonateViewHolder import org.mozilla.fenix.home.topsites.TopSitePagerViewHolder import mozilla.components.feature.tab.collections.Tab as ComponentTab @@ -102,8 +99,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) { object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID) object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID) - object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID) - object CollectionHeader : AdapterItem(CollectionHeaderViewHolder.LAYOUT_ID) data class CollectionItem( val collection: TabCollection, @@ -143,9 +138,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) { object CustomizeHomeButton : AdapterItem(CustomizeHomeButtonViewHolder.LAYOUT_ID) - object TorOnboardingSecurityLevel : AdapterItem(TorOnboardingSecurityLevelViewHolder.LAYOUT_ID) - object TorOnboardingDonate : AdapterItem(TorOnboardingDonateViewHolder.LAYOUT_ID) - object RecentTabsHeader : AdapterItem(RecentTabsHeaderViewHolder.LAYOUT_ID) object RecentTabItem : AdapterItem(RecentTabViewHolder.LAYOUT_ID) @@ -293,11 +285,6 @@ class SessionControlAdapter( viewLifecycleOwner = viewLifecycleOwner, interactor = interactor, ) - TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder( - view, - components, - interactor - ) NoCollectionsMessageViewHolder.LAYOUT_ID -> NoCollectionsMessageViewHolder( view, @@ -307,15 +294,6 @@ class SessionControlAdapter( interactor, ) BottomSpacerViewHolder.LAYOUT_ID -> BottomSpacerViewHolder(view) - - TorOnboardingSecurityLevelViewHolder.LAYOUT_ID -> TorOnboardingSecurityLevelViewHolder( - view, - interactor - ) - TorOnboardingDonateViewHolder.LAYOUT_ID -> TorOnboardingDonateViewHolder( - view, - interactor - ) else -> throw IllegalStateException() } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt ===================================== @@ -134,21 +134,6 @@ interface SessionControlController { */ fun handleTopSiteLongClicked(topSite: TopSite) - /** - * @see [OnboardingInteractor.onOpenSettingsClicked] - */ - fun handleOpenSettingsClicked() - - /** - * @see [OnboardingInteractor.onOpenSecurityLevelSettingsClicked] - */ - fun handleOpenSecurityLevelSettingsClicked() - - /** - * @see [OnboardingInteractor.onDonateClicked] - */ - fun handleDonateClicked() - /** * @see [CollectionInteractor.onToggleCollectionExpanded] */ @@ -188,31 +173,6 @@ interface SessionControlController { * @see [SessionControlInteractor.reportSessionMetrics] */ fun handleReportSessionMetrics(state: AppState) - - /** - * @see [TorBootstrapInteractor.onTorBootstrapConnectClicked] - */ - fun handleTorBootstrapConnectClicked() - - /** - * @see [TorBootstrapInteractor.onTorStopBootstrapping] - */ - fun handleTorStopBootstrapping() - - /** - * @see [TorBootstrapInteractor.onTorStartBootstrapping] - */ - fun handleTorStartBootstrapping() - - /** - * @see [TorBootstrapInteractor.onTorStartDebugBootstrapping] - */ - fun handleTorStartDebugBootstrapping() - - /** - * @see [TorBootstrapInteractor.onTorBootstrapNetworkSettingsClicked] - */ - fun handleTorNetworkSettingsClicked() } @Suppress("TooManyFunctions", "LargeClass", "LongParameterList") @@ -233,10 +193,6 @@ class DefaultSessionControlController( private val registerCollectionStorageObserver: () -> Unit, private val removeCollectionWithUndo: (tabCollection: TabCollection) -> Unit, private val showTabTray: () -> Unit, - private val handleTorBootstrapConnect: () -> Unit, - private val initiateTorBootstrap: (Boolean) -> Unit, - private val cancelTorBootstrap: () -> Unit, - private val openTorNetworkSettings: () -> Unit ) : SessionControlController { override fun handleCollectionAddTabTapped(collection: TabCollection) { @@ -511,25 +467,6 @@ class DefaultSessionControlController( } } } - - override fun handleOpenSettingsClicked() { - val directions = HomeFragmentDirections.actionGlobalPrivateBrowsingFragment() - navController.nav(R.id.homeFragment, directions) - } - - override fun handleOpenSecurityLevelSettingsClicked() { - val directions = HomeFragmentDirections.actionGlobalTorSecurityLevelFragment() - navController.nav(R.id.homeFragment, directions) - } - - override fun handleDonateClicked() { - activity.openToBrowserAndLoad( - searchTermOrURL = SupportUtils.DONATE_URL, - newTab = true, - from = BrowserDirection.FromHome - ) - } - override fun handleToggleCollectionExpanded(collection: TabCollection, expand: Boolean) { appStore.dispatch(AppAction.CollectionExpanded(collection, expand)) } @@ -601,24 +538,4 @@ class DefaultSessionControlController( RecentBookmarks.recentBookmarksCount.set(state.recentBookmarks.size.toLong()) } - - override fun handleTorBootstrapConnectClicked() { - handleTorBootstrapConnect() - } - - override fun handleTorStopBootstrapping() { - cancelTorBootstrap() - } - - override fun handleTorStartBootstrapping() { - initiateTorBootstrap(false) - } - - override fun handleTorStartDebugBootstrapping() { - initiateTorBootstrap(true) - } - - override fun handleTorNetworkSettingsClicked() { - openTorNetworkSettings() - } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt ===================================== @@ -129,26 +129,6 @@ interface CollectionInteractor { fun onRemoveCollectionsPlaceholder() } -/** - * Interface for onboarding related actions in the [SessionControlInteractor]. - */ -interface OnboardingInteractor { - /** - * Hides the onboarding and navigates to Search. Called when a user clicks on the "Start Browsing" button. - */ - fun onStartBrowsingClicked() - - /** - * Hides the onboarding and navigates to Settings. Called when a user clicks on the "Open settings" button. - */ - fun onOpenSettingsClicked() - - /** - * Opens a custom tab to privacy notice url. Called when a user clicks on the "read our privacy notice" button. - */ - fun onDonateClicked() -} - interface CustomizeHomeIteractor { /** * Opens the customize home settings page. @@ -156,34 +136,6 @@ interface CustomizeHomeIteractor { fun openCustomizeHomePage() } -interface TorBootstrapInteractor { - /** - * Initiates Tor bootstrapping. Called when a user clicks on the "Connect" button. - */ - fun onTorBootstrapConnectClicked() - - /** - * Initiates Tor bootstrapping. Called when a user clicks on the "Connect" button. - */ - fun onTorStartBootstrapping() - - /** - * Stop Tor bootstrapping. Called when a user clicks on the "settings" cog/button. - */ - fun onTorStopBootstrapping() - - /** - * Initiates Tor bootstrapping with debug logging. Called when bootstrapping fails with - * the control.txt file not existing. - */ - fun onTorStartDebugBootstrapping() - - /** - * Open Tor Network Settings preference screen - */ - fun onTorBootstrapNetworkSettingsClicked() -} - /** * Interface for top site related actions in the [SessionControlInteractor]. */ @@ -295,7 +247,6 @@ class SessionControlInteractor( PocketStoriesInteractor, PrivateBrowsingInteractor, SearchSelectorInteractor, - TorBootstrapInteractor, WallpaperInteractor { override fun onCollectionAddTabTapped(collection: TabCollection) { @@ -358,15 +309,6 @@ class SessionControlInteractor( return controller.handleShowWallpapersOnboardingDialog(state) } - // TODO: Do these still work, if not overrides, cus parent class dropped, are they wired in still? - fun onOpenSettingsClicked() { - controller.handleOpenSettingsClicked() - } - - fun onDonateClicked() { - controller.handleDonateClicked() - } - override fun onToggleCollectionExpanded(collection: TabCollection, expand: Boolean) { controller.handleToggleCollectionExpanded(collection, expand) } @@ -500,24 +442,4 @@ class SessionControlInteractor( override fun onMenuItemTapped(item: SearchSelectorMenu.Item) { searchSelectorController.handleMenuItemTapped(item) } - - override fun onTorBootstrapConnectClicked() { - controller.handleTorBootstrapConnectClicked() - } - - override fun onTorStopBootstrapping() { - controller.handleTorStopBootstrapping() - } - - override fun onTorStartBootstrapping() { - controller.handleTorStartBootstrapping() - } - - override fun onTorStartDebugBootstrapping() { - controller.handleTorStartDebugBootstrapping() - } - - override fun onTorBootstrapNetworkSettingsClicked() { - controller.handleTorNetworkSettingsClicked() - } } ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt ===================================== @@ -126,15 +126,6 @@ private fun showCollections( private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription) -private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap) - -private fun torOnboardingAdapterItems() = - listOf( - AdapterItem.TorOnboardingSecurityLevel, - AdapterItem.TorOnboardingDonate, - // AdapterItem.OnboardingFinish - ) - private fun AppState.toAdapterList(settings: Settings): List<AdapterItem> = when (mode) { is Mode.Normal -> normalModeAdapterItems( settings, @@ -151,7 +142,6 @@ private fun AppState.toAdapterList(settings: Settings): List<AdapterItem> = when firstFrameDrawn, ) is Mode.Private -> privateModeAdapterItems() - is Mode.Bootstrap -> bootstrapAdapterItems() } private fun collectionTabItems(collection: TabCollection) = ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingDonateViewHolder.kt deleted ===================================== @@ -1,28 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding - -import android.view.View -import androidx.recyclerview.widget.RecyclerView -import org.mozilla.fenix.R -import org.mozilla.fenix.databinding.TorOnboardingDonateBinding -import org.mozilla.fenix.home.sessioncontrol.SessionControlInteractor - -class TorOnboardingDonateViewHolder( - view: View, - private val interactor: SessionControlInteractor -) : RecyclerView.ViewHolder(view) { - - init { - val binding = TorOnboardingDonateBinding.bind(view) - binding.donateNowButton.setOnClickListener { - interactor.onDonateClicked() - } - } - - companion object { - const val LAYOUT_ID = R.layout.tor_onboarding_donate - } -} ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/TorOnboardingSecurityLevelViewHolder.kt deleted ===================================== @@ -1,95 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding - -import android.view.View -import androidx.recyclerview.widget.RecyclerView -import org.mozilla.fenix.R -import org.mozilla.fenix.databinding.TorOnboardingSecurityLevelBinding -import org.mozilla.fenix.home.sessioncontrol.SessionControlInteractor -import org.mozilla.fenix.ext.components -import org.mozilla.fenix.onboarding.OnboardingRadioButton -import org.mozilla.fenix.tor.SecurityLevel -import org.mozilla.fenix.tor.SecurityLevelUtil -import org.mozilla.fenix.utils.view.addToRadioGroup - -class TorOnboardingSecurityLevelViewHolder( - view: View, - private val interactor: SessionControlInteractor -) : RecyclerView.ViewHolder(view) { - - private var _binding: TorOnboardingSecurityLevelBinding? = null - private val binding get() = _binding!! - - private var standardSecurityLevel: OnboardingRadioButton - private var saferSecurityLevel: OnboardingRadioButton - private var safestSecurityLevel: OnboardingRadioButton - - init { - _binding = TorOnboardingSecurityLevelBinding.bind(view) - binding.headerText.setOnboardingIcon(R.drawable.ic_onboarding_tracking_protection) - - standardSecurityLevel = binding.securityLevelStandardOption - saferSecurityLevel = binding.securityLevelSaferOption - safestSecurityLevel = binding.securityLevelSafestOption - - binding.descriptionText.text = view.context.getString( - R.string.tor_onboarding_security_level_description - ) - - setupRadioGroup(view) - - } - - private fun setupRadioGroup(view: View) { - - addToRadioGroup(standardSecurityLevel, saferSecurityLevel, safestSecurityLevel) - - val securityLevel = try { - SecurityLevelUtil.getSecurityLevelFromInt( - view.context.components.core.engine.settings.torSecurityLevel - ) - } catch (e: IllegalStateException) { - SecurityLevel.STANDARD - } - - standardSecurityLevel.isChecked = securityLevel == SecurityLevel.STANDARD - safestSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFEST - saferSecurityLevel.isChecked = securityLevel == SecurityLevel.SAFER - - standardSecurityLevel.onClickListener { - updateSecurityLevel(SecurityLevel.STANDARD, view) - } - - saferSecurityLevel.onClickListener { - updateSecurityLevel(SecurityLevel.SAFER, view) - } - - safestSecurityLevel.onClickListener { - updateSecurityLevel(SecurityLevel.SAFEST, view) - } - - updateSecurityLevel(securityLevel, view) - } - - private fun updateSecurityLevel(newLevel: SecurityLevel, view: View) { - val resources = view.context.resources - val securityLevel = when (newLevel) { - SecurityLevel.STANDARD -> resources.getString(R.string.tor_security_level_standard_option) - SecurityLevel.SAFER -> resources.getString(R.string.tor_security_level_safer_option) - SecurityLevel.SAFEST -> resources.getString(R.string.tor_security_level_safest_option) - } - binding.currentLevel.text = resources.getString( - R.string.tor_onboarding_chosen_security_level_label, securityLevel - ) - view.context.components.let { - it.core.engine.settings.torSecurityLevel = newLevel.intRepresentation - } - } - - companion object { - const val LAYOUT_ID = R.layout.tor_onboarding_security_level - } -} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt ===================================== @@ -0,0 +1,195 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.annotation.VisibleForTesting +import androidx.core.view.children +import androidx.fragment.app.Fragment +import androidx.lifecycle.lifecycleScope +import org.mozilla.fenix.BuildConfig +import org.mozilla.fenix.databinding.FragmentHomeBinding +import org.mozilla.fenix.ext.requireComponents +import org.mozilla.fenix.tor.bootstrap.TorQuickStart +import org.mozilla.fenix.tor.interactor.DefaultTorBootstrapInteractor +import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor +import androidx.navigation.fragment.findNavController +import com.google.android.material.appbar.AppBarLayout +import org.mozilla.fenix.ext.components +import org.mozilla.fenix.ext.hideToolbar +import org.mozilla.fenix.tor.controller.DefaultTorBootstrapController +import org.mozilla.fenix.tor.view.TorBootstrapView + + +@Suppress("TooManyFunctions", "LargeClass") +class TorBootstrapFragment : Fragment() { + private val torQuickStart by lazy { TorQuickStart(requireContext()) } + + internal var _binding: FragmentHomeBinding? = null + private val binding get() = _binding!! + + + private var torBootstrapView: TorBootstrapView? = null + + private var _torBootstrapInteractor: TorBootstrapInteractor? = null + private val torBootstrapInteractor: TorBootstrapInteractor + get() = _torBootstrapInteractor!! + + private lateinit var torBootstrapStatus: TorBootstrapStatus + + + @Suppress("LongMethod") + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?, + ): View { + _binding = FragmentHomeBinding.inflate(inflater, container, false) + val components = requireComponents + + torBootstrapStatus = TorBootstrapStatus( + torQuickStart, + !BuildConfig.DISABLE_TOR, + components.torController, + ::dispatchModeChanges + ) + + if (!torBootstrapStatus.isBootstrapping()) { + openHome() + } + + // Was _sessionControlInteractor + _torBootstrapInteractor = DefaultTorBootstrapInteractor( + controller = DefaultTorBootstrapController( + handleTorBootstrapConnect = ::handleTorBootstrapConnect, + cancelTorBootstrap = ::cancelTorBootstrap, + initiateTorBootstrap = ::initiateTorBootstrap, + openTorNetworkSettings = ::openTorNetworkSettings + ), + ) + + torBootstrapView = TorBootstrapView( + containerView = binding.sessionControlRecyclerView, + viewLifecycleOwner = viewLifecycleOwner, + interactor = torBootstrapInteractor, + ) + + adjustHomeFragmentView() + updateSessionControlView() + showSessionControlView() + + return binding.root + } + + private fun updateSessionControlView() { + torBootstrapView?.update(requireContext().components.appStore.state) + } + + // This function should be paired with showSessionControlView() + private fun adjustHomeFragmentView() { + binding.sessionControlRecyclerView.apply { + visibility = View.INVISIBLE + } + + binding.sessionControlRecyclerView.apply { + setPadding(0, 0, 0, 0) + (layoutParams as ViewGroup.MarginLayoutParams).setMargins(0, 0, 0, 0) + } + + binding.homeAppBar.apply { + visibility = View.GONE + + // Reset this as SCROLL in case it was previously set as NO_SCROLL after bootstrap + children.forEach { + (it.layoutParams as AppBarLayout.LayoutParams).scrollFlags = + AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL + } + } + binding.onionPatternImage.apply { + visibility = View.GONE + } + binding.toolbarLayout.apply { + visibility = View.GONE + } + } + + // This function should be paired with adjustHomeFragmentView() + private fun showSessionControlView() { + binding.sessionControlRecyclerView.apply { + visibility = View.VISIBLE + } + } + + private fun dispatchModeChanges(isBootstrapping: Boolean) { + //requireComponents.appStore.dispatch(AppAction.ModeChange(mode)) + if (!isBootstrapping) { + openHome() + } else { + adjustHomeFragmentView() + updateSessionControlView() + showSessionControlView() + } + } + + override fun onStop() { + super.onStop() + torBootstrapStatus.unregisterTorListener() + } + + override fun onResume() { + super.onResume() + + torBootstrapStatus.registerTorListener() + + // fenix#40176: Ensure the Home fragment is rendered correctly when we resume. + val isBootstraping = torBootstrapStatus.isBootstrapping() + + if (!isBootstraping) { + openHome() + } + + adjustHomeFragmentView() + updateSessionControlView() + showSessionControlView() + + hideToolbar() + + // Whenever a tab is selected its last access timestamp is automatically updated by A-C. + // However, in the case of resuming the app to the home fragment, we already have an + // existing selected tab, but its last access timestamp is outdated. No action is + // triggered to cause an automatic update on warm start (no tab selection occurs). So we + // update it manually here. + requireComponents.useCases.sessionUseCases.updateLastAccess() + } + + private fun handleTorBootstrapConnect() { + requireComponents.torController.onTorConnecting() + } + + private fun cancelTorBootstrap() { + requireComponents.torController.stopTor() + } + + private fun initiateTorBootstrap(withDebugLogging: Boolean = false) { + requireComponents.torController.initiateTorBootstrap(lifecycleScope, withDebugLogging) + } + + private fun openTorNetworkSettings() { + val directions = + TorBootstrapFragmentDirections.actionTorbootstrapFragmentToTorNetworkSettingsFragment() + findNavController().navigate(directions) + } + + private fun openHome() { + val directions = + TorBootstrapFragmentDirections + .actionStartupHome() + findNavController().navigate(directions) + } + +} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapStatus.kt ===================================== @@ -0,0 +1,48 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import org.mozilla.fenix.tor.bootstrap.TorQuickStart + +@SuppressWarnings("LongParameterList", "TooManyFunctions") +class TorBootstrapStatus( + private val torQuickStart: TorQuickStart, + private val shouldStartTor: Boolean, + private val torController: TorController, + private val dispatchModeChanges: (isShouldBootstrap: Boolean) -> Unit + ) : TorEvents { + + init { + torController.registerTorListener(this) + } + + fun isBootstrapping() = (shouldStartTor && (!torQuickStart.quickStartTor() && !torController.isBootstrapped)) + + + @SuppressWarnings("EmptyFunctionBlock") + override fun onTorConnecting() { + } + + override fun onTorConnected() { + dispatchModeChanges(isBootstrapping()) + } + + override fun onTorStopped() { + dispatchModeChanges(isBootstrapping()) + } + + @SuppressWarnings("EmptyFunctionBlock") + override fun onTorStatusUpdate(entry: String?, status: String?) { + } + + fun unregisterTorListener() { + torController.unregisterTorListener(this) + } + + fun registerTorListener() { + torController.registerTorListener(this) + } + +} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/controller/TorBootstrapController.kt ===================================== @@ -0,0 +1,63 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor.controller + +import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor + +interface TorBootstrapController { + /** + * @see [TorBootstrapInteractor.onTorBootstrapConnectClicked] + */ + fun handleTorBootstrapConnectClicked() + + /** + * @see [TorBootstrapInteractor.onTorStopBootstrapping] + */ + fun handleTorStopBootstrapping() + + /** + * @see [TorBootstrapInteractor.onTorStartBootstrapping] + */ + fun handleTorStartBootstrapping() + + /** + * @see [TorBootstrapInteractor.onTorStartDebugBootstrapping] + */ + fun handleTorStartDebugBootstrapping() + + /** + * @see [TorBootstrapInteractor.onTorBootstrapNetworkSettingsClicked] + */ + fun handleTorNetworkSettingsClicked() + + +} + +class DefaultTorBootstrapController( + private val handleTorBootstrapConnect: () -> Unit, + private val initiateTorBootstrap: (Boolean) -> Unit, + private val cancelTorBootstrap: () -> Unit, + private val openTorNetworkSettings: () -> Unit +) : TorBootstrapController { + override fun handleTorBootstrapConnectClicked() { + handleTorBootstrapConnect() + } + + override fun handleTorStopBootstrapping() { + cancelTorBootstrap() + } + + override fun handleTorStartBootstrapping() { + initiateTorBootstrap(false) + } + + override fun handleTorStartDebugBootstrapping() { + initiateTorBootstrap(true) + } + + override fun handleTorNetworkSettingsClicked() { + openTorNetworkSettings() + } +} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/interactor/TorBootstrapInteractor.kt ===================================== @@ -0,0 +1,60 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor.interactor + +import org.mozilla.fenix.tor.controller.TorBootstrapController + +interface TorBootstrapInteractor { + /** + * Initiates Tor bootstrapping. Called when a user clicks on the "Connect" button. + */ + fun onTorBootstrapConnectClicked() + + /** + * Initiates Tor bootstrapping. Called when a user clicks on the "Connect" button. + */ + fun onTorStartBootstrapping() + + /** + * Stop Tor bootstrapping. Called when a user clicks on the "settings" cog/button. + */ + fun onTorStopBootstrapping() + + /** + * Initiates Tor bootstrapping with debug logging. Called when bootstrapping fails with + * the control.txt file not existing. + */ + fun onTorStartDebugBootstrapping() + + /** + * Open Tor Network Settings preference screen + */ + fun onTorBootstrapNetworkSettingsClicked() +} + +class DefaultTorBootstrapInteractor( + private val controller: TorBootstrapController, +) : TorBootstrapInteractor { + + override fun onTorBootstrapConnectClicked() { + controller.handleTorBootstrapConnectClicked() + } + + override fun onTorStopBootstrapping() { + controller.handleTorStopBootstrapping() + } + + override fun onTorStartBootstrapping() { + controller.handleTorStartBootstrapping() + } + + override fun onTorStartDebugBootstrapping() { + controller.handleTorStartDebugBootstrapping() + } + + override fun onTorBootstrapNetworkSettingsClicked() { + controller.handleTorNetworkSettingsClicked() + } +} ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapAdapter.kt ===================================== @@ -0,0 +1,83 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor.view + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.annotation.LayoutRes +import androidx.lifecycle.LifecycleOwner +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.ListAdapter +import androidx.recyclerview.widget.RecyclerView +import org.mozilla.fenix.components.Components +import org.mozilla.fenix.home.topsites.TopSitePagerViewHolder +import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor + +sealed class AdapterItem(@LayoutRes val viewType: Int) { + object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID) + + + open fun sameAs(other: AdapterItem) = this::class == other::class + open fun getChangePayload(newItem: AdapterItem): Any? = null + open fun contentsSameAs(other: AdapterItem) = this::class == other::class + +} + +class AdapterItemDiffCallback : DiffUtil.ItemCallback<AdapterItem>() { + override fun areItemsTheSame(oldItem: AdapterItem, newItem: AdapterItem) = + oldItem.sameAs(newItem) + + @Suppress("DiffUtilEquals") + override fun areContentsTheSame(oldItem: AdapterItem, newItem: AdapterItem) = + oldItem.contentsSameAs(newItem) + + override fun getChangePayload(oldItem: AdapterItem, newItem: AdapterItem): Any? { + return oldItem.getChangePayload(newItem) ?: return super.getChangePayload(oldItem, newItem) + } +} + + + +class TorBootstrapAdapter( + private val interactor: TorBootstrapInteractor, + private val viewLifecycleOwner: LifecycleOwner, + private val components: Components, +) : ListAdapter<AdapterItem, RecyclerView.ViewHolder>(AdapterItemDiffCallback()) { + + // This method triggers the ComplexMethod lint error when in fact it's quite simple. + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { + val view = LayoutInflater.from(parent.context).inflate(viewType, parent, false) + return when (viewType) { + TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder( + view, + components, + interactor + ) + else -> throw IllegalStateException() + } + } + + override fun getItemViewType(position: Int) = getItem(position).viewType + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int, payloads: MutableList<Any>) { + if (payloads.isEmpty()) { + onBindViewHolder(holder, position) + } else { + when (holder) { + is TopSitePagerViewHolder -> { + if (payloads[0] is org.mozilla.fenix.home.sessioncontrol.AdapterItem.TopSitePagerPayload) { + val payload = payloads[0] as org.mozilla.fenix.home.sessioncontrol.AdapterItem.TopSitePagerPayload + holder.update(payload) + } + } + } + } + } + + override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { + // no-op. This ViewHolder receives the HomeStore as argument and will observe that + // without the need for us to manually update from here the data to be displayed. + } +} ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapConnectViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapConnectViewHolder.kt ===================================== @@ -2,17 +2,16 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.home.sessioncontrol.viewholders +package org.mozilla.fenix.tor.view import android.view.View -import androidx.appcompat.widget.SwitchCompat import androidx.recyclerview.widget.RecyclerView import org.mozilla.fenix.R +import org.mozilla.fenix.components.Components import org.mozilla.fenix.databinding.TorBootstrapConnectBinding import org.mozilla.fenix.tor.TorEvents import org.mozilla.fenix.tor.bootstrap.TorQuickStart -import org.mozilla.fenix.components.Components -import org.mozilla.fenix.home.sessioncontrol.TorBootstrapInteractor +import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor class TorBootstrapConnectViewHolder( private val view: View, ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapLoggerViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapLoggerViewHolder.kt ===================================== @@ -2,20 +2,20 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.home.sessioncontrol.viewholders +package org.mozilla.fenix.tor.view import android.text.method.ScrollingMovementMethod import android.view.View import androidx.recyclerview.widget.RecyclerView import org.mozilla.fenix.R +import org.mozilla.fenix.components.Components import org.mozilla.fenix.databinding.TorBootstrapLoggerBinding import org.mozilla.fenix.tor.TorEvents -import org.mozilla.fenix.components.Components class TorBootstrapLoggerViewHolder( - private val view: View, - private val components: Components -) : RecyclerView.ViewHolder(view), TorEvents { + private val view: View, + private val components: Components + ) : RecyclerView.ViewHolder(view), TorEvents { private var entries = mutableListOf<String>() private var binding: TorBootstrapLoggerBinding @@ -25,10 +25,10 @@ class TorBootstrapLoggerViewHolder( components.torController.registerTorListener(this) val currentEntries = components.torController.logEntries - .filter { it.first != null } - .filter { !(it.first!!.startsWith("Circuit") && it.second == "ON") } - // Keep synchronized with format in onTorStatusUpdate - .flatMap { listOf("(${it.second}) '${it.first}'") } + .filter { it.first != null } + .filter { !(it.first!!.startsWith("Circuit") && it.second == "ON") } + // Keep synchronized with format in onTorStatusUpdate + .flatMap { listOf("(${it.second}) '${it.first}'") } val entriesLen = currentEntries.size val subListOffset = if (entriesLen > MAX_NEW_ENTRIES) MAX_NEW_ENTRIES else entriesLen entries = currentEntries.subList((entriesLen - subListOffset), entriesLen) as MutableList<String> @@ -72,4 +72,5 @@ class TorBootstrapLoggerViewHolder( const val MAX_NEW_ENTRIES = 24 const val MAX_LINES = 25 } + } ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/torbootstrap/BootstrapPagerAdapter.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapPagerAdapter.kt ===================================== @@ -2,18 +2,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.home.sessioncontrol.viewholders.torbootstrap +package org.mozilla.fenix.tor.view import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import androidx.recyclerview.widget.RecyclerView.ViewHolder import org.mozilla.fenix.components.Components -import org.mozilla.fenix.home.sessioncontrol.TorBootstrapInteractor -import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapConnectViewHolder -import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapLoggerViewHolder +import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor -class BootstrapPagerAdapter( +class TorBootstrapPagerAdapter( private val components: Components, private val interactor: TorBootstrapInteractor ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() { ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorBootstrapPagerViewHolder.kt → fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapPagerViewHolder.kt ===================================== @@ -2,23 +2,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.fenix.home.sessioncontrol.viewholders +package org.mozilla.fenix.tor.view import android.view.View import androidx.recyclerview.widget.RecyclerView import org.mozilla.fenix.R -import org.mozilla.fenix.databinding.TorBootstrapPagerBinding import org.mozilla.fenix.components.Components -import org.mozilla.fenix.home.sessioncontrol.TorBootstrapInteractor -import org.mozilla.fenix.home.sessioncontrol.viewholders.torbootstrap.BootstrapPagerAdapter +import org.mozilla.fenix.databinding.TorBootstrapPagerBinding +import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor class TorBootstrapPagerViewHolder( - view: View, - components: Components, - interactor: TorBootstrapInteractor -) : RecyclerView.ViewHolder(view) { + view: View, + components: Components, + interactor: TorBootstrapInteractor + ) : RecyclerView.ViewHolder(view) { - private val bootstrapPagerAdapter = BootstrapPagerAdapter(components, interactor) + private val bootstrapPagerAdapter = TorBootstrapPagerAdapter(components, interactor) init { val binding = TorBootstrapPagerBinding.bind(view) ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/view/TorBootstrapView.kt ===================================== @@ -0,0 +1,49 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor.view + +import androidx.lifecycle.LifecycleOwner +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import org.mozilla.fenix.components.appstate.AppState +import org.mozilla.fenix.ext.components +import org.mozilla.fenix.tor.interactor.TorBootstrapInteractor + + +class TorBootstrapView( + containerView: RecyclerView, + viewLifecycleOwner: LifecycleOwner, + interactor: TorBootstrapInteractor, +) { + + val view: RecyclerView = containerView //as RecyclerView + + private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap) + + private val torBootstrapAdapter = TorBootstrapAdapter( + interactor, + viewLifecycleOwner, + containerView.context.components, + ) + + //private val torBootstrapAdapter = + // TorBootstrapAdapter(interactor, containerView.context.components) + //private val torBootstrapAdapter = TorBootstrapPagerAdapter(containerView.context.components, interactor) + + init { + containerView.apply { + adapter = torBootstrapAdapter + layoutManager = LinearLayoutManager(containerView.context) + } + } + + private fun AppState.toAdapterList(): List<AdapterItem> { + return bootstrapAdapterItems() + } + + fun update(state: AppState) { + torBootstrapAdapter.submitList(state.toAdapterList()) + } +} ===================================== fenix/app/src/main/res/drawable/tor_onboarding_donate_gradient.xml deleted ===================================== @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape> - <gradient - android:angle="45" - android:startColor="#07d1db" - android:endColor="#b240f5" - android:type="linear" /> - </shape> - </item> -</selector> ===================================== fenix/app/src/main/res/drawable/tor_onboarding_donate_rounded_corners.xml deleted ===================================== @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - - - -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="#70efde" /> - <corners android:radius="10dp" /> -</shape> ===================================== fenix/app/src/main/res/layout/tor_onboarding_donate.xml deleted ===================================== @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/onboarding_card" - style="@style/TorOnboardingDonateCardLightWithPadding" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView - android:id="@+id/header_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="@string/tor_onboarding_donate_header" - android:textAppearance="@style/TorHeaderTextStyle" - android:gravity="center_vertical" - android:lines="1" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> - <TextView - android:id="@+id/description_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="@style/TorBody16TextStyle" - android:layout_marginTop="14dp" - android:text="@string/tor_onboarding_donate_description" - app:layout_constraintTop_toBottomOf="@id/header_text" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> - - <Button - style="@style/TorDonateOnboardingButton" - android:id="@+id/donate_now_button" - android:text="@string/tor_onboarding_donate_button" - android:layout_marginTop="10dp" - android:textAppearance="@style/TorHeaderTextStyle" - android:background="@drawable/tor_onboarding_donate_rounded_corners" - app:layout_constraintTop_toBottomOf="@id/description_text" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> -</androidx.constraintlayout.widget.ConstraintLayout> ===================================== fenix/app/src/main/res/layout/tor_onboarding_security_level.xml deleted ===================================== @@ -1,123 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/onboarding_card" - style="@style/OnboardingCardLightWithPadding" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false" - android:clipToPadding="false"> - - <TextView - android:id="@+id/header_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:drawablePadding="12dp" - android:gravity="center_vertical" - android:lines="1" - android:text="@string/tor_onboarding_security_level" - android:textAppearance="@style/HeaderTextStyle" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:drawableStart="@drawable/ic_onboarding_tracking_protection" /> - - <TextView - android:id="@+id/description_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:textAppearance="@style/Body14TextStyle" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/current_level" - tools:text="@string/tor_onboarding_security_level_description" /> - - <TextView - android:id="@+id/current_level" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="12dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/header_text" - tools:text="@string/tor_onboarding_chosen_security_level_label" /> - - <org.mozilla.fenix.onboarding.OnboardingRadioButton - android:id="@+id/security_level_standard_option" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:background="@android:color/transparent" - android:checked="true" - android:foreground="@drawable/rounded_ripple" - android:gravity="top" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:theme="@style/Checkable.Colored" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/description_text" - app:onboardingKey="@string/pref_key_tor_security_level_standard_option" - app:onboardingKeyDescription="@string/tor_security_level_standard_description" - app:onboardingKeyTitle="@string/tor_security_level_standard_option" - tools:text="Standard" /> - - <org.mozilla.fenix.onboarding.OnboardingRadioButton - android:id="@+id/security_level_safer_option" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:background="@android:color/transparent" - android:checked="false" - android:foreground="@drawable/rounded_ripple" - android:gravity="top" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:textColor="@color/primary_state_list_text_color" - android:theme="@style/Checkable.Colored" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/security_level_standard_option" - app:onboardingKey="@string/pref_key_tor_security_level_safer_option" - app:onboardingKeyDescription="@string/tor_security_level_safer_description" - app:onboardingKeyTitle="@string/tor_security_level_safer_option" - tools:text="Safer" /> - - <org.mozilla.fenix.onboarding.OnboardingRadioButton - android:id="@+id/security_level_safest_option" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:background="@android:color/transparent" - android:checked="false" - android:foreground="@drawable/rounded_ripple" - android:gravity="top" - android:paddingStart="8dp" - android:paddingEnd="8dp" - android:textColor="@color/primary_state_list_text_color" - android:theme="@style/Checkable.Colored" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/security_level_safer_option" - app:onboardingKey="@string/pref_key_tor_security_level_safest_option" - app:onboardingKeyDescription="@string/tor_security_level_safest_description" - app:onboardingKeyTitle="@string/tor_security_level_safest_option" - tools:text="Safest" /> - - <Button - android:id="@+id/open_settings_button" - style="@style/NeutralOnboardingButton" - android:layout_marginTop="16dp" - android:text="@string/tor_onboarding_security_settings_button" - app:layout_constraintTop_toBottomOf="@id/security_level_safest_option" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> - -</androidx.constraintlayout.widget.ConstraintLayout> ===================================== fenix/app/src/main/res/navigation/nav_graph.xml ===================================== @@ -21,6 +21,12 @@ app:popUpTo="@id/startupFragment" app:popUpToInclusive="true" /> + <action + android:id="@+id/action_startup_torbootstrap" + app:destination="@id/torbootstrapFragment" + app:popUpTo="@id/startupFragment" + app:popUpToInclusive="true" /> + <action android:id="@+id/action_global_home" app:destination="@id/homeFragment" @@ -247,6 +253,24 @@ app:popUpToInclusive="true" /> </fragment> + <fragment + android:id="@+id/torbootstrapFragment" + android:name="org.mozilla.fenix.tor.TorBootstrapFragment" + tools:layout="@layout/fragment_home"> + <action + android:id="@+id/action_home" + app:destination="@id/homeFragment" + app:popUpTo="@id/torbootstrapFragment" + app:popUpToInclusive="true" /> + <action + android:id="@+id/action_torbootstrapFragment_to_torNetworkSettingsFragment" + app:destination="@id/torNetworkSettingsFragment" + app:enterAnim="@anim/slide_in_right" + app:exitAnim="@anim/slide_out_left" + app:popEnterAnim="@anim/slide_in_left" + app:popExitAnim="@anim/slide_out_right" /> + </fragment> + <dialog android:id="@+id/homeOnboardingDialogFragment" android:name="org.mozilla.fenix.onboarding.HomeOnboardingDialogFragment" /> ===================================== fenix/app/src/main/res/values/styles.xml ===================================== @@ -375,13 +375,6 @@ <item name="android:textColor">?attr/textPrimary</item> </style> -  - <style name="TorDonateOnboardingButton" parent="NeutralButton"> - <item name="android:background">@drawable/tor_onboarding_donate_rounded_corners</item> - <item name="backgroundTint">#70efde</item> - <item name="android:textColor">#000000</item> - </style> - <style name="DestructiveButton" parent="NeutralButton"> <item name="iconTint">@color/fx_mobile_icon_color_warning_button</item> <item name="android:textColor">@color/fx_mobile_text_color_warning_button</item> @@ -582,10 +575,6 @@ <item name="android:elevation">0dp</item> </style> - <style name="TorOnboardingDonateCardLightWithPadding" parent="OnboardingCardDark"> - <item name="android:background">@drawable/tor_onboarding_donate_gradient</item> - </style> - <style name="SearchClipboardStyle"> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/d1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/compare/d1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.2.0esr-13.0-1] Bug 42072: 2023 year end campaign for about:tor.
by Pier Angelo Vendrame (＠pierov) 12 Sep '23

12 Sep '23

Pier Angelo Vendrame pushed to branch tor-browser-115.2.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 51bcca21 by Henry Wilkes at 2023-09-12T15:25:12+01:00 Bug 42072: 2023 year end campaign for about:tor. - - - - - 1 changed file: - browser/locales/en-US/browser/tor-browser.ftl Changes: ===================================== browser/locales/en-US/browser/tor-browser.ftl ===================================== @@ -39,3 +39,21 @@ tor-browser-home-message-testing = This is an unstable version of Tor Browser fo # Shown in Home settings, corresponds to the default about:tor home page. home-mode-choice-tor = .label = Tor Browser Home + + +## 2023 year-end-campaign. + +# Large introduction text. +yec-2023-introduction = Right now, Tor Browser is protecting your privacy and the privacy of millions of people like you! +# Follows directly below yec-2023-introduction. +# The <span data-l10n-name="attention"> tag is meant to bring some styling attention to the first phrase, but doesn't have any semantic meaning. +yec-2023-please-donate = <span data-l10n-name="attention">This is possible because of donations from our community.</span> If you value the privacy that Tor Browser offers yourself and others, please make a donation today. You’ll ensure Tor Browser continues to provide online privacy to everyone who needs it. +# Shown only during a period where donations will be matched. The end date should match the end of the year. +# $amount (Number) - The donation limit. This will be a whole-number and will be automatically formatted according to the language/locale: using the language's numeral symbols and thousand-separators. +# NOTE: The amount should be shown as USD (United States dollar) currency. In the original English string, the first "$" is the literal USD currency symbol, and this can be changed or removed when translating to whatever is most appropriate for USD currency in the locale. In contrast, the "$" at the start of "$amount" is part of the Fluent format's syntax and should not be changed when translating. +# For example, "${ $amount }" for English would eventually be shown as "$5,000", whilst "{ $amount } US$" for Arabic would be shown as "٥٬٠٠٠ US$". +# Translators: If you need any help or clarification, feel free to ask a question on weblate or in IRC (#tor-l10n). +yec-2023-matched-donation = From now until December 31, your gift will be matched one-to-one, up to ${ $amount }! +yec-2023-close-button = + .title = Close +yec-2023-donate-button = Donate now View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/51bcca2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/51bcca2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

← Newer
1
...
11
12
13
14
15
16
17
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2023