- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-102.7.0esr-12.5-1
by Richard Pospesel (＠richard) 12 Jan '23

12 Jan '23

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.7.0esr-12.0-1-build1
by Richard Pospesel (＠richard) 12 Jan '23

12 Jan '23

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-102.7.0esr-12.0-1
by Richard Pospesel (＠richard) 12 Jan '23

12 Jan '23

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.0-1] 93 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Richard Pospesel (＠richard) 12 Jan '23

12 Jan '23

Richard Pospesel pushed to branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 272a3ba8 by Pier Angelo Vendrame at 2023-01-11T21:34:58+00:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - 783caf57 by Pier Angelo Vendrame at 2023-01-11T21:34:59+00:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - c233735c by Jamie Nicol at 2023-01-11T21:35:00+00:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - ed74a024 by Pier Angelo Vendrame at 2023-01-11T21:35:01+00:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 7ad47484 by Neill Miller at 2023-01-11T21:35:02+00:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - 5ba89b7f by Gabriele Svelto at 2023-01-11T21:35:04+00:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - afea20c7 by Gabriele Svelto at 2023-01-11T21:35:05+00:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - 20eb8876 by Gabriele Svelto at 2023-01-11T21:35:07+00:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - ff86f79d by Gabriele Svelto at 2023-01-11T21:35:08+00:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 8d00cd64 by Georg Koppen at 2023-01-11T21:35:09+00:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - d06cd47a by Richard Pospesel at 2023-01-11T21:35:11+00:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - 53262967 by hackademix at 2023-01-12T18:46:31+00:00 Bug 41506: Distrust TrustCor root certificates after 2022-11-30. - - - - - 5fdceec4 by Henry Wilkes at 2023-01-12T18:46:32+00:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - f21d3d7c by Pier Angelo Vendrame at 2023-01-12T18:46:32+00: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. - - - - - b2915d38 by Pier Angelo Vendrame at 2023-01-12T18:46:33+00: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. - - - - - 8f0caafc by Dan Ballard at 2023-01-12T18:46:33+00:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restpre email link on mac - - - - - 55fefcf6 by Gaba at 2023-01-12T18:46:33+00:00 Adding issue template for bugs. - - - - - 5ac43347 by Pier Angelo Vendrame at 2023-01-12T18:46:34+00:00 Base Browser's .mozconfigs. - - - - - a9257185 by Pier Angelo Vendrame at 2023-01-12T18:46:34+00:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - b0b531f6 by Dan Ballard at 2023-01-12T18:46:35+00:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 8c22dbc6 by Matthew Finkel at 2023-01-12T18:46:35+00: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. - - - - - 23f7fc8e by Matthew Finkel at 2023-01-12T18:46:35+00: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. - - - - - fa4cc1ca by Matthew Finkel at 2023-01-12T18:46:36+00:00 Bug 28125: Prevent non-Necko network connections - - - - - 4e0235b2 by Mike Perry at 2023-01-12T18:46:36+00: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 - - - - - 97df7886 by Alex Catarineu at 2023-01-12T18:46:37+00:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - cd24c6ef by Georg Koppen at 2023-01-12T18:46:37+00: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. - - - - - b960127b by Kathy Brade at 2023-01-12T18:46:38+00:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 3e26825e by Kathy Brade at 2023-01-12T18:46:38+00: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. - - - - - b01c323b by Alex Catarineu at 2023-01-12T18:46:39+00:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 821aa6c7 by Kathy Brade at 2023-01-12T18:46:39+00: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. - - - - - 042b5bd8 by Arthur Edelstein at 2023-01-12T18:46:39+00: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. - - - - - 729bcce1 by Alex Catarineu at 2023-01-12T18:46:40+00: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. - - - - - 3a2c7731 by Georg Koppen at 2023-01-12T18:46:40+00:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 97925e0b by Alex Catarineu at 2023-01-12T18:46:41+00:00 Bug 28369: Stop shipping pingsender executable - - - - - 20c20010 by Alex Catarineu at 2023-01-12T18:46:41+00: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. - - - - - 87ae5631 by Mike Perry at 2023-01-12T20:08:19+00: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. - - - - - b5eb7b37 by Pier Angelo Vendrame at 2023-01-12T20:08:20+00: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). - - - - - d8869880 by Alex Catarineu at 2023-01-12T20:08:20+00: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 - - - - - d8523c61 by Alex Catarineu at 2023-01-12T20:08:21+00:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 26bc2e98 by Alex Catarineu at 2023-01-12T20:08:21+00:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - aca0e2f3 by Alex Catarineu at 2023-01-12T20:08:22+00:00 Bug 26345: Hide tracking protection UI - - - - - 7955e0b3 by Kathy Brade at 2023-01-12T20:08:22+00:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - ed8facc8 by Kathy Brade at 2023-01-12T20:08:22+00:00 Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1769028 - - - - - 4a871078 by Alex Catarineu at 2023-01-12T20:08:23+00:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 7a881ed0 by Mike Perry at 2023-01-12T20:08:23+00: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 - - - - - b462f1e3 by Kathy Brade at 2023-01-12T20:08:24+00: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. - - - - - ca96c059 by Igor Oliveira at 2023-01-12T20:08:24+00:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - 18e9ff4b by Pier Angelo Vendrame at 2023-01-12T20:08:25+00: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. - - - - - 8bdf317e by Matthew Finkel at 2023-01-12T20:08:25+00:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - e123d32f by hackademix at 2023-01-12T20:08:25+00:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - f1955131 by hackademix at 2023-01-12T20:08:26+00:00 Bug 41434: Letterboxing, improve logging. - - - - - 876242bc by hackademix at 2023-01-12T20:08:26+00:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - 14b90dbd by hackademix at 2023-01-12T20:08:27+00:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 9e1740c9 by Richard Pospesel at 2023-01-12T20:08:27+00:00 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and outline are tied to the currently selected theme. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1594455 - - - - - f25b7562 by Alex Catarineu at 2023-01-12T20:08:28+00:00 Bug 40069: Add helpers for message passing with extensions - - - - - 4b336e1d by Matthew Finkel at 2023-01-12T20:08:28+00:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - b4d24a15 by Pier Angelo Vendrame at 2023-01-12T20:08:29+00: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. - - - - - c8514889 by Henry Wilkes at 2023-01-12T20:08:29+00:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - 4ed3f500 by Pier Angelo Vendrame at 2023-01-12T20:08:29+00:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - daa52700 by Pier Angelo Vendrame at 2023-01-12T20:08:30+00: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 - - - - - fd4eb775 by Pier Angelo Vendrame at 2023-01-12T20:08:31+00:00 Bug 40926: Implemented the New Identity feature - - - - - 5e566e9c by Richard Pospesel at 2023-01-12T20:08:31+00:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 1d142de8 by Mike Perry at 2023-01-12T20:08:32+00: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 - - - - - 3112feca by Alex Catarineu at 2023-01-12T20:08:32+00:00 Bring back old Firefox onboarding Revert "Bug 1462415 - Delete onboarding system add-on r=Standard8,k88hudson" This reverts commit f7ffd78b62541d44d0102f8051d2f4080bdbc432. Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. Bug 28822: Convert onboarding to webextension Partially revert 1564367 (controlCenter in UITour.jsm) - - - - - 366b7d21 by Kathy Brade at 2023-01-12T20:08:33+00:00 Bug 26961: New user onboarding. Reuse the Firefox onboarding mechanism with minimal changes. Localizable strings are pulled in from Torbutton (if Torbutton is not installed, we lack about:tor and no tour will be shown). Replace SVG images with PNGs (see bug 27002), For defense in depth, omit include OnboardingTelemetry.jsm entirely. Added support for the following UITour page event: torBrowserOpenSecuritySettings Also fix bug 27403: the onboarding bubble is not always displayed. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. Also fix bug 27484: Improve navigation within onboarding. Bug 27082: enable a limited UITour Disallow access to UITour functionality from all pages other than about:home, about:newtab, and about:tor. Implement a whitelist mechanism for page actions. Bug 26962 - implement new features onboarding (part 1). Add an "Explore" button to the "Circuit Display" panel within new user onboarding which opens the DuckDuckGo .onion and then guides users through a short circuit display tutorial. Allow a few additional UITour actions while limiting as much as possible how it can be used. Tweak the UITour styles to match the Tor Browser branding. All user interface strings are retrieved from Torbutton's browserOnboarding.properties file. Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". Bug 29768: Introduce new features to users Add an "update" tour for the Tor Browser 8.5 release that contains two panels: Toolbar and Security (with appropriate description text and images). Display an attention-grabbing dot on the onboarding text bubble when the update tour is active. The animation lasts for 14 seconds. Bug 31768: Introduce toolbar and network settings changes in onboarding Update the "Tor Network" onboarding page to include a note that settings can now be accessed via the application preferences and add an "Adjust Your Tor Network Settings" action button which opens about:preferences#tor. Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one that includes the revised "Tor Network" page and a revised "Toolbar" page. The latter explains that Torbutton's toolbar item has been removed ("Goodbye Onion Button") and explains how to access the New Identity feature using the hamburger menu and new toolbar item. Bug 34321 - Add Learn More onboarding item Bug 40429: Update Onboarding for 10.5 - - - - - b97df1c2 by Mike Perry at 2023-01-12T20:08:34+00:00 TB3: Tor Browser's official .mozconfigs. Also: Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24 Changes needed to build Mac in 64bit Bug 10715: Enable Webgl for mingw-w64 again. Disable ICU when cross-compiling; clean-up. Bug 15773: Enable ICU on OS X Bug 15990: Don't build the sandbox with mingw-w64 Bug 12761: Switch to ESR 38 for OS X Updating .mozconfig-asan Bug 12516: Compile hardenend Tor Browser with -fwrapv Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 13419: Add back ICU for Windows Bug 21239: Use GTK2 for ESR52 Linux builds Bug 23025: Add hardening flags for macOS Bug 24478: Enable debug assertions and tests in our ASan builds --enable-proxy-bypass-protection Bug 27597: ASan build option in tor-browser-build is broken Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 21849: Don't allow SSL key logging. Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 25741 - TBA: Disable features at compile-time MOZ_NATIVE_DEVICES for casting and the media player MOZ_TELEMETRY_REPORTING for telemetry MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo) Bug 25741 - TBA: Add default configure options in dedicated file Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 29859: Disable HLS support for now Add --disable-tor-launcher build option Add --enable-tor-browser-update build option Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40061: Omit the Windows default browser agent from the build Bug 40107: Adapt .mozconfig-asan for ESR 78 Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 40793: moved Tor configuration options from old-configure.in to moz.configure - - - - - 10217d30 by Henry Wilkes at 2023-01-12T20:08:34+00:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 2c3319e5 by Pier Angelo Vendrame at 2023-01-12T20:08:34+00: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. - - - - - 0c8c7911 by Kathy Brade at 2023-01-12T20:08:35+00:00 Bug 13252: Do not store data in the app bundle When --enable-tor-browser-data-outside-app-dir is enabled, all user data is stored in a directory named TorBrowser-Data which is located next to the application directory. Display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. On Mac OS, add support for the --invisible command line option which is used by the meek-http-helper to avoid showing an icon for the helper browser on the dock. - - - - - 8fdef6ae by Pier Angelo Vendrame at 2023-01-12T20:08:35+00:00 Bug 40933: Add tor-launcher functionality - - - - - ce29779d by Richard Pospesel at 2023-01-12T20:08:36+00: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 - - - - - 9f7a57d1 by Alex Catarineu at 2023-01-12T20:08:36+00:00 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule Bug 31575: Replace Firefox Home (newtab) with about:tor Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. - - - - - 1cbaba54 by hackademix at 2023-01-12T20:08:37+00:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop - - - - - e81dd7f0 by Amogh Pradeep at 2023-01-12T20:08:37+00: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 - - - - - 3b4c4723 by Alex Catarineu at 2023-01-12T20:08:37+00:00 Add TorStrings module for localization - - - - - 72fe5507 by Kathy Brade at 2023-01-12T20:08:38+00: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. - - - - - 9a72457c by sanketh at 2023-01-12T20:08:38+00: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 - - - - - 6f84a17e by Kathy Brade at 2023-01-12T20:08:39+00:00 Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. Other bugs fixed: Bug 21766: Crash with e10s enabled while trying to download a file Bug 21886: Download is stalled in non-e10s mode Bug 22471: Downloading files via the PDF viewer download button is broken Bug 22472: Fix FTP downloads when external helper app dialog is shown Bug 22610: Avoid crashes when canceling external helper app downloads Bug 22618: Downloading pdf file via file:/// is stalling - - - - - 3a4d9aba by Pier Angelo Vendrame at 2023-01-12T20:08:39+00:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - bd3f77b7 by Richard Pospesel at 2023-01-12T20:08:40+00: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 - - - - - 3fee7c3c by Richard Pospesel at 2023-01-12T20:08:40+00:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds tor connection status to url bar and tweaks UX when not online - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor - explicitly allows about:torconnect URIs to ignore Resist Fingerprinting (RFP) - various tweaks to info-pages.inc.css for about:torconnect (also affects other firefox info pages) Bug 40773: Update the about:torconnect frontend page to match additional UI flows - - - - - e621d023 by Arthur Edelstein at 2023-01-12T20:08:40+00: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. - - - - - 9681fabe by Kathy Brade at 2023-01-12T20:08:41+00:00 Bug 4234: Use the Firefox Update Process for Tor Browser. The following files are never updated: TorBrowser/Data/Browser/profiles.ini TorBrowser/Data/Browser/profile.default/bookmarks.html TorBrowser/Data/Tor/torrc Mac OS: Store update metadata under TorBrowser/UpdateInfo. Removed the %OS_VERSION% component from the update URL (13047) and added support for minSupportedOSVersion, an attribute of the <update> element that may be used to trigger Firefox's "unsupported platform" behavior. Hide the "What's new" links (set app.releaseNotesURL value to about:blank). Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix Bug 26049: reduce the delay before the update prompt is displayed. Instead of Firefox's 2 days, we use 1 hour (after which time the update doorhanger will be displayed). Also fix bug 27221: purge the startup cache if the Tor Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Tor Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Tor Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 3db85732 by Kathy Brade at 2023-01-12T20:08:41+00:00 Bug 13379: Sign our MAR files. Configure with --enable-verify-mar (when updating, require a valid signature on the MAR file before it is applied). Use the Tor Browser version instead of the Firefox version inside the MAR file info block (necessary to prevent downgrade attacks). Use NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, which Mozilla does on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used by Mozilla to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that is under TorBrowser-Data, and the location of TorBrowser-Data varies. Also includes the fix for bug 18900. Bug 19121: reinstate the update.xml hash check Revert most changes from Mozilla Bug 1373267 "Remove hashFunction and hashValue attributes from nsIUpdatePatch and code related to these attributes." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. Also partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - c8618808 by Kathy Brade at 2023-01-12T20:08:42+00: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. - - - - - 163ebd73 by Georg Koppen at 2023-01-12T20:08:42+00: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 - - - - - 9012b31d by Mike Perry at 2023-01-12T20:08:43+00: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. - - - - - 94e2f325 by Richard Pospesel at 2023-01-12T20:08:43+00: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. - - - - - 6a673db7 by Kathy Brade at 2023-01-12T20:08:44+00: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. - - - - - 3e30bcf2 by Alex Catarineu at 2023-01-12T20:08:44+00: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. - - - - - ccf23b85 by Pier Angelo Vendrame at 2023-01-12T20:08:45+00: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. - - - - - 2f8af40b by Pier Angelo Vendrame at 2023-01-12T20:08:45+00: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. - - - - - 7def1d4e by Pier Angelo Vendrame at 2023-01-12T20:08:46+00: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. - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitmodules - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - browser/actors/NetErrorChild.jsm - browser/actors/NetErrorParent.jsm - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/abouttbupdate/aboutTBUpdate.css - + browser/base/content/abouttbupdate/aboutTBUpdate.js - + browser/base/content/abouttbupdate/aboutTBUpdate.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - + browser/base/content/browser-doctype.inc - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/302095… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/302095… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-102.7.0esr-12.5-1
by Richard Pospesel (＠richard) 12 Jan '23

12 Jan '23

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] squash! Adding issue template for bugs.
by Richard Pospesel (＠richard) 12 Jan '23

12 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: e929baa6 by Richard Pospesel at 2023-01-12T20:20:15+00:00 squash! Adding issue template for bugs. Adding issue and merge request templates - - - - - 1 changed file: - + .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -0,0 +1,25 @@ +## Merge Info + + + +- ### Related Issues + - tor-browser#xxxxx + - tor-browser-build#xxxxx + - etc + +- ### Backport Timeline + - [ ] **Immediate** - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build) + - [ ] **Next Minor Stable Release** - patchset that needs to be verified in nightly before backport + - [ ] **Eventually** - patchset that needs to be verified in alpha before backport + - [ ] **No Backport** - patchset for the next major stable + +- ### Upstream Merging + - [ ] Merge to `base-browser` - typically for `!fixups` to patches in the `base-browser` branch, though sometimes new patches as well + - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please please make separate merge requests for each part + +- ### Issue Tracking + - [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation + +## Change Description + + \ No newline at end of file View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e929baa… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e929baa… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 12 Jan '23

12 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: eac505b2 by Dan Ballard at 2023-01-12T20:06:58+00:00 fixup! Firefox preference overrides. bug 40565: lock security.tls.version.enable-deprecated (cherry picked from commit 2ec04e750ebb1fd9c31f6b33f1becbba8135d95c) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -80,6 +80,9 @@ pref("security.ssl3.ecdhe_rsa_aes_256_sha", false, locked); pref("security.ssl3.rsa_aes_128_sha", false, locked); pref("security.ssl3.rsa_aes_256_sha", false, locked); +// Wrapping a static pref to lock it and prevent changing. +// See tor-browser#40565. +pref("security.tls.version.enable-deprecated", false, locked); // Misc privacy: Remote pref("browser.send_pings", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eac505b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/eac505b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

12 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: e4496e7a by Pier Angelo Vendrame at 2023-01-12T17:28:08+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41572: Check for userContextId also in the circuit display - - - - - 1 changed file: - toolkit/torbutton/chrome/content/tor-circuit-display.js Changes: ===================================== toolkit/torbutton/chrome/content/tor-circuit-display.js ===================================== @@ -306,21 +306,32 @@ let createTorCircuitDisplay = (function() { // Obtains the circuit used by the given browser. let currentCircuitData = function(browser) { if (browser) { - let firstPartyDomain = getDomainForBrowser(browser); - let domain = firstPartyDomain || "--unknown--"; - let domainMap = browserToCredentialsMap.get(browser); - let credentials = domainMap && domainMap.get(domain); + const firstPartyDomain = getDomainForBrowser(browser); + const userContextId = + browser.contentPrincipal.originAttributes.userContextId; + const key = firstPartyDomain + ? `${firstPartyDomain}:${userContextId}` + : "--unknown--"; + const credentialMap = browserToCredentialsMap.get(browser); + const credentials = credentialMap && credentialMap.get(key); if (credentials) { - let [SOCKS_username, SOCKS_password] = credentials; - let nodeData = credentialsToNodeDataMap.get( + const [SOCKS_username, SOCKS_password] = credentials; + const nodeData = credentialsToNodeDataMap.get( `${SOCKS_username}|${SOCKS_password}` ); - let domain = SOCKS_username; - if (browser.documentURI.host.endsWith(".tor.onion")) { - const service = Cc[ - "@torproject.org/onion-alias-service;1" - ].getService(Ci.IOnionAliasService); - domain = service.getOnionAlias(browser.documentURI.host); + let domain = firstPartyDomain; + try { + if (browser.documentURI.host.endsWith(".tor.onion")) { + const service = Cc[ + "@torproject.org/onion-alias-service;1" + ].getService(Ci.IOnionAliasService); + domain = service.getOnionAlias(browser.documentURI.host); + } + } catch (e) { + logger.eclog( + 3, + `[circuit display] Cannot verify if we are visiting an onion alias: ${e.message}\n${e.stack}` + ); } return { domain, nodeData }; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4496e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4496e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40714: Ship NoScript also in the extension distribution directory
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4e52d507 by Pier Angelo Vendrame at 2023-01-12T15:28:37+01:00 Bug 40714: Ship NoScript also in the extension distribution directory - - - - - 1 changed file: - projects/browser/build Changes: ===================================== projects/browser/build ===================================== @@ -40,10 +40,13 @@ touch "$GENERATEDPREFSPATH" TBDIRS=("$TBDIR") DOCSPATH=[% c('var/ProjectName') %]/Docs - EXTSPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions + EXTSPATH=distribution/extensions TORBINPATH=TorBrowser/Tor TORCONFIGPATH=TorBrowser/Data/Tor + PROFILEPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions + mkdir -p "$TBDIR/$PROFILEPATH" + mkdir -p "$TBDIR/[% c('var/ProjectName') %]/Data/Browser/Caches" [% END %] @@ -57,6 +60,9 @@ unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zi MARTOOLS=$rootdir/mar-tools mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" +[% IF !c("var/macos") -%] + cp "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$TBDIR/$PROFILEPATH/" +[% END %] [% IF c("var/tor-browser") -%] function mv_tbdir { @@ -91,7 +97,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b # Snowflake's README is a documentation shipped in tor-expert-bundle mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %] mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md" - + # WebTunnel's README is a documentation shipped in tor-expert-bundle mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %] mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 847ff5d3 by Pier Angelo Vendrame at 2023-01-12T14:17:24+01:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41569: Launch directly the real tor also on macOS, rather than the shim script Bug 41570: Do not customize environment variables for tor anymore - - - - - 2 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.jsm - toolkit/components/tor-launcher/TorProcess.jsm Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.jsm ===================================== @@ -144,9 +144,10 @@ class TorFile { // Anyway, that macro is also available in AppConstants. if (TorFile.isUserDataOutsideOfAppDir) { if (TorLauncherUtil.isMac) { - torPath = "Contents/Resources/"; + torPath = "Contents/MacOS/Tor"; + } else { + torPath = "TorBrowser/Tor"; } - torPath += "TorBrowser/Tor"; } else { torPath = "Tor"; dataDir = "Data/"; @@ -154,17 +155,16 @@ class TorFile { switch (this.fileType) { case "tor": - if (TorLauncherUtil.isMac) { - this.path = `${torPath}/tor`; - } else { - this.path = - torPath + "/tor" + (TorLauncherUtil.isWindows ? ".exe" : ""); + this.path = `${torPath}/tor`; + if (TorLauncherUtil.isWindows) { + this.path += ".exe"; } break; case "torrc-defaults": - this.path = TorFile.isUserDataOutsideOfAppDir - ? `${torPath}/torrc-defaults` - : `${dataDir}Tor/torrc-defaults`; + this.path = TorLauncherUtil.isMac + ? "Contents/Resources/TorBrowser/Tor" + : `${dataDir}Tor`; + this.path += "/torrc-defaults"; break; case "torrc": this.path = `${dataDir}Tor/torrc`; ===================================== toolkit/components/tor-launcher/TorProcess.jsm ===================================== @@ -93,27 +93,6 @@ class TorProcess { this._args.push("1"); } - // Set an environment variable that points to the Tor data directory. - // This is used by meek-client-torbrowser to find the location for - // the meek browser profile. - const environment = { - TOR_BROWSER_TOR_DATA_DIR: this._dataDir.path, - }; - - // On Windows, prepend the Tor program directory to PATH. This is needed - // so that pluggable transports can find OpenSSL DLLs, etc. - // See https://trac.torproject.org/projects/tor/ticket/10845 - if (TorLauncherUtil.isWindows) { - let path = this._exeFile.parent.path; - const env = Cc["@mozilla.org/process/environment;1"].getService( - Ci.nsIEnvironment - ); - if (env.exists("PATH")) { - path += ";" + env.get("PATH"); - } - environment.PATH = path; - } - this._status = TorProcessStatus.Starting; this._didConnectToTorControlPort = false; @@ -131,10 +110,13 @@ class TorProcess { const options = { command: this._exeFile.path, arguments: this._args, - environment, - environmentAppend: true, stderr: "stdout", }; + if (TorLauncherUtil.isMac) { + // On macOS, we specify pluggable transport relative to the tor + // executable. + options.workdir = this._exeFile.parent.path; + } this._subprocess = await Subprocess.call(options); this._dumpStdout(); this._watchProcess(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/847ff5d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/847ff5d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40695: Do not ship the macOS tor shim anymore
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6da7839e by Pier Angelo Vendrame at 2023-01-12T14:14:50+01:00 Bug 40695: Do not ship the macOS tor shim anymore We moved the requested operations to Tor Browser side. - - - - - 2 changed files: - − projects/browser/Bundle-Data/mac-tor.sh - projects/browser/build Changes: ===================================== projects/browser/Bundle-Data/mac-tor.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/sh -# Compiled Python modules require a compatible Python, which means 32-bit 2.6. -export VERSIONER_PYTHON_VERSION=2.6 -export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH -# Set the current working directory to the directory containing this executable, -# so that pluggable transport executables can be given with relative paths. This -# works around a change in OS X 10.9, where the current working directory is -# otherwise set to "/" when an application bundle is started from Finder.. -# https://trac.torproject.org/projects/tor/ticket/10030 -cd "$(dirname "$0")" -if [ ! -f tor.real -a -d ../../../MacOS/Tor ]; then - # On newer releases of Tor Browser, tor.real is in Contents/MacOS/Tor/.. - cd ../../../MacOS/Tor -fi -exec ./tor.real "$@" ===================================== projects/browser/build ===================================== @@ -211,15 +211,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz rm -Rf Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac - [% IF c("var/tor-browser") -%] - # Install a "tor" shim that sets the working directory. See #10030. - for tbdir in "${TBDIRS[@]}" - do - mv "$tbdir/$TORBINPATH/tor" "$tbdir/$TORBINPATH/tor.real" - cp Bundle-Data/mac-tor.sh "$tbdir/$TORCONFIGPATH/tor" - done - [% END -%] - tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update `Release Prep - Stable`
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c027f7cb by Nicolas Vigier at 2023-01-12T13:10:42+01:00 Update `Release Prep - Stable` Following changes from tor-browser-build#40734 and tor-browser-build#40735 - - - - - 1 changed file: - .gitlab/issue_templates/Release Prep - Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -131,10 +131,12 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation-base-browser/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] Update `projects/translation-base-browser-fluent/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch + - [ ] Update `projects/translation/config`: + - [ ] run `make list_translation_updates-release` to get updated hashes + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` 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 - [ ] ***(Optional)*** Update Android-specific build configs - [ ] ***(Optional)*** Update `projects/geckoview/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 2ec04e75 by Dan Ballard at 2023-01-12T12:53:35+00:00 fixup! Firefox preference overrides. bug 40565: lock security.tls.version.enable-deprecated - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -83,6 +83,9 @@ pref("security.ssl3.ecdhe_rsa_aes_256_sha", false, locked); pref("security.ssl3.rsa_aes_128_sha", false, locked); pref("security.ssl3.rsa_aes_256_sha", false, locked); +// Wrapping a static pref to lock it and prevent changing. +// See tor-browser#40565. +pref("security.tls.version.enable-deprecated", false, locked); // Misc privacy: Remote pref("browser.send_pings", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2ec04e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2ec04e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40735: Add command to list which translation components need to be updated
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: fe869201 by Nicolas Vigier at 2023-01-12T13:00:48+01:00 Bug 40735: Add command to list which translation components need to be updated - - - - - 3 changed files: - Makefile - projects/translation/config - − tools/get-translation-hashes Changes: ===================================== Makefile ===================================== @@ -223,6 +223,12 @@ dmg2mar-alpha: submodule-update tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha +list_translation_updates-release: + $(rbm) showconf --target release --step list_updates translation list_updates + +list_translation_updates-alpha: + $(rbm) showconf --target alpha --step list_updates translation list_updates + list_toolchain_updates-fenix: submodule-update $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 ===================================== projects/translation/config ===================================== @@ -30,3 +30,17 @@ steps: targets: nightly: git_hash: 'fenix-torbrowserstringsxml' + list_updates: + list_updates: | + [% + FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'fenix' ]; + branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] }); + commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch }); + IF commit_hash == pc(project, "git_hash", { step => component }); + GET '* ' _ component _ " is up to date\n"; + ELSE; + GET '* ' _ component _ ' can be updated: ' _ commit_hash _ "\n"; + END; + END; + -%] + fetch: 1 ===================================== tools/get-translation-hashes deleted ===================================== @@ -1,13 +0,0 @@ -#!/bin/bash - -cd "$(dirname "$0")/../git_clones/translation" -git fetch > /dev/null 2>&1 - -echo -n "base-browser: " -git rev-parse origin/base-browser -echo -n "base-browser-fluent: " -git rev-parse origin/basebrowser-newidentityftl -echo -n "tor-browser: " -git rev-parse origin/tor-browser -echo -n "fenix: " -git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40735: Add command to list which translation components need to be updated
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: eda7d2c8 by Nicolas Vigier at 2023-01-12T12:29:55+01:00 Bug 40735: Add command to list which translation components need to be updated - - - - - 4 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - Makefile - projects/translation/config - − tools/get-translation-hashes Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -121,7 +121,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - [ ] Update `projects/translation/config`: - - [ ] run `tools/get-translation-hashes` to get updated hashes + - [ ] 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/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch ===================================== Makefile ===================================== @@ -223,6 +223,12 @@ dmg2mar-alpha: submodule-update tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha +list_translation_updates-release: + $(rbm) showconf --target release --step list_updates translation list_updates + +list_translation_updates-alpha: + $(rbm) showconf --target alpha --step list_updates translation list_updates + list_toolchain_updates-fenix: submodule-update $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 ===================================== projects/translation/config ===================================== @@ -30,3 +30,17 @@ steps: targets: nightly: git_hash: 'fenix-torbrowserstringsxml' + list_updates: + list_updates: | + [% + FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'fenix' ]; + branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] }); + commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch }); + IF commit_hash == pc(project, "git_hash", { step => component }); + GET '* ' _ component _ " is up to date\n"; + ELSE; + GET '* ' _ component _ ' can be updated: ' _ commit_hash _ "\n"; + END; + END; + -%] + fetch: 1 ===================================== tools/get-translation-hashes deleted ===================================== @@ -1,13 +0,0 @@ -#!/bin/bash - -cd "$(dirname "$0")/../git_clones/translation" -git fetch > /dev/null 2>&1 - -echo -n "base-browser: " -git rev-parse origin/base-browser -echo -n "base-browser-fluent: " -git rev-parse origin/basebrowser-newidentityftl -echo -n "tor-browser: " -git rev-parse origin/tor-browser -echo -n "fenix: " -git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40713: Inject torbutton translations during the build
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 68b589f8 by Pier Angelo Vendrame at 2023-01-12T08:53:32+01:00 Bug 40713: Inject torbutton translations during the build Co-authored-by: Nicolas Vigier <boklm(a)torproject.org> - - - - - 12 changed files: - projects/fenix/build - projects/fenix/config - projects/firefox/build - projects/firefox/config - − projects/tba-translation/config - − projects/translation-base-browser-fluent/build - − projects/translation-base-browser-fluent/config - − projects/translation-base-browser/build - − projects/translation-base-browser/config - projects/tba-translation/build → projects/translation/build - + projects/translation/config - + tools/get-translation-hashes Changes: ===================================== projects/fenix/build ===================================== @@ -32,7 +32,7 @@ EOF nimbusdir=$builddir-[% c("version") %]/app/build/bin/nimbus mkdir -p $nimbusdir cp $distdir/application-services/nimbus-fml $nimbusdir/ - tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %] + tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -60,7 +60,7 @@ v=[% c("variant") %] [% FOREACH lang = c('var/locales_mobile'); SET lang = tmpl(lang); %] # Copy our torbrowser_strings.xml at the right place - cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ + cp /var/tmp/dist/translation-fenix/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ [% END %] # Prepare Glean dependencies for offline build ===================================== projects/fenix/config ===================================== @@ -46,8 +46,9 @@ input_files: project: geckoview pkg_type: merge_aars enable: '[% !c("var/android_single_arch") %]' - - name: tba-translation - project: tba-translation + - name: translation-fenix + project: translation + pkg_type: fenix - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/firefox/build ===================================== @@ -62,6 +62,10 @@ mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %] tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %] transl_base_browser=$rootdir/translation-base-browser +[% IF c("var/tor-browser") -%] + tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %] + transl_tor_browser=$rootdir/translation-tor-browser +[% END -%] cd /var/tmp/build/[% project %]-[% c("version") %] cat > .mozconfig << 'MOZCONFIG_EOF' @@ -108,11 +112,6 @@ add_translation () { component=$2 lang=$3 filename=$4 - [% IF c("var/macos") -%] - if [ "$lang" == "ja-JP-mac" ]; then - lang="ja" - fi - [% END-%] mkdir "browser/components/$component/locale/$lang" cp "$transl_dir/$lang/$filename" "browser/components/$component/locale/$lang/" @@ -121,9 +120,25 @@ add_translation () { } supported_locales="[% tmpl(c('var/locales').join(' ')) %]" +[% IF c("var/tor-browser") -%] + torbutton_locales="toolkit/torbutton/chrome/locale/" + torbutton_jar="toolkit/torbutton/jar.mn" +[% END -%] for lang in $supported_locales; do + [% IF c("var/macos") -%] + if [ "$lang" == "ja-JP-mac" ]; then + lang="ja" + fi + [% END-%] + add_translation $transl_base_browser newidentity $lang newIdentity.properties add_translation $transl_base_browser securitylevel $lang securityLevel.properties + + [% IF c("var/tor-browser") -%] + mv "$transl_tor_browser/$lang" "$torbutton_locales/" + echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" + echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" + [% END -%] done rm -f configure ===================================== projects/firefox/config ===================================== @@ -181,11 +181,17 @@ input_files: enable: '[% c("var/linux") %]' - filename: start-firefox enable: '[% c("var/linux") %]' - - project: translation-base-browser + - project: translation name: translation-base-browser - - project: translation-base-browser-fluent + pkg_type: base-browser + - project: translation name: translation-base-browser-fluent + pkg_type: base-browser-fluent enable: '[% !c("var/testbuild") %]' + - project: translation + name: translation-tor-browser + pkg_type: tor-browser + enable: '[% c("var/tor-browser") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin ===================================== projects/tba-translation/config deleted ===================================== @@ -1,7 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -# We need to bump the commit before releasing but just pointing to a branch -# might cause too much rebuidling of the Firefox part. -git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35 -version: '[% c("abbrev") %]' ===================================== projects/translation-base-browser-fluent/build deleted ===================================== @@ -1,10 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -# We do not need new identity for now, only languageNotification.ftl -find [% project %] -name new-identity.ftl -delete -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/translation-base-browser-fluent/config deleted ===================================== @@ -1,9 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: e1bb5278668e71317ccbf1fdd21cf25c4d56b95c -version: '[% c("abbrev") %]' - -targets: - nightly: - git_hash: 'basebrowser-newidentityftl' ===================================== projects/translation-base-browser/build deleted ===================================== @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/translation-base-browser/config deleted ===================================== @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: f3c816f0fde87471f98e46515482a493c4eb57dc -version: '[% c("abbrev") %]' ===================================== projects/tba-translation/build → projects/translation/build ===================================== @@ -1,8 +1,9 @@ #!/bin/bash [% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] +mv [% project %]-[% c("version") %] [% project %]-[% c("step") %] +[% SET tar_source = project _ '-' _ c('step') -%] [% c('tar', { - tar_src => [ project ], + tar_src => [ tar_source ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), }) %] ===================================== projects/translation/config ===================================== @@ -0,0 +1,32 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("step") %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +git_url: https://gitlab.torproject.org/tpo/translation.git +version: '[% c("abbrev") %]' + +steps: + base-browser: + base-browser: '[% INCLUDE build %]' + git_hash: d1aa584f3da4c2fc6bfe5d289e2783705ee7e015 + targets: + nightly: + git_hash: 'base-browser' + base-browser-fluent: + base-browser-fluent: '[% INCLUDE build %]' + git_hash: d771fd689978f52053e8a14bb622c936aa938769 + targets: + nightly: + git_hash: 'basebrowser-newidentityftl' + tor-browser: + tor-browser: '[% INCLUDE build %]' + git_hash: a73ed9756f5d9a753fb7c3c7676174e4d9b68dee + targets: + nightly: + git_hash: 'tor-browser' + fenix: + fenix: '[% INCLUDE build %]' + # We need to bump the commit before releasing but just pointing to a branch + # might cause too much rebuidling of the Firefox part. + git_hash: 5e1d058123f3a5d34a59799bd6f80db5d71e563e + targets: + nightly: + git_hash: 'fenix-torbrowserstringsxml' ===================================== tools/get-translation-hashes ===================================== @@ -0,0 +1,13 @@ +#!/bin/bash + +cd "$(dirname "$0")/../git_clones/translation" +git fetch > /dev/null 2>&1 + +echo -n "base-browser: " +git rev-parse origin/base-browser +echo -n "base-browser-fluent: " +git rev-parse origin/basebrowser-newidentityftl +echo -n "tor-browser: " +git rev-parse origin/tor-browser +echo -n "fenix: " +git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40733: Use the new branding directories
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 49af2a8d by Pier Angelo Vendrame at 2023-01-11T12:02:45+01:00 Bug 40733: Use the new branding directories In tor-browser#41428 we decided not to change contents of Firefox branding directories anymore, but to create ours. This commit updates the build files to use the new branding directories. - - - - - 1 changed file: - projects/firefox/config Changes: ===================================== projects/firefox/config ===================================== @@ -15,7 +15,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.5-1' browser_build: 1 - branding_directory: 'browser/branding/alpha' + branding_directory: 'browser/branding/tb-alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' deps: @@ -67,13 +67,13 @@ targets: release: var: - branding_directory: 'browser/branding/official' + branding_directory: 'browser/branding/tb-release' nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 var: - branding_directory: 'browser/branding/nightly' + branding_directory: 'browser/branding/tb-nightly' linux-x86_64: var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_102_7_0esr_BUILD1
by Richard Pospesel (＠richard) 11 Jan '23

11 Jan '23

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-102.7.0esr-12.0-1
by Richard Pospesel (＠richard) 11 Jan '23

11 Jan '23

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] 3 commits: fixup! Bug 2176: Rebrand Firefox to TorBrowser
by Richard Pospesel (＠richard) 11 Jan '23

11 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: fb0ac5b2 by Pier Angelo Vendrame at 2023-01-11T19:03:00+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41428: Do not change Firefox branding, but create Tor Browser's branding directories. This commit restores the original Firefox branding files. - - - - - 74b66022 by Pier Angelo Vendrame at 2023-01-11T19:03:09+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41428: Do not change Firefox branding, but create Tor Browser's branding directories. This commit adds the new files for Tor Browser release and nightly. Then it renames alpha to tb-alpha and cleans unused files. - - - - - af8d56a3 by Pier Angelo Vendrame at 2023-01-11T19:03:10+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41428: Use Tor Browser's branding directory for dev builds - - - - - 30 changed files: - − browser/branding/alpha/background.png - − browser/branding/alpha/bgstub.jpg - − browser/branding/alpha/bgstub_2x.jpg - − browser/branding/alpha/branding.nsi - − browser/branding/alpha/content/aboutlogins.svg - − browser/branding/alpha/default512.png - − browser/branding/alpha/disk.icns - − browser/branding/alpha/dsstore - − browser/branding/alpha/firefox64.ico - − browser/branding/alpha/stubinstaller/bgstub.jpg - − browser/branding/alpha/stubinstaller/installing_page.css - − browser/branding/alpha/stubinstaller/profile_cleanup_page.css - − browser/branding/alpha/wizHeader.bmp - − browser/branding/alpha/wizHeaderRTL.bmp - − browser/branding/alpha/wizWatermark.bmp - browser/branding/branding-common.mozbuild - browser/branding/nightly/VisualElements_150.png - browser/branding/nightly/VisualElements_70.png - browser/branding/nightly/configure.sh - browser/branding/nightly/content/jar.mn - browser/branding/nightly/default128.png - browser/branding/nightly/default16.png - browser/branding/nightly/default22.png - browser/branding/nightly/default24.png - browser/branding/nightly/default256.png - browser/branding/nightly/default32.png - browser/branding/nightly/default48.png - − browser/branding/nightly/default512.png - browser/branding/nightly/default64.png - browser/branding/nightly/document.icns The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/84e066… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/84e066… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 11 commits: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 11 Jan '23

11 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 83bd811c by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Removed the torbutton submodule - - - - - 465fc665 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Checked out toolkit/torbutton/ from dbaaa5df. - - - - - 1a3dda31 by Alex Catarineu at 2023-01-11T17:55:35+00:00 fixup! Add TorStrings module for localization Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Cherry-picked the new TorStrings commit. - - - - - 750d8085 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Add TorStrings module for localization Bug 41563: Fix old placeholders in TorStrings.jsm - - - - - 9b8cdc2c by hackademix at 2023-01-11T17:55:35+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41561: fix maximize warning notifications. - - - - - 67d5b272 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 Revert "Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore" This reverts commit 8825bcad66f9ad96c29258cc57bfdb92a6437b1b. - - - - - 556068cd by hackademix at 2023-01-11T17:55:35+00:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop - - - - - 3b425ef2 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Changed placeholders for strings as we switched from dtd to .properties. - - - - - 3203dab0 by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Changed placeholders for strings as we switched from dtd to .properties. - - - - - 7c6101a6 by Henry Wilkes at 2023-01-11T17:55:35+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Fixed a problem with linting - - - - - c0a310eb by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series Restore crypto safety strings. - - - - - 30 changed files: - .gitmodules - browser/components/torconnect/content/aboutTorConnect.js - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorStrings.jsm - toolkit/moz.build - + toolkit/torbutton/CREDITS - + toolkit/torbutton/LICENSE - + toolkit/torbutton/chrome/content/aboutTor/aboutTor-content.js - + toolkit/torbutton/chrome/content/aboutTor/aboutTor.xhtml - + toolkit/torbutton/chrome/content/aboutTor/resources/aboutTor.js - + toolkit/torbutton/chrome/content/tor-circuit-display.js - + toolkit/torbutton/chrome/content/torbutton.js - + toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd - + toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd - + toolkit/torbutton/chrome/locale/en-US/aboutTor.dtd - + toolkit/torbutton/chrome/locale/en-US/brand.dtd - + toolkit/torbutton/chrome/locale/en-US/brand.properties - + toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl - + toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties - + toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties - + toolkit/torbutton/chrome/locale/en-US/onboarding.properties - + toolkit/torbutton/chrome/locale/en-US/onionLocation.properties - + toolkit/torbutton/chrome/locale/en-US/rulesets.properties - + toolkit/torbutton/chrome/locale/en-US/settings.properties - + toolkit/torbutton/chrome/locale/en-US/torConnect.properties - + toolkit/torbutton/chrome/locale/en-US/torbutton.dtd - + toolkit/torbutton/chrome/locale/en-US/torbutton.properties - + toolkit/torbutton/chrome/locale/en-US/torlauncher.properties - + toolkit/torbutton/chrome/skin/about-wordmark.png - + toolkit/torbutton/chrome/skin/aboutDialog.css The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/be0f1d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/be0f1d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] fixup! Bug 40209: Implement Basic Crypto Safety
by Richard Pospesel (＠richard) 11 Jan '23

11 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: be0f1dcb by Henry Wilkes at 2023-01-11T17:22:14+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 41539: Remove all whitespace from copied text before testing if it looks like a crypto address. (cherry picked from commit 221b7a494351e853bae3aa4878573829e7f7015a) - - - - - 1 changed file: - browser/actors/CryptoSafetyChild.jsm Changes: ===================================== browser/actors/CryptoSafetyChild.jsm ===================================== @@ -74,7 +74,7 @@ class CryptoSafetyChild extends JSWindowActorChild { if (event.type == "copy" || event.type == "cut") { this.contentWindow.navigator.clipboard.readText().then(clipText => { - const selection = clipText.trim(); + const selection = clipText.replace(/\s+/g, ""); if (looksLikeCryptoAddress(selection)) { this.sendAsyncMessage("CryptoSafety:CopiedText", { selection, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/be0f1dc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/be0f1dc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by Pier Angelo Vendrame (＠pierov) 11 Jan '23

11 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 84e066a2 by hackademix at 2023-01-11T11:10:14+01:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 41560: fix turning off letterboxing causes content not rendering in the current window. - - - - - 2 changed files: - browser/base/content/browser.css - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/base/content/browser.css ===================================== @@ -111,7 +111,7 @@ body { outline: initial; } -:root:not([inDOMFullscreen]) .letterboxing-ready .browserStack:not(.exclude-letterboxing) { +:root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserStack:not(.exclude-letterboxing) { place-content: start center; } ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -601,7 +601,7 @@ class _RFPHelper { _detachWindow(aWindow) { let tabBrowser = aWindow.gBrowser; tabBrowser.removeTabsProgressListener(this); - aWindow._rfpResizeObserver.disconnect(); + aWindow._rfpResizeObserver?.disconnect(); delete aWindow._rfpResizeObserver; aWindow.removeEventListener("TabOpen", this); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/84e066a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/84e066a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! TB3: Tor Browser's official .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 11 Jan '23

11 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 60e9699e by Pier Angelo Vendrame at 2023-01-11T09:26:34+00:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41567: Do not customize MOZ_APP_BASENAME in Tor Browser. That variable renames a lot of "firefox"es to "torbrowser". It could be desirable, but it will break a lot of legacy, including links generated with the Windows installer. - - - - - 1 changed file: - browser/config/mozconfigs/tor-browser Changes: ===================================== browser/config/mozconfigs/tor-browser ===================================== @@ -1,6 +1,5 @@ . $topsrcdir/browser/config/mozconfigs/base-browser -export MOZ_APP_BASENAME="TorBrowser" mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60e9699… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/60e9699… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

11 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 56d4c3f6 by hackademix at 2023-01-10T23:42:13+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41561: fix maximize warning notifications. - - - - - 1 changed file: - toolkit/torbutton/chrome/content/torbutton.js Changes: ===================================== toolkit/torbutton/chrome/content/torbutton.js ===================================== @@ -871,6 +871,13 @@ var torbutton_new_circuit; onLocationChange(aProgress, aRequest, aURI) {}, onStateChange(aProgress, aRequest, aFlag, aStatus) { if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { + window.promiseDocumentFlushed(() => { + // Here we're guaranteed to read the "final" (!) initial size, rather than [1, 1]. + torbutton_resizelistener.originalSize = { + width: window.outerWidth, + height: window.outerHeight, + }; + }); m_tb_resize_handler = async function() { // Wait for end of execution queue to ensure we have correct windowState. await new Promise(resolve => setTimeout(resolve, 0)); @@ -878,17 +885,18 @@ var torbutton_new_circuit; window.windowState === window.STATE_MAXIMIZED || window.windowState === window.STATE_FULLSCREEN ) { + const kRemainingWarnings = + "extensions.torbutton.maximize_warnings_remaining"; if ( - m_tb_prefs.getBoolPref( + Services.prefs.getBoolPref( "extensions.torbutton.resize_new_windows" ) && - m_tb_prefs.getIntPref( - "extensions.torbutton.maximize_warnings_remaining" - ) > 0 + Services.prefs.getIntPref(kRemainingWarnings) > 0 ) { // Do not add another notification if one is already showing. const kNotificationName = "torbutton-maximize-notification"; - let box = gBrowser.getNotificationBox(); + + const box = gNotificationBox; if (box.getNotificationWithValue(kNotificationName)) { return; } @@ -908,38 +916,53 @@ var torbutton_new_circuit; } // No need to get "OK" translated again. - let sbSvc = Services.strings; - let bundle = sbSvc.createBundle( + const bundle = Services.strings.createBundle( "chrome://global/locale/commonDialogs.properties" ); - let button_label = bundle.GetStringFromName("OK"); + + const decreaseWarningsCount = () => { + const currentCount = Services.prefs.getIntPref( + kRemainingWarnings + ); + if (currentCount > 0) { + Services.prefs.setIntPref( + kRemainingWarnings, + currentCount - 1 + ); + } + }; let buttons = [ { - label: button_label, + label: bundle.GetStringFromName("OK"), accessKey: "O", popup: null, callback() { - m_tb_prefs.setIntPref( - "extensions.torbutton.maximize_warnings_remaining", - m_tb_prefs.getIntPref( - "extensions.torbutton.maximize_warnings_remaining" - ) - 1 - ); + // reset notification timer to work-around resize race conditions + m_tb_resize_date = Date.now(); + // restore the original (rounded) size we had stored on window startup + let { originalSize } = torbutton_resizelistener; + window.resizeTo(originalSize.width, originalSize.height); }, }, ]; - let priority = box.PRIORITY_WARNING_LOW; - let message = torbutton_get_property_string( + const label = torbutton_get_property_string( "torbutton.maximize_warning" ); box.appendNotification( - message, kNotificationName, - null, - priority, + { + label, + priority: box.PRIORITY_WARNING_LOW, + eventCallback(event) { + if (event === "dismissed") { + // user manually dismissed the notification + decreaseWarningsCount(); + } + }, + }, buttons ); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56d4c3f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56d4c3f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.6.0esr-12.5-1] fixup! Bug 9173: Change the default Firefox profile directory to be relative.
by Richard Pospesel (＠richard) 10 Jan '23

10 Jan '23

Richard Pospesel pushed to branch base-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: cc5f2fcd by Pier Angelo Vendrame at 2023-01-10T19:59:42+00:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Bug 20497: Make it possible to disable portable mode 9173 is the patch that enables portable mode for Tor Browser. We modified it to make it optional, but it still used to remove a few important parts that made it compulsory to define a profile directory in the application.ini (through the mozconfig). This commit restores these parts, and makes it hopefully possible to disable portable mode without filling the home directory with TBB files. A few parts are then disabled in a following commit, since they are TBB-legacy behavior, but we might not want them for base-browser and for privacy-browser. Also, this commit changes the configure flag from --with-relative-profile-directory to --with-relative-data-dir, because the data directories can contain the profile and the local data such as caches, not only the profile. Still, we are assuming we are using the same data directory for the profile and for the caches, which is not the case on Windows (where the profile is roaming, and the caches are local) and on Linux (where the profile is in the home, and the cache is in ~/.cache). - - - - - 5 changed files: - browser/config/mozconfigs/base-browser - moz.configure - mozconfig-macos-x86_64 - toolkit/xre/nsXREDirProvider.cpp - xpcom/io/nsAppFileLocationProvider.cpp Changes: ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -42,4 +42,4 @@ if test -z "$WASI_SYSROOT"; then ac_add_options --without-wasm-sandboxed-libraries fi -ac_add_options --with-relative-profile=BaseBrowser/Data/Browser +ac_add_options --with-relative-data-dir=BaseBrowser/Data/Browser ===================================== moz.configure ===================================== @@ -1026,22 +1026,22 @@ set_define("BASE_BROWSER", True, when="--enable-base-browser") option( - "--with-relative-profile", + "--with-relative-data-dir", nargs=1, - help="Sets the directory of the profile, relative to the application directory" + help="Sets the data directories to be relative to the application directory" ) -@depends("--with-relative-profile", target) +@depends("--with-relative-data-dir", target) @imports("json") -def relative_profile(value, target): +def relative_data_dir(value, target): if value and target.os == "Android": - die("--with-relative-profile is not supported on Android") + die("--with-relative-data-dir is not supported on Android") if value: return json.dumps(value[0]) -set_define("RELATIVE_PROFILE_DIRECTORY", relative_profile) +set_define("RELATIVE_DATA_DIR", relative_data_dir) # Please do not add configure checks from here on. ===================================== mozconfig-macos-x86_64 ===================================== @@ -4,3 +4,6 @@ ac_add_options --enable-strip # See bug #41131 ac_add_options --disable-update-agent + +# For base-browser we do not enable portable mode on macOS. +ac_add_options --without-relative-data-dir ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -234,6 +234,9 @@ nsresult nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult) { nsresult rv = GetUserDataDirectory(getter_AddRefs(file), false); if (NS_SUCCEEDED(rv)) { +#if !defined(XP_UNIX) || defined(XP_MACOSX) + rv = file->AppendNative("Profiles"_ns); +#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -249,6 +252,9 @@ nsresult nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult) { nsresult rv = GetUserDataDirectory(getter_AddRefs(file), true); if (NS_SUCCEEDED(rv)) { +#if !defined(XP_UNIX) || defined(XP_MACOSX) + rv = file->AppendNative("Profiles"_ns); +#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -1332,14 +1338,14 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, return gDataDirHome->Clone(aFile); } -#if defined(RELATIVE_PROFILE_DIRECTORY) +#if defined(RELATIVE_DATA_DIR) RefPtr<nsXREDirProvider> singleton = GetSingleton(); if (!singleton) { return NS_ERROR_OUT_OF_MEMORY; } rv = singleton->GetAppRootDir(getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); - nsAutoCString profileDir(RELATIVE_PROFILE_DIRECTORY); + nsAutoCString profileDir(RELATIVE_DATA_DIR); rv = localDir->SetRelativePath(localDir.get(), profileDir); NS_ENSURE_SUCCESS(rv, rv); if (aLocal) { @@ -1502,7 +1508,7 @@ nsresult nsXREDirProvider::GetAppRootDir(nsIFile** aFile) { #endif while (levelsToRemove-- > 0) { rv = file->GetParent(getter_AddRefs(appRootDir)); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); file = appRootDir; } return appRootDir->Clone(aFile); @@ -1559,8 +1565,13 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { } nsAutoCString profile; + nsAutoCString appName; + nsAutoCString vendor; if (gAppData->profile) { profile = gAppData->profile; + } else { + appName = gAppData->name; + vendor = gAppData->vendor; } nsresult rv = NS_OK; @@ -1568,12 +1579,27 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { #if defined(XP_MACOSX) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); +# ifndef RELATIVE_DATA_DIR + } else { + // Note that MacOS ignores the vendor when creating the profile hierarchy - + // all application preferences directories live alongside one another in + // ~/Library/Application Support/ + rv = aFile->AppendNative(appName); +# endif } NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); +# ifndef RELATIVE_DATA_DIR + } else { + if (!vendor.IsEmpty()) { + rv = aFile->AppendNative(vendor); + NS_ENSURE_SUCCESS(rv, rv); + } + rv = aFile->AppendNative(appName); +# endif } NS_ENSURE_SUCCESS(rv, rv); @@ -1585,21 +1611,48 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) + nsAutoCString folder; + // Make it hidden (by starting with "."), except when local (the + // profile is already under ~/.cache or XDG_CACHE_HOME). +# ifndef RELATIVE_DATA_DIR + if (!aLocal) folder.Assign('.'); +# endif + if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); while (*profileStart == '/' || *profileStart == '\\') profileStart++; +# ifndef RELATIVE_DATA_DIR // On the off chance that someone wanted their folder to be hidden don't // let it become ".." - if (*profileStart == '.') profileStart++; + if (*profileStart == '.' && !aLocal) profileStart++; +# endif - // Make it hidden (by starting with "."). - nsAutoCString folder("."); folder.Append(profileStart); ToLowerCase(folder); rv = AppendProfileString(aFile, folder.BeginReading()); +# ifndef RELATIVE_DATA_DIR + } else { + if (!vendor.IsEmpty()) { + folder.Append(vendor); + ToLowerCase(folder); + + rv = aFile->AppendNative(folder); + NS_ENSURE_SUCCESS(rv, rv); + + folder.Truncate(); + } + + // This can be the case in tests. + if (!appName.IsEmpty()) { + folder.Append(appName); + ToLowerCase(folder); + + rv = aFile->AppendNative(folder); + } +# endif } NS_ENSURE_SUCCESS(rv, rv); ===================================== xpcom/io/nsAppFileLocationProvider.cpp ===================================== @@ -247,7 +247,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, bool exists; nsCOMPtr<nsIFile> localDir; -#if defined(RELATIVE_PROFILE_DIRECTORY) +#if defined(RELATIVE_DATA_DIR) nsCOMPtr<nsIProperties> directoryService( do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); NS_ENSURE_SUCCESS(rv, rv); @@ -260,9 +260,9 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, rv = file->Normalize(); NS_ENSURE_SUCCESS(rv, rv); int levelsToRemove = 1; -#if defined(XP_MACOSX) +# if defined(XP_MACOSX) levelsToRemove += 2; -#endif +# endif while (levelsToRemove-- > 0) { rv = file->GetParent(getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); @@ -270,7 +270,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, } localDir = appRootDir; - nsAutoCString profileDir(RELATIVE_PROFILE_DIRECTORY); + nsAutoCString profileDir(RELATIVE_DATA_DIR); rv = localDir->SetRelativePath(localDir.get(), profileDir); NS_ENSURE_SUCCESS(rv, rv); @@ -318,6 +318,12 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, # error dont_know_how_to_get_product_dir_on_your_platform #endif +#if !defined(RELATIVE_DATA_DIR) + rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); + if (NS_FAILED(rv)) { + return rv; + } +#endif rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { @@ -351,6 +357,23 @@ nsresult nsAppFileLocationProvider::GetDefaultUserProfileRoot( return rv; } +#if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN) + // These 3 platforms share this part of the path - do them as one + rv = localDir->AppendRelativeNativePath("Profiles"_ns); + if (NS_FAILED(rv)) { + return rv; + } + + bool exists; + rv = localDir->Exists(&exists); + if (NS_SUCCEEDED(rv) && !exists) { + rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775); + } + if (NS_FAILED(rv)) { + return rv; + } +#endif + localDir.forget(aLocalFile); return rv; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cc5f2fc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/cc5f2fc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] fixup! Bug 40933: Add tor-launcher functionality
by Richard Pospesel (＠richard) 10 Jan '23

10 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: dca7ddb7 by Pier Angelo Vendrame at 2023-01-10T19:18:47+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41549: Correctly handle tor's stdout Subprocess.jsm manages stdout through a pipe, which we never emptied. As a result, it tor filled it completely, a lot of other stuff stalled. The previous implementation dumped tor's stdout to the browser's one, so this commit restores this behavior. (cherry picked from commit c20e9ad7c04325c67c7259d7bf69a7ff3e160466) - - - - - 1 changed file: - toolkit/components/tor-launcher/TorProcess.jsm Changes: ===================================== toolkit/components/tor-launcher/TorProcess.jsm ===================================== @@ -133,9 +133,10 @@ class TorProcess { arguments: this._args, environment, environmentAppend: true, - stderr: "pipe", + stderr: "stdout", }; this._subprocess = await Subprocess.call(options); + this._dumpStdout(); this._watchProcess(); this._status = TorProcessStatus.Running; this._torProcessStartTime = Date.now(); @@ -173,6 +174,16 @@ class TorProcess { this._didConnectToTorControlPort = true; } + async _dumpStdout() { + let string; + while ( + this._subprocess && + (string = await this._subprocess.stdout.readString()) + ) { + dump(string); + } + } + async _watchProcess() { const watched = this._subprocess; if (!watched) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dca7ddb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/dca7ddb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Richard Pospesel (＠richard) 10 Jan '23

10 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c20e9ad7 by Pier Angelo Vendrame at 2023-01-10T19:17:03+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41549: Correctly handle tor's stdout Subprocess.jsm manages stdout through a pipe, which we never emptied. As a result, it tor filled it completely, a lot of other stuff stalled. The previous implementation dumped tor's stdout to the browser's one, so this commit restores this behavior. - - - - - 1 changed file: - toolkit/components/tor-launcher/TorProcess.jsm Changes: ===================================== toolkit/components/tor-launcher/TorProcess.jsm ===================================== @@ -133,9 +133,10 @@ class TorProcess { arguments: this._args, environment, environmentAppend: true, - stderr: "pipe", + stderr: "stdout", }; this._subprocess = await Subprocess.call(options); + this._dumpStdout(); this._watchProcess(); this._status = TorProcessStatus.Running; this._torProcessStartTime = Date.now(); @@ -173,6 +174,16 @@ class TorProcess { this._didConnectToTorControlPort = true; } + async _dumpStdout() { + let string; + while ( + this._subprocess && + (string = await this._subprocess.stdout.readString()) + ) { + dump(string); + } + } + async _watchProcess() { const watched = this._subprocess; if (!watched) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c20e9ad… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c20e9ad… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] 5 commits: dropme! Partial revert of Bug 13252
by Richard Pospesel (＠richard) 10 Jan '23

10 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5858c308 by Pier Angelo Vendrame at 2023-01-10T18:10:55+01:00 dropme! Partial revert of Bug 13252 I need to modify Bug 9173. So, I am removing a few changes from 13252 to make both the modifications and the rebase easier. - - - - - acdcfcae by Pier Angelo Vendrame at 2023-01-10T18:11:04+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser This commit adds TorProject as the vendor of Tor Browser. This should be visible both in the Windows binaries, and will be used to create the profile directory if we disable the portable mode. - - - - - 5c5e44d0 by Pier Angelo Vendrame at 2023-01-10T18:13:36+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Bug 20497: Make it possible to disable portable mode 9173 is the patch that enables portable mode for Tor Browser. We modified it to make it optional, but it still used to remove a few important parts that made it compulsory to define a profile directory in the application.ini (through the mozconfig). This commit restores these parts, and makes it hopefully possible to disable portable mode without filling the home directory with TBB files. A few parts are then disabled in a following commit, since they are TBB-legacy behavior, but we might not want them for base-browser and for privacy-browser. Also, this commit changes the configure flag from --with-relative-profile-directory to --with-relative-data-dir, because the data directories can contain the profile and the local data such as caches, not only the profile. Still, we are assuming we are using the same data directory for the profile and for the caches, which is not the case on Windows (where the profile is roaming, and the caches are local) and on Linux (where the profile is in the home, and the cache is in ~/.cache). - - - - - 458fbecf by Pier Angelo Vendrame at 2023-01-10T18:13:44+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Change relative-profile-directory with relative-data-dir. - - - - - a958edce by Pier Angelo Vendrame at 2023-01-10T18:13:45+01:00 fixup! Bug 13252: Do not store data in the app bundle Bug 20497: Make it possible to use Tor Browser in non-portable mode Add back some legacy Tor Browser-specific behaviors that we restored in 9173. Bug 41535: Remove the old, unused and undocumented "-invisible" macOS CLI flag - - - - - 6 changed files: - browser/config/mozconfigs/tor-browser - browser/confvars.sh - moz.configure - toolkit/xre/nsAppRunner.cpp - toolkit/xre/nsXREDirProvider.cpp - xpcom/io/nsAppFileLocationProvider.cpp Changes: ===================================== browser/config/mozconfigs/tor-browser ===================================== @@ -1,8 +1,15 @@ . $topsrcdir/browser/config/mozconfigs/base-browser +export MOZ_APP_BASENAME="TorBrowser" mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -ac_add_options --with-relative-profile=TorBrowser/Data/Browser +ac_add_options --with-relative-data-dir=TorBrowser/Data/Browser +# This is not needed with the relative data directory, but it is when you +# disable it, otherwise it is "Mozilla" (on Windows and macOS) or ".mozilla" on +# Unix systems. +# It is used, for example, for GetProductDirectory. +# ac_add_options --with-user-appdir=TorProject +# ac_add_options --with-user-appdir=.torproject ac_add_options --enable-tor-browser-update ac_add_options --enable-verify-mar ===================================== browser/confvars.sh ===================================== @@ -3,7 +3,7 @@ # 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/. -MOZ_APP_VENDOR=Mozilla +MOZ_APP_VENDOR="Tor Project" BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml ===================================== moz.configure ===================================== @@ -1026,22 +1026,22 @@ set_define("BASE_BROWSER", True, when="--enable-base-browser") option( - "--with-relative-profile", + "--with-relative-data-dir", nargs=1, - help="Sets the directory of the profile, relative to the application directory" + help="Sets the data directories to be relative to the application directory" ) -@depends("--with-relative-profile", target) +@depends("--with-relative-data-dir", target) @imports("json") -def relative_profile(value, target): +def relative_data_dir(value, target): if value and target.os == "Android": - die("--with-relative-profile is not supported on Android") + die("--with-relative-data-dir is not supported on Android") if value: return json.dumps(value[0]) -set_define("RELATIVE_PROFILE_DIRECTORY", relative_profile) +set_define("RELATIVE_DATA_DIR", relative_data_dir) # Tor additions. ===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -4158,14 +4158,6 @@ int XREMain::XRE_mainInit(bool* aExitFlag) { if (PR_GetEnv("XRE_MAIN_BREAK")) NS_BREAK(); #endif -#if defined(XP_MACOSX) && defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) - bool hideDockIcon = (CheckArg("invisible") == ARG_FOUND); - if (hideDockIcon) { - ProcessSerialNumber psn = {0, kCurrentProcess}; - TransformProcessType(&psn, kProcessTransformToBackgroundApplication); - } -#endif - mozilla::startup::IncreaseDescriptorLimits(); #ifdef USE_GLX_TEST @@ -5222,6 +5214,14 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) { if (CheckArg("test-process-updates")) { SaveToEnv("MOZ_TEST_PROCESS_UPDATES=1"); } +# ifndef TOR_BROWSER_DATA_OUTSIDE_APP_DIR + nsCOMPtr<nsIFile> exeFile, exeDir; + rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, &persistent, + getter_AddRefs(exeFile)); + NS_ENSURE_SUCCESS(rv, 1); + rv = exeFile->GetParent(getter_AddRefs(exeDir)); +# endif + # ifdef TOR_BROWSER_UPDATE nsAutoCString compatVersion(TOR_BROWSER_VERSION_QUOTED); # endif ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -236,6 +236,11 @@ nsresult nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult) { nsresult rv = GetUserDataDirectory(getter_AddRefs(file), false); if (NS_SUCCEEDED(rv)) { + // For some reason, we have decided not to append "Profiles" in Tor Browser. + // So, let's keep removing it, or we should somehow migrate the profile. +#if !defined(TOR_BROWSER_VERSION) && (!defined(XP_UNIX) || defined(XP_MACOSX)) + rv = file->AppendNative("Profiles"_ns); +#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -251,6 +256,9 @@ nsresult nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult) { nsresult rv = GetUserDataDirectory(getter_AddRefs(file), true); if (NS_SUCCEEDED(rv)) { +#if !defined(TOR_BROWSER_VERSION) && (!defined(XP_UNIX) || defined(XP_MACOSX)) + rv = file->AppendNative("Profiles"_ns); +#endif // We must create the profile directory here if it does not exist. nsresult tmp = EnsureDirectoryExists(file); if (NS_FAILED(tmp)) { @@ -1366,8 +1374,7 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, return gDataDirHome->Clone(aFile); } -#if defined(RELATIVE_PROFILE_DIRECTORY) || \ - defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) +#if defined(RELATIVE_DATA_DIR) || defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) # ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); @@ -1379,10 +1386,10 @@ nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, } rv = singleton->GetAppRootDir(getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); - nsAutoCString profileDir(RELATIVE_PROFILE_DIRECTORY); + nsAutoCString profileDir(RELATIVE_DATA_DIR); rv = localDir->SetRelativePath(localDir.get(), profileDir); NS_ENSURE_SUCCESS(rv, rv); -#endif +# endif if (aLocal) { rv = localDir->AppendNative("Caches"_ns); NS_ENSURE_SUCCESS(rv, rv); @@ -1555,7 +1562,7 @@ nsresult nsXREDirProvider::GetAppRootDir(nsIFile** aFile) { #endif while (levelsToRemove-- > 0) { rv = file->GetParent(getter_AddRefs(appRootDir)); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); file = appRootDir; } return appRootDir->Clone(aFile); @@ -1612,8 +1619,13 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { } nsAutoCString profile; + nsAutoCString appName; + nsAutoCString vendor; if (gAppData->profile) { profile = gAppData->profile; + } else { + appName = gAppData->name; + vendor = gAppData->vendor; } nsresult rv = NS_OK; @@ -1621,12 +1633,27 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { #if defined(XP_MACOSX) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); +# ifndef RELATIVE_DATA_DIR + } else { + // Note that MacOS ignores the vendor when creating the profile hierarchy - + // all application preferences directories live alongside one another in + // ~/Library/Application Support/ + rv = aFile->AppendNative(appName); +# endif } NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); +# ifndef RELATIVE_DATA_DIR + } else { + if (!vendor.IsEmpty()) { + rv = aFile->AppendNative(vendor); + NS_ENSURE_SUCCESS(rv, rv); + } + rv = aFile->AppendNative(appName); +# endif } NS_ENSURE_SUCCESS(rv, rv); @@ -1638,21 +1665,48 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) { rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) + nsAutoCString folder; + // Make it hidden (by starting with "."), except when local (the + // profile is already under ~/.cache or XDG_CACHE_HOME). +# ifndef RELATIVE_DATA_DIR + if (!aLocal) folder.Assign('.'); +# endif + if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); while (*profileStart == '/' || *profileStart == '\\') profileStart++; +# ifndef RELATIVE_DATA_DIR // On the off chance that someone wanted their folder to be hidden don't // let it become ".." - if (*profileStart == '.') profileStart++; + if (*profileStart == '.' && !aLocal) profileStart++; +# endif - // Make it hidden (by starting with "."). - nsAutoCString folder("."); folder.Append(profileStart); ToLowerCase(folder); rv = AppendProfileString(aFile, folder.BeginReading()); +# ifndef RELATIVE_DATA_DIR + } else { + if (!vendor.IsEmpty()) { + folder.Append(vendor); + ToLowerCase(folder); + + rv = aFile->AppendNative(folder); + NS_ENSURE_SUCCESS(rv, rv); + + folder.Truncate(); + } + + // This can be the case in tests. + if (!appName.IsEmpty()) { + folder.Append(appName); + ToLowerCase(folder); + + rv = aFile->AppendNative(folder); + } +# endif } NS_ENSURE_SUCCESS(rv, rv); ===================================== xpcom/io/nsAppFileLocationProvider.cpp ===================================== @@ -249,8 +249,7 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, bool exists; nsCOMPtr<nsIFile> localDir; -#if defined(RELATIVE_PROFILE_DIRECTORY) || \ - defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) +#if defined(RELATIVE_DATA_DIR) || defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR) nsCOMPtr<nsIProperties> directoryService( do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv)); NS_ENSURE_SUCCESS(rv, rv); @@ -263,26 +262,24 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, rv = file->Normalize(); NS_ENSURE_SUCCESS(rv, rv); int levelsToRemove = 1; -#if defined(XP_MACOSX) +# if defined(XP_MACOSX) levelsToRemove += 2; -#endif +# endif while (levelsToRemove-- > 0) { rv = file->GetParent(getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); file = appRootDir; } -#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR +# ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR rv = TorBrowser_GetUserDataDir(appRootDir, getter_AddRefs(localDir)); NS_ENSURE_SUCCESS(rv, rv); rv = localDir->AppendNative("Browser"_ns); -#else +# else localDir = appRootDir; - nsAutoCString profileDir(RELATIVE_PROFILE_DIRECTORY); + nsAutoCString profileDir(RELATIVE_DATA_DIR); rv = localDir->SetRelativePath(localDir.get(), profileDir); - NS_ENSURE_SUCCESS(rv, rv); -#endif - +# endif NS_ENSURE_SUCCESS(rv, rv); if (aLocal) { @@ -329,6 +326,12 @@ nsresult nsAppFileLocationProvider::GetProductDirectory(nsIFile** aLocalFile, # error dont_know_how_to_get_product_dir_on_your_platform #endif +#if !defined(RELATIVE_DATA_DIR) && !defined(TOR_BROWSER_VERSION) + rv = localDir->AppendRelativeNativePath(DEFAULT_PRODUCT_DIR); + if (NS_FAILED(rv)) { + return rv; + } +#endif rv = localDir->Exists(&exists); if (NS_SUCCEEDED(rv) && !exists) { @@ -362,6 +365,26 @@ nsresult nsAppFileLocationProvider::GetDefaultUserProfileRoot( return rv; } +#if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN) + // These 3 platforms share this part of the path - do them as one +# ifndef TOR_BROWSER_VERSION + // Legacy: we do not use "Profiles" on Tor Browser. + rv = localDir->AppendRelativeNativePath("Profiles"_ns); + if (NS_FAILED(rv)) { + return rv; + } +# endif + + bool exists; + rv = localDir->Exists(&exists); + if (NS_SUCCEEDED(rv) && !exists) { + rv = localDir->Create(nsIFile::DIRECTORY_TYPE, 0775); + } + if (NS_FAILED(rv)) { + return rv; + } +#endif + localDir.forget(aLocalFile); return rv; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/060e2d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/060e2d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 10 Jan '23

10 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 060e2d72 by Pier Angelo Vendrame at 2023-01-10T16:38:50+00:00 fixup! Add TorStrings module for localization Bug 41563: Fix old placeholders in TorStrings.jsm - - - - - 1 changed file: - browser/modules/TorStrings.jsm Changes: ===================================== browser/modules/TorStrings.jsm ===================================== @@ -137,7 +137,7 @@ const Loader = { bridgeCurrent: "Your Current Bridges", bridgeCurrentDescription: "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.", - bridgeId: "#1 bridge: #2", + bridgeId: "%1$S bridge: %2$S", remove: "Remove", bridgeDisableBuiltIn: "Disable built-in bridges", bridgeShare: @@ -247,16 +247,16 @@ const Loader = { couldNotConnect: "Tor Browser could not connect to Tor", configureConnection: "configure your connection", assistDescription: - "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead.", + "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can %S manually instead.", tryingBridge: "Trying a bridge…", tryingBridgeAgain: "Trying one more time…", errorLocation: "Tor Browser couldn’t locate you", errorLocationDescription: - "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead.", + "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, %S manually instead.", isLocationCorrect: "Are these location settings correct?", isLocationCorrectDescription: - "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead.", + "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or %S instead.", finalError: "Tor Browser still cannot connect", finalErrorDescription: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/060e2d7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/060e2d7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40209: Implement Basic Crypto Safety
by Pier Angelo Vendrame (＠pierov) 10 Jan '23

10 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 221b7a49 by Henry Wilkes at 2023-01-10T10:21:09+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 41539: Remove all whitespace from copied text before testing if it looks like a crypto address. - - - - - 1 changed file: - browser/actors/CryptoSafetyChild.jsm Changes: ===================================== browser/actors/CryptoSafetyChild.jsm ===================================== @@ -74,7 +74,7 @@ class CryptoSafetyChild extends JSWindowActorChild { if (event.type == "copy" || event.type == "cut") { this.contentWindow.navigator.clipboard.readText().then(clipText => { - const selection = clipText.trim(); + const selection = clipText.replace(/\s+/g, ""); if (looksLikeCryptoAddress(selection)) { this.sendAsyncMessage("CryptoSafety:CopiedText", { selection, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/221b7a4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/221b7a4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by Pier Angelo Vendrame (＠pierov) 10 Jan '23

10 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1340b399 by hackademix at 2023-01-09T22:50:42+01:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 45162: do not force letterboxing on API-initiated fullscreen. - - - - - 2 changed files: - browser/base/content/browser.css - layout/style/res/ua.css Changes: ===================================== browser/base/content/browser.css ===================================== @@ -111,8 +111,8 @@ body { outline: initial; } -.letterboxing-ready .browserStack:not(.exclude-letterboxing) { - place-content: start center; +:root:not([inDOMFullscreen]) .letterboxing-ready .browserStack:not(.exclude-letterboxing) { + place-content: start center; } /* extend down the toolbar's colors when letterboxing is enabled */ ===================================== layout/style/res/ua.css ===================================== @@ -356,8 +356,8 @@ left: 0 !important; right: 0 !important; bottom: 0 !important; - width: 100%; - height: 100%; + width: 100% !important; + height: 100% !important; margin: 0 !important; min-width: 0 !important; max-width: none !important; @@ -368,11 +368,6 @@ transform: none !important; } -*|*:fullscreen:not(:root, .letterboxing .browserStack:not(.exclude-letterboxing) > browser) { - width: 100% !important; - height: 100% !important; -} - xul|*:fullscreen:not(:root, [hidden="true"]) { /* The position: fixed; property above used to force the computed display * value to block. It is no longer the case now, so we manually set it here to View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1340b39… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1340b39… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40925: Implemented the Security Level component
by Richard Pospesel (＠richard) 09 Jan '23

09 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 90395b29 by Henry Wilkes at 2023-01-09T20:41:54+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 32274: Make the security level settings more accessible: + We remove the "Restore Defaults" link that was between each radio option and place it separately as a button, with some notification text. + We set the `aria-describedby` attribute on the radio options to point to the description. + We change the security level popup's button text from "Change" to "Change Setting" to give users more of a hint that clicking the button will land them in the middle of about:preferences. We also tidied up the javascript, CSS and xhtml. - - - - - 5 changed files: - browser/components/preferences/privacy.js - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/content/securityLevelPreferences.css - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - browser/components/securitylevel/locale/en-US/securityLevel.properties Changes: ===================================== browser/components/preferences/privacy.js ===================================== @@ -341,11 +341,9 @@ var gPrivacyPane = { */ _initSecurityLevel() { SecurityLevelPreferences.init(); - let unload = () => { - window.removeEventListener("unload", unload); - SecurityLevelPreferences.uninit(); - }; - window.addEventListener("unload", unload); + window.addEventListener("unload", () => SecurityLevelPreferences.uninit(), { + once: true, + }); }, /** ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -17,13 +17,14 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", () => { security_level_restore: "Restore Defaults", security_level_learn_more: "Learn more", // Panel - security_level_change: "Change…", + security_level_change_setting: "Change Setting…", security_level_standard_summary: "All browser and website features are enabled.", security_level_safer_summary: "Disables website features that are often dangerous, causing some sites to lose functionality.", security_level_safest_summary: "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.", + security_level_custom_heading: "Warning!", security_level_custom_summary: "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.", // Security level section in about:preferences#privacy @@ -259,7 +260,7 @@ var SecurityLevelPanel = { this._elements.restoreDefaultsButton.textContent = SecurityLevelStrings.security_level_restore; this._elements.settingsButton.textContent = - SecurityLevelStrings.security_level_change; + SecurityLevelStrings.security_level_change_setting; this._elements.restoreDefaultsButton.addEventListener("command", () => { this.restoreDefaults(); @@ -367,120 +368,112 @@ var SecurityLevelPanel = { var SecurityLevelPreferences = { _securityPrefsBranch: null, + /** + * The notification box shown when the user has a custom security setting. + * + * @type {Element} + */ + _customNotification: null, + /** + * The radiogroup for this preference. + * + * @type {Element} + */ + _radiogroup: null, + /** + * A list of radio options and their containers. + * + * @type {Array<Object>} + */ + _radioOptions: null, _populateXUL() { - const groupbox = document.querySelector("#securityLevel-groupbox"); - const radiogroup = groupbox.querySelector("#securityLevel-radiogroup"); - radiogroup.addEventListener( - "command", - SecurityLevelPreferences.selectSecurityLevel + this._customNotification = document.getElementById( + "securityLevel-customNotification" ); + this._radiogroup = document.getElementById("securityLevel-radiogroup"); - groupbox.querySelector("h2").textContent = + document.querySelector("#securityLevel-groupbox h2").textContent = SecurityLevelStrings.security_level; - groupbox.querySelector("#securityLevel-overview").textContent = + document.getElementById("securityLevel-overview").textContent = SecurityLevelStrings.security_level_overview; - groupbox - .querySelector("#securityLevel-learnMore") + document + .getElementById("securityLevel-learnMore") .setAttribute("value", SecurityLevelStrings.security_level_learn_more); - const populateRadioElements = (level, descr) => { - const vbox = groupbox.querySelector(`#securityLevel-vbox-${level}`); - vbox - .querySelector("radio") - .setAttribute("label", SecurityLevelStrings[`security_level_${level}`]); - vbox - .querySelector(".securityLevel-customWarning") - .setAttribute("value", SecurityLevelStrings.security_level_custom); - vbox.querySelector(".summary").textContent = - SecurityLevelStrings[`security_level_${level}_summary`]; - const labelRestoreDefaults = vbox.querySelector( - ".securityLevel-restoreDefaults" - ); - labelRestoreDefaults.setAttribute( - "value", - SecurityLevelStrings.security_level_restore + document.getElementById("securityLevel-customHeading").textContent = + SecurityLevelStrings.security_level_custom_heading; + document.getElementById("securityLevel-customDescription").textContent = + SecurityLevelStrings.security_level_custom_summary; + const restoreDefaultsButton = document.getElementById( + "securityLevel-restoreDefaults" + ); + restoreDefaultsButton.textContent = + SecurityLevelStrings.security_level_restore; + + this._radioOptions = Array.from( + this._radiogroup.querySelectorAll(".securityLevel-radio-option"), + container => { + return { container, radio: container.querySelector("radio") }; + } + ); + const descListItemsMap = { + safer: [ + SecurityLevelStrings.security_level_js_https_only, + SecurityLevelStrings.security_level_limit_typography, + SecurityLevelStrings.security_level_limit_media, + ], + safest: [ + SecurityLevelStrings.security_level_js_disabled, + SecurityLevelStrings.security_level_limit_typography_svg, + SecurityLevelStrings.security_level_limit_media, + ], + }; + for (const { container, radio } of this._radioOptions) { + const level = radio.value; + radio.setAttribute( + "label", + SecurityLevelStrings[`security_level_${level}`] ); - labelRestoreDefaults.addEventListener( - "click", - SecurityLevelStrings.restoreDefaults + container.querySelector(".summary").textContent = + SecurityLevelStrings[`security_level_${level}_summary`]; + const descListItems = descListItemsMap[level]; + if (!descListItems) { + continue; + } + const descrList = container.querySelector( + ".securityLevel-descriptionList" ); - if (descr) { - const descrList = vbox.querySelector(".securityLevel-descriptionList"); - // TODO: Add the elements in securityLevelPreferences.inc.xhtml again - // when we switch to Fluent - for (const text of descr) { - let elem = document.createXULElement("description"); - elem.textContent = text; - elem.className = "indent"; - descrList.append(elem); - } + // TODO: Add the elements in securityLevelPreferences.inc.xhtml again + // when we switch to Fluent + for (const text of descListItems) { + let elem = document.createXULElement("description"); + elem.textContent = text; + elem.className = "indent"; + descrList.append(elem); } - }; - populateRadioElements("standard"); - populateRadioElements("safer", [ - SecurityLevelStrings.security_level_js_https_only, - SecurityLevelStrings.security_level_limit_typography, - SecurityLevelStrings.security_level_limit_media, - ]); - populateRadioElements("safest", [ - SecurityLevelStrings.security_level_js_disabled, - SecurityLevelStrings.security_level_limit_typography_svg, - SecurityLevelStrings.security_level_limit_media, - ]); + } + + restoreDefaultsButton.addEventListener("command", () => { + SecurityLevelPrefs.securityCustom = false; + }); + this._radiogroup.addEventListener("select", () => { + SecurityLevelPrefs.securityLevel = this._radiogroup.value; + }); }, _configUIFromPrefs() { - // read our prefs - const securityLevel = SecurityLevelPrefs.securityLevel; - const securityCustom = SecurityLevelPrefs.securityCustom; - - // get our elements - const groupbox = document.querySelector("#securityLevel-groupbox"); - let radiogroup = groupbox.querySelector("#securityLevel-radiogroup"); - let labelStandardCustom = groupbox.querySelector( - "#securityLevel-vbox-standard label.securityLevel-customWarning" - ); - let labelSaferCustom = groupbox.querySelector( - "#securityLevel-vbox-safer label.securityLevel-customWarning" - ); - let labelSafestCustom = groupbox.querySelector( - "#securityLevel-vbox-safest label.securityLevel-customWarning" - ); - let labelStandardRestoreDefaults = groupbox.querySelector( - "#securityLevel-vbox-standard label.securityLevel-restoreDefaults" - ); - let labelSaferRestoreDefaults = groupbox.querySelector( - "#securityLevel-vbox-safer label.securityLevel-restoreDefaults" - ); - let labelSafestRestoreDefaults = groupbox.querySelector( - "#securityLevel-vbox-safest label.securityLevel-restoreDefaults" - ); - - // hide custom label by default until we know which level we're at - labelStandardCustom.hidden = true; - labelSaferCustom.hidden = true; - labelSafestCustom.hidden = true; - - labelStandardRestoreDefaults.hidden = true; - labelSaferRestoreDefaults.hidden = true; - labelSafestRestoreDefaults.hidden = true; - - radiogroup.value = securityLevel; - - switch (securityLevel) { - case "standard": - labelStandardCustom.hidden = !securityCustom; - labelStandardRestoreDefaults.hidden = !securityCustom; - break; - case "safer": - labelSaferCustom.hidden = !securityCustom; - labelSaferRestoreDefaults.hidden = !securityCustom; - break; - case "safest": - labelSafestCustom.hidden = !securityCustom; - labelSafestRestoreDefaults.hidden = !securityCustom; - break; + this._radiogroup.value = SecurityLevelPrefs.securityLevel; + const isCustom = SecurityLevelPrefs.securityCustom; + this._radiogroup.disabled = isCustom; + this._customNotification.hidden = !isCustom; + // Have the container's selection CSS class match the selection state of the + // radio elements. + for (const { container, radio } of this._radioOptions) { + container.classList.toggle( + "securityLevel-radio-option-selected", + radio.selected + ); } }, @@ -514,17 +507,4 @@ var SecurityLevelPreferences = { break; } }, - - selectSecurityLevel() { - // radio group elements - let radiogroup = document.getElementById("securityLevel-radiogroup"); - - // update pref based on selected radio option - SecurityLevelPrefs.securityLevel = radiogroup.value; - SecurityLevelPreferences.restoreDefaults(); - }, - - restoreDefaults() { - SecurityLevelPrefs.securityCustom = false; - }, }; /* SecurityLevelPreferences */ ===================================== browser/components/securitylevel/content/securityLevelPreferences.css ===================================== @@ -1,51 +1,58 @@ -label.securityLevel-customWarning { - border-radius: 4px; - background-color: var(--yellow-50); - color: black; - font-size: 1em; - height: 1.6em; - padding: 0.4em 0.5em; +#securityLevel-groupbox { + --section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent); +} + +#securityLevel-customNotification { + /* Spacing similar to #fpiIncompatibilityWarning. */ + margin-block: 16px; +} + +.info-icon.securityLevel-custom-warning-icon { + list-style-image: url("chrome://global/skin/icons/warning.svg"); +} + +#securityLevel-customHeading { + font-weight: bold; } -radiogroup#securityLevel-radiogroup description { - color: var(--in-content-page-color)!important; +/* Overwrite indent rule from preferences.css */ +#securityLevel-radiogroup description.indent { + color: var(--in-content-page-color); } -radiogroup#securityLevel-radiogroup radio { +#securityLevel-radiogroup radio { font-weight: bold; } -radiogroup#securityLevel-radiogroup > vbox { +#securityLevel-radiogroup[disabled] { + opacity: 0.5; +} + +/* Overwrite the rule in common-shared.css so we don't get 0.25 opacity overall + * on the radio text. */ +#securityLevel-radiogroup[disabled] radio[disabled] { + opacity: 1.0; +} + +.securityLevel-radio-option { border: 1px solid var(--in-content-box-border-color); border-radius: 4px; margin: 3px 0; padding: 9px; } -radiogroup#securityLevel-radiogroup[value=standard] > vbox#securityLevel-vbox-standard, -radiogroup#securityLevel-radiogroup[value=safer] > vbox#securityLevel-vbox-safer, -radiogroup#securityLevel-radiogroup[value=safest] > vbox#securityLevel-vbox-safest { - --section-highlight-background-color: color-mix(in srgb, var(--in-content-accent-color) 20%, transparent); +.securityLevel-radio-option.securityLevel-radio-option-selected { background-color: var(--section-highlight-background-color); border: 1px solid var(--in-content-accent-color); } -vbox.securityLevel-descriptionList { +.securityLevel-radio-option:not( + .securityLevel-radio-option-selected +) .securityLevel-descriptionList { display: none; } -radiogroup#securityLevel-radiogroup[value=safer] vbox#securityLevel-vbox-safer vbox.securityLevel-descriptionList, -radiogroup#securityLevel-radiogroup[value=safest] vbox#securityLevel-vbox-safest vbox.securityLevel-descriptionList { - display: inherit; -} - -vbox.securityLevel-descriptionList description { +.securityLevel-descriptionList description { display: list-item; } - -vbox#securityLevel-vbox-standard, -vbox#securityLevel-vbox-safer, -vbox#securityLevel-vbox-safest { - margin-top: 0.4em; -} ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -2,62 +2,58 @@ data-category="panePrivacy" data-subcategory="securitylevel" hidden="true"> - <label><html:h2/></label> + <label><html:h2></html:h2></label> <vbox flex="1"> <description flex="1"> - <html:span id="securityLevel-overview" class="tail-with-learn-more"/> + <html:span id="securityLevel-overview" class="tail-with-learn-more"> + </html:span> <label id="securityLevel-learnMore" class="learnMore text-link" is="text-link" href="about:manual#security-settings" useoriginprincipal="true"/> </description> + <hbox id="securityLevel-customNotification" + class="info-box-container" + flex="1"> + <hbox class="info-icon-container"> + <image class="info-icon securityLevel-custom-warning-icon"/> + </hbox> + <vbox flex="1"> + <label id="securityLevel-customHeading"/> + <description id="securityLevel-customDescription" flex="1"/> + </vbox> + <hbox align="center"> + <button id="securityLevel-restoreDefaults"/> + </hbox> + </hbox> <radiogroup id="securityLevel-radiogroup"> - <vbox id="securityLevel-vbox-standard"> - <hbox> - <radio value="standard"/> - <vbox> - <spacer flex="1"/> - <label class="securityLevel-customWarning"/> - <spacer flex="1"/> - </vbox> - <spacer flex="1"/> - </hbox> - <description flex="1" class="indent"> - <html:span class="summary tail-with-learn-more"/> - <label class="securityLevel-restoreDefaults learnMore text-link"/> - </description> + <vbox class="securityLevel-radio-option"> + <radio value="standard" + aria-describedby="securityLevelSummary-standard"/> + <vbox id="securityLevelSummary-standard"> + <description class="summary indent" flex="1"/> + </vbox> </vbox> - <vbox id="securityLevel-vbox-safer"> - <hbox> - <radio value="safer"/> - <vbox> - <spacer flex="1"/> - <label class="securityLevel-customWarning"/> - <spacer flex="1"/> - </vbox> - </hbox> - <description flex="1" class="indent"> - <html:span class="summary tail-with-learn-more"/> - <label class="securityLevel-restoreDefaults learnMore text-link"/> - </description> - <vbox class="securityLevel-descriptionList indent"> + <vbox class="securityLevel-radio-option"> +  + <radio value="safer" + aria-describedby="securityLevelSummary-safer"/> + <vbox id="securityLevelSummary-safer"> + <description class="summary indent" flex="1"/> + <vbox class="securityLevel-descriptionList indent"/> </vbox> </vbox> - <vbox id="securityLevel-vbox-safest"> - <hbox> - <radio value="safest"/> - <vbox> - <spacer flex="1"/> - <label class="securityLevel-customWarning"/> - <spacer flex="1"/> - </vbox> - </hbox> - <description flex="1" class="indent"> - <html:span class="summary tail-with-learn-more"/> - <label class="securityLevel-restoreDefaults learnMore text-link"/> - </description> - <vbox class="securityLevel-descriptionList indent"> + <vbox class="securityLevel-radio-option"> + <radio value="safest" + aria-describedby="securityLevelSummary-safest"/> + <vbox id="securityLevelSummary-safest"> + <description class="summary indent" flex="1"/> + <vbox class="securityLevel-descriptionList indent"/> </vbox> </vbox> </radiogroup> ===================================== browser/components/securitylevel/locale/en-US/securityLevel.properties ===================================== @@ -13,9 +13,11 @@ security_level_learn_more = Learn more # Panel security_level_change = Change… +security_level_change_setting = Change Setting… security_level_standard_summary = All browser and website features are enabled. security_level_safer_summary = Disables website features that are often dangerous, causing some sites to lose functionality. security_level_safest_summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. +security_level_custom_heading = Warning! security_level_custom_summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. ## Security level section in about:preferences#privacy View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/90395b2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/90395b2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 2 commits: fixup! Bug 16940: After update, load local change notes.
by Richard Pospesel (＠richard) 09 Jan '23

09 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 4b8dca0d by Pier Angelo Vendrame at 2023-01-09T20:34:21+00:00 fixup! Bug 16940: After update, load local change notes. Bug 41524: Read changelogs as UTF-8 - - - - - 7774a06e by Henry Wilkes at 2023-01-09T20:34:31+00:00 fixup! Bug 16940: After update, load local change notes. We make a number of related changed to improve the semantics and accessibility of the about:tbupdate page: + We parse and show the release notes as a bullet list. + We use paragraphs, headings and bullet list to structure content. + We stop using fixed "px" font sizes and use relative sizes instead. + Add a lang="en-US" and dir="ltr" attribute to the english text. - - - - - 4 changed files: - browser/actors/AboutTBUpdateParent.jsm - browser/base/content/abouttbupdate/aboutTBUpdate.css - browser/base/content/abouttbupdate/aboutTBUpdate.js - browser/base/content/abouttbupdate/aboutTBUpdate.xhtml Changes: ===================================== browser/actors/AboutTBUpdateParent.jsm ===================================== @@ -8,7 +8,6 @@ this.EXPORTED_SYMBOLS = ["AboutTBUpdateParent"]; const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); @@ -22,9 +21,9 @@ const kRequestUpdateMessageName = "FetchUpdateData"; * implementation. */ class AboutTBUpdateParent extends JSWindowActorParent { - receiveMessage(aMessage) { + async receiveMessage(aMessage) { if (aMessage.name == kRequestUpdateMessageName) { - return this.releaseNoteInfo; + return this.getReleaseNoteInfo(); } return undefined; } @@ -51,7 +50,7 @@ class AboutTBUpdateParent extends JSWindowActorParent { // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir // to support Gatekeeper signing, the ChangeLog.txt file is located in // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. - get releaseNoteInfo() { + async getReleaseNoteInfo() { let info = { moreInfoURL: this.moreInfoURL }; try { @@ -74,46 +73,72 @@ class AboutTBUpdateParent extends JSWindowActorParent { f.append("Docs"); f.append("ChangeLog.txt"); - let fs = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( - Ci.nsIFileInputStream - ); - fs.init(f, -1, 0, 0); - let s = NetUtil.readInputStreamToString(fs, fs.available()); - fs.close(); - - // Truncate at the first empty line. - s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); - - // Split into first line (version plus releaseDate) and - // remainder (releaseNotes). - // This first match() uses multiline mode with two capture groups: - // first line: (.*$) - // remaining lines: ([\s\S]+) - // [\s\S] matches all characters including end of line. This trick - // is needed because when using JavaScript regex in multiline mode, - // . does not match an end of line character. - let matchArray = s.match(/(.*$)\s*([\s\S]+)/m); - if (matchArray && matchArray.length == 3) { - info.releaseNotes = matchArray[2]; - let line1 = matchArray[1]; - // Extract the version and releaseDate. The first line looks like: - // Tor Browser 8.5 -- May 1 2019 - // The regex uses two capture groups: - // text that does not include a hyphen: (^[^-]*) - // remaining text: (.*$) - // In between we match optional whitespace, one or more hyphens, and - // optional whitespace by using: \s*-+\s* - matchArray = line1.match(/(^[^-]*)\s*-+\s*(.*$)/); - if (matchArray && matchArray.length == 3) { - info.version = matchArray[1]; - info.releaseDate = matchArray[2]; + // NOTE: We load in the entire file, but only use the first few lines + // before the first blank line. + const logLines = (await IOUtils.readUTF8(f.path)) + .replace(/\n\r?\n.*/ms, "") + .split(/\n\r?/); + + // Read the first line to get the version and date. + // Assume everything after the last "-" is the date. + const firstLine = logLines.shift(); + const match = firstLine?.match(/(.*)-+(.*)/); + if (match) { + info.version = match[1].trim(); + info.releaseDate = match[2].trim(); + } else { + // No date. + info.version = firstLine?.trim(); + } + + // We want to read the rest of the release notes as a tree. Each entry + // will contain the text for that line. + // We choose a negative index for the top node of this tree to ensure no + // line will appear less indented. + const topEntry = { indent: -1, children: undefined }; + let prevEntry = topEntry; + + for (let line of logLines) { + const indent = line.match(/^ */)[0]; + line = line.trim(); + if (line.startsWith("*")) { + // Treat as a bullet point. + let entry = { + text: line.replace(/^\*\s/, ""), + indent: indent.length, + }; + let parentEntry; + if (entry.indent > prevEntry.indent) { + // A sub-list of the previous item. + prevEntry.children = []; + parentEntry = prevEntry; + } else { + // Same list or end of sub-list. + // Search for the first parent whose indent comes before ours. + parentEntry = prevEntry.parent; + while (entry.indent <= parentEntry.indent) { + parentEntry = parentEntry.parent; + } + } + entry.parent = parentEntry; + parentEntry.children.push(entry); + prevEntry = entry; + } else if (prevEntry === topEntry) { + // Unexpected, missing bullet point on first line. + // Place as its own bullet point instead, and set as prevEntry for the + // next loop. + prevEntry = { text: line, indent: indent.length, parent: topEntry }; + topEntry.children = [prevEntry]; } else { - info.version = line1; // Match failed: return entire line in version. + // Append to the previous bullet point. + prevEntry.text += ` ${line}`; } - } else { - info.releaseNotes = s; // Only one line: use as releaseNotes. } - } catch (e) {} + + info.releaseNotes = topEntry.children; + } catch (e) { + Cu.reportError(e); + } return info; } ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.css ===================================== @@ -14,61 +14,54 @@ body { font-family: Helvetica, Arial, sans-serif; color: var(--abouttor-text-color); background-color: var(--abouttor-bg-toron-color); - background-attachment: fixed; - background-size: 100% 100%; -} - -a { - color: var(--abouttor-text-color); -} - -.two-column-grid { - display: inline-grid; + margin-block: 40px; + margin-inline: 50px; + display: grid; grid-template-columns: auto auto; - grid-column-gap: 50px; - margin: 10px 0px 0px 50px; + align-items: baseline; + gap: 40px 50px; } -.two-column-grid div { - margin-top: 40px; - align-self: baseline; /* Align baseline of text across the row. */ +body > *:not([hidden]) { + display: contents; } .label-column { - font-size: 14px; - font-weight: 400; + grid-column: 1; } -/* - * Use a reduced top margin to bring the row that contains the - * "visit our website" link closer to the row that precedes it. This - * looks better because the "visit our website" row does not have a - * label in the left column. - */ -div.more-info-row { - margin-top: 5px; - font-size: 14px; +.content { + grid-column: 2; + font-family: monospace; + line-height: 1.4; +} + +.label-column, .content { + margin: 0; + padding: 0; + font-size: 1rem; + font-weight: normal; } -#version-content { - font-size: 50px; - font-weight: 300; +a { + color: inherit; } -body:not([havereleasedate]) .release-date-cell { - display: none; +.no-line-break { + white-space: nowrap; } -#releasedate-content { - font-size: 17px; +ul { + padding-inline: 1em 0; } -#releasenotes-label { - align-self: start; /* Anchor "Release Notes" label at the top. */ +h3, h4 { + font-size: 1.1rem; + font-weight: bold; } -#releasenotes-content { - font-family: monospace; - font-size: 15px; - white-space: pre; +h3.build-system-heading { + font-size: 1.5rem; + font-weight: normal; + margin-block-start: 3em; } ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.js ===================================== @@ -5,23 +5,105 @@ /* eslint-env mozilla/frame-script */ -// aData may contain the following string properties: -// version -// releaseDate -// moreInfoURL -// releaseNotes -function onUpdate(aData) { - document.getElementById("version-content").textContent = aData.version; - if (aData.releaseDate) { - document.body.setAttribute("havereleasedate", "true"); - document.getElementById("releasedate-content").textContent = - aData.releaseDate; +/** + * An object representing a bullet point in the release notes. + * + * typedef {Object} ReleaseBullet + * @property {string} text - The text for this bullet point. + * @property {?Array<ReleaseBullet>} children - A sub-list of bullet points. + */ + +/** + * Fill an element with the given list of release bullet points. + * + * @param {Element} container - The element to fill with bullet points. + * @param {Array<ReleaseBullet>} bulletPoints - The list of bullet points. + * @param {string} [childTag="h3"] - The element tag name to use for direct + * children. Initially, the children are h3 sub-headings. + */ +function fillReleaseNotes(container, bulletPoints, childTag = "h3") { + for (const { text, children } of bulletPoints) { + const childEl = document.createElement(childTag); + // Keep dashes like "[tor-browser]" on the same line by nowrapping the word. + for (const [index, part] of text.split(/(\S+-\S+)/).entries()) { + if (!part) { + continue; + } + const span = document.createElement("span"); + span.textContent = part; + span.classList.toggle("no-line-break", index % 2); + childEl.appendChild(span); + } + container.appendChild(childEl); + if (children) { + if (childTag == "h3" && text.toLowerCase() === "build system") { + // Special case: treat the "Build System" heading's children as + // sub-headings. + childEl.classList.add("build-system-heading"); + fillReleaseNotes(container, children, "h4"); + } else { + const listEl = document.createElement("ul"); + fillReleaseNotes(listEl, children, "li"); + if (childTag == "li") { + // Insert within the "li" element. + childEl.appendChild(listEl); + } else { + container.appendChild(listEl); + } + } + } + } +} + +/** + * Set the content for the specified container, or hide it if we have no + * content. + * + * @template C + * @param {string} containerId - The id for the container. + * @param {?C} content - The content for this container, or a falsey value if + * the container has no content. + * @param {function(contentEl: Elemenet, content: C)} [fillContent] - A function + * to fill the ".content" contentEl with the given 'content'. If unspecified, + * the 'content' will become the contentEl's textContent. + */ +function setContent(containerId, content, fillContent) { + const container = document.getElementById(containerId); + if (!content) { + container.hidden = true; + return; } + const contentEl = container.querySelector(".content"); + // Release notes are only in English. + contentEl.setAttribute("lang", "en-US"); + contentEl.setAttribute("dir", "ltr"); + if (fillContent) { + fillContent(contentEl, content); + } else { + contentEl.textContent = content; + } +} + +/** + * Callback when we receive the update details. + * + * @param {Object} aData - The update details. + * @param {?string} aData.version - The update version. + * @param {?string} aData.releaseDate - The release date. + * @param {?string} aData.moreInfoURL - A URL for more info. + * @param {?Array<ReleaseBullet>} aData.releaseNotes - Release notes as bullet + * points. + */ +function onUpdate(aData) { + setContent("version-row", aData.version); + setContent("releasedate-row", aData.releaseDate); + setContent("releasenotes", aData.releaseNotes, fillReleaseNotes); + if (aData.moreInfoURL) { document.getElementById("infolink").setAttribute("href", aData.moreInfoURL); + } else { + document.getElementById("fullinfo").hidden = true; } - document.getElementById("releasenotes-content").textContent = - aData.releaseNotes; } RPMSendQuery("FetchUpdateData").then(onUpdate); ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.xhtml ===================================== @@ -21,19 +21,26 @@ type="text/javascript"/> </head> <body dir="&locale.dir;"> -<div class="two-column-grid"> - <div class="label-column">&aboutTBUpdate.version;</div> - <div id="version-content"/> - - <div class="label-column release-date-cell">&aboutTBUpdate.releaseDate;</div> - <div id="releasedate-content" class="release-date-cell"/> - - <div class="more-info-row"/> - <div class="more-info-row">&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> - - <div id="releasenotes-label" - class="label-column">&aboutTBUpdate.releaseNotes;</div> - <div id="releasenotes-content"></div> -</div> +  + <div id="version-row"> + <span class="label-column">&aboutTBUpdate.version;</span> + <span class="content"></span> + </div> + <div id="releasedate-row"> + <span class="label-column">&aboutTBUpdate.releaseDate;</span> + <span class="content"></span> + </div> + <div id="fullinfo"> + <p class="content"> + &aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix; + </p> + </div> + <section id="releasenotes"> + <h2 class="label-column">&aboutTBUpdate.releaseNotes;</h2> + <div class="content"></div> + </section> </body> </html> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4177d7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4177d7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 16940: After update, load local change notes.
by Richard Pospesel (＠richard) 09 Jan '23

09 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9714187f by Henry Wilkes at 2023-01-09T20:07:59+00:00 fixup! Bug 16940: After update, load local change notes. We make a number of related changed to improve the semantics and accessibility of the about:tbupdate page: + We parse and show the release notes as a bullet list. + We use paragraphs, headings and bullet list to structure content. + We stop using fixed "px" font sizes and use relative sizes instead. + Add a lang="en-US" and dir="ltr" attribute to the english text. - - - - - 4 changed files: - browser/actors/AboutTBUpdateParent.jsm - browser/base/content/abouttbupdate/aboutTBUpdate.css - browser/base/content/abouttbupdate/aboutTBUpdate.js - browser/base/content/abouttbupdate/aboutTBUpdate.xhtml Changes: ===================================== browser/actors/AboutTBUpdateParent.jsm ===================================== @@ -8,7 +8,6 @@ this.EXPORTED_SYMBOLS = ["AboutTBUpdateParent"]; const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); @@ -74,41 +73,72 @@ class AboutTBUpdateParent extends JSWindowActorParent { f.append("Docs"); f.append("ChangeLog.txt"); - let s = await IOUtils.readUTF8(f.path); - - // Truncate at the first empty line. - s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); - - // Split into first line (version plus releaseDate) and - // remainder (releaseNotes). - // This first match() uses multiline mode with two capture groups: - // first line: (.*$) - // remaining lines: ([\s\S]+) - // [\s\S] matches all characters including end of line. This trick - // is needed because when using JavaScript regex in multiline mode, - // . does not match an end of line character. - let matchArray = s.match(/(.*$)\s*([\s\S]+)/m); - if (matchArray && matchArray.length == 3) { - info.releaseNotes = matchArray[2]; - let line1 = matchArray[1]; - // Extract the version and releaseDate. The first line looks like: - // Tor Browser 8.5 -- May 1 2019 - // The regex uses two capture groups: - // text that does not include a hyphen: (^[^-]*) - // remaining text: (.*$) - // In between we match optional whitespace, one or more hyphens, and - // optional whitespace by using: \s*-+\s* - matchArray = line1.match(/(^[^-]*)\s*-+\s*(.*$)/); - if (matchArray && matchArray.length == 3) { - info.version = matchArray[1]; - info.releaseDate = matchArray[2]; + // NOTE: We load in the entire file, but only use the first few lines + // before the first blank line. + const logLines = (await IOUtils.readUTF8(f.path)) + .replace(/\n\r?\n.*/ms, "") + .split(/\n\r?/); + + // Read the first line to get the version and date. + // Assume everything after the last "-" is the date. + const firstLine = logLines.shift(); + const match = firstLine?.match(/(.*)-+(.*)/); + if (match) { + info.version = match[1].trim(); + info.releaseDate = match[2].trim(); + } else { + // No date. + info.version = firstLine?.trim(); + } + + // We want to read the rest of the release notes as a tree. Each entry + // will contain the text for that line. + // We choose a negative index for the top node of this tree to ensure no + // line will appear less indented. + const topEntry = { indent: -1, children: undefined }; + let prevEntry = topEntry; + + for (let line of logLines) { + const indent = line.match(/^ */)[0]; + line = line.trim(); + if (line.startsWith("*")) { + // Treat as a bullet point. + let entry = { + text: line.replace(/^\*\s/, ""), + indent: indent.length, + }; + let parentEntry; + if (entry.indent > prevEntry.indent) { + // A sub-list of the previous item. + prevEntry.children = []; + parentEntry = prevEntry; + } else { + // Same list or end of sub-list. + // Search for the first parent whose indent comes before ours. + parentEntry = prevEntry.parent; + while (entry.indent <= parentEntry.indent) { + parentEntry = parentEntry.parent; + } + } + entry.parent = parentEntry; + parentEntry.children.push(entry); + prevEntry = entry; + } else if (prevEntry === topEntry) { + // Unexpected, missing bullet point on first line. + // Place as its own bullet point instead, and set as prevEntry for the + // next loop. + prevEntry = { text: line, indent: indent.length, parent: topEntry }; + topEntry.children = [prevEntry]; } else { - info.version = line1; // Match failed: return entire line in version. + // Append to the previous bullet point. + prevEntry.text += ` ${line}`; } - } else { - info.releaseNotes = s; // Only one line: use as releaseNotes. } - } catch (e) {} + + info.releaseNotes = topEntry.children; + } catch (e) { + Cu.reportError(e); + } return info; } ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.css ===================================== @@ -14,61 +14,54 @@ body { font-family: Helvetica, Arial, sans-serif; color: var(--abouttor-text-color); background-color: var(--abouttor-bg-toron-color); - background-attachment: fixed; - background-size: 100% 100%; -} - -a { - color: var(--abouttor-text-color); -} - -.two-column-grid { - display: inline-grid; + margin-block: 40px; + margin-inline: 50px; + display: grid; grid-template-columns: auto auto; - grid-column-gap: 50px; - margin: 10px 0px 0px 50px; + align-items: baseline; + gap: 40px 50px; } -.two-column-grid div { - margin-top: 40px; - align-self: baseline; /* Align baseline of text across the row. */ +body > *:not([hidden]) { + display: contents; } .label-column { - font-size: 14px; - font-weight: 400; + grid-column: 1; } -/* - * Use a reduced top margin to bring the row that contains the - * "visit our website" link closer to the row that precedes it. This - * looks better because the "visit our website" row does not have a - * label in the left column. - */ -div.more-info-row { - margin-top: 5px; - font-size: 14px; +.content { + grid-column: 2; + font-family: monospace; + line-height: 1.4; +} + +.label-column, .content { + margin: 0; + padding: 0; + font-size: 1rem; + font-weight: normal; } -#version-content { - font-size: 50px; - font-weight: 300; +a { + color: inherit; } -body:not([havereleasedate]) .release-date-cell { - display: none; +.no-line-break { + white-space: nowrap; } -#releasedate-content { - font-size: 17px; +ul { + padding-inline: 1em 0; } -#releasenotes-label { - align-self: start; /* Anchor "Release Notes" label at the top. */ +h3, h4 { + font-size: 1.1rem; + font-weight: bold; } -#releasenotes-content { - font-family: monospace; - font-size: 15px; - white-space: pre; +h3.build-system-heading { + font-size: 1.5rem; + font-weight: normal; + margin-block-start: 3em; } ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.js ===================================== @@ -5,23 +5,105 @@ /* eslint-env mozilla/frame-script */ -// aData may contain the following string properties: -// version -// releaseDate -// moreInfoURL -// releaseNotes -function onUpdate(aData) { - document.getElementById("version-content").textContent = aData.version; - if (aData.releaseDate) { - document.body.setAttribute("havereleasedate", "true"); - document.getElementById("releasedate-content").textContent = - aData.releaseDate; +/** + * An object representing a bullet point in the release notes. + * + * typedef {Object} ReleaseBullet + * @property {string} text - The text for this bullet point. + * @property {?Array<ReleaseBullet>} children - A sub-list of bullet points. + */ + +/** + * Fill an element with the given list of release bullet points. + * + * @param {Element} container - The element to fill with bullet points. + * @param {Array<ReleaseBullet>} bulletPoints - The list of bullet points. + * @param {string} [childTag="h3"] - The element tag name to use for direct + * children. Initially, the children are h3 sub-headings. + */ +function fillReleaseNotes(container, bulletPoints, childTag = "h3") { + for (const { text, children } of bulletPoints) { + const childEl = document.createElement(childTag); + // Keep dashes like "[tor-browser]" on the same line by nowrapping the word. + for (const [index, part] of text.split(/(\S+-\S+)/).entries()) { + if (!part) { + continue; + } + const span = document.createElement("span"); + span.textContent = part; + span.classList.toggle("no-line-break", index % 2); + childEl.appendChild(span); + } + container.appendChild(childEl); + if (children) { + if (childTag == "h3" && text.toLowerCase() === "build system") { + // Special case: treat the "Build System" heading's children as + // sub-headings. + childEl.classList.add("build-system-heading"); + fillReleaseNotes(container, children, "h4"); + } else { + const listEl = document.createElement("ul"); + fillReleaseNotes(listEl, children, "li"); + if (childTag == "li") { + // Insert within the "li" element. + childEl.appendChild(listEl); + } else { + container.appendChild(listEl); + } + } + } + } +} + +/** + * Set the content for the specified container, or hide it if we have no + * content. + * + * @template C + * @param {string} containerId - The id for the container. + * @param {?C} content - The content for this container, or a falsey value if + * the container has no content. + * @param {function(contentEl: Elemenet, content: C)} [fillContent] - A function + * to fill the ".content" contentEl with the given 'content'. If unspecified, + * the 'content' will become the contentEl's textContent. + */ +function setContent(containerId, content, fillContent) { + const container = document.getElementById(containerId); + if (!content) { + container.hidden = true; + return; } + const contentEl = container.querySelector(".content"); + // Release notes are only in English. + contentEl.setAttribute("lang", "en-US"); + contentEl.setAttribute("dir", "ltr"); + if (fillContent) { + fillContent(contentEl, content); + } else { + contentEl.textContent = content; + } +} + +/** + * Callback when we receive the update details. + * + * @param {Object} aData - The update details. + * @param {?string} aData.version - The update version. + * @param {?string} aData.releaseDate - The release date. + * @param {?string} aData.moreInfoURL - A URL for more info. + * @param {?Array<ReleaseBullet>} aData.releaseNotes - Release notes as bullet + * points. + */ +function onUpdate(aData) { + setContent("version-row", aData.version); + setContent("releasedate-row", aData.releaseDate); + setContent("releasenotes", aData.releaseNotes, fillReleaseNotes); + if (aData.moreInfoURL) { document.getElementById("infolink").setAttribute("href", aData.moreInfoURL); + } else { + document.getElementById("fullinfo").hidden = true; } - document.getElementById("releasenotes-content").textContent = - aData.releaseNotes; } RPMSendQuery("FetchUpdateData").then(onUpdate); ===================================== browser/base/content/abouttbupdate/aboutTBUpdate.xhtml ===================================== @@ -21,19 +21,26 @@ type="text/javascript"/> </head> <body dir="&locale.dir;"> -<div class="two-column-grid"> - <div class="label-column">&aboutTBUpdate.version;</div> - <div id="version-content"/> - - <div class="label-column release-date-cell">&aboutTBUpdate.releaseDate;</div> - <div id="releasedate-content" class="release-date-cell"/> - - <div class="more-info-row"/> - <div class="more-info-row">&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> - - <div id="releasenotes-label" - class="label-column">&aboutTBUpdate.releaseNotes;</div> - <div id="releasenotes-content"></div> -</div> +  + <div id="version-row"> + <span class="label-column">&aboutTBUpdate.version;</span> + <span class="content"></span> + </div> + <div id="releasedate-row"> + <span class="label-column">&aboutTBUpdate.releaseDate;</span> + <span class="content"></span> + </div> + <div id="fullinfo"> + <p class="content"> + &aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix; + </p> + </div> + <section id="releasenotes"> + <h2 class="label-column">&aboutTBUpdate.releaseNotes;</h2> + <div class="content"></div> + </section> </body> </html> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9714187… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9714187… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] Bug 41506: Distrust TrustCor root certificates after 2022-11-30.
by Richard Pospesel (＠richard) 09 Jan '23

09 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 4177d7e9 by hackademix at 2023-01-09T19:39:13+00:00 Bug 41506: Distrust TrustCor root certificates after 2022-11-30. (cherry picked from commit fb7cbedd86fd6960639e87f8ed6692ba4c1d3068) - - - - - 1 changed file: - security/nss/lib/ckfw/builtins/certdata.txt Changes: ===================================== security/nss/lib/ckfw/builtins/certdata.txt ===================================== @@ -15730,8 +15730,14 @@ CKA_VALUE MULTILINE_OCTAL \132\171\054\031 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END # Trust for "TrustCor RootCert CA-1" # Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -15923,8 +15929,15 @@ CKA_VALUE MULTILINE_OCTAL \326\354\011 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END + # Trust for "TrustCor RootCert CA-2" # Issuer: CN=TrustCor RootCert CA-2,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -16081,8 +16094,14 @@ CKA_VALUE MULTILINE_OCTAL \264\237\327\346 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END # Trust for "TrustCor ECA-1" # Issuer: CN=TrustCor ECA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4177d7e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4177d7e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] Bug 41506: Distrust TrustCor root certificates after 2022-11-30.
by Richard Pospesel (＠richard) 09 Jan '23

09 Jan '23

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: fb7cbedd by hackademix at 2023-01-09T20:29:33+01:00 Bug 41506: Distrust TrustCor root certificates after 2022-11-30. - - - - - 1 changed file: - security/nss/lib/ckfw/builtins/certdata.txt Changes: ===================================== security/nss/lib/ckfw/builtins/certdata.txt ===================================== @@ -15730,8 +15730,14 @@ CKA_VALUE MULTILINE_OCTAL \132\171\054\031 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END # Trust for "TrustCor RootCert CA-1" # Issuer: CN=TrustCor RootCert CA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -15923,8 +15929,15 @@ CKA_VALUE MULTILINE_OCTAL \326\354\011 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END + # Trust for "TrustCor RootCert CA-2" # Issuer: CN=TrustCor RootCert CA-2,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA @@ -16081,8 +16094,14 @@ CKA_VALUE MULTILINE_OCTAL \264\237\327\346 END CKA_NSS_MOZILLA_CA_POLICY CK_BBOOL CK_TRUE -CKA_NSS_SERVER_DISTRUST_AFTER CK_BBOOL CK_FALSE -CKA_NSS_EMAIL_DISTRUST_AFTER CK_BBOOL CK_FALSE +# For Server Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_SERVER_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END +# For Email Distrust After: Wed Nov 30 00:00:00 2022 +CKA_NSS_EMAIL_DISTRUST_AFTER MULTILINE_OCTAL +\062\062\061\061\063\060\060\060\060\060\060\060\132 +END # Trust for "TrustCor ECA-1" # Issuer: CN=TrustCor ECA-1,OU=TrustCor Certificate Authority,O=TrustCor Systems S. de R.L.,L=Panama City,ST=Panama,C=PA View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fb7cbed… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fb7cbed… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

09 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4a257dd5 by trinity-1686a at 2023-01-09T17:32:45+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41066: isolate tor connections based on userContextId - - - - - 1 changed file: - toolkit/torbutton/components/domain-isolator.js Changes: ===================================== toolkit/torbutton/components/domain-isolator.js ===================================== @@ -58,7 +58,11 @@ let tor = {}; // __tor.noncesForDomains__. // A mutable map that records what nonce we are using for each domain. -tor.noncesForDomains = {}; +tor.noncesForDomains = new Map(); + +// __tor.noncesForUserContextId__. +// A mutable map that records what nonce we are using for each tab container. +tor.noncesForUserContextId = new Map(); // __tor.isolationEabled__. // A bool that controls if we use SOCKS auth for isolation or not. @@ -68,23 +72,37 @@ tor.isolationEnabled = true; // Specifies when the current catch-all circuit was first used tor.unknownDirtySince = Date.now(); -// __tor.socksProxyCredentials(originalProxy, domain)__. -// Takes a proxyInfo object (originalProxy) and returns a new proxyInfo -// object with the same properties, except the username is set to the -// the domain, and the password is a nonce. -tor.socksProxyCredentials = function(originalProxy, domain) { +tor.passwordForDomainAndUserContextId = function(domain, userContextId) { // Check if we already have a nonce. If not, create - // one for this domain. - if (!tor.noncesForDomains.hasOwnProperty(domain)) { - tor.noncesForDomains[domain] = tor.nonce(); + // one for this domain and userContextId. + if (!tor.noncesForDomains.has(domain)) { + tor.noncesForDomains.set(domain, tor.nonce()); + } + if (!tor.noncesForUserContextId.has(userContextId)) { + tor.noncesForUserContextId.set(userContextId, tor.nonce()); } + return ( + tor.noncesForDomains.get(domain) + + tor.noncesForUserContextId.get(userContextId) + ); +}; + +// __tor.socksProxyCredentials(originalProxy, domain, userContextId)__. +// Takes a proxyInfo object (originalProxy) and returns a new proxyInfo +// object with the same properties, except the username is set to the +// the domain and userContextId, and the password is a nonce. +tor.socksProxyCredentials = function(originalProxy, domain, userContextId) { let proxy = originalProxy.QueryInterface(Ci.nsIProxyInfo); + let proxyPassword = tor.passwordForDomainAndUserContextId( + domain, + userContextId + ); return mozilla.protocolProxyService.newProxyInfoWithAuth( "socks", proxy.host, proxy.port, - domain, // username - tor.noncesForDomains[domain], // password + `${domain}:${userContextId}`, // username + proxyPassword, "", // aProxyAuthorizationHeader "", // aConnectionIsolationKey proxy.flags, @@ -116,10 +134,21 @@ tor.newCircuitForDomain = function(domain) { if (domain === "") { domain = "--unknown--"; } - tor.noncesForDomains[domain] = tor.nonce(); + tor.noncesForDomains.set(domain, tor.nonce()); + logger.eclog( + 3, + `New domain isolation for ${domain}: ${tor.noncesForDomains.get(domain)}` + ); +}; + +tor.newCircuitForUserContextId = function(userContextId) { + // Re-generate the nonce for the context. + tor.noncesForUserContextId.set(userContextId, tor.nonce()); logger.eclog( 3, - "New domain isolation for " + domain + ": " + tor.noncesForDomains[domain] + `New container isolation for ${userContextId}: ${tor.noncesForUserContextId.get( + userContextId + )}` ); }; @@ -127,8 +156,9 @@ tor.newCircuitForDomain = function(domain) { // Clear the isolation state cache, forcing new circuits to be used for all // subsequent requests. tor.clearIsolation = function() { - // Per-domain nonces are stored in a map, so simply re-initialize the map. - tor.noncesForDomains = {}; + // Per-domain and per contextId nonces are stored in maps, so simply clear them. + tor.noncesForDomains.clear(); + tor.noncesForUserContextId.clear(); // Force a rotation on the next catch-all circuit use by setting the creation // time to the epoch. @@ -137,9 +167,9 @@ tor.clearIsolation = function() { // __tor.isolateCircuitsByDomain()__. // For every HTTPChannel, replaces the default SOCKS proxy with one that authenticates -// to the SOCKS server (the tor client process) with a username (the first party domain) -// and a nonce password. Tor provides a separate circuit for each username+password -// combination. +// to the SOCKS server (the tor client process) with a username (the first party domain +// and userContextId) and a nonce password. Tor provides a separate circuit for each +// username+password combination. tor.isolateCircuitsByDomain = function() { mozilla.registerProxyChannelFilter(function(aChannel, aProxy) { if (!tor.isolationEnabled) { @@ -147,7 +177,8 @@ tor.isolateCircuitsByDomain = function() { } try { let channel = aChannel.QueryInterface(Ci.nsIChannel), - firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain; + firstPartyDomain = channel.loadInfo.originAttributes.firstPartyDomain, + userContextId = channel.loadInfo.originAttributes.userContextId; if (firstPartyDomain === "") { firstPartyDomain = "--unknown--"; if (Date.now() - tor.unknownDirtySince > 1000 * 10 * 60) { @@ -161,7 +192,8 @@ tor.isolateCircuitsByDomain = function() { } let replacementProxy = tor.socksProxyCredentials( aProxy, - firstPartyDomain + firstPartyDomain, + userContextId ); logger.eclog( 3, @@ -206,6 +238,9 @@ DomainIsolator.prototype = { newCircuitForDomain(domain) { tor.newCircuitForDomain(domain); }, + newCircuitForUserContextId(userContextId) { + tor.newCircuitForUserContextId(userContextId); + }, enableIsolation() { tor.isolationEnabled = true; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4a257dd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4a257dd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40727: Update Snowflake STUN servers in the default bridge line
by Pier Angelo Vendrame (＠pierov) 09 Jan '23

09 Jan '23

Pier Angelo Vendrame pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: b95fc641 by Cecylia Bocovich at 2023-01-09T08:24:38+00:00 Bug 40727: Update Snowflake STUN servers in the default bridge line Removing stun.stunprotocol.org:3478 and stun.altar.com.pl:3478. Also, removing stun.sonetel.com, since it is an alias of stun.sonetel.net. (cherry picked from commit fc89e8b10c3ff30db2079b2fb327d05b2b5f3c80) - - - - - 1 changed file: - projects/common/bridges_list.snowflake.txt Changes: ===================================== projects/common/bridges_list.snowflake.txt ===================================== @@ -1,2 +1,2 @@ -snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn -snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn +snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn +snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40727: Update Snowflake STUN servers in the default bridge line
by Pier Angelo Vendrame (＠pierov) 09 Jan '23

09 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: fc89e8b1 by Cecylia Bocovich at 2023-01-09T08:23:24+00:00 Bug 40727: Update Snowflake STUN servers in the default bridge line Removing stun.stunprotocol.org:3478 and stun.altar.com.pl:3478. Also, removing stun.sonetel.com, since it is an alias of stun.sonetel.net. - - - - - 1 changed file: - projects/common/bridges_list.snowflake.txt Changes: ===================================== projects/common/bridges_list.snowflake.txt ===================================== @@ -1,2 +1,2 @@ -snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn -snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn +snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn +snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40706: macos-signer-stapler should wait for user interaction before attempting stapling
by Richard Pospesel (＠richard) 22 Dec '22

22 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 1f66e1a8 by Richard Pospesel at 2022-12-22T17:05:28+00:00 Bug 40706: macos-signer-stapler should wait for user interaction before attempting stapling (cherry picked from commit f228c0cd1fd7b0e4ab373c56740b2808ce901a01) - - - - - 1 changed file: - tools/signing/macos-signer-stapler Changes: ===================================== tools/signing/macos-signer-stapler ===================================== @@ -1,6 +1,8 @@ #!/bin/bash set -e +read -n 1 -p "Press enter once notarization is complete..." + script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40706: macos-signer-stapler should wait for user interaction before attempting stapling
by Richard Pospesel (＠richard) 22 Dec '22

22 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f228c0cd by Richard Pospesel at 2022-12-22T17:04:30+00:00 Bug 40706: macos-signer-stapler should wait for user interaction before attempting stapling - - - - - 1 changed file: - tools/signing/macos-signer-stapler Changes: ===================================== tools/signing/macos-signer-stapler ===================================== @@ -1,6 +1,8 @@ #!/bin/bash set -e +read -n 1 -p "Press enter once notarization is complete..." + script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40718: Remove a few mozconfig entries that we set already in tor-browser.git
by Pier Angelo Vendrame (＠pierov) 22 Dec '22

22 Dec '22

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: dbc4a024 by Pier Angelo Vendrame at 2022-12-22T15:47:40+01:00 Bug 40718: Remove a few mozconfig entries that we set already in tor-browser.git - - - - - 1 changed file: - projects/firefox/mozconfig Changes: ===================================== projects/firefox/mozconfig ===================================== @@ -71,7 +71,5 @@ ac_add_options --enable-verify-mar [% END -%] -ac_add_options --with-relative-profile=[% c('var/ProjectName') %]/Data/Browser -mk_add_options MOZ_APP_DISPLAYNAME="[% c('var/Project_Name') %]" mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40720: Support the new "Build System" label in fetch-changelogs.py
by Richard Pospesel (＠richard) 22 Dec '22

22 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 05e44b83 by Pier Angelo Vendrame at 2022-12-22T11:09:24+01:00 Bug 40720: Support the new "Build System" label in fetch-changelogs.py - - - - - 1 changed file: - tools/fetch-changelogs.py Changes: ===================================== tools/fetch-changelogs.py ===================================== @@ -48,6 +48,7 @@ class Issue: if not self.platform: self.platform = Platform.ALL_PLATFORMS self.num_platforms = 4 + self.is_build = "Build System" in j["labels"] def get_platforms(self): if self.platform == Platform.ALL_PLATFORMS: @@ -70,6 +71,15 @@ class Issue: return self.number < other.number +def sorted_issues(issues): + issues = [sorted(v) for v in issues.values()] + return sorted( + issues, + key=lambda group: (group[0].num_platforms << 8) | group[0].platform, + reverse=True, + ) + + if len(sys.argv) < 2: print(f"Usage: {sys.argv[0]} version-to-release or #issue-id") sys.exit(1) @@ -117,24 +127,28 @@ else: version = "????" iid = sys.argv[1][1:] +linked = {} +linked_build = {} r = requests.get( f"{API_URL}/projects/{PROJECT_ID}/issues/{iid}/links", headers=headers ) -linked = {} for i in r.json(): i = Issue(i) - if i.platform not in linked: - linked[i.platform] = [] - linked[i.platform].append(i) -linked = sorted( - linked.values(), - key=lambda issues: (issues[0].num_platforms << 8) | issues[0].platform, - reverse=True, -) + target = linked_build if i.is_build else linked + if i.platform not in target: + target[i.platform] = [] + target[i.platform].append(i) +linked = sorted_issues(linked) +linked_build = sorted_issues(linked_build) date = datetime.now().strftime("%B %d %Y") print(f"Tor Browser {version} - {date}") for issues in linked: print(f" * {issues[0].get_platforms()}") - for i in sorted(issues): + for i in issues: print(f" * {i}") +print(" * Build System") +for issues in linked_build: + print(f" * {issues[0].get_platforms()}") + for i in issues: + print(f" * {i}") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40719: Allow non-universal macOS builds also on base-browser
by Pier Angelo Vendrame (＠pierov) 21 Dec '22

21 Dec '22

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6448705f by Nicolas Vigier at 2022-12-21T18:08:27+01:00 Bug 40719: Allow non-universal macOS builds also on base-browser - - - - - 2 changed files: - Makefile - rbm.conf Changes: ===================================== Makefile ===================================== @@ -444,6 +444,12 @@ basebrowser-testbuild-windows-i686: submodule-update basebrowser-testbuild-macos: submodule-update $(rbm) build release --target testbuild --target browser-macos --target basebrowser +basebrowser-testbuild-macos-x86_64: submodule-update + $(rbm) build release --target testbuild --target browser-macos-x86_64 --target basebrowser + +basebrowser-testbuild-macos-aarch64: submodule-update + $(rbm) build release --target testbuild --target browser-macos-aarch64 --target basebrowser + basebrowser-testbuild-src: submodule-update $(rbm) build release --target testbuild --target browser-src-testbuild --target basebrowser ===================================== rbm.conf ===================================== @@ -529,6 +529,14 @@ targets: - macos-x86_64 - macos - basebrowser + basebrowser-macos-x86_64: + - macos-x86_64 + - macos + - basebrowser + basebrowser-macos-aarch64: + - macos-aarch64 + - macos + - basebrowser macos-universal: var: macos_universal: 1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.5a1-build1
by Pier Angelo Vendrame (＠pierov) 21 Dec '22

21 Dec '22

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

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40703: Prepare alpha release 12.5a1
by Pier Angelo Vendrame (＠pierov) 21 Dec '22

21 Dec '22

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 210a4b2c by Pier Angelo Vendrame at 2022-12-20T20:10:56+01:00 Bug 40703: Prepare alpha release 12.5a1 - - - - - 13 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - projects/android-components/config - projects/browser/Bundle-Data/Docs/ChangeLog.txt - projects/browser/allowed_addons.json - projects/fenix/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/tor/config - projects/translation/config - rbm.conf - + tools/get-translation-hashes Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -69,11 +69,6 @@ <summary>Shared</summary> ### tor-browser: https://gitlab.torproject.org/tpo/applications/tor-browser.git -- [ ] ***(Optional)*** Update torbutton translations in `toolkit/torbutton` - - [ ] `./import-translations.sh` - - **NOTE** : if there are no new strings imported then we are done here - - [ ] Commit as `fixup!` to the `Add TorStrings module for localization` commit - - **NOTE** : only add files which are already being tracked - [ ] ***(Optional)*** Backport any Android-specific security fixes from Firefox rapid-release - [ ] ***(Optional, Chemspill)*** Backport security-fixes to both `tor-browser` and `base-browser` branches - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` @@ -126,6 +121,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - [ ] Update `projects/translation/config`: + - [ ] run `tools/get-translation-hashes` to get updated hashes - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch @@ -155,7 +151,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] **(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` + - [ ] ***(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 ===================================== projects/android-components/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build5' +git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/browser_branch") %]-build[% c("var/android_components_build") %]' git_url: https://gitlab.torproject.org/tpo/applications/android-components.git tag_gpg_id: 1 gpg_keyring: @@ -13,7 +13,8 @@ container: var: android_components_version: 102.0.14 - torbrowser_branch: 12.0 + browser_branch: 12.5-1 + android_components_build: 1 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 37 gradle_version: 7.0.2 ===================================== projects/browser/Bundle-Data/Docs/ChangeLog.txt ===================================== @@ -1,3 +1,253 @@ +Tor Browser 12.5a1 - December 21 2022 + * All Platforms + * Updated tor to 0.4.7.12 + * Bug 40711: Review and expand the stakeholders we communicate major changes to [tor-browser-build] + * Bug 41478: Drop the torbutton submodule in 12.5 [tor-browser] + * Bug 41514: eslint broken since migrating torbutton [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 102.6esr + * Bug 26504: about:preferences shows Firefox's version instead of Tor Browser's + * Bug 32308: Stop inner letterbox jiggling as border is dragged [tor-browser] + * Bug 40347: URL bar lock icon says connection is not secure when on "view-source:[...].onion" URLs [tor-browser] + * Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0 [tor-browser-build] + * Bug 41375: Clean unused strings [tor-browser] + * Bug 41435: Add a Tor Browser migration function [tor-browser] + * Bug 41448: User `danger` style for primary button in new identity modal [tor-browser] + * Bug 41483: Tor Browser says Firefox timed out, confusing users [tor-browser] + * Bug 41503: Disable restart in case of reboot and restore in case of crash [tor-browser] + * Bug 41520: Regression: rearranging bookmarks / place items by drag & drop doesn't work anymore [tor-browser] + * Bug 41524: about:tbupdate needs UTF-8 [tor-browser] + * Bug 41525: Drop locales from torbutton, since we will inject them in tor-browser-build [tor-browser] + * macOS + Linux + * Bug 41519: TOR_SOCKS_IPC_PATH environment variable not honored [tor-browser] + * Windows + * Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe [tor-browser-build] + * macOS + * Bug 40716: Unable to update to 12.0.1 on Apple Silicon-based Mac [tor-browser-build] + * Android + * Updated GeckoView to 102.6esr + * Bug 41001: Remove remaining security slider code [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.19.4 + * Bug 40645: Verify we no longer depend on any signed tags from sysrqb and gk, and remove them from torbutton.gpg [tor-browser-build] + * Bug 40679: Use the latest translations for nightly builds [tor-browser-build] + * Bug 40681: Run apt-get clean, after installing packages in projects/container-image/config [tor-browser-build] + * Bug 40683: Install more packages in the default containers to reduce the number of custom containers [tor-browser-build] + * Bug 40689: Update Ubuntu version from projects/mmdebstrap-image/config to 22.04.1 [tor-browser-build] + * Bug 40717: Create a script to prepare changelogs [tor-browser-build] + * Windows + macOS + Linux + * Bug 40707: Update update_responses_config.yml to allow 11.5.8 to update to whatever latest is [tor-browser-build] + * Bug 40713: Use the new tor-browser l10n branch in Firefox [tor-browser-build] + * Linux + Android + * Bug 40653: Build compiler-rt with runtimes instead of the main LLVM build [tor-browser-build] + * macOS + * Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build [tor-browser-build] + * Bug 40704: Building nightly macos incrementals fails [tor-browser-build] + * Linux + * Bug 40693: Can't build container-image in main [tor-browser-build] + * Android + * Bug 40702: Nightly builds fails with "error: pathspec 'tor-browser-102.5.0esr-12.0-2' did not match any file(s) known to git" [tor-browser-build] + +Tor Browser 12.0.1 - December 14 2022 + * Windows + macOS + Linux + * Updated Firefox to 102.6esr + * Bug 41519: TOR_SOCKS_IPC_PATH environment variable not honored [tor-browser] + * Bug 41520: Regression: rearranging bookmarks / place items by drag & drop doesn't work anymore [tor-browser] + * Android + * Updated GeckoView to 102.6esr + * Build System + * All Platforms + * Updated Go to 1.19.4 + * Bug 40653: Build compiler-rt with runtimes instead of the main LLVM build [tor-browser-build] + * Bug 40681: Run apt-get clean, after installing packages in projects/container-image/config [tor-browser-build] + * Bug 40683: Install more packages in the default containers to reduce the number of custom containers [tor-browser-build] + * Bug 40693: Can't build container-image in main [tor-browser-build] + * Bug 40705: Add empty commit mentioning that gitolite repo is no longer updated [tor-browser-build] + * Windows + * Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe [tor-browser-build] + * Linux + * Bug 40689: Update Ubuntu version from projects/mmdebstrap-image/config to 22.04.1 [tor-browser-build] + +Tor Browser 12.0 - December 5 2022 + * All Platforms + * Update Translations + * Update tor to 0.4.7.12 + * Bug 17228: Consideration for disabling/trimming referrers within TBB [tor-browser] + * Bug 24686: In Tor Browser context, should network.http.tailing.enabled be set to false? [tor-browser] + * Bug 27127: Audit and enable HTTP/2 push [tor-browser] + * Bug 27258: font whitelist means we don't have to set gfx.downloadable_fonts.fallback_delay [tor-browser] + * Bug 40057: ensure that CSS4 system colors are not a fingerprinting vector [tor-browser] + * Bug 40058: ensure no locale leaks from new Intl APIs [tor-browser] + * Bug 40183: Consider disabling TLS ciphersuites containing SHA-1 [tor-browser] + * Bug 40251: Clear obsolete prefs after torbutton!27 [tor-browser] + * Bug 40406: Remove Presentation API related prefs [tor-browser] + * Bug 40491: Don't auto-pick a v2 address when it's in Onion-Location header [tor-browser] + * Bug 40494: Update Startpage and Blockchair onion search providers [tor-browser] + * Bug 40580: Add support for Ukranian (uk) [tor-browser-build] + * Bug 40646: Don't build Español AR anymore [tor-browser-build] + * Bug 40674: Add Secondary Snowflake Bridge [tor-browser-build] + * Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 [tor-browser] + * Bug 41098: Compare Tor Browser's and GeckoView's profiles [tor-browser] + * Bug 41125: Review Mozilla 1732792: retry polling requests without proxy [tor-browser] + * Bug 41154: Review Mozilla 1765167: Deprecate Cu.import [tor-browser] + * Bug 41164: Add some #define for the base-browser section [tor-browser] + * Bug 41306: Typo "will not able" in "Tor unexpectedly exited" dialog [tor-browser] + * Bug 41317: Tor Browser leaks banned ports in network.security.ports.banned [tor-browser] + * Bug 41345: fonts: windows whitelist contains supplemental fonts [tor-browser] + * Bug 41398: Disable Web MIDI API [tor-browser] + * Bug 41406: Do not define `--without-wasm-sandboxed-libraries` if `WASI_SYSROOT` is defined [tor-browser] + * Bug 41420: Remove brand.dtd customization on nightly [tor-browser] + * Bug 41457: Remove more Mozilla permissions [tor-browser] + * Bug 41473: Add support for Albanian (sq) [tor-browser] + * Windows + macOS + Linux + * Update Firefox to 102.5.0esr + * Bug 17400: Decide how to use the multi-lingual Tor Browser in the alpha/release series [tor-browser] + * Bug 40595: Migrate to 102 on desktop [tor-browser-buid] + * Bug 40638: Visit our website link after build-to-build upgrade in Nightly channel points to old v2 onion [tor-browser-build] + * Bug 40648: Do not customize update.locale in multi-lingual builds [tor-browser-build] + * Bug 40853: use Subprocess.jsm to launch tor [tor-browser] + * Bug 40933: Migrate remaining tor-launcher functionality to tor-browser [tor-browser] + * Bug 41011: The Internet and Tor status are visible when opening the settings [tor-browser] + * Bug 41044: Content exceeding the height of the connection settings modals [tor-browser] + * Bug 41116: Review Mozilla 1226042: add support for the new 'system-ui' generic font family [tor-browser] + * Bug 41117: Review Mozilla 1512851: Add Share Menu to File Menu on macOS [tor-browser] + * Bug 41283: Toolbar buttons missing their label attribute [tor-browser] + * Bug 41284: Stray security-level- fluent ids [tor-browser] + * Bug 41287: New identity button inactive if added after customization [tor-browser] + * Bug 41292: moreFromMozilla pane in about:preferences in 12.0a2 [tor-browser] + * Bug 41293: Incomplete branding in German with 12.0a2 [tor-browser] + * Bug 41337: Add a title to the new identity confirmation [tor-browser] + * Bug 41342: Update the New Identity dialog to the proton modal style [tor-browser] + * Bug 41344: Authenticated Onion Services do not prompt for auth key in 12.0 alpha series [tor-browser] + * Bug 41352: Update or drop the show manual logic in torbutton [tor-browser] + * Bug 41369: Consider a different list-order for locales in language menu [tor-browser] + * Bug 41374: Missing a few torconnect strings in the DTD [tor-browser] + * Bug 41377: Hide `Search for more languages...` from Language selector in multi-locale build [tor-browser] + * Bug 41378: Inform users when Tor Browser sets their language automatically [tor-browser] + * Bug 41385: Bootstrap failure is logged but not raised up to about:torconnect [tor-browser] + * Bug 41386: The new tor-launcher has a problem when another Tor is running [tor-browser] + * Bug 41387: New identity and new circuit ended up inside history [tor-browser] + * Bug 41400: Missing onionAuthViewKeys causes "Onion Services Keys" dialog to be empty. [tor-browser] + * Bug 41401: Missing some mozilla icons because we still loading them from "chrome://browser/skin" rather than "chrome://global/skin/icons" [tor-browser] + * Bug 41404: Fix blockchair-onion search extension [tor-browser] + * Bug 41409: Circuit display is broken on Tails [tor-browser] + * Bug 41410: Opening and closing HTTPS-Only settings make the identity panel shrink [tor-browser] + * Bug 41412: New Identity shows "Tor Browser" instead of "Restart Tor Browser" in unstranslated locales [tor-browser] + * Bug 41417: Prompt users to restart after changing language [tor-browser] + * Bug 41429: TorConnect and TorSettings are initialized twice [tor-browser] + * Bug 41435: Add a Tor Browser migration function [tor-browser] + * Bug 41436: The new tor-launcher handles arrays in the wrong way [tor-browser] + * Bug 41437: Use the new media query for dark theme for the "Connected" pill in bridges [tor-browser] + * Bug 41449: Onion authentication's learn more should link to the offline manual [tor-browser] + * Bug 41451: Still using requestedLocales in torbutton [tor-browser] + * Bug 41455: Tor Browser dev build cannot launch tor [tor-browser] + * Bug 41458: Prevent `mach package-multi-locale` from actually creating a package [tor-browser] + * Bug 41462: Add anchors to bridge-moji and onion authentication entries [tor-browser] + * Bug 41466: Port YEC 2022 campaign to Tor Browser 12.0 (Desktop) [tor-browser] + * Bug 41495: Clicking on "View Logs" in the "Establishing Connection" page takes you to about:preferences#connection and not logs [tor-browser] + * Bug 41498: The Help panel is empty in 12.0a4 [tor-browser] + * Bug 41508: Update the onboarding link for 12.0 [tor-browser] + * Windows + * Bug 41149: Review Mozilla 1762576: Firefox is not allowing Symantec DLP to inject DLL into the browser for Data Loss Prevention software [tor-browser] + * Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one [tor-browser] + * Bug 41426: base-browser nightly fails to build for windows-i686 [tor-browser] + * macOS + * Bug 23451: Adapt font whitelist to changes on macOS (zh locales) [tor-browser] + * Bug 41004: The Bangla font does not display correctly on MacOs [tor-browser] + * Bug 41108: Remove privileged macOS installation from 102 [tor-browser] + * Bug 41294: Bookmarks manager broken in 12.0a2 on MacOS [tor-browser] + * Bug 41348: cherry-pick macOS OSSpinLock replacements [tor-browser] + * Bug 41370: Find a way to ship custom default bookmarks without changing language-packs on macOS [tor-browser] + * Bug 41372: "Japanese" language menu item is localised in multi-locale testbuild (on mac OS) [tor-browser] + * Bug 41379: The new tor-launcher is broken also on macOS [tor-browser] + * Linux + * Bug 40359: Tor Browser Launcher has Wrong Icon [tor-browser] + * Bug 40626: Define the replacements for generic families on Linux [tor-browser-build] + * Bug 41163: Fixing loading of bundled fonts on linux [tor-browser] + * Android + * Update GeckoView to 102.5.0esr + * Bug 40014: Check which of our mobile prefs and configuration changes are still valid for GeckoView [tor-browser] + * Bug 40631: Stop bundling HTTPS Everywhere on Android [tor-browser-build] + * Bug 41394: Implement a setting to always prefer onion sites [tor-browser] + * Bug 41465: Port YEC 2022 campaign to Tor Browser 12.0 (Android) [tor-browser] + * Build System + * All Platforms + * Update Go to 1.19.3 + * Bug 23656: Use .mozconfig files in tor-browser repo for rbm builds [tor-browser-build] + * Bug 28754: make testbuild-android-armv7 stalls during sha256sum step [tor-browser-build] + * Bug 40049: gpg_keyring should allow for array of keyrings [rbm] + * Bug 40397: Create a new build target to package tor daemon, pluggable transports and dependencies [tor-browser-build] + * Bug 40407: Bump binutils version to pick up security improvements for Windows users [tor-browser-build] + * Bug 40585: Prune the manual more [tor-browser-build] + * Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos [tor-browser-build] + * Bug 40591: Rust 1.60 not working to build 102 on Debian Jessie [tor-browser-build] + * Bug 40592: Consider re-using our LLVM/Clang to build Rust [tor-browser-build] + * Bug 40593: Update signing scripts to take into account new project names and layout [tor-browser-build] + * Bug 40607: Add alpha-specific release prep template [tor-browser-build] + * Bug 40610: src-*.tar.xz tarballs are missing in https://dist.torproject.org/torbrowser/12.0a1/ [tor-browser-build] + * Bug 40612: Migrate Release Prep template to Release Prep - Stable [tor-browser-build] + * Bug 40619: Make sure translations are taken from gitlab.tpo and not git.tpo [tor-browser-build] + * Bug 40627: Add boklm to torbutton.gpg [torbrowser-build] + * Bug 40634: Update the project/browser path in tools/changelog-format-blog-post and other files [tor-browser-build] + * Bug 40636: Remove https-everywhere from projects/browser/config [tor-browser-build] + * Bug 40639: Remove tor-launcher references [tor-browser-build] + * Bug 40643: Update Richard's key in torbutton.gpg [tor-browser-build] + * Bug 40645: Remove unused signing keys and create individual keyrings for Tor Project developers [tor-browser-build] + * Bug 40655: Published tor-expert-bundle tar.gz files should not include their tor-browser-build build id [tor-browser-build] + * Bug 40656: Improve get_last_build_version in tools/signing/nightly/sign-nightly [tor-browser-build] + * Bug 40660: Update changelog-format-blog-post script to point gitlab rather than gitolite [tor-browser-build] + * Bug 40662: Make base-browser nightly build from tag [tor-browser-build] + * Bug 40663: Do not ship bookmarks in tor-browser-build anymore [tor-browser-build] + * Bug 40667: Update Node.js to 12.22.12 [tor-browser-build] + * Bug 40669: Remove HTTPS-Everywhere keyring [tor-browser-build] + * Bug 40671: Update langpacks URL [tor-browser-build] + * Bug 40675: Update tb_builders list in set-config [tor-browser-build] + * Bug 40690: Revert fix for zlib build break [tor-browser-build] + * Bug 41308: Use the same branch for Desktop and GeckoView [tor-browser] + * Bug 41321: Delete various master branches after automated build/testing scripts are updated [tor-browser] + * Bug 41340: Opt in to some of the NIGHTLY_BUILD features [tor-browser] + * Bug 41357: Enable browser toolbox debugging by default for dev builds [tor-browser] + * Bug 41446: Multi-lingual alpha bundles break make fetch [tor-browser] + * Windows + macOS + Linux + * Bug 40499: Update firefox to enable building from new 'base-browser' tag [tor-browser-build] + * Bug 40500: Add base-browser package project [tor-browser-build] + * Bug 40501: Makefile updates to support building base-browser packages [tor-browser-build] + * Bug 40503: Update Release Prep issue template with base-browser and privacy browser changes [tor-browser-build] + * Bug 40547: Remove container/remote_* from rbm.conf [tor-browser-build] + * Bug 40581: Update reference to master branches [tor-browser-build] + * Bug 40641: Fetch Firefox locales from l10n-central [tor-browser-build] + * Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0 [tor-browser-build] + * Bug 40685: Remove targets/nightly/var/mar_locales from rbm.conf [tor-browser-build] + * Bug 40686: Add a temporary project to fetch Fluent tranlations for base-browser [tor-browser-build] + * Bug 40691: Update firefox config to point to base-browser branch rather than a particular tag in nightly [tor-browser-build] + * Bug 40699: Fix input_files in projects/firefox-l10n/config [tor-browser-build] + * Bug 41099: Update+comment the update channels in update_responses.config.yaml [tor-browser] + * Windows + * Bug 29318: Use Clang for everything on Windows [tor-browser-buid] + * Bug 29321: Use mingw-w64/clang toolchain to build tor [tor-browser-build] + * Bug 29322: Use mingw-w64/clang toolchain to build OpenSSL [tor-browser-build] + * Bug 40409: Upgrade NSIS to 3.08 [tor-browser-build] + * Bug 40666: Fix compiler depedencies for Firefox on Windows [tor-browser-build] + * macOS + * Bug 40067: Rename "OS X" to "macOS" [tor-browser-build] + * Bug 40158: Add support for macOS AArch64 [tor-browser-build] + * Bug 40439: Create universal x86-64/arm64 mac builds [tor-browser-build] + * Bug 40605: Reworked the macOS toolchain creation [tor-browser-build] + * Bug 40620: Update macosx-sdk to 11.0 [tor-browser-build] + * Bug 40687: macOS nightly builds with packaged locales fail [tor-browser-build] + * Bug 40694: aarch64 tor-expert-bundle for macOS is not exported as part of the browser build [tor-browser-build] + * Linux + * Bug 31321: Add cc -> gcc link to projects/gcc [tor-browser-build] + * Bug 40621: Update namecoin patches for linted TorButton [tor-browser-build] + * Bug 40659: Error building goservice for linux in nightly build [tor-browser-build] + * Bug 41343: Add -without-wam-sandboxed-libraries to mozconfig-linux-x86_64-dev for local builds [tor-browser] + * Android + * Bug 40574: Improve tools/signing/android-signing [tor-browser-build] + * Bug 40604: Fix binutils build on android [tor-browser-build] + * Bug 40640: Extract Gradle in the toolchain setup [tor-browser-build] + * Bug 41304: Add Android-specific targets to makefiles [tor-browser] + Tor Browser 12.0a5 - November 30 2022 * All Platforms * Update Translations @@ -89,9 +339,13 @@ Tor Browser 11.5.8 - November 18 2022 * Bug 40622: Update obfs4proxy to 0.0.14 in Tor Browser [tor-browser-build] * Windows + macOS + Linux * Bug 31064: Letterboxing is enabled in priviledged contexts too [tor-browser] + * Bug 31821: reapply window.open() clamping [tor-browser] * Bug 32411: Consider adding about:tor and others to the list of pages that do not need letterboxing [tor-browser] + * Bug 40081: Letterboxing since 32220 affected by layout.css.devPixelsPerPx [tor-browser] + * Bug 40767: 1px white border visible on fullscreen video playback [tor-browser] * Bug 41105: Tor Browser Does Not Clear CORS Preflight Cache despite creating a “New Identity” [tor-browser] * Bug 41413: Backup intl.locale.requested in 11.5.x [tor-browser] + * Bug 41433: Should letterboxing take in account optional components' heights? [tor-browser] * Bug 41434: Letterboxing bypass through secondary tab (popup/popunder...) [tor-browser] * Bug 41456: Backport ESR 102.5 security fixes to 91.13-based Tor Browser [tor-browser] * Bug 41460: Migrate new identity and security level preferences in 11.5.8 [tor-browser] @@ -232,7 +486,6 @@ Tor Browser 11.5.5 - October 20 2022 Tor Browser 11.5.4 - October 11 2022 * All Platforms - * Bug 40580: Add support for uk (ukranian) locale [tor-browser-build] * Bug 40629: Bump snowflake version to 9ce1de4eee4e [tor-browser-build] * Bug 40633: Remove Team Cymru hard-coded bridges [tor-browser-build] * Bug 41326: Update preference for remoteRecipes [tor-browser] @@ -334,7 +587,7 @@ Tor Browser 12.0a2 - September 1 2022 * Update Go to 1.18.5 * Bug 40574: Improve tools/signing/android-signing [tor-browser-build] * Bug 40582: Prepared TBA to use Mozilla 102 components [tor-browser-build] - * Bug 40604: Bug 40604: Fix binutils build on android [tor-browser-build] + * Bug 40604: Fix binutils build on android [tor-browser-build] Tor Browser 11.5.3 - August 29 2022 * Android ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 909198, + "average_daily_users": 920784, "categories": { "android": [ "experimental", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5584, - "bayesian_average": 4.557180943955026, - "count": 4710, - "text_count": 1504 + "average": 4.5582, + "bayesian_average": 4.556981916903566, + "count": 4742, + "text_count": 1512 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 25656 + "weekly_downloads": 25636 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 669887, + "average_daily_users": 661005, "categories": { "android": [ "security-privacy" @@ -469,9 +469,9 @@ "category": "spotlight" }, "ratings": { - "average": 4.6597, - "bayesian_average": 4.657149505820861, - "count": 2307, + "average": 4.6599, + "bayesian_average": 4.657336257654981, + "count": 2311, "text_count": 460 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/reviews/", @@ -501,7 +501,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/", - "weekly_downloads": 7804 + "weekly_downloads": 5713 }, "notes": null }, @@ -517,7 +517,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 256617, + "average_daily_users": 257005, "categories": { "android": [ "security-privacy" @@ -732,9 +732,9 @@ "category": "recommended" }, "ratings": { - "average": 4.82, - "bayesian_average": 4.815284382393805, - "count": 1300, + "average": 4.8208, + "bayesian_average": 4.816082492766398, + "count": 1306, "text_count": 235 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", @@ -820,7 +820,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 5014 + "weekly_downloads": 4839 }, "notes": null }, @@ -836,7 +836,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1080325, + "average_daily_users": 1077418, "categories": { "android": [ "security-privacy" @@ -1358,10 +1358,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7978, - "bayesian_average": 4.794944343168069, - "count": 2136, - "text_count": 419 + "average": 4.7982, + "bayesian_average": 4.7953467483624355, + "count": 2151, + "text_count": 423 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1385,7 +1385,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 23645 + "weekly_downloads": 18282 }, "notes": null }, @@ -1401,7 +1401,7 @@ "picture_url": null } ], - "average_daily_users": 6109476, + "average_daily_users": 6143701, "categories": { "android": [ "security-privacy" @@ -1565,7 +1565,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2022-11-21T14:05:21Z", + "last_updated": "2022-12-15T18:40:20Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1710,10 +1710,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7782, - "bayesian_average": 4.777784409823513, - "count": 14615, - "text_count": 3832 + "average": 4.7784, + "bayesian_average": 4.777984735280378, + "count": 14716, + "text_count": 3857 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1775,7 +1775,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 145268 + "weekly_downloads": 144039 }, "notes": null }, @@ -1791,7 +1791,7 @@ "picture_url": null } ], - "average_daily_users": 137691, + "average_daily_users": 139255, "categories": { "android": [ "photos-media" @@ -1888,9 +1888,9 @@ "category": "recommended" }, "ratings": { - "average": 4.5084, - "bayesian_average": 4.503134943951076, - "count": 1074, + "average": 4.5097, + "bayesian_average": 4.5044214841383585, + "count": 1077, "text_count": 399 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", @@ -1913,7 +1913,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 367 + "weekly_downloads": 309 }, "notes": null }, @@ -1929,7 +1929,7 @@ "picture_url": null } ], - "average_daily_users": 93297, + "average_daily_users": 92068, "categories": { "android": [ "experimental", @@ -2066,7 +2066,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 578 + "weekly_downloads": 609 }, "notes": null }, @@ -2082,7 +2082,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 241693, + "average_daily_users": 242609, "categories": { "android": [ "photos-media", @@ -2300,10 +2300,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6475, - "bayesian_average": 4.6426080367355835, - "count": 1200, - "text_count": 234 + "average": 4.646, + "bayesian_average": 4.641119725504792, + "count": 1209, + "text_count": 237 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2324,7 +2324,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 3908 + "weekly_downloads": 3474 }, "notes": null }, @@ -2347,7 +2347,7 @@ "picture_url": null } ], - "average_daily_users": 97618, + "average_daily_users": 99861, "categories": { "android": [ "other" @@ -2629,9 +2629,9 @@ "category": "recommended" }, "ratings": { - "average": 4.4413, - "bayesian_average": 4.436575665528032, - "count": 1176, + "average": 4.4392, + "bayesian_average": 4.434480963861528, + "count": 1184, "text_count": 316 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", @@ -2652,7 +2652,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 37 + "weekly_downloads": 45 }, "notes": null }, @@ -2668,7 +2668,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 331471, + "average_daily_users": 328150, "categories": { "android": [ "performance", @@ -2785,7 +2785,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2022-11-22T09:08:25Z", + "last_updated": "2022-12-04T09:05:24Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2857,10 +2857,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4093, - "bayesian_average": 4.406550750110661, - "count": 2006, - "text_count": 784 + "average": 4.4106, + "bayesian_average": 4.4078510292178406, + "count": 2019, + "text_count": 790 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2904,7 +2904,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7527 + "weekly_downloads": 7328 }, "notes": null }, @@ -2920,7 +2920,7 @@ "picture_url": null } ], - "average_daily_users": 140511, + "average_daily_users": 140692, "categories": { "android": [ "performance", @@ -3034,10 +3034,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9128, - "bayesian_average": 3.90842770432453, - "count": 1089, - "text_count": 388 + "average": 3.916, + "bayesian_average": 3.911620482957336, + "count": 1095, + "text_count": 393 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -3056,7 +3056,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1431 + "weekly_downloads": 1318 }, "notes": null } ===================================== projects/fenix/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build6' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/browser_branch") %]-build[% c("var/fenix_build") %]' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: @@ -13,7 +13,8 @@ container: var: fenix_version: 102.2.1 - torbrowser_branch: 12.0 + browser_branch: 12.5-1 + fenix_build: 1 git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' # This should be updated when the list of gradle dependencies is changed. ===================================== projects/firefox/config ===================================== @@ -4,7 +4,6 @@ filename: 'firefox-[% c("var/project-name") %]-[% c("version") %]-[% c("var/osna git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]' tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git -git_submodule: 1 gpg_keyring: - pierov.gpg - richard.gpg @@ -12,10 +11,10 @@ container: use_container: 1 var: - firefox_platform_version: 102.5.0 + firefox_platform_version: 102.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - browser_branch: '12.0-1' - browser_build: 4 + browser_branch: '12.5-1' + browser_build: 1 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -1,10 +1,9 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build4' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]' tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git -git_submodule: 1 gpg_keyring: - pierov.gpg - richard.gpg @@ -12,8 +11,9 @@ container: use_container: 1 var: - geckoview_version: 102.5.0esr - torbrowser_branch: 12.0 + geckoview_version: 102.6.0esr + browser_branch: 12.5-1 + browser_build: 1 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.19.3 +version: 1.19.4 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -121,7 +121,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212 + sha256sum: eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 56847 +version: 60224 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -17,8 +17,8 @@ var: input_files: - project: container-image - - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip' + - URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: f22d6206c668eee194e19bc27f39e4bbe1d21c20dc69064f67dc3f9db52525e9 + sha256sum: a76908f228d006b49f18ff731d4bd9ff220183535b2c1ccc9bb92c78709e1966 - filename: packagemanual.py name: package_script ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.4.7.11 +version: 0.4.7.12 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== projects/translation/config ===================================== @@ -18,7 +18,7 @@ steps: git_hash: 'basebrowser-newidentityftl' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 4cd0600f352a6883462dbdc1b59119a0a946be10 + git_hash: 6a1d58f5d3c749a55d18e7dc6d902d9b622e8d5d targets: nightly: git_hash: 'tor-browser' @@ -26,7 +26,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35 + git_hash: 3abd32f7db3779af063d937f8a5d87b88504b006 targets: nightly: git_hash: 'fenix-torbrowserstringsxml' ===================================== rbm.conf ===================================== @@ -71,10 +71,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.0a5' + torbrowser_version: '12.5a1' torbrowser_build: 'build1' torbrowser_incremental_from: - - 12.0a4 + - 12.0a5 build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed ===================================== tools/get-translation-hashes ===================================== @@ -0,0 +1,13 @@ +#!/bin/bash + +cd "$(dirname "$0")/../git_clones/translation" +git fetch > /dev/null 2>&1 + +echo -n "base-browser: " +git rev-parse origin/base-browser +echo -n "base-browser-fluent: " +git rev-parse origin/basebrowser-newidentityftl +echo -n "tor-browser: " +git rev-parse origin/tor-browser +echo -n "fenix: " +git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.6.0esr-12.5-1-build1
by Pier Angelo Vendrame (＠pierov) 20 Dec '22

20 Dec '22

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.6.0esr-12.5-1-build1
by Pier Angelo Vendrame (＠pierov) 20 Dec '22

20 Dec '22

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

1 0

[Git][tpo/applications/tor-browser][base-browser-102.6.0esr-12.5-1] 60 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Pier Angelo Vendrame (＠pierov) 20 Dec '22

20 Dec '22

Pier Angelo Vendrame pushed to branch base-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 6164a9c7 by Pier Angelo Vendrame at 2022-12-16T09:24:26+01:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - d3df8099 by Pier Angelo Vendrame at 2022-12-16T09:24:35+01:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - ad9318e3 by Jamie Nicol at 2022-12-16T09:24:36+01:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 38570e1c by Pier Angelo Vendrame at 2022-12-16T09:24:36+01:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 5a4e345f by Neill Miller at 2022-12-16T09:24:36+01:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - c1060319 by Gabriele Svelto at 2022-12-16T09:24:37+01:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - cf83ea75 by Gabriele Svelto at 2022-12-16T09:24:37+01:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - fa3e8a38 by Gabriele Svelto at 2022-12-16T09:24:38+01:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - 088e0741 by Gabriele Svelto at 2022-12-16T09:24:38+01:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 40ca5d4a by Georg Koppen at 2022-12-16T09:24:38+01:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - b7a562c5 by Richard Pospesel at 2022-12-16T09:24:39+01:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - 1153ed4f by Henry Wilkes at 2022-12-16T09:24:39+01:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 7036c040 by Pier Angelo Vendrame at 2022-12-16T09:24:39+01: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. - - - - - d60d46e7 by Pier Angelo Vendrame at 2022-12-16T09:24:40+01:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 3bec9311 by Dan Ballard at 2022-12-16T09:24:40+01:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restpre email link on mac - - - - - f582d95c by Gaba at 2022-12-16T09:24:41+01:00 Adding issue template for bugs. - - - - - 6f573e79 by Pier Angelo Vendrame at 2022-12-16T09:24:41+01:00 Base Browser's .mozconfigs. - - - - - 237cf12b by Pier Angelo Vendrame at 2022-12-16T09:24:41+01:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 31388fe3 by Dan Ballard at 2022-12-16T09:24:42+01:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 214d2b17 by Matthew Finkel at 2022-12-16T09:24:42+01:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 72a6ec17 by Matthew Finkel at 2022-12-16T09:24:43+01:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 5bc8148c by Matthew Finkel at 2022-12-16T09:24:43+01:00 Bug 28125: Prevent non-Necko network connections - - - - - 98a94d6d by Mike Perry at 2022-12-16T09:24:43+01:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 81c4dfa0 by Alex Catarineu at 2022-12-16T09:24:44+01:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 81b3f970 by Georg Koppen at 2022-12-16T09:24:44+01:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 2e68d8eb by Kathy Brade at 2022-12-16T09:24:44+01:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 135675ca by Kathy Brade at 2022-12-16T09:24:45+01:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 2cfed1c0 by Alex Catarineu at 2022-12-16T09:24:45+01:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 5b5d9493 by Kathy Brade at 2022-12-16T09:24:46+01:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. - - - - - f6990022 by Arthur Edelstein at 2022-12-16T09:24:46+01:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 8a46130a by Alex Catarineu at 2022-12-16T09:24:46+01:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 4a0777cc by Georg Koppen at 2022-12-16T09:24:47+01:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - ff5150df by Alex Catarineu at 2022-12-16T09:24:47+01:00 Bug 28369: Stop shipping pingsender executable - - - - - 6b7b93c2 by Alex Catarineu at 2022-12-16T09:24:48+01:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - 5696cdd5 by Mike Perry at 2022-12-16T09:36:24+01:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - b03f1dde by Pier Angelo Vendrame at 2022-12-16T09:36:34+01:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 2a474849 by Alex Catarineu at 2022-12-16T09:36:35+01:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - c4e00817 by Alex Catarineu at 2022-12-16T09:36:35+01:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 2a4fabf6 by Alex Catarineu at 2022-12-16T09:36:35+01:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - f3e14e76 by Alex Catarineu at 2022-12-16T09:36:36+01:00 Bug 26345: Hide tracking protection UI - - - - - 29c01e8c by Kathy Brade at 2022-12-16T09:36:36+01:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - 945f10ad by Kathy Brade at 2022-12-16T09:36:37+01:00 Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1769028 - - - - - 214dba2a by Alex Catarineu at 2022-12-16T09:36:37+01:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 99156a2d by Mike Perry at 2022-12-16T09:36:37+01:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 51625d4c by Kathy Brade at 2022-12-16T09:36:38+01:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 2b2b6e4f by Igor Oliveira at 2022-12-16T09:36:38+01:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - 5db832b2 by Pier Angelo Vendrame at 2022-12-16T09:36:39+01:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 71a29349 by Matthew Finkel at 2022-12-16T09:36:39+01:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 67991d11 by hackademix at 2022-12-16T09:36:39+01:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 227a560d by hackademix at 2022-12-16T09:36:40+01:00 Bug 41434: Letterboxing, improve logging. - - - - - 1f69a5b2 by hackademix at 2022-12-16T09:36:40+01:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - dbcc84b8 by hackademix at 2022-12-16T09:36:41+01:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - cc6d14fb by hackademix at 2022-12-20T19:25:53+01:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - 4774e47a by Alex Catarineu at 2022-12-20T19:26:32+01:00 Bug 40069: Add helpers for message passing with extensions - - - - - f6d756e8 by Matthew Finkel at 2022-12-20T19:26:33+01:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 8504b6c6 by Pier Angelo Vendrame at 2022-12-20T19:26:33+01:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - b084c307 by Henry Wilkes at 2022-12-20T19:26:34+01:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - e8eda273 by Pier Angelo Vendrame at 2022-12-20T19:26:35+01:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - cc816b2d by Pier Angelo Vendrame at 2022-12-20T19:26:35+01:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 0bd2aa9f by Pier Angelo Vendrame at 2022-12-20T19:26:36+01:00 Bug 40926: Implemented the New Identity feature - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - − browser/actors/RFPHelperChild.jsm - − browser/actors/RFPHelperParent.jsm - browser/actors/moz.build - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/jar.mn - + browser/branding/alpha/document_pdf.ico - browser/components/BrowserGlue.jsm - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/aboutlogins/AboutLoginsParent.jsm - browser/components/aboutlogins/content/aboutLogins.css - browser/components/aboutlogins/content/aboutLogins.js - browser/components/aboutlogins/content/components/fxaccounts-button.css - browser/components/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] 93 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Richard Pospesel (＠richard) 20 Dec '22

20 Dec '22

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 6164a9c7 by Pier Angelo Vendrame at 2022-12-16T09:24:26+01:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - d3df8099 by Pier Angelo Vendrame at 2022-12-16T09:24:35+01:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - ad9318e3 by Jamie Nicol at 2022-12-16T09:24:36+01:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 38570e1c by Pier Angelo Vendrame at 2022-12-16T09:24:36+01:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 5a4e345f by Neill Miller at 2022-12-16T09:24:36+01:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - c1060319 by Gabriele Svelto at 2022-12-16T09:24:37+01:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - cf83ea75 by Gabriele Svelto at 2022-12-16T09:24:37+01:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - fa3e8a38 by Gabriele Svelto at 2022-12-16T09:24:38+01:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - 088e0741 by Gabriele Svelto at 2022-12-16T09:24:38+01:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 40ca5d4a by Georg Koppen at 2022-12-16T09:24:38+01:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - b7a562c5 by Richard Pospesel at 2022-12-16T09:24:39+01:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - 1153ed4f by Henry Wilkes at 2022-12-16T09:24:39+01:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 7036c040 by Pier Angelo Vendrame at 2022-12-16T09:24:39+01: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. - - - - - d60d46e7 by Pier Angelo Vendrame at 2022-12-16T09:24:40+01:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 3bec9311 by Dan Ballard at 2022-12-16T09:24:40+01:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restpre email link on mac - - - - - f582d95c by Gaba at 2022-12-16T09:24:41+01:00 Adding issue template for bugs. - - - - - 6f573e79 by Pier Angelo Vendrame at 2022-12-16T09:24:41+01:00 Base Browser's .mozconfigs. - - - - - 237cf12b by Pier Angelo Vendrame at 2022-12-16T09:24:41+01:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 31388fe3 by Dan Ballard at 2022-12-16T09:24:42+01:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 214d2b17 by Matthew Finkel at 2022-12-16T09:24:42+01:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 72a6ec17 by Matthew Finkel at 2022-12-16T09:24:43+01:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 5bc8148c by Matthew Finkel at 2022-12-16T09:24:43+01:00 Bug 28125: Prevent non-Necko network connections - - - - - 98a94d6d by Mike Perry at 2022-12-16T09:24:43+01:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 81c4dfa0 by Alex Catarineu at 2022-12-16T09:24:44+01:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 81b3f970 by Georg Koppen at 2022-12-16T09:24:44+01:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 2e68d8eb by Kathy Brade at 2022-12-16T09:24:44+01:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 135675ca by Kathy Brade at 2022-12-16T09:24:45+01:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 2cfed1c0 by Alex Catarineu at 2022-12-16T09:24:45+01:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 5b5d9493 by Kathy Brade at 2022-12-16T09:24:46+01:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. - - - - - f6990022 by Arthur Edelstein at 2022-12-16T09:24:46+01:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 8a46130a by Alex Catarineu at 2022-12-16T09:24:46+01:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 4a0777cc by Georg Koppen at 2022-12-16T09:24:47+01:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - ff5150df by Alex Catarineu at 2022-12-16T09:24:47+01:00 Bug 28369: Stop shipping pingsender executable - - - - - 6b7b93c2 by Alex Catarineu at 2022-12-16T09:24:48+01:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - 5696cdd5 by Mike Perry at 2022-12-16T09:36:24+01:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - b03f1dde by Pier Angelo Vendrame at 2022-12-16T09:36:34+01:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 2a474849 by Alex Catarineu at 2022-12-16T09:36:35+01:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - c4e00817 by Alex Catarineu at 2022-12-16T09:36:35+01:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 2a4fabf6 by Alex Catarineu at 2022-12-16T09:36:35+01:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - f3e14e76 by Alex Catarineu at 2022-12-16T09:36:36+01:00 Bug 26345: Hide tracking protection UI - - - - - 29c01e8c by Kathy Brade at 2022-12-16T09:36:36+01:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - 945f10ad by Kathy Brade at 2022-12-16T09:36:37+01:00 Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1769028 - - - - - 214dba2a by Alex Catarineu at 2022-12-16T09:36:37+01:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 99156a2d by Mike Perry at 2022-12-16T09:36:37+01:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 51625d4c by Kathy Brade at 2022-12-16T09:36:38+01:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 2b2b6e4f by Igor Oliveira at 2022-12-16T09:36:38+01:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - 5db832b2 by Pier Angelo Vendrame at 2022-12-16T09:36:39+01:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 71a29349 by Matthew Finkel at 2022-12-16T09:36:39+01:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 67991d11 by hackademix at 2022-12-16T09:36:39+01:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 227a560d by hackademix at 2022-12-16T09:36:40+01:00 Bug 41434: Letterboxing, improve logging. - - - - - 1f69a5b2 by hackademix at 2022-12-16T09:36:40+01:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - dbcc84b8 by hackademix at 2022-12-16T09:36:41+01:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - cc6d14fb by hackademix at 2022-12-20T19:25:53+01:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - 4774e47a by Alex Catarineu at 2022-12-20T19:26:32+01:00 Bug 40069: Add helpers for message passing with extensions - - - - - f6d756e8 by Matthew Finkel at 2022-12-20T19:26:33+01:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 8504b6c6 by Pier Angelo Vendrame at 2022-12-20T19:26:33+01:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - b084c307 by Henry Wilkes at 2022-12-20T19:26:34+01:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - e8eda273 by Pier Angelo Vendrame at 2022-12-20T19:26:35+01:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - cc816b2d by Pier Angelo Vendrame at 2022-12-20T19:26:35+01:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 0bd2aa9f by Pier Angelo Vendrame at 2022-12-20T19:26:36+01:00 Bug 40926: Implemented the New Identity feature - - - - - 76909aa0 by Richard Pospesel at 2022-12-20T19:26:37+01:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 745cb921 by Mike Perry at 2022-12-20T19:26:37+01:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one - - - - - c6f176c2 by Alex Catarineu at 2022-12-20T19:26:38+01:00 Bring back old Firefox onboarding Revert "Bug 1462415 - Delete onboarding system add-on r=Standard8,k88hudson" This reverts commit f7ffd78b62541d44d0102f8051d2f4080bdbc432. Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. Bug 28822: Convert onboarding to webextension Partially revert 1564367 (controlCenter in UITour.jsm) - - - - - 7753dccf by Kathy Brade at 2022-12-20T19:26:38+01:00 Bug 26961: New user onboarding. Reuse the Firefox onboarding mechanism with minimal changes. Localizable strings are pulled in from Torbutton (if Torbutton is not installed, we lack about:tor and no tour will be shown). Replace SVG images with PNGs (see bug 27002), For defense in depth, omit include OnboardingTelemetry.jsm entirely. Added support for the following UITour page event: torBrowserOpenSecuritySettings Also fix bug 27403: the onboarding bubble is not always displayed. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. Also fix bug 27484: Improve navigation within onboarding. Bug 27082: enable a limited UITour Disallow access to UITour functionality from all pages other than about:home, about:newtab, and about:tor. Implement a whitelist mechanism for page actions. Bug 26962 - implement new features onboarding (part 1). Add an "Explore" button to the "Circuit Display" panel within new user onboarding which opens the DuckDuckGo .onion and then guides users through a short circuit display tutorial. Allow a few additional UITour actions while limiting as much as possible how it can be used. Tweak the UITour styles to match the Tor Browser branding. All user interface strings are retrieved from Torbutton's browserOnboarding.properties file. Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". Bug 29768: Introduce new features to users Add an "update" tour for the Tor Browser 8.5 release that contains two panels: Toolbar and Security (with appropriate description text and images). Display an attention-grabbing dot on the onboarding text bubble when the update tour is active. The animation lasts for 14 seconds. Bug 31768: Introduce toolbar and network settings changes in onboarding Update the "Tor Network" onboarding page to include a note that settings can now be accessed via the application preferences and add an "Adjust Your Tor Network Settings" action button which opens about:preferences#tor. Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one that includes the revised "Tor Network" page and a revised "Toolbar" page. The latter explains that Torbutton's toolbar item has been removed ("Goodbye Onion Button") and explains how to access the New Identity feature using the hamburger menu and new toolbar item. Bug 34321 - Add Learn More onboarding item Bug 40429: Update Onboarding for 10.5 - - - - - 2f9358b7 by Mike Perry at 2022-12-20T19:26:39+01:00 TB3: Tor Browser's official .mozconfigs. Also: Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24 Changes needed to build Mac in 64bit Bug 10715: Enable Webgl for mingw-w64 again. Disable ICU when cross-compiling; clean-up. Bug 15773: Enable ICU on OS X Bug 15990: Don't build the sandbox with mingw-w64 Bug 12761: Switch to ESR 38 for OS X Updating .mozconfig-asan Bug 12516: Compile hardenend Tor Browser with -fwrapv Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 13419: Add back ICU for Windows Bug 21239: Use GTK2 for ESR52 Linux builds Bug 23025: Add hardening flags for macOS Bug 24478: Enable debug assertions and tests in our ASan builds --enable-proxy-bypass-protection Bug 27597: ASan build option in tor-browser-build is broken Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 21849: Don't allow SSL key logging. Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 25741 - TBA: Disable features at compile-time MOZ_NATIVE_DEVICES for casting and the media player MOZ_TELEMETRY_REPORTING for telemetry MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo) Bug 25741 - TBA: Add default configure options in dedicated file Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 29859: Disable HLS support for now Add --disable-tor-launcher build option Add --enable-tor-browser-update build option Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40061: Omit the Windows default browser agent from the build Bug 40107: Adapt .mozconfig-asan for ESR 78 Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 40793: moved Tor configuration options from old-configure.in to moz.configure - - - - - e3d95648 by Henry Wilkes at 2022-12-20T19:26:40+01:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - c4fba35e by Pier Angelo Vendrame at 2022-12-20T19:26:41+01:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - 58303c60 by Kathy Brade at 2022-12-20T19:26:41+01:00 Bug 13252: Do not store data in the app bundle When --enable-tor-browser-data-outside-app-dir is enabled, all user data is stored in a directory named TorBrowser-Data which is located next to the application directory. Display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. On Mac OS, add support for the --invisible command line option which is used by the meek-http-helper to avoid showing an icon for the helper browser on the dock. - - - - - 8f930bbe by Pier Angelo Vendrame at 2022-12-20T19:26:42+01:00 Bug 40933: Add tor-launcher functionality - - - - - 4932bc27 by Richard Pospesel at 2022-12-20T19:26:43+01:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - dbaaa5df by Alex Catarineu at 2022-12-20T19:26:44+01:00 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule Bug 31575: Replace Firefox Home (newtab) with about:tor Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. - - - - - ffbde65a by hackademix at 2022-12-20T19:26:44+01:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop - - - - - 4a6622aa by Amogh Pradeep at 2022-12-20T19:26:45+01: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 - - - - - d21b6ac9 by Alex Catarineu at 2022-12-20T19:26:46+01:00 Add TorStrings module for localization - - - - - 57270341 by Kathy Brade at 2022-12-20T19:26:47+01:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - 73640da2 by sanketh at 2022-12-20T19:26:48+01:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - beccddc4 by Kathy Brade at 2022-12-20T19:26:48+01:00 Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. Other bugs fixed: Bug 21766: Crash with e10s enabled while trying to download a file Bug 21886: Download is stalled in non-e10s mode Bug 22471: Downloading files via the PDF viewer download button is broken Bug 22472: Fix FTP downloads when external helper app dialog is shown Bug 22610: Avoid crashes when canceling external helper app downloads Bug 22618: Downloading pdf file via file:/// is stalling - - - - - ed12e6ef by Pier Angelo Vendrame at 2022-12-20T19:26:49+01:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - 7cf4b290 by Richard Pospesel at 2022-12-20T19:26:50+01:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - 2c5641a8 by Richard Pospesel at 2022-12-20T19:26:51+01:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds tor connection status to url bar and tweaks UX when not online - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor - explicitly allows about:torconnect URIs to ignore Resist Fingerprinting (RFP) - various tweaks to info-pages.inc.css for about:torconnect (also affects other firefox info pages) Bug 40773: Update the about:torconnect frontend page to match additional UI flows - - - - - 671e681a by Arthur Edelstein at 2022-12-20T19:26:52+01: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. - - - - - 84c06892 by Kathy Brade at 2022-12-20T19:26:53+01:00 Bug 4234: Use the Firefox Update Process for Tor Browser. The following files are never updated: TorBrowser/Data/Browser/profiles.ini TorBrowser/Data/Browser/profile.default/bookmarks.html TorBrowser/Data/Tor/torrc Mac OS: Store update metadata under TorBrowser/UpdateInfo. Removed the %OS_VERSION% component from the update URL (13047) and added support for minSupportedOSVersion, an attribute of the <update> element that may be used to trigger Firefox's "unsupported platform" behavior. Hide the "What's new" links (set app.releaseNotesURL value to about:blank). Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix Bug 26049: reduce the delay before the update prompt is displayed. Instead of Firefox's 2 days, we use 1 hour (after which time the update doorhanger will be displayed). Also fix bug 27221: purge the startup cache if the Tor Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Tor Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Tor Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 6a29e40e by Kathy Brade at 2022-12-20T19:26:53+01:00 Bug 13379: Sign our MAR files. Configure with --enable-verify-mar (when updating, require a valid signature on the MAR file before it is applied). Use the Tor Browser version instead of the Firefox version inside the MAR file info block (necessary to prevent downgrade attacks). Use NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, which Mozilla does on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS.. On Linux, rpath is used by Mozilla to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that is under TorBrowser-Data, and the location of TorBrowser-Data varies. Also includes the fix for bug 18900. Bug 19121: reinstate the update.xml hash check Revert most changes from Mozilla Bug 1373267 "Remove hashFunction and hashValue attributes from nsIUpdatePatch and code related to these attributes." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. Also partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - 139a65eb by Kathy Brade at 2022-12-20T19:26:54+01:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - fa04dc1a by Georg Koppen at 2022-12-20T19:26:55+01:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - e117e339 by Mike Perry at 2022-12-20T19:26:56+01: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. - - - - - ab37d662 by Richard Pospesel at 2022-12-20T19:26:57+01:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - 91572c2b by Kathy Brade at 2022-12-20T19:26:58+01:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - 8c5886c5 by Alex Catarineu at 2022-12-20T19:26:59+01:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - 63924ccd by Pier Angelo Vendrame at 2022-12-20T19:27:00+01:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - ac131ec7 by Pier Angelo Vendrame at 2022-12-20T19:27:00+01:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - ca4dc51c by Pier Angelo Vendrame at 2022-12-20T19:27:01+01:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 059f27f1 by Henry Wilkes at 2022-12-20T19:27:02+01:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - browser/actors/NetErrorChild.jsm - browser/actors/NetErrorParent.jsm - − browser/actors/RFPHelperChild.jsm - − browser/actors/RFPHelperParent.jsm - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/abouttbupdate/aboutTBUpdate.css - + browser/base/content/abouttbupdate/aboutTBUpdate.js - + browser/base/content/abouttbupdate/aboutTBUpdate.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - + browser/base/content/browser-doctype.inc - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] Bug 32308: use direct browser sizing for letterboxing.
by Richard Pospesel (＠richard) 20 Dec '22

20 Dec '22

Richard Pospesel pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1f87c8fb by hackademix at 2022-12-20T18:26:01+01:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - 8 changed files: - − browser/actors/RFPHelperChild.jsm - − browser/actors/RFPHelperParent.jsm - browser/actors/moz.build - browser/base/content/browser.css - browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js - layout/style/res/ua.css - toolkit/components/resistfingerprinting/RFPHelper.jsm - toolkit/modules/FinderParent.jsm Changes: ===================================== browser/actors/RFPHelperChild.jsm deleted ===================================== @@ -1,27 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ - -var EXPORTED_SYMBOLS = ["RFPHelperChild"]; - -const { XPCOMUtils } = ChromeUtils.import( - "resource://gre/modules/XPCOMUtils.jsm" -); - -const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing"; - -XPCOMUtils.defineLazyPreferenceGetter( - this, - "isLetterboxingEnabled", - kPrefLetterboxing, - false -); - -class RFPHelperChild extends JSWindowActorChild { - handleEvent(event) { - if (isLetterboxingEnabled && event.type == "resize") { - this.sendAsyncMessage("Letterboxing:ContentSizeUpdated"); - } - } -} ===================================== browser/actors/RFPHelperParent.jsm deleted ===================================== @@ -1,32 +0,0 @@ -1; /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */ -/* 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/. */ - -var EXPORTED_SYMBOLS = ["RFPHelperParent"]; - -const { XPCOMUtils } = ChromeUtils.import( - "resource://gre/modules/XPCOMUtils.jsm" -); - -const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing"; - -XPCOMUtils.defineLazyPreferenceGetter( - this, - "isLetterboxingEnabled", - kPrefLetterboxing, - false -); - -class RFPHelperParent extends JSWindowActorParent { - receiveMessage(aMessage) { - if ( - isLetterboxingEnabled && - aMessage.name == "Letterboxing:ContentSizeUpdated" - ) { - let browser = this.browsingContext.top.embedderElement; - let window = browser.ownerGlobal; - window.RFPHelper.contentSizeUpdated(window); - } - } -} ===================================== browser/actors/moz.build ===================================== @@ -82,8 +82,6 @@ FINAL_TARGET_FILES.actors += [ "PromptParent.jsm", "RefreshBlockerChild.jsm", "RefreshBlockerParent.jsm", - "RFPHelperChild.jsm", - "RFPHelperParent.jsm", "ScreenshotsComponentChild.jsm", "SearchSERPTelemetryChild.jsm", "SearchSERPTelemetryParent.jsm", ===================================== browser/base/content/browser.css ===================================== @@ -102,16 +102,19 @@ body { Never modify the following selector without synchronizing LETTERBOX_CSS_SELECTOR in RFPHelper.jsm! **/ -.letterboxing .browserStack > browser:not(.exclude-letterboxing) { - margin: 0; /* to be dynamically set by RFHelper.jsm */ +.letterboxing .browserStack:not(.exclude-letterboxing) > browser { + /* width & height to be dynamically set by RFPHelper.jsm */ outline: 1px solid var(--chrome-content-separator-color); } -browser.exclude-letterboxing { - margin: 0 !important; +.exclude-letterboxing > browser { outline: initial; } +.letterboxing-ready .browserStack:not(.exclude-letterboxing) { + place-content: start center; +} + /* extend down the toolbar's colors when letterboxing is enabled */ .letterboxing { background-color: var(--toolbar-bgcolor); ===================================== browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js ===================================== @@ -82,7 +82,7 @@ async function test_dynamical_window_rounding(aWindow, aCheckFunc) { // We need to wait for the updating the margins for the newly opened tab, or // it will affect the following tests. let promiseForTheFirstRounding = TestUtils.topicObserved( - "test:letterboxing:update-margin-finish" + "test:letterboxing:update-size-finish" ); info("Open a content tab for testing."); @@ -108,7 +108,7 @@ async function test_dynamical_window_rounding(aWindow, aCheckFunc) { let caseString = "Case " + width + "x" + height + ": "; // Create a promise for waiting for the margin update. let promiseRounding = TestUtils.topicObserved( - "test:letterboxing:update-margin-finish" + "test:letterboxing:update-size-finish" ); let { containerWidth, containerHeight } = getContainerSize(tab); @@ -316,7 +316,7 @@ async function test_findbar(aWindow) { ); let promiseRounding = TestUtils.topicObserved( - "test:letterboxing:update-margin-finish" + "test:letterboxing:update-size-finish" ); let findBarOpenPromise = BrowserTestUtils.waitForEvent( @@ -330,7 +330,7 @@ async function test_findbar(aWindow) { ok(true, "Margin updated when findbar opened"); promiseRounding = TestUtils.topicObserved( - "test:letterboxing:update-margin-finish" + "test:letterboxing:update-size-finish" ); let findBarClosePromise = BrowserTestUtils.waitForEvent( ===================================== layout/style/res/ua.css ===================================== @@ -356,8 +356,8 @@ left: 0 !important; right: 0 !important; bottom: 0 !important; - width: 100% !important; - height: 100% !important; + width: 100%; + height: 100%; margin: 0 !important; min-width: 0 !important; max-width: none !important; @@ -368,6 +368,11 @@ transform: none !important; } +*|*:fullscreen:not(:root, .letterboxing .browserStack:not(.exclude-letterboxing) > browser) { + width: 100% !important; + height: 100% !important; +} + xul|*:fullscreen:not(:root, [hidden="true"]) { /* The position: fixed; property above used to force the computed display * value to block. It is no longer the case now, so we manually set it here to ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -95,7 +95,7 @@ class _RFPHelper { case kTopicDOMWindowOpened: // We attach to the newly created window by adding tabsProgressListener // and event listener on it. We listen for new tabs being added or - // the change of the content principal and apply margins accordingly. + // the change of the content principal and round browser sizes accordingly. this._handleDOMWindowOpened(subject); break; default: @@ -106,8 +106,9 @@ class _RFPHelper { handleEvent(aMessage) { switch (aMessage.type) { case "TabOpen": { - let tab = aMessage.target; - this._addOrClearContentMargin(tab.linkedBrowser, /* isNewTab = */ true); + let browser = aMessage.target.linkedBrowser; + this._roundOrResetContentSize(browser, /* isNewTab = */ true); + browser.ownerGlobal._rfpResizeObserver.observe(browser.parentElement); break; } default: @@ -131,10 +132,6 @@ class _RFPHelper { } } - contentSizeUpdated(win) { - this._updateMarginsForTabsInWindow(win); - } - // ============================================================================ // Language Prompt // ============================================================================ @@ -291,44 +288,22 @@ class _RFPHelper { // ============================================================================ /** * We use the TabsProgressListener to catch the change of the content - * principal. We would clear the margins around the content viewport if - * it is the system principal. + * principal. We would reset browser size if it is the system principal. */ onLocationChange(aBrowser) { - this._addOrClearContentMargin(aBrowser); + this._roundOrResetContentSize(aBrowser); } _handleLetterboxingPrefChanged() { if (Services.prefs.getBoolPref(kPrefLetterboxing, false)) { Services.ww.registerNotification(this); - this._registerActor(); this._attachAllWindows(); } else { - this._unregisterActor(); this._detachAllWindows(); Services.ww.unregisterNotification(this); } } - _registerActor() { - ChromeUtils.registerWindowActor("RFPHelper", { - parent: { - moduleURI: "resource:///actors/RFPHelperParent.jsm", - }, - child: { - moduleURI: "resource:///actors/RFPHelperChild.jsm", - events: { - resize: {}, - }, - }, - allFrames: true, - }); - } - - _unregisterActor() { - ChromeUtils.unregisterWindowActor("RFPHelper"); - } - // The function to parse the dimension set from the pref value. The pref value // should be formated as 'width1xheight1, width2xheight2, ...'. For // example, '100x100, 200x200, 400x200 ...'. @@ -354,13 +329,13 @@ class _RFPHelper { getLetterboxingDefaultRule(aBrowser) { let document = aBrowser.ownerDocument; - return (document._letterboxingMarginsRule ||= (() => { + return (document._letterBoxingSizingRule ||= (() => { // If not already cached on the document object, traverse the CSSOM and // find the rule applying the default letterboxing styles to browsers // preemptively in order to beat race conditions on tab/window creation const LETTERBOX_CSS_URL = "chrome://browser/content/browser.css"; const LETTERBOX_CSS_SELECTOR = - ".letterboxing .browserStack > browser:not(.exclude-letterboxing)"; + ".letterboxing .browserStack:not(.exclude-letterboxing) > browser"; for (let ss of document.styleSheets) { if (ss.href !== LETTERBOX_CSS_URL) { continue; @@ -389,23 +364,23 @@ class _RFPHelper { ); } - _addOrClearContentMargin(aBrowser, isNewTab = false) { + _roundOrResetContentSize(aBrowser, isNewTab = false) { // We won't do anything for lazy browsers. - if (!aBrowser.isConnected) { + if (!aBrowser?.isConnected) { return; } if (this._noLetterBoxingFor(aBrowser)) { // this tab doesn't need letterboxing - this._clearContentViewMargin(aBrowser); + this._resetContentSize(aBrowser); } else { - this._roundContentView(aBrowser, isNewTab); + this._roundContentSize(aBrowser, isNewTab); } } /** - * Given a width or height, returns the appropriate margin to apply. + * Given a width or height, rounds it with the proper stepping. */ - steppedRange(aDimension) { + steppedSize(aDimension) { let stepping; if (aDimension <= 50) { return 0; @@ -417,22 +392,21 @@ class _RFPHelper { stepping = 200; } - return (aDimension % stepping) / 2; + return aDimension - (aDimension % stepping); } /** - * The function will round the given browser by adding margins around the - * content viewport. + * The function will round the given browser size */ - async _roundContentView(aBrowser, isNewTab = false) { - let logPrefix = `_roundContentView[${Math.random()}]`; + async _roundContentSize(aBrowser, isNewTab = false) { + let logPrefix = `_roundContentSize[${Math.random()}]`; log(logPrefix); - aBrowser.classList.remove("exclude-letterboxing"); let win = aBrowser.ownerGlobal; let browserContainer = aBrowser .getTabBrowser() .getBrowserContainer(aBrowser); let browserParent = aBrowser.parentElement; + browserParent.classList.remove("exclude-letterboxing"); let [ [contentWidth, contentHeight], [parentWidth, parentHeight], @@ -455,25 +429,27 @@ class _RFPHelper { return; } - const calcMargins = (aWidth, aHeight) => { + const roundDimensions = (aWidth, aHeight) => { + const r = (aWidth, aHeight) => ({ + width: `${aWidth}px`, + height: `${aHeight}px`, + }); + let result; - log(`${logPrefix} calcMargins(${aWidth}, ${aHeight})`); + log(`${logPrefix} roundDimensions(${aWidth}, ${aHeight})`); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - result = { - width: this.steppedRange(aWidth), - height: this.steppedRange(aHeight), - }; + result = r(this.steppedSize(aWidth), this.steppedSize(aHeight)); log( - `${logPrefix} calcMargins(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` + `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` ); return result; } let matchingArea = aWidth * aHeight; let minWaste = Number.MAX_SAFE_INTEGER; - let targetDimensions = undefined; + let targetDimensions; // Find the desired dimensions which waste the least content area. for (let dim of this._letterboxingDimensions) { @@ -493,119 +469,119 @@ class _RFPHelper { // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this - // case, we won't apply any margins. - if (!targetDimensions) { - result = { - width: 0, - height: 0, - }; - } else { - result = { - width: (aWidth - targetDimensions.width) / 2, - height: (aHeight - targetDimensions.height) / 2, - }; - } + // case, we won't round the size and default to the max. + result = targetDimensions + ? r(targetDimensions.width, targetDimensions.height) + : r(aWidth, aHeight); log( - `${logPrefix} calcMargins(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` + `${logPrefix} roundDimensions(${aWidth}, ${aHeight}) = ${result.width} x ${result.height}` ); return result; }; - // Calculating the margins around the browser element in order to round the - // content viewport. We will use a 200x100 stepping if the dimension set - // is not given. - // Margin and outline colors are set in browser.css (.letterboxing * selectors). - - const buildMarginStyleString = (aWidth, aHeight) => { - const marginDims = calcMargins(aWidth, aHeight); - - // snap browser element to top - const top = 0, - // and leave 'double' margin at the bottom - bottom = 2 * marginDims.height, - // identical margins left and right - left = marginDims.width, - right = marginDims.width; - - return `${top}px ${right}px ${bottom}px ${left}px`; - }; - - const marginChanges = Object.assign([], { - queueIfNeeded({ style }, margin) { - if (style.margin !== margin) { - this.push(() => { - style.margin = margin; - }); + const styleChanges = Object.assign([], { + queueIfNeeded({ style }, props) { + for (let [name, value] of Object.entries(props)) { + if (style[name] !== value) { + this.push(() => { + style.setProperty(name, value, "important"); + }); + } } }, perform() { win.requestAnimationFrame(() => { for (let change of this) { - change(); + try { + change(); + } catch (e) { + logConsole.error(e); + } } }); }, }); - marginChanges.queueIfNeeded( + const roundedDefault = roundDimensions(containerWidth, containerHeight); + + styleChanges.queueIfNeeded( this.getLetterboxingDefaultRule(aBrowser), - buildMarginStyleString(containerWidth, containerHeight) + roundedDefault ); - const marginStyleString = + const roundedInline = !isNewTab && // new tabs cannot have extra UI components (containerHeight > parentHeight || containerWidth > parentWidth) ? // optional UI components such as the notification box, the find bar // or devtools are constraining this browser's size: recompute custom - buildMarginStyleString(parentWidth, parentHeight) - : ""; // otherwise we can keep the default letterboxing margins - marginChanges.queueIfNeeded(aBrowser, marginStyleString); + roundDimensions(parentWidth, parentHeight) + : { width: "", height: "" }; // otherwise we can keep the default (rounded) size + styleChanges.queueIfNeeded(aBrowser, roundedInline); // If the size of the content is already quantized, we do nothing. - if (!marginChanges.length) { + if (!styleChanges.length) { log(`${logPrefix} is_rounded == true`); if (this._isLetterboxingTesting) { log( - `${logPrefix} is_rounded == true test:letterboxing:update-margin-finish` + `${logPrefix} is_rounded == true test:letterboxing:update-size-finish` ); Services.obs.notifyObservers( null, - "test:letterboxing:update-margin-finish" + "test:letterboxing:update-size-finish" ); } return; } - log(`${logPrefix} setting margins to ${marginStyleString}`); - // Here we set the browser's margin to round its content size. + log( + `${logPrefix} setting size to ${JSON.stringify({ + roundedDefault, + roundedInline, + })}` + ); + // Here we round the browser's size through CSS. // A "border" visual is created by using a CSS outline, which does't // affect layout, while the background appearance is borrowed from the // toolbar and set in the .letterboxing ancestor (see browser.css). - marginChanges.perform(); + styleChanges.perform(); } - _clearContentViewMargin(aBrowser) { - aBrowser.classList.add("exclude-letterboxing"); + _resetContentSize(aBrowser) { + aBrowser.parentElement.classList.add("exclude-letterboxing"); } - _updateMarginsForTabsInWindow(aWindow) { + _updateSizeForTabsInWindow(aWindow) { let tabBrowser = aWindow.gBrowser; tabBrowser.tabpanels?.classList.add("letterboxing"); for (let tab of tabBrowser.tabs) { let browser = tab.linkedBrowser; - this._addOrClearContentMargin(browser); + this._roundOrResetContentSize(browser); } + // we need to add this class late because otherwise new windows get maximized + aWindow.setTimeout(() => { + tabBrowser.tabpanels?.classList.add("letterboxing-ready"); + }); } _attachWindow(aWindow) { aWindow.gBrowser.addTabsProgressListener(this); aWindow.addEventListener("TabOpen", this); - + const resizeObserver = (aWindow._rfpResizeObserver = new aWindow.ResizeObserver( + entries => { + for (let { target } of entries) { + this._roundOrResetContentSize(target.querySelector("browser")); + } + } + )); + // observe resizing of each browser's parent (gets rid of RPC from content windows) + for (let bs of aWindow.document.querySelectorAll(".browserStack")) { + resizeObserver.observe(bs); + } // Rounding the content viewport. - this._updateMarginsForTabsInWindow(aWindow); + this._updateSizeForTabsInWindow(aWindow); } _attachAllWindows() { @@ -625,15 +601,17 @@ class _RFPHelper { _detachWindow(aWindow) { let tabBrowser = aWindow.gBrowser; tabBrowser.removeTabsProgressListener(this); + aWindow._rfpResizeObserver.disconnect(); + delete aWindow._rfpResizeObserver; aWindow.removeEventListener("TabOpen", this); // revert tabpanel's style to default tabBrowser.tabpanels?.classList.remove("letterboxing"); - // and restore default margins on each browser element + // and restore default size on each browser element for (let tab of tabBrowser.tabs) { let browser = tab.linkedBrowser; - this._clearContentViewMargin(browser); + this._resetContentSize(browser); } } ===================================== toolkit/modules/FinderParent.jsm ===================================== @@ -27,15 +27,6 @@ ChromeUtils.defineModuleGetter( "resource://gre/modules/Geometry.jsm" ); -const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing"; - -XPCOMUtils.defineLazyPreferenceGetter( - this, - "isLetterboxingEnabled", - kPrefLetterboxing, - false -); - XPCOMUtils.defineLazyPreferenceGetter( this, "isSoundEnabled", @@ -586,24 +577,10 @@ FinderParent.prototype = { onFindbarClose() { this._lastFoundBrowsingContext = null; this.sendMessageToAllContexts("Finder:FindbarClose"); - - if (isLetterboxingEnabled) { - let window = this._browser.ownerGlobal; - if (window.RFPHelper) { - window.RFPHelper.contentSizeUpdated(window); - } - } }, onFindbarOpen() { this.sendMessageToAllContexts("Finder:FindbarOpen"); - - if (isLetterboxingEnabled) { - let window = this._browser.ownerGlobal; - if (window.RFPHelper) { - window.RFPHelper.contentSizeUpdated(window); - } - } }, onModalHighlightChange(aUseModalHighlight) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1f87c8f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1f87c8f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] 2 commits: fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 20 Dec '22

20 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: bcb8ec9d by Pier Angelo Vendrame at 2022-12-20T13:37:33+00:00 fixup! Add TorStrings module for localization Bug 41525 (part 1): Remove all locales, except en-US - - - - - e31fc073 by Pier Angelo Vendrame at 2022-12-20T13:37:33+00:00 fixup! Add TorStrings module for localization Bug 41525 (part 2): Remove torbutton locales from jar.mn and the script to import translations. - - - - - 30 changed files: - − toolkit/torbutton/.gitignore - − toolkit/torbutton/chrome/locale/ar/aboutDialog.dtd - − toolkit/torbutton/chrome/locale/ar/aboutTBUpdate.dtd - − toolkit/torbutton/chrome/locale/ar/aboutTor.dtd - − toolkit/torbutton/chrome/locale/ar/brand.dtd - − toolkit/torbutton/chrome/locale/ar/brand.properties - − toolkit/torbutton/chrome/locale/ar/branding/brand.ftl - − toolkit/torbutton/chrome/locale/ar/browserOnboarding.properties - − toolkit/torbutton/chrome/locale/ar/network-settings.dtd - − toolkit/torbutton/chrome/locale/ar/onboarding.properties - − toolkit/torbutton/chrome/locale/ar/torbutton.dtd - − toolkit/torbutton/chrome/locale/ar/torbutton.properties - − toolkit/torbutton/chrome/locale/ar/torlauncher.properties - − toolkit/torbutton/chrome/locale/ca/aboutDialog.dtd - − toolkit/torbutton/chrome/locale/ca/aboutTBUpdate.dtd - − toolkit/torbutton/chrome/locale/ca/aboutTor.dtd - − toolkit/torbutton/chrome/locale/ca/brand.dtd - − toolkit/torbutton/chrome/locale/ca/brand.properties - − toolkit/torbutton/chrome/locale/ca/branding/brand.ftl - − toolkit/torbutton/chrome/locale/ca/browserOnboarding.properties - − toolkit/torbutton/chrome/locale/ca/network-settings.dtd - − toolkit/torbutton/chrome/locale/ca/onboarding.properties - − toolkit/torbutton/chrome/locale/ca/torbutton.dtd - − toolkit/torbutton/chrome/locale/ca/torbutton.properties - − toolkit/torbutton/chrome/locale/ca/torlauncher.properties - − toolkit/torbutton/chrome/locale/cs/aboutDialog.dtd - − toolkit/torbutton/chrome/locale/cs/aboutTBUpdate.dtd - − toolkit/torbutton/chrome/locale/cs/aboutTor.dtd - − toolkit/torbutton/chrome/locale/cs/brand.dtd - − toolkit/torbutton/chrome/locale/cs/brand.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9b2acd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9b2acd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40679: Always use the latest available translations for nightly builds
by Pier Angelo Vendrame (＠pierov) 20 Dec '22

20 Dec '22

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8dee2fe0 by Pier Angelo Vendrame at 2022-12-20T13:37:39+00:00 Bug 40679: Always use the latest available translations for nightly builds - - - - - 42660210 by Pier Angelo Vendrame at 2022-12-20T13:37:39+00:00 Bug 40713: Inject torbutton translations during the build Co-authored-by: Nicolas Vigier <boklm(a)torproject.org> - - - - - 12 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - projects/fenix/build - projects/fenix/config - projects/firefox/build - projects/firefox/config - − projects/tba-translation/config - − projects/translation-base-browser-fluent/build - − projects/translation-base-browser-fluent/config - − projects/translation-base-browser/build - − projects/translation-base-browser/config - projects/tba-translation/build → projects/translation/build - + projects/translation/config Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -125,16 +125,11 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation-base-browser/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] Update `projects/translation-base-browser-fluent/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch -- [ ] ***(Optional)*** Update Android-specific build configs - - [ ] ***(Optional)*** Update `projects/geckoview/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/tba-translations/config`: - - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch + - [ ] Update `projects/translation/config`: + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` 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 - [ ] ***(Optional)*** Update `projects/tor-android-service/config` - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch - [ ] ***(Optional)*** Update `projects/application-services/config`: ===================================== projects/fenix/build ===================================== @@ -32,7 +32,7 @@ EOF nimbusdir=$builddir-[% c("version") %]/app/build/bin/nimbus mkdir -p $nimbusdir cp $distdir/application-services/nimbus-fml $nimbusdir/ - tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %] + tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -60,7 +60,7 @@ v=[% c("variant") %] [% FOREACH lang = c('var/locales_mobile'); SET lang = tmpl(lang); %] # Copy our torbrowser_strings.xml at the right place - cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ + cp /var/tmp/dist/translation-fenix/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ [% END %] # Prepare Glean dependencies for offline build ===================================== projects/fenix/config ===================================== @@ -46,8 +46,9 @@ input_files: project: geckoview pkg_type: merge_aars enable: '[% !c("var/android_single_arch") %]' - - name: tba-translation - project: tba-translation + - name: translation-fenix + project: translation + pkg_type: fenix - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/firefox/build ===================================== @@ -62,6 +62,10 @@ mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %] tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %] transl_base_browser=$rootdir/translation-base-browser +[% IF c("var/tor-browser") -%] + tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %] + transl_tor_browser=$rootdir/translation-tor-browser +[% END -%] cd /var/tmp/build/[% project %]-[% c("version") %] cat > .mozconfig << 'MOZCONFIG_EOF' @@ -108,11 +112,6 @@ add_translation () { component=$2 lang=$3 filename=$4 - [% IF c("var/macos") -%] - if [ "$lang" == "ja-JP-mac" ]; then - lang="ja" - fi - [% END-%] mkdir "browser/components/$component/locale/$lang" cp "$transl_dir/$lang/$filename" "browser/components/$component/locale/$lang/" @@ -121,9 +120,25 @@ add_translation () { } supported_locales="[% tmpl(c('var/locales').join(' ')) %]" +[% IF c("var/tor-browser") -%] + torbutton_locales="toolkit/torbutton/chrome/locale/" + torbutton_jar="toolkit/torbutton/jar.mn" +[% END -%] for lang in $supported_locales; do + [% IF c("var/macos") -%] + if [ "$lang" == "ja-JP-mac" ]; then + lang="ja" + fi + [% END-%] + add_translation $transl_base_browser newidentity $lang newIdentity.properties add_translation $transl_base_browser securitylevel $lang securityLevel.properties + + [% IF c("var/tor-browser") -%] + mv "$transl_tor_browser/$lang" "$torbutton_locales/" + echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" + echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" + [% END -%] done rm -f configure ===================================== projects/firefox/config ===================================== @@ -181,11 +181,17 @@ input_files: enable: '[% c("var/linux") %]' - filename: start-firefox enable: '[% c("var/linux") %]' - - project: translation-base-browser + - project: translation name: translation-base-browser - - project: translation-base-browser-fluent + pkg_type: base-browser + - project: translation name: translation-base-browser-fluent + pkg_type: base-browser-fluent enable: '[% !c("var/testbuild") %]' + - project: translation + name: translation-tor-browser + pkg_type: tor-browser + enable: '[% c("var/tor-browser") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin ===================================== projects/tba-translation/config deleted ===================================== @@ -1,7 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -# We need to bump the commit before releasing but just pointing to a branch -# might cause too much rebuidling of the Firefox part. -git_hash: 462686c5f3fc57ba17ea8804c76e425682ed522f -version: '[% c("abbrev") %]' ===================================== projects/translation-base-browser-fluent/build deleted ===================================== @@ -1,10 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -# We do not need new identity for now, only languageNotification.ftl -find [% project %] -name new-identity.ftl -delete -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/translation-base-browser-fluent/config deleted ===================================== @@ -1,9 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: 55b370953218b77f3bee6fc7b819bc8c9a7bb699 -version: '[% c("abbrev") %]' - -targets: - nightly: - git_hash: 'basebrowser-newidentityftl' ===================================== projects/translation-base-browser/build deleted ===================================== @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/translation-base-browser/config deleted ===================================== @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: 7bcd63fc23945231facd75d1316c534c12f08a31 -version: '[% c("abbrev") %]' ===================================== projects/tba-translation/build → projects/translation/build ===================================== @@ -1,8 +1,9 @@ #!/bin/bash [% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] +mv [% project %]-[% c("version") %] [% project %]-[% c("step") %] +[% SET tar_source = project _ '-' _ c('step') -%] [% c('tar', { - tar_src => [ project ], + tar_src => [ tar_source ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), }) %] ===================================== projects/translation/config ===================================== @@ -0,0 +1,32 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("step") %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +git_url: https://gitlab.torproject.org/tpo/translation.git +version: '[% c("abbrev") %]' + +steps: + base-browser: + base-browser: '[% INCLUDE build %]' + git_hash: f3c816f0fde87471f98e46515482a493c4eb57dc + targets: + nightly: + git_hash: 'base-browser' + base-browser-fluent: + base-browser-fluent: '[% INCLUDE build %]' + git_hash: d771fd689978f52053e8a14bb622c936aa938769 + targets: + nightly: + git_hash: 'basebrowser-newidentityftl' + tor-browser: + tor-browser: '[% INCLUDE build %]' + git_hash: 4cd0600f352a6883462dbdc1b59119a0a946be10 + targets: + nightly: + git_hash: 'tor-browser' + fenix: + fenix: '[% INCLUDE build %]' + # We need to bump the commit before releasing but just pointing to a branch + # might cause too much rebuidling of the Firefox part. + git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35 + targets: + nightly: + git_hash: 'fenix-torbrowserstringsxml' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Removed @'s from issue templates to avoid pinging ahf and dgoulet
by Richard Pospesel (＠richard) 20 Dec '22

20 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: fce8e9e4 by Richard Pospesel at 2022-12-20T11:38:45+00:00 Removed @'s from issue templates to avoid pinging ahf and dgoulet - - - - - 2 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - .gitlab/issue_templates/Release Prep - Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -161,7 +161,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `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) + - [ ] `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` ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -167,7 +167,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `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 non `-alpha` tag (ping @dgoulet or @ahf if unsure) + - [ ] `version` : update to latest non `-alpha` tag (ping dgoulet or ahf if unsure) - [ ] Check for go updates here : https://golang.org/dl - **NOTE** : Tor Browser Stable uses the latest of the *previous* Stable major series go version (apart from the transition phase from Tor Browser Alpha to Stable, in which case Tor Browser Stable may use the latest major series go version) - [ ] ***(Optional)*** Update `projects/go/config` View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40717: Create a script to prepare changelogs
by Pier Angelo Vendrame (＠pierov) 20 Dec '22

20 Dec '22

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2318e242 by Pier Angelo Vendrame at 2022-12-20T11:37:49+01:00 Bug 40717: Create a script to prepare changelogs - - - - - 3 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - tools/.gitignore - + tools/fetch-changelogs.py Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -179,6 +179,13 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] 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 + - At the moment, the script does not create a _Build System_ section + - If you used the issue number, you will need to write the Tor Browser version manually - [ ] Open MR with above changes - [ ] Begin build on `$(BUILD_SERVER)` (fix any issues which come up and update MR) - [ ] Sign/Tag commit: `make signtag-alpha` ===================================== tools/.gitignore ===================================== @@ -1 +1,2 @@ _repackaged +.changelogs_token ===================================== tools/fetch-changelogs.py ===================================== @@ -0,0 +1,140 @@ +#!/usr/bin/env python3 +from datetime import datetime +import enum +from pathlib import Path +import sys + +import requests + + +GITLAB = "https://gitlab.torproject.org" +API_URL = f"{GITLAB}/api/v4" +PROJECT_ID = 473 + + +class Platform(enum.IntFlag): + WINDOWS = 8 + MACOS = 4 + LINUX = 2 + ANDROID = 1 + DESKTOP = 8 | 4 | 2 + ALL_PLATFORMS = 8 | 4 | 2 | 1 + + +class Issue: + def __init__(self, j): + self.title = j["title"] + self.project, self.number = ( + j["references"]["full"].rsplit("/", 2)[-1].split("#") + ) + self.platform = 0 + self.num_platforms = 0 + if "Desktop" in j["labels"]: + self.platform = Platform.DESKTOP + self.num_platforms += 3 + else: + if "Windows" in j["labels"]: + self.platform |= Platform.WINDOWS + self.num_platforms += 1 + if "MacOS" in j["labels"]: + self.platform |= Platform.MACOS + self.num_platforms += 1 + if "Linux" in j["labels"]: + self.platform |= Platform.LINUX + self.num_platforms += 1 + if "Android" in j["labels"]: + self.platform |= Platform.ANDROID + self.num_platforms += 1 + if not self.platform: + self.platform = Platform.ALL_PLATFORMS + self.num_platforms = 4 + + def get_platforms(self): + if self.platform == Platform.ALL_PLATFORMS: + return "All Platforms" + platforms = [] + if self.platform & Platform.WINDOWS: + platforms.append("Windows") + if self.platform & Platform.MACOS: + platforms.append("macOS") + if self.platform & Platform.LINUX: + platforms.append("Linux") + if self.platform & Platform.ANDROID: + platforms.append("Android") + return " + ".join(platforms) + + def __str__(self): + return f"Bug {self.number}: {self.title} [{self.project}]" + + def __lt__(self, other): + return self.number < other.number + + +if len(sys.argv) < 2: + print(f"Usage: {sys.argv[0]} version-to-release or #issue-id") + sys.exit(1) + +token_file = Path(__file__).parent / ".changelogs_token" +if not token_file.exists(): + print( + f"Please add your personal GitLab token (with 'read_api' scope) to {token_file}" + ) + print( + f"Please go to {GITLAB}/-/profile/personal_access_tokens and generate it." + ) + token = input("Please enter the new token: ").strip() + if not token: + print("Invalid token!") + sys.exit(2) + with token_file.open("w") as f: + f.write(token) +with token_file.open() as f: + token = f.read().strip() +headers = {"PRIVATE-TOKEN": token} + +if sys.argv[1][0] != "#": + version = sys.argv[1] + r = requests.get( + f"{API_URL}/projects/{PROJECT_ID}/issues?labels=Release Prep", + headers=headers, + ) + issue = None + for i in r.json(): + if i["title"].find(sys.argv[1]) != -1: + if issue is None: + issue = i + else: + print("More than one matching issue found!") + print("Please use the issue id.") + sys.exit(3) + if not issue: + print( + "Release preparation issue not found. Please make sure it has ~Release Prep." + ) + sys.exit(4) + iid = issue["iid"] +else: + version = "????" + iid = sys.argv[1][1:] + +r = requests.get( + f"{API_URL}/projects/{PROJECT_ID}/issues/{iid}/links", headers=headers +) +linked = {} +for i in r.json(): + i = Issue(i) + if i.platform not in linked: + linked[i.platform] = [] + linked[i.platform].append(i) +linked = sorted( + linked.values(), + key=lambda issues: (issues[0].num_platforms << 8) | issues[0].platform, + reverse=True, +) + +date = datetime.now().strftime("%B %d %Y") +print(f"Tor Browser {version} - {date}") +for issues in linked: + print(f" * {issues[0].get_platforms()}") + for i in sorted(issues): + print(f" * {i}") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Fix bad formatting in release prep templates
by Richard Pospesel (＠richard) 19 Dec '22

19 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c38d8b77 by Richard Pospesel at 2022-12-19T18:54:58+00:00 Fix bad formatting in release prep templates - - - - - 2 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - .gitlab/issue_templates/Release Prep - Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -187,6 +187,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in <details> <summary>Communications</summary> + ### notify stakeholders - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -193,6 +193,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in <details> <summary>Communications</summary> + ### notify stakeholders - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update release prep templates
by Richard Pospesel (＠richard) 19 Dec '22

19 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 91eae818 by Richard Pospesel at 2022-12-19T18:47:01+00:00 Update release prep templates - - - - - 2 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - .gitlab/issue_templates/Release Prep - Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -31,13 +31,13 @@ <details> <summary>Android</summary> -### ***Security Vulnerabilities Backport*** : https://www.mozilla.org/en-US/security/advisories/ -- **NOTE** : this work may have already occurred in the analogous stable release prep issue +### **Security Vulnerabilities Backport** : https://www.mozilla.org/en-US/security/advisories/ +- **NOTE** : this work usually first occurs during the Tor Browser Stable release, so for alpha we typically only need to update the various `tor-browser-build` configs to point to the right release tags. - [ ] Create tor-browser issue `Backport Android-specific Firefox $(RR_VERSION) to ESR $(ESR_VERSION)-based Tor Browser` - [ ] Link new backport issue to this release prep issue - [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create list of CVEs which affect Android that need to be a backported - Potentially Affected Components: - - `firefox` + - `firefox`/`geckoview` - `application-services` - `android-components` - `fenix` @@ -88,15 +88,15 @@ - [ ] `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - [ ] `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - [ ] Push new branches and esr tag to origin - - [ ] Rebase `base-browser` patches onto the `gecko-dev` commit - - [ ] Rebase `tor-browser` patches onto the `base-browser` branch + - [ ] Rebase previous `base-browser` patches onto the `gecko-dev` commit + - [ ] Rebase previous `tor-browser` patches onto the new `base-browser` branch - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase): - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)` - [ ] diff of diffs: - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred `$(DIFF_TOOL)` and look at differences on lines that starts with + or - - [ ] `git diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) > current_patchset.diff` - [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff` - - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff` + - [ ] `$(DIFF_TOOL) current_patchset.diff rebased_patchset.diff` - [ ] Open MR for the rebase - [ ] Sign/Tag `base-browser` commit: - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the final commit of `base-browser` before `tor-browser` @@ -119,73 +119,89 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] 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 + - [ ] ***(Optional, Desktop)*** `var/torbrowser_incremental_from` : update to previous Desktop version - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail -- [ ] Update `projects/firefox/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased -- [ ] Update `projects/geckoview/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased -- [ ] Update `projects/translation-base-browser/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch -- [ ] Update `projects/translation-base-browser-fluent/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch -- [ ] Update `projects/tba-translations/config`: - - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch -- [ ] ***(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 have any of our own patches for this project - - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` -- [ ] Update `projects/android-components/config`: - - [ ] `git_hash` : update the `$(BUILD_N)` section to match alpha `android-components` tag -- [ ] Update `projects/fenix/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag - - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(ESR_VERSION)` if rebased -- [ ] Update allowed_addons.json by running (from `tor-browser-build` root): - - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` -- [ ] 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 1.X.Y version available, update `projects/openssl/config` - - [ ] `version` : update to next 1.X.Y 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 ; Tor Browser Alpha uses latest `-alpha` tagged tor (or latest of stable if newer) - - [ ] ***(Optional)*** Update `projects/tor/config` - - [ ] `version` : update to next release tag -- [ ] Check for go updates here : https://golang.org/dl - - **NOTE** : Tor Browser Alpha uses the latest Stable go version, while Tor Browser Stable uses the latest of the previous Stable major series 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) -- [ ] ***(Optional)*** Update the manual - - [ ] Go to https://gitlab.torproject.org/tpo/web/manual/-/jobs/ - - [ ] Open the latest build stage - - [ ] Download the artifacts (they come in a .zip file). - - [ ] Rename it to `manual_$PIPELINEID.zip` - - [ ] Upload it to people.tpo - - [ ] Update `projects/manual/config` - - [ ] Change the version to `$PIPELINEID` - - [ ] Update the hash in the input_files section - - [ ] Update the URL if you have uploaded to a different people.tpo home +- [ ] ***(Optional)*** Update Desktop-specific build configs + - [ ] Update `projects/firefox/config` + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag + - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] Update `projects/translation-base-browser/config` + - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] Update `projects/translation-base-browser-fluent/config` + - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch +- [ ] ***(Optional)*** Update Android-specific build configs + - [ ] ***(Optional)*** Update `projects/geckoview/config` + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag + - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] Update `projects/tba-translations/config`: + - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch + - [ ] ***(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/android-components/config`: + - [ ] `git_hash` : update the `$(BUILD_N)` section to match alpha `android-components` tag + - [ ] ***(Optional)*** Update `projects/fenix/config` + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag + - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] 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 1.X.Y version available, update `projects/openssl/config` + - [ ] `version` : update to next 1.X.Y 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) + - [ ] ***(Optional)*** Update the manual + - [ ] Go to https://gitlab.torproject.org/tpo/web/manual/-/jobs/ + - [ ] Open the latest build stage + - [ ] Download the artifacts (they come in a .zip file). + - [ ] Rename it to `manual_$PIPELINEID.zip` + - [ ] Upload it to people.tpo + - [ ] Update `projects/manual/config` + - [ ] Change the version to `$PIPELINEID` + - [ ] Update the hash in the input_files section + - [ ] 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 - [ ] Open MR with above changes -- [ ] Begin build on `$(BUILD_SERVER)` (and fix any issues which come up) -- [ ] Sign/Tag commit : `make signtag-alpha` +- [ ] Begin build on `$(BUILD_SERVER)` (fix any issues which come up and update MR) +- [ ] Sign/Tag commit: `make signtag-alpha` - [ ] Push tag to origin +</details> +<details> + <summary>Communications</summary> ### notify stakeholders - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` - - [ ] Call out any new functionality which needs testing - - [ ] Link to any known issues + - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` + - [ ] Note any new functionality which needs testing + - [ ] Link to any known issues +- [ ] Email downstream consumers: + - Recipients: + - [ ] Tails dev mailing list: tails-dev(a)boum.org + - [ ] Guardian Project: nathan(a)guardianproject.info + - [ ] torbrowser-launcher: micah(a)micahflee.com + - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` + - [ ] Note any changes which may affect packaging/downstream integration +- [ ] Email upstream stakeholders: + - [ ] ***(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> ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -44,13 +44,12 @@ <details> <summary>Android</summary> -### ***Security Vulnerabilities Backport*** : https://www.mozilla.org/en-US/security/advisories/ -- **NOTE** : this work may have already occurred in the analogous stable release prep issue +### **Security Vulnerabilities Backport** : https://www.mozilla.org/en-US/security/advisories/ - [ ] Create tor-browser issue `Backport Android-specific Firefox $(RR_VERSION) to ESR $(ESR_VERSION)-based Tor Browser` - [ ] Link new backport issue to this release prep issue - [ ] Go through any `Security Vulnerabilities fixed in Firefox $(RR_VERSION)` (or similar) and create list of CVEs which affect Android that need to be a backported - Potentially Affected Components: - - `firefox` + - `firefox`/`geckoview` - `application-services` - `android-components` - `fenix` @@ -59,21 +58,21 @@ - [ ] Backport any Android-specific security fixes from Firefox rapid-release - [ ] Sign/Tag commit: - Tag : `application-services-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha` + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable` - [ ] Push tag to `origin` ### **android-components** ***(Optional)*** : https://gitlab.torproject.org/tpo/applications/android-components.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - [ ] Sign/Tag commit: - Tag : `android-components-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable)` - [ ] Push tag to `origin` ### **fenix** ***(Optional)*** : https://gitlab.torproject.org/tpo/applications/fenix.git - [ ] Backport any Android-specific security fixes from Firefox rapid-release - [ ] Sign/Tag commit: - Tag : `tor-browser-$(ESR_VERSION)-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(BUILD_N)` - - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based alpha)` + - Message: `Tagging $(BUILD_N) for $(ESR_VERSION)-based stable)` - [ ] Push tag to `origin` </details> @@ -96,25 +95,24 @@ - [ ] `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - [ ] `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR-BROWSER_MINOR)-1` - [ ] Push new branches and esr tag to origin - - [ ] Rebase `base-browser` patches onto the `gecko-dev` commit - - [ ] Rebase `tor-browser` patches onto the `base-browser` branch + - [ ] Rebase previous `base-browser` patches onto the `gecko-dev` commit + - [ ] Rebase previous `tor-browser` patches onto the new `base-browser` branch - [ ] Compare patch-sets (ensure nothing *weird* happened during rebase): - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..$(TOR_BROWSER_BRANCH)` - [ ] diff of diffs: - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred `$(DIFF_TOOL)` and look at differences on lines that starts with + or - - [ ] `git diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) > current_patchset.diff` - [ ] `git diff $(ESR_TAG)..$(TOR_BROWSER_BRANCH) > rebased_patchset.diff` - - [ ] `$(DIFF_TOOL) current_patchset.dif rebased_patchset.deff` + - [ ] `$(DIFF_TOOL) current_patchset.diff rebased_patchset.diff` - [ ] Open MR for the rebase - [ ] Sign/Tag `base-browser` commit: - **NOTE** : Currently we are using the `Bug 40926: Implemented the New Identity feature` commit as the final commit of `base-browser` before `tor-browser` - Tag : `base-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-build1` - - Message: `Tagging build1 for $(ESR_VERSION)esr-based alpha` + - Message: `Tagging build1 for $(ESR_VERSION)esr-based stable` - [ ] Sign/Tag `tor-browser` commit : - Tag : `tor-browser-$(ESR_VERSION)esr-$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-1-$(FIREFOX_BUILD_N)` - - Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based alpha` + - Message : `Tagging $(FIREFOX_BUILD_N) for $(ESR_VERSION)esr-based stable` - [ ] Push rebased branches and tags to `origin` -- [ ] Update Gitlab Default Branch to new Alpha branch: https://gitlab.torproject.org/tpo/applications/tor-browser/-/settings/repos… </details> @@ -127,75 +125,89 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] 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 + - [ ] ***(Optional, Desktop)*** `var/torbrowser_incremental_from` : update to previous Desktop version - [ ] **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make incrementals-*` step will fail -- [ ] Update `projects/firefox/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased -- [ ] Update `projects/geckoview/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased -- [ ] Update `projects/translation-base-browser/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch -- [ ] Update `projects/translation-base-browser-fluent/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch -- [ ] Update `projects/tba-translations/config`: - - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch -- [ ] ***(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 have any of our own patches for this project - - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` -- [ ] Update `projects/android-components/config`: - - [ ] `git_hash` : update the `$(BUILD_N)` section to match alpha `android-components` tag -- [ ] Update `projects/fenix/config` - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag - - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(ESR_VERSION)` if rebased -- [ ] Update allowed_addons.json by running (from `tor-browser-build` root): - - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json` -- [ ] 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 1.X.Y version available, update `projects/openssl/config` - - [ ] `version` : update to next 1.X.Y 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 ; Tor Browser Alpha uses latest `-alpha` tagged tor (or latest of stable if newer) - - [ ] ***(Optional)*** Update `projects/tor/config` - - [ ] `version` : update to next release tag -- [ ] Check for go updates here : https://golang.org/dl - - **NOTE** : Tor Browser Alpha uses the latest Stable go version, while Tor Browser Stable uses the latest of the previous Stable major series 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) -- [ ] ***(Optional)*** Update the manual - - [ ] Go to https://gitlab.torproject.org/tpo/web/manual/-/jobs/ - - [ ] Open the latest build stage - - [ ] Download the artifacts (they come in a .zip file). - - [ ] Rename it to `manual_$PIPELINEID.zip` - - [ ] Upload it to people.tpo - - [ ] Update `projects/manual/config` - - [ ] Change the version to `$PIPELINEID` - - [ ] Update the hash in the input_files section - - [ ] Update the URL if you have uploaded to a different people.tpo home +- [ ] ***(Optional)*** Update Desktop-specific build configs + - [ ] Update `projects/firefox/config` + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag + - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] Update `projects/translation-base-browser/config` + - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] Update `projects/translation-base-browser-fluent/config` + - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch +- [ ] ***(Optional)*** Update Android-specific build configs + - [ ] ***(Optional)*** Update `projects/geckoview/config` + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag + - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] Update `projects/tba-translations/config`: + - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch + - [ ] ***(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/android-components/config`: + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `android-components` tag + - [ ] ***(Optional)*** Update `projects/fenix/config` + - [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag + - [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(ESR_VERSION)` if rebased + - [ ] 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 1.X.Y version available, update `projects/openssl/config` + - [ ] `version` : update to next 1.X.Y 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 non `-alpha` tag (ping @dgoulet or @ahf if unsure) + - [ ] Check for go updates here : https://golang.org/dl + - **NOTE** : Tor Browser Stable uses the latest of the *previous* Stable major series go version (apart from the transition phase from Tor Browser Alpha to Stable, in which case Tor Browser Stable may use the latest 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) + - [ ] ***(Optional)*** Update the manual + - [ ] Go to https://gitlab.torproject.org/tpo/web/manual/-/jobs/ + - [ ] Open the latest build stage + - [ ] Download the artifacts (they come in a .zip file). + - [ ] Rename it to `manual_$PIPELINEID.zip` + - [ ] Upload it to people.tpo + - [ ] Update `projects/manual/config` + - [ ] Change the version to `$PIPELINEID` + - [ ] Update the hash in the input_files section + - [ ] 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 - [ ] Open MR with above changes -- [ ] Begin build on `$(BUILD_SERVER)` (and fix any issues which come up) -- [ ] Sign/Tag commit : `make signtag-release` +- [ ] Begin build on `$(BUILD_SERVER)` (and fix any issues which come up and update MR) +- [ ] Sign/Tag commit: `make signtag-release` - [ ] Push tag to origin +</details> +<details> + <summary>Communications</summary> ### notify stakeholders - [ ] Email tor-qa mailing list: tor-qa(a)lists.torproject.org - - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` - - [ ] Call out any new functionality which needs testing - - [ ] Link to any known issues -- [ ] Email Tails dev mailing list: tails-dev(a)boum.org - - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` + - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` + - [ ] Note any new functionality which needs testing + - [ ] Link to any known issues +- [ ] Email downstream consumers: + - Recipients: + - [ ] Tails dev mailing list: tails-dev(a)boum.org + - [ ] Guardian Project: nathan(a)guardianproject.info + - [ ] torbrowser-launcher: micah(a)micahflee.com + - [ ] Provide links to unsigned builds on `$(BUILD_SERVER)` + - [ ] Note any changes which may affect packaging/downstream integration +- [ ] Email upstream stakeholders: + - [ ] ***(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> @@ -237,7 +249,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Enable update responses : `./deploy_update_responses-alpha.sh` - [ ] Publish APKs to Google Play: - Log into https://play.google.com/apps/publish - - Select `Tor Browser (Alpha)` app + - Select `Tor Browser` app - Navigate to `Release > Production` and click `Create new release` button - [ ] Upload the `*.multi.apk` APKs - [ ] Update Release Name to Tor Browser version number View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

19 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9b2acde7 by cypherpunks1 at 2022-12-17T22:06:06+00:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 40347: Fix the "not secure" icon and text on view-source:http://*.onion addresses - - - - - 1 changed file: - browser/base/content/browser-siteIdentity.js Changes: ===================================== browser/base/content/browser-siteIdentity.js ===================================== @@ -857,11 +857,11 @@ var gIdentityHandler = { } else if (this._isAboutNetErrorPage || this._isAboutBlockedPage) { // Network errors and blocked pages get a more neutral icon this._identityBox.className = "unknownIdentity"; + } else if (this._uriIsOnionHost) { + this._identityBox.className = "onionUnknownIdentity"; } else if (this._isPotentiallyTrustworthy) { - // This is a local resource or an onion site (and shouldn't be marked insecure). - this._identityBox.className = this._uriIsOnionHost - ? "onionUnknownIdentity" - : "localResource"; + // This is a local resource (and shouldn't be marked insecure). + this._identityBox.className = "localResource"; } else { // This is an insecure connection. let warnOnInsecure = View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b2acde… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9b2acde… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-102.0.14-12.5-1] 15 commits: Bug 40005: Modify Default toolbar menu
by Richard Pospesel (＠richard) 19 Dec '22

19 Dec '22

Richard Pospesel pushed to branch android-components-102.0.14-12.5-1 at The Tor Project / Applications / android-components Commits: e4d552ec by Matthew Finkel at 2022-12-16T10:58:18+01:00 Bug 40005: Modify Default toolbar menu - - - - - f980f6cf by Alex Catarineu at 2022-12-16T10:59:04+01:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 3ddffe61 by Alex Catarineu at 2022-12-16T10:59:04+01:00 Bug 40002: Ensure system download manager is not used Bug 40075: Support scoped storage to enable downloads on API < 29 - in android-components!7, we blocked all usage of Scoped Storage in an attempt to block usage of Android's DownloadManager, which is known to cause proxy bypasses - as of Android API 29, downloads will not work without Scoped Storage, causing all downlaods to fail (see: fenix##40192) - here, we enable usage of scoped storage for API >= 29, but block calls to DownloadManager on API < 29 - - - - - 42193329 by Alex Catarineu at 2022-12-16T10:59:04+01:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. Bug 40062: Update DuckDuckGo onion search plugin - - - - - eedbcb98 by Alex Catarineu at 2022-12-16T10:59:05+01:00 Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - 2d822a9c by Georg Koppen at 2022-12-16T10:59:05+01:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - e32ea911 by Alex Catarineu at 2022-12-16T10:59:05+01:00 Bug 40015: Port padlock states for .onion services - - - - - a170a488 by Alex Catarineu at 2022-12-16T10:59:05+01:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - a4c2e146 by Alex Catarineu at 2022-12-16T10:59:05+01:00 Bug 40022: Migrate Tor security level from Fennec - - - - - b9b4c0c6 by Matthew Finkel at 2022-12-16T10:59:05+01:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - ccf10e49 by Matthew Finkel at 2022-12-16T10:59:05+01:00 Bug 40023: Stop PrivateNotificationService - - - - - 8f82a9bd by Matthew Finkel at 2022-12-16T10:59:06+01:00 Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android Bug 41394: Expose privacy.prioritizeonions.enabled to Android. - - - - - 6415ced7 by sarah541 at 2022-12-16T10:59:09+01:00 Improve search term performance on the toolbar - - - - - 169b6812 by Arturo Mejia at 2022-12-16T10:59:10+01:00 Improve the media delegate - - - - - 5ac31896 by Roger Yang at 2022-12-16T10:59:10+01:00 Close #12926: Use external flag when opening fallback URL - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - + components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/media/GeckoMediaDelegate.kt - components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt - + components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/media/GeckoMediaDelegateTest.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/BrowserToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/browser/toolbar/src/test/java/mozilla/components/browser/toolbar/BrowserToolbarTest.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/AddonManager.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt - components/feature/search/src/main/assets/search/list.json The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40716: Remove `minSupportedInstructionSet: SSE2` on macOS
by Richard Pospesel (＠richard) 19 Dec '22

19 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 03a1b492 by Nicolas Vigier at 2022-12-19T12:09:41+00:00 Bug 40716: Remove `minSupportedInstructionSet: SSE2` on macOS - - - - - 2 changed files: - projects/release/update_responses_config.yml - tools/signing/nightly/update-responses-base-config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -42,7 +42,6 @@ versions: migrate_archs: # for example, pt-PT: pt-BR migrate_langs: - minSupportedInstructionSet: SSE2 # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) ) macos: # macOS v10.12.0 @@ -51,9 +50,15 @@ versions: win32: # Windows 7 minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 win64: # Windows 7 minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 + linux32: + minSupportedInstructionSet: SSE2 + linux64: + minSupportedInstructionSet: SSE2 mar_compression: xz tag: 'tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]' htaccess_rewrite_rules: ===================================== tools/signing/nightly/update-responses-base-config.yml ===================================== @@ -21,11 +21,16 @@ versions: detailsURL: http://umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad.onion/ migrate_langs: pt-PT: pt-BR - minSupportedInstructionSet: SSE2 macos: minSupportedOSVersion: 16.0.0 win32: minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 win64: minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 + linux32: + minSupportedInstructionSet: SSE2 + linux64: + minSupportedInstructionSet: SSE2 mar_compression: xz View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40716: Remove `minSupportedInstructionSet: SSE2` on macOS
by Richard Pospesel (＠richard) 19 Dec '22

19 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ace8df91 by Nicolas Vigier at 2022-12-17T10:12:06+01:00 Bug 40716: Remove `minSupportedInstructionSet: SSE2` on macOS - - - - - 2 changed files: - projects/release/update_responses_config.yml - tools/signing/nightly/update-responses-base-config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -42,7 +42,6 @@ versions: migrate_archs: # for example, pt-PT: pt-BR migrate_langs: - minSupportedInstructionSet: SSE2 # minSupportedOsVersion on macOS corresponds to the Darwin version ( https://en.wikipedia.org/wiki/Darwin_(operating_system) ) macos: # macOS v10.12.0 @@ -51,9 +50,15 @@ versions: win32: # Windows 7 minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 win64: # Windows 7 minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 + linux32: + minSupportedInstructionSet: SSE2 + linux64: + minSupportedInstructionSet: SSE2 mar_compression: xz tag: 'tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]' htaccess_rewrite_rules: ===================================== tools/signing/nightly/update-responses-base-config.yml ===================================== @@ -21,11 +21,16 @@ versions: detailsURL: http://umj4zbqdfcyevlkgqgpq6foxk3z75zzxsbgt5jqmfxofrbrjh3crbnad.onion/ migrate_langs: pt-PT: pt-BR - minSupportedInstructionSet: SSE2 macos: minSupportedOSVersion: 16.0.0 win32: minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 win64: minSupportedOSVersion: 6.1 + minSupportedInstructionSet: SSE2 + linux32: + minSupportedInstructionSet: SSE2 + linux64: + minSupportedInstructionSet: SSE2 mar_compression: xz View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] 2 commits: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 17 Dec '22

17 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: d84fac57 by hackademix at 2022-12-17T13:28:36+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core - - - - - a1ee91a6 by hackademix at 2022-12-17T13:28:36+00:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop - - - - - 5 changed files: - browser/components/places/PlacesUIUtils.jsm - browser/components/places/content/controller.js - dom/base/ContentAreaDropListener.jsm - toolkit/components/places/PlacesUtils.jsm - toolkit/torbutton/components/dragDropFilter.js Changes: ===================================== browser/components/places/PlacesUIUtils.jsm ===================================== @@ -1903,7 +1903,11 @@ XPCOMUtils.defineLazyGetter(PlacesUIUtils, "URI_FLAVORS", () => { return [PlacesUtils.TYPE_X_MOZ_URL, TAB_DROP_TYPE, PlacesUtils.TYPE_UNICODE]; }); XPCOMUtils.defineLazyGetter(PlacesUIUtils, "SUPPORTED_FLAVORS", () => { - return [...PlacesUIUtils.PLACES_FLAVORS, ...PlacesUIUtils.URI_FLAVORS]; + return [ + ...PlacesUIUtils.PLACES_FLAVORS, + ...PlacesUIUtils.URI_FLAVORS, + "application/x-torbrowser-opaque", + ]; }); XPCOMUtils.defineLazyGetter(PlacesUIUtils, "ellipsis", function() { ===================================== browser/components/places/content/controller.js ===================================== @@ -1251,6 +1251,7 @@ PlacesController.prototype = { [ PlacesUtils.TYPE_X_MOZ_PLACE, PlacesUtils.TYPE_X_MOZ_URL, + "application/x-torbrowser-opaque", PlacesUtils.TYPE_UNICODE, ].forEach(type => xferable.addDataFlavor(type)); ===================================== dom/base/ContentAreaDropListener.jsm ===================================== @@ -5,6 +5,16 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); +const { XPCOMUtils } = ChromeUtils.import( + "resource://gre/modules/XPCOMUtils.jsm" +); + +XPCOMUtils.defineLazyGetter(this, "gOpaqueDrag", () => { + return Cc["@torproject.org/torbutton-dragDropFilter;1"].getService( + Ci.nsISupports + ).wrappedJSObject.opaqueDrag; +}); + // This component is used for handling dragover and drop of urls. // // It checks to see whether a drop of a url is allowed. For instance, a url @@ -43,10 +53,15 @@ ContentAreaDropListener.prototype = { } } - type = "text/x-moz-url"; - if (types.contains(type)) { + for (let type of ["text/x-moz-url", "application/x-torbrowser-opaque"]) { + if (!types.contains(type)) { + continue; + } data = dt.mozGetDataAt(type, i); if (data) { + if (type === "application/x-torbrowser-opaque") { + ({ type, value: data = "" } = gOpaqueDrag.get(data)); + } let lines = data.split("\n"); for (let i = 0, length = lines.length; i < length; i += 2) { this._addLink(links, lines[i], lines[i + 1], type); @@ -250,6 +265,7 @@ ContentAreaDropListener.prototype = { if ( !types.includes("application/x-moz-file") && !types.includes("text/x-moz-url") && + !types.includes("application/x-torbrowser-opaque") && !types.includes("text/uri-list") && !types.includes("text/x-moz-text-internal") && !types.includes("text/plain") ===================================== toolkit/components/places/PlacesUtils.jsm ===================================== @@ -32,6 +32,12 @@ XPCOMUtils.defineLazyGetter(this, "gCryptoHash", () => { return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash); }); +XPCOMUtils.defineLazyGetter(this, "gOpaqueDrag", () => { + return Cc["@torproject.org/torbutton-dragDropFilter;1"].getService( + Ci.nsISupports + ).wrappedJSObject.opaqueDrag; +}); + // On Mac OSX, the transferable system converts "\r\n" to "\n\n", where // we really just want "\n". On other platforms, the transferable system // converts "\r\n" to "\n". @@ -1132,6 +1138,9 @@ var PlacesUtils = { unwrapNodes: function PU_unwrapNodes(blob, type) { // We split on "\n" because the transferable system converts "\r\n" to "\n" var nodes = []; + if (type === "application/x-torbrowser-opaque") { + ({ value: blob, type } = gOpaqueDrag.get(blob)); + } switch (type) { case this.TYPE_X_MOZ_PLACE: case this.TYPE_X_MOZ_PLACE_SEPARATOR: ===================================== toolkit/torbutton/components/dragDropFilter.js ===================================== @@ -13,6 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", }); +XPCOMUtils.defineLazyGlobalGetters(this, ["crypto"]); // Module specific constants const kMODULE_NAME = "Torbutton Drag and Drop Handler"; @@ -28,50 +29,55 @@ const URLISH_TYPES = Object.freeze([ "application/x-moz-file-promise-url", ]); -/* - Returns true if the text resembles a URL or even just a hostname - in a way that may prompt the O.S. or other applications to send out a - validation DNS query, if not a full request (e.g. " torproject.org", - even with the leading whitespace). -*/ -function isURLish(text) { - // Ignore leading whitespace. - text = text.trim(); - - // Without any protocol or dot in the first chunk, this is unlikely - // to be considered URLish (exception: localhost, but we don't care). - if (!/^[a-z][a-z0-9+-]*:\/\//i.test(text)) { - // no protocol - if (!/^[^.\s\/]+\.[^.\s\/]/.test(text)) { - // no dot - return false; +const MAIN_PROCESS = + Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT; + +const EMPTY_PAYLOAD = {}; +const OpaqueDrag = { + listening: false, + payload: EMPTY_PAYLOAD, + store(value, type) { + let opaqueKey = crypto.randomUUID(); + this.payload = { opaqueKey, value, type }; + if (!this.listening && MAIN_PROCESS) { + Services.ppmm.addMessageListener( + "DragDropFilter:GetOpaqueDrag", + () => this.payload + ); + this.listening = true; } - // Prepare for hostname validation via relative URL building. - text = `//${text}`; - } - // Validate URL or hostname. - try { - new URL(text, "https://localhost"); - return true; - } catch (e) { - // invalid URL, bail out - } - return false; -} - -// Returns true if any chunk of text is URLish -const hasURLish = text => text.split(/[^\p{L}_.-:\/%~@$-]+/u).some(isURLish); + return opaqueKey; + }, + retrieve(key) { + let { opaqueKey, value, type } = this.payload; + if (opaqueKey === key) { + return { value, type }; + } + if (!MAIN_PROCESS) { + this.payload = Services.cpmm.sendSyncMessage( + "DragDropFilter:GetOpaqueDrag" + )[0]; + if (key === this.payload.opaqueKey) { + return this.retrieve(key); + } + } + return EMPTY_PAYLOAD; + }, +}; function DragDropFilter() { this.logger = Cc["@torproject.org/torbutton-logger;1"].getService( Ci.nsISupports ).wrappedJSObject; this.logger.log(3, "Component Load 0: New DragDropFilter."); - - try { - Services.obs.addObserver(this, "on-datatransfer-available"); - } catch (e) { - this.logger.log(5, "Failed to register drag observer"); + if (MAIN_PROCESS) { + // We want to update our status in the main process only, in order to + // serve the same opaque drag payload in every process. + try { + Services.obs.addObserver(this, "on-datatransfer-available"); + } catch (e) { + this.logger.log(5, "Failed to register drag observer"); + } } } @@ -109,23 +115,38 @@ DragDropFilter.prototype = { const types = aDataTransfer.mozTypesAt(i); for (const type of types) { this.logger.log(3, `Type is: ${type}.`); - if ( - URLISH_TYPES.includes(type) || - ((type === "text/plain" || type === "text/html") && - hasURLish(aDataTransfer.getData(type))) - ) { + if (URLISH_TYPES.includes(type)) { this.logger.log( 3, - `Removing transfer data ${aDataTransfer.getData(type)}` + `Removing transfer data ${aDataTransfer.mozGetDataAt(type, i)}` ); + const urlType = "text/x-moz-url"; + // Fallback url type, to be parsed by this browser but not externally + const INTERNAL_FALLBACK = "application/x-torbrowser-opaque"; + if (types.contains(urlType)) { + const link = aDataTransfer.mozGetDataAt(urlType, i); + const opaqueKey = OpaqueDrag.store(link, urlType); + aDataTransfer.mozSetDataAt(INTERNAL_FALLBACK, opaqueKey, i); + } for (const type of types) { - aDataTransfer.clearData(type); + if ( + type !== INTERNAL_FALLBACK && + type !== "text/x-moz-place" // don't touch bookmarks + ) { + aDataTransfer.mozClearDataAt(type, i); + } } break; } } } }, + + opaqueDrag: { + get(opaqueKey) { + return OpaqueDrag.retrieve(opaqueKey); + }, + }, }; // Assign factory to global object. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fdfd2b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fdfd2b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new tag tor-browser-102.2.1-12.5-1-build1
by Pier Angelo Vendrame (＠pierov) 16 Dec '22

16 Dec '22

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

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-102.2.1-12.5-1
by Pier Angelo Vendrame (＠pierov) 16 Dec '22

16 Dec '22

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

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-102.0.14-12.5-1
by Pier Angelo Vendrame (＠pierov) 16 Dec '22

16 Dec '22

Pier Angelo Vendrame pushed new branch android-components-102.0.14-12.5-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by Pier Angelo Vendrame (＠pierov) 16 Dec '22

16 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: fdfd2b97 by Henry Wilkes at 2022-12-16T07:50:43+00:00 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. - - - - - 1 changed file: - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/main.js ===================================== @@ -554,7 +554,7 @@ var gMainPane = { .setAttribute("style", "display: none !important"); } // Initialize the Firefox Updates section. - let version = AppConstants.MOZ_APP_VERSION_DISPLAY; + let version = AppConstants.TOR_BROWSER_VERSION; // Include the build ID if this is an "a#" (nightly) build if (/a\d+$/.test(version)) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fdfd2b9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fdfd2b9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 16 Dec '22

16 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: afa37f60 by Pier Angelo Vendrame at 2022-12-16T07:31:13+00:00 fixup! Firefox preference overrides. Bug 41503: Disable restart in case of reboot and restore in case of crash - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -52,6 +52,9 @@ pref("browser.sessionstore.privacy_level", 2); // Use the in-memory media cache and increase its maximum size (#29120) pref("browser.privatebrowsing.forceMediaMemoryCache", true); pref("media.memory_cache_max_size", 16384); +// Disable restore in case of crash (tor-browser#41503) +// This should not be needed in PBM, but we added it anyway like other options. +pref("browser.sessionstore.resume_from_crash", false); // Enable HTTPS-Only mode (tor-browser#19850) pref("dom.security.https_only_mode", true); @@ -454,8 +457,8 @@ pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-disp pref("browser.onboarding.updatetour", "learn-more"); pref("browser.onboarding.skip-tour-button.hide", true); -// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) #ifdef XP_WIN +// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) // this pref changes the app's set AUMID to be dependent on the profile path, rather than // attempting to read it from the registry; this is necessary so that the file generated // by the jumplist system can be properly deleted if it is disabled @@ -464,6 +467,10 @@ pref("browser.taskbar.lists.enabled", false); pref("browser.taskbar.lists.frequent.enabled", false); pref("browser.taskbar.lists.tasks.enabled", false); pref("browser.taskbar.lists.recent.enabled", false); + +// Do not re-open Tor Browser automatically after reboots when "Restart apps" is +// enabled (tor-browser#41503) +pref("toolkit.winRegisterApplicationRestart", false); #endif // If we are bundling fonts, whitelist those bundled fonts, and restrict system fonts to a selection. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/afa37f6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/afa37f6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.0.1-build1
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

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

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Draft Bug 40709: Prepare stable release 12.0.1
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 23a6cf35 by ma1 at 2022-12-15T18:51:41+00:00 Draft Bug 40709: Prepare stable release 12.0.1 - - - - - 10 changed files: - projects/browser/Bundle-Data/Docs/ChangeLog.txt - projects/browser/allowed_addons.json - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/manual/config - projects/tba-translation/config - projects/translation-base-browser-fluent/config - projects/translation-base-browser/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs/ChangeLog.txt ===================================== @@ -1,3 +1,23 @@ +Tor Browser 12.0.1 - December 14 2022 + * Windows + macOS + Linux + * Updated Firefox to 102.6esr + * Bug 41519: TOR_SOCKS_IPC_PATH environment variable not honored [tor-browser] + * Bug 41520: Regression: rearranging bookmarks / place items by drag & drop doesn't work anymore [tor-browser] + * Android + * Updated GeckoView to 102.6esr + * Build System + * All Platforms + * Updated Go to 1.19.4 + * Bug 40653: Build compiler-rt with runtimes instead of the main LLVM build [tor-browser-build] + * Bug 40681: Run apt-get clean, after installing packages in projects/container-image/config [tor-browser-build] + * Bug 40683: Install more packages in the default containers to reduce the number of custom containers [tor-browser-build] + * Bug 40693: Can't build container-image in main [tor-browser-build] + * Bug 40705: Add empty commit mentioning that gitolite repo is no longer updated [tor-browser-build] + * Windows + * Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe [tor-browser-build] + * Linux + * Bug 40689: Update Ubuntu version from projects/mmdebstrap-image/config to 22.04.1 [tor-browser-build] + Tor Browser 12.0 - December 5 2022 * All Platforms * Update Translations ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 915519, + "average_daily_users": 931676, "categories": { "android": [ "experimental", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5589, - "bayesian_average": 4.557679323413176, - "count": 4716, - "text_count": 1505 + "average": 4.5581, + "bayesian_average": 4.556880457185879, + "count": 4723, + "text_count": 1508 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 28250 + "weekly_downloads": 28481 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 669677, + "average_daily_users": 679121, "categories": { "android": [ "security-privacy" @@ -469,9 +469,9 @@ "category": "spotlight" }, "ratings": { - "average": 4.6597, - "bayesian_average": 4.657149505820861, - "count": 2307, + "average": 4.6594, + "bayesian_average": 4.65683895233368, + "count": 2308, "text_count": 460 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/reviews/", @@ -501,7 +501,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/", - "weekly_downloads": 6221 + "weekly_downloads": 6282 }, "notes": null }, @@ -517,7 +517,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 257360, + "average_daily_users": 260954, "categories": { "android": [ "security-privacy" @@ -733,7 +733,7 @@ }, "ratings": { "average": 4.82, - "bayesian_average": 4.815277608880884, + "bayesian_average": 4.815272675239451, "count": 1300, "text_count": 234 }, @@ -820,7 +820,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 5300 + "weekly_downloads": 5737 }, "notes": null }, @@ -836,7 +836,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1084595, + "average_daily_users": 1101611, "categories": { "android": [ "security-privacy" @@ -1358,10 +1358,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7954, - "bayesian_average": 4.792545624484679, - "count": 2141, - "text_count": 421 + "average": 4.7955, + "bayesian_average": 4.792644702996817, + "count": 2142, + "text_count": 422 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1385,7 +1385,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 19509 + "weekly_downloads": 20003 }, "notes": null }, @@ -1401,7 +1401,7 @@ "picture_url": null } ], - "average_daily_users": 6142453, + "average_daily_users": 6260785, "categories": { "android": [ "security-privacy" @@ -1565,7 +1565,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2022-11-29T17:10:20Z", + "last_updated": "2022-12-09T16:25:27Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1710,10 +1710,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7782, - "bayesian_average": 4.777784259376361, - "count": 14646, - "text_count": 3840 + "average": 4.7783, + "bayesian_average": 4.777884356510374, + "count": 14661, + "text_count": 3843 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1775,7 +1775,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 150038 + "weekly_downloads": 155177 }, "notes": null }, @@ -1791,7 +1791,7 @@ "picture_url": null } ], - "average_daily_users": 138306, + "average_daily_users": 138965, "categories": { "android": [ "photos-media" @@ -1913,7 +1913,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 364 + "weekly_downloads": 335 }, "notes": null }, @@ -1929,7 +1929,7 @@ "picture_url": null } ], - "average_daily_users": 93276, + "average_daily_users": 94303, "categories": { "android": [ "experimental", @@ -2066,7 +2066,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 611 + "weekly_downloads": 665 }, "notes": null }, @@ -2082,7 +2082,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 242839, + "average_daily_users": 245350, "categories": { "android": [ "photos-media", @@ -2300,10 +2300,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6481, - "bayesian_average": 4.643208419519093, - "count": 1202, - "text_count": 234 + "average": 4.6487, + "bayesian_average": 4.643806966863276, + "count": 1204, + "text_count": 236 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2324,7 +2324,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 4261 + "weekly_downloads": 4231 }, "notes": null }, @@ -2347,7 +2347,7 @@ "picture_url": null } ], - "average_daily_users": 98361, + "average_daily_users": 98953, "categories": { "android": [ "other" @@ -2629,9 +2629,9 @@ "category": "recommended" }, "ratings": { - "average": 4.4377, - "bayesian_average": 4.432981831118983, - "count": 1179, + "average": 4.4378, + "bayesian_average": 4.433084802866931, + "count": 1181, "text_count": 316 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", @@ -2652,7 +2652,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 45 + "weekly_downloads": 30 }, "notes": null }, @@ -2668,7 +2668,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 331130, + "average_daily_users": 335017, "categories": { "android": [ "performance", @@ -2858,7 +2858,7 @@ }, "ratings": { "average": 4.4075, - "bayesian_average": 4.404750805731901, + "bayesian_average": 4.404748711196217, "count": 2010, "text_count": 787 }, @@ -2904,7 +2904,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7694 + "weekly_downloads": 7735 }, "notes": null }, @@ -2920,7 +2920,7 @@ "picture_url": null } ], - "average_daily_users": 140965, + "average_daily_users": 142004, "categories": { "android": [ "performance", @@ -3034,10 +3034,10 @@ "category": "recommended" }, "ratings": { - "average": 3.911, - "bayesian_average": 3.906620181546117, - "count": 1090, - "text_count": 390 + "average": 3.912, + "bayesian_average": 3.907620335503252, + "count": 1091, + "text_count": 391 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -3056,7 +3056,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1452 + "weekly_downloads": 1504 }, "notes": null } ===================================== projects/firefox/config ===================================== @@ -12,10 +12,10 @@ container: use_container: 1 var: - firefox_platform_version: 102.5.0 + firefox_platform_version: 102.6.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - browser_branch: '12.0-2' - browser_build: 1 + browser_branch: '12.0-1' + browser_build: 2 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-build[% c("var/browser_build") %]' tag_gpg_id: 1 git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git git_submodule: 1 @@ -12,8 +12,9 @@ container: use_container: 1 var: - geckoview_version: 102.5.0esr - torbrowser_branch: 12.0 + geckoview_version: 102.6.0esr + torbrowser_branch: 12.0-1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential ===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.19.3 +version: 1.19.4 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -121,7 +121,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212 + sha256sum: eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 58611 +version: 59571 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -17,8 +17,8 @@ var: input_files: - project: container-image - - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip' + - URL: 'https://people.torproject.org/~ma1/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: c5466b54474ca16095f9d22ea7f092941634b50e7c63673853766e26fd53b1c0 + sha256sum: e4f19badca9207c8249e79b5fdf81363d1964cc84b2875355c9b4478db584224 - filename: packagemanual.py name: package_script ===================================== projects/tba-translation/config ===================================== @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://gitlab.torproject.org/tpo/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 5c29c501b58ce41df844079e4b841aa475a3d2d4 +git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35 version: '[% c("abbrev") %]' ===================================== projects/translation-base-browser-fluent/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: 0a69485d1b27d6a76ab98c622b09db8b3bca5a3c +git_hash: e1bb5278668e71317ccbf1fdd21cf25c4d56b95c version: '[% c("abbrev") %]' targets: ===================================== projects/translation-base-browser/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: 5bcca955007294df0e6e837710e8049b140fc6fd +git_hash: f3c816f0fde87471f98e46515482a493c4eb57dc version: '[% c("abbrev") %]' ===================================== rbm.conf ===================================== @@ -71,10 +71,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.0' + torbrowser_version: '12.0.1' torbrowser_build: 'build1' torbrowser_incremental_from: - - 11.5.8 + - 12.0 build_mar: 1 # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40707: Don't redirect 11.5.8 users to pre12.0
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 926c375c by Nicolas Vigier at 2022-12-15T18:48:34+00:00 Bug 40707: Don't redirect 11.5.8 users to pre12.0 - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -64,6 +64,9 @@ htaccess_rewrite_rules: release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] - # tor-browser-build#40678: Force all 11.5 users to update through 11.5.8 before 12.0 + # tor-browser-build#40678: Force all <=11.5.7 users to update through 11.5.8 before 12.0 RewriteRule ^[^/]+/[89]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] - RewriteRule ^[^/]+/1[01]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/10\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.5/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.5\.[01234567]/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] 2 commits: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 683baff6 by Pier Angelo Vendrame at 2022-12-15T15:01:28+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41001: Removed the old security preferences code from torbutton. - - - - - c7a1ca3c by Pier Angelo Vendrame at 2022-12-15T15:01:28+00:00 fixup! Add TorStrings module for localization Bug 41001: Removed strings used only by preferences.xhtml - - - - - 5 changed files: - − toolkit/torbutton/chrome/content/preferences-mobile.js - − toolkit/torbutton/chrome/content/preferences.xhtml - toolkit/torbutton/chrome/content/torbutton.js - toolkit/torbutton/chrome/locale/en-US/torbutton.dtd - toolkit/torbutton/jar.mn Changes: ===================================== toolkit/torbutton/chrome/content/preferences-mobile.js deleted ===================================== @@ -1,59 +0,0 @@ -// # Security Settings User Interface for Mobile - -// Utilities -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { - getBoolPref, - getIntPref, - setBoolPref, - setIntPref, - getCharPref, -} = Services.prefs; - -// Description elements have the follow names. -const descNames = ["", "desc_standard", "desc_safer", "desc_safest"]; -// "Learn-more"-elements have the follow names. -const linkNames = ["", "link_standard", "link_safer", "link_safest"]; -// A single `state` object that reflects the user settings in this UI. - -let state = { slider: 0, custom: false }; - -// Utility functions to convert between the legacy 4-value pref index -// and the 3-valued security slider. -let sliderPositionToPrefSetting = pos => [0, 4, 2, 1][pos]; -let prefSettingToSliderPosition = pref => [0, 3, 2, 2, 1][pref]; - -// Set the desired slider value and update UI. -function torbutton_set_slider(sliderValue) { - state.slider = sliderValue; - let slider = document.getElementById("torbutton_sec_slider"); - slider.value = sliderValue.toString(); - let descs = descNames.map(name => document.getElementById(name)); - descs.forEach((desc, i) => { - if (state.slider !== i) { - desc.style.display = "none"; - } else { - desc.style.display = "block"; - } - }); - torbutton_save_security_settings(); -} - -// Read prefs 'browser.security_level.security_slider' and -// 'browser.security_level.security_custom', and initialize the UI. -function torbutton_init_security_ui() { - torbutton_set_slider( - prefSettingToSliderPosition( - getIntPref("browser.security_level.security_slider") - ) - ); -} - -// Write the two prefs from the current settings. -function torbutton_save_security_settings() { - setIntPref( - "browser.security_level.security_slider", - sliderPositionToPrefSetting(state.slider) - ); - setBoolPref("browser.security_level.security_custom", state.custom); -} ===================================== toolkit/torbutton/chrome/content/preferences.xhtml deleted ===================================== @@ -1,84 +0,0 @@ -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <meta charset="UTF-8"/> - <meta name="viewport" content="width=device-width, initial-scale=1"/> - <head> - <title>&torbutton.prefs.security_settings;</title> - <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences.css"/> - <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences-mobile.css"/> - <script type="text/javascript" src="preferences-mobile.js"></script> - <style> - </style> - </head> - <body onload="torbutton_init_security_ui()"> - <div class="wrapper outer-wrapper"> - <div class="title"> - &torbutton.prefs.sec_caption; - </div> - <div class="wrapper inner-wrapper"> - <input id="torbutton_sec_slider" type="range" min="1" max="3" list="datalist" onchange="torbutton_set_slider(parseInt(this.value, 10))"/> - <datalist id="datalist"> - <option onclick="torbutton_set_slider(1)"> - &torbutton.prefs.sec_standard_label; - </option> - <option onclick="torbutton_set_slider(2)"> - &torbutton.prefs.sec_safer_label; - </option> - <option onclick="torbutton_set_slider(3)"> - &torbutton.prefs.sec_safest_label; - </option> - </datalist> - <div class="description-wrapper"> - <div id="desc_safest" class="description"> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_safest_description; - </p> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_safest_list_label; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_js_disabled; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_limit_graphics_and_typography; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_click_to_play_media; - </p> - <a id="link_safest" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </a> - </div> - <div id="desc_safer" class="description"> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_safer_description; - </p> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_safer_list_label; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_js_on_https_sites_only; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_limit_typography; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_click_to_play_media; - </p> - <a id="link_safer" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </a> - </div> - <div id="desc_standard" class="description"> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_standard_description; - </p> - <a id="link_standard" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </a> - </div> - </div> - </div> - </div> - </body> -</html> ===================================== toolkit/torbutton/chrome/content/torbutton.js ===================================== @@ -20,7 +20,6 @@ var torbutton_new_circuit; let { unescapeTorString, - bindPrefAndInit, getDomainForBrowser, torbutton_log, torbutton_get_property_string, @@ -185,10 +184,6 @@ var torbutton_new_circuit; }, }; - function torbutton_is_mobile() { - return Services.appinfo.OS === "Android"; - } - // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. @@ -269,8 +264,6 @@ var torbutton_new_circuit; torbutton_abouttor_message_handler ); - setupPreferencesForMobile(); - torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); @@ -323,7 +316,7 @@ var torbutton_new_circuit; // not working. async getChromeData(aIsRespondingToPageLoad) { let dataObj = { - mobile: torbutton_is_mobile(), + mobile: Services.appinfo.OS === "Android", updateChannel: AppConstants.MOZ_UPDATE_CHANNEL, torOn: await torbutton_tor_check_ok(), }; @@ -788,53 +781,6 @@ var torbutton_new_circuit; return true; } - function showSecurityPreferencesPanel(chromeWindow) { - const tabBrowser = chromeWindow.BrowserApp; - let settingsTab = null; - - const SECURITY_PREFERENCES_URI = - "chrome://torbutton/content/preferences.xhtml"; - - tabBrowser.tabs.some(function(tab) { - // If the security prefs tab is opened, send the user to it - if (tab.browser.currentURI.spec === SECURITY_PREFERENCES_URI) { - settingsTab = tab; - return true; - } - return false; - }); - - if (settingsTab === null) { - // Open up the settings panel in a new tab. - tabBrowser.addTab(SECURITY_PREFERENCES_URI, { - selected: true, - parentId: tabBrowser.selectedTab.id, - triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), - }); - } else { - // Activate an existing settings panel tab. - tabBrowser.selectTab(settingsTab); - } - } - - function setupPreferencesForMobile() { - if (!torbutton_is_mobile()) { - return; - } - - torbutton_log(4, "Setting up settings preferences for Android."); - - const chromeWindow = Services.wm.getMostRecentWindow("navigator:browser"); - - // Add the extension's chrome menu item to the main browser menu. - chromeWindow.NativeWindow.menu.add({ - name: torbutton_get_property_string( - "torbutton.security_settings.menu.title" - ), - callback: showSecurityPreferencesPanel.bind(this, chromeWindow), - }); - } - // Bug 1506 P3: This is needed pretty much only for the window resizing. // See comments for individual functions for details function torbutton_new_window(event) { ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.dtd ===================================== @@ -13,30 +13,3 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> <!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> - -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> -<!ENTITY torbutton.prefs.sec_standard_label "Standard"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Safer"> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> -<!ENTITY torbutton.prefs.sec_custom_warning "Custom"> -<!ENTITY torbutton.prefs.sec_overview "Disable certain web features that can be used to attack your security and anonymity."> -<!ENTITY torbutton.prefs.sec_standard_tooltip "Security Level : Standard"> -<!ENTITY torbutton.prefs.sec_safer_tooltip "Security Level : Safer"> -<!ENTITY torbutton.prefs.sec_safest_tooltip "Security Level : Safest"> -<!ENTITY torbutton.prefs.sec_custom_summary "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> -<!ENTITY torbutton.prefs.sec_restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> -<!ENTITY torbutton.prefs.sec_change "Change…"> ===================================== toolkit/torbutton/jar.mn ===================================== @@ -6,11 +6,9 @@ torbutton.jar: content/torbutton.js (chrome/content/torbutton.js) content/tor-circuit-display.js (chrome/content/tor-circuit-display.js) - content/preferences.xhtml (chrome/content/preferences.xhtml) content/aboutTor/aboutTor-content.js (chrome/content/aboutTor/aboutTor-content.js) * content/aboutTor/aboutTor.xhtml (chrome/content/aboutTor/aboutTor.xhtml) content/aboutTor/resources/aboutTor.js (chrome/content/aboutTor/resources/aboutTor.js) - content/preferences-mobile.js (chrome/content/preferences-mobile.js) components/ (components/*) modules/ (modules/*) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/81c511… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/81c511… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] fixup! Bug 16940: After update, load local change notes.
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 81c5119b by Pier Angelo Vendrame at 2022-12-13T16:27:53+01:00 fixup! Bug 16940: After update, load local change notes. Bug 41524: Read changelogs as UTF-8 - - - - - 1 changed file: - browser/actors/AboutTBUpdateParent.jsm Changes: ===================================== browser/actors/AboutTBUpdateParent.jsm ===================================== @@ -22,9 +22,9 @@ const kRequestUpdateMessageName = "FetchUpdateData"; * implementation. */ class AboutTBUpdateParent extends JSWindowActorParent { - receiveMessage(aMessage) { + async receiveMessage(aMessage) { if (aMessage.name == kRequestUpdateMessageName) { - return this.releaseNoteInfo; + return this.getReleaseNoteInfo(); } return undefined; } @@ -51,7 +51,7 @@ class AboutTBUpdateParent extends JSWindowActorParent { // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir // to support Gatekeeper signing, the ChangeLog.txt file is located in // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. - get releaseNoteInfo() { + async getReleaseNoteInfo() { let info = { moreInfoURL: this.moreInfoURL }; try { @@ -74,12 +74,7 @@ class AboutTBUpdateParent extends JSWindowActorParent { f.append("Docs"); f.append("ChangeLog.txt"); - let fs = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( - Ci.nsIFileInputStream - ); - fs.init(f, -1, 0, 0); - let s = NetUtil.readInputStreamToString(fs, fs.available()); - fs.close(); + let s = await IOUtils.readUTF8(f.path); // Truncate at the first empty line. s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81c5119… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81c5119… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-102.6.0esr-12.5-1
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-102.6.0esr-12.5-1
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

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

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40707: Don't redirect 11.5.8 users to pre12.0
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ea4c8aa3 by Nicolas Vigier at 2022-12-13T20:07:12+01:00 Bug 40707: Don't redirect 11.5.8 users to pre12.0 - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -64,6 +64,9 @@ htaccess_rewrite_rules: release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] - # tor-browser-build#40678: Force all 11.5 users to update through 11.5.8 before 12.0 + # tor-browser-build#40678: Force all <=11.5.7 users to update through 11.5.8 before 12.0 RewriteRule ^[^/]+/[89]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] - RewriteRule ^[^/]+/1[01]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/10\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.5/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.5\.[01234567]/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Deleted branch foo
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

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

1 0

[Git][tpo/applications/tor-browser] Pushed new branch foo
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

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

1 0

[Git][tpo/applications/tor-browser] Deleted branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash
by Pier Angelo Vendrame (＠pierov) 14 Dec '22

14 Dec '22

Pier Angelo Vendrame deleted branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash at The Tor Project / Applications / Tor Browser -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash
by Pier Angelo Vendrame (＠pierov) 14 Dec '22

14 Dec '22

Pier Angelo Vendrame pushed new branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/41503-dis… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.6.0esr-12.0-1-build2
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 2 commits: Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 8825bcad by hackademix at 2022-12-14T13:34:31+00:00 Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore - - - - - 8b01895e by hackademix at 2022-12-14T13:34:31+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core - - - - - 5 changed files: - browser/components/places/PlacesUIUtils.jsm - browser/components/places/content/controller.js - dom/base/ContentAreaDropListener.jsm - toolkit/components/places/PlacesUtils.jsm - toolkit/torproject/torbutton Changes: ===================================== browser/components/places/PlacesUIUtils.jsm ===================================== @@ -1903,7 +1903,11 @@ XPCOMUtils.defineLazyGetter(PlacesUIUtils, "URI_FLAVORS", () => { return [PlacesUtils.TYPE_X_MOZ_URL, TAB_DROP_TYPE, PlacesUtils.TYPE_UNICODE]; }); XPCOMUtils.defineLazyGetter(PlacesUIUtils, "SUPPORTED_FLAVORS", () => { - return [...PlacesUIUtils.PLACES_FLAVORS, ...PlacesUIUtils.URI_FLAVORS]; + return [ + ...PlacesUIUtils.PLACES_FLAVORS, + ...PlacesUIUtils.URI_FLAVORS, + "application/x-torbrowser-opaque", + ]; }); XPCOMUtils.defineLazyGetter(PlacesUIUtils, "ellipsis", function() { ===================================== browser/components/places/content/controller.js ===================================== @@ -1251,6 +1251,7 @@ PlacesController.prototype = { [ PlacesUtils.TYPE_X_MOZ_PLACE, PlacesUtils.TYPE_X_MOZ_URL, + "application/x-torbrowser-opaque", PlacesUtils.TYPE_UNICODE, ].forEach(type => xferable.addDataFlavor(type)); ===================================== dom/base/ContentAreaDropListener.jsm ===================================== @@ -5,6 +5,16 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); +const { XPCOMUtils } = ChromeUtils.import( + "resource://gre/modules/XPCOMUtils.jsm" +); + +XPCOMUtils.defineLazyGetter(this, "gOpaqueDrag", () => { + return Cc["@torproject.org/torbutton-dragDropFilter;1"].getService( + Ci.nsISupports + ).wrappedJSObject.opaqueDrag; +}); + // This component is used for handling dragover and drop of urls. // // It checks to see whether a drop of a url is allowed. For instance, a url @@ -43,10 +53,15 @@ ContentAreaDropListener.prototype = { } } - type = "text/x-moz-url"; - if (types.contains(type)) { + for (let type of ["text/x-moz-url", "application/x-torbrowser-opaque"]) { + if (!types.contains(type)) { + continue; + } data = dt.mozGetDataAt(type, i); if (data) { + if (type === "application/x-torbrowser-opaque") { + ({ type, value: data = "" } = gOpaqueDrag.get(data)); + } let lines = data.split("\n"); for (let i = 0, length = lines.length; i < length; i += 2) { this._addLink(links, lines[i], lines[i + 1], type); @@ -250,6 +265,7 @@ ContentAreaDropListener.prototype = { if ( !types.includes("application/x-moz-file") && !types.includes("text/x-moz-url") && + !types.includes("application/x-torbrowser-opaque") && !types.includes("text/uri-list") && !types.includes("text/x-moz-text-internal") && !types.includes("text/plain") ===================================== toolkit/components/places/PlacesUtils.jsm ===================================== @@ -32,6 +32,12 @@ XPCOMUtils.defineLazyGetter(this, "gCryptoHash", () => { return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash); }); +XPCOMUtils.defineLazyGetter(this, "gOpaqueDrag", () => { + return Cc["@torproject.org/torbutton-dragDropFilter;1"].getService( + Ci.nsISupports + ).wrappedJSObject.opaqueDrag; +}); + // On Mac OSX, the transferable system converts "\r\n" to "\n\n", where // we really just want "\n". On other platforms, the transferable system // converts "\r\n" to "\n". @@ -1132,6 +1138,9 @@ var PlacesUtils = { unwrapNodes: function PU_unwrapNodes(blob, type) { // We split on "\n" because the transferable system converts "\r\n" to "\n" var nodes = []; + if (type === "application/x-torbrowser-opaque") { + ({ value: blob, type } = gOpaqueDrag.get(blob)); + } switch (type) { case this.TYPE_X_MOZ_PLACE: case this.TYPE_X_MOZ_PLACE_SEPARATOR: ===================================== toolkit/torproject/torbutton ===================================== @@ -1 +1 @@ -Subproject commit b0a2e740d6c7440cc9722358eb775c6a04f49e72 +Subproject commit a5767f29c0d509c6cb34527c091ae0c4bfc2f386 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2657bb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2657bb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 2657bbcf by Richard Pospesel at 2022-12-14T13:20:10+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core migrate from gitolite repo to our gitlab repo for the torbutton submodule - - - - - 1 changed file: - .gitmodules Changes: ===================================== .gitmodules ===================================== @@ -1,3 +1,3 @@ [submodule "toolkit/torproject/torbutton"] path = toolkit/torproject/torbutton - url = https://git.torproject.org/torbutton.git + url = https://gitlab.torproject.org/tpo/applications/torbutton.git View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2657bbc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2657bbc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbutton][maint-12.0] Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / torbutton Commits: a5767f29 by hackademix at 2022-12-14T12:43:47+00:00 Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore - - - - - 1 changed file: - components/dragDropFilter.js Changes: ===================================== components/dragDropFilter.js ===================================== @@ -13,6 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", }); +XPCOMUtils.defineLazyGlobalGetters(this, ["crypto"]); // Module specific constants const kMODULE_NAME = "Torbutton Drag and Drop Handler"; @@ -28,50 +29,55 @@ const URLISH_TYPES = Object.freeze([ "application/x-moz-file-promise-url", ]); -/* - Returns true if the text resembles a URL or even just a hostname - in a way that may prompt the O.S. or other applications to send out a - validation DNS query, if not a full request (e.g. " torproject.org", - even with the leading whitespace). -*/ -function isURLish(text) { - // Ignore leading whitespace. - text = text.trim(); - - // Without any protocol or dot in the first chunk, this is unlikely - // to be considered URLish (exception: localhost, but we don't care). - if (!/^[a-z][a-z0-9+-]*:\/\//i.test(text)) { - // no protocol - if (!/^[^.\s\/]+\.[^.\s\/]/.test(text)) { - // no dot - return false; +const MAIN_PROCESS = + Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT; + +const EMPTY_PAYLOAD = {}; +const OpaqueDrag = { + listening: false, + payload: EMPTY_PAYLOAD, + store(value, type) { + let opaqueKey = crypto.randomUUID(); + this.payload = { opaqueKey, value, type }; + if (!this.listening && MAIN_PROCESS) { + Services.ppmm.addMessageListener( + "DragDropFilter:GetOpaqueDrag", + () => this.payload + ); + this.listening = true; } - // Prepare for hostname validation via relative URL building. - text = `//${text}`; - } - // Validate URL or hostname. - try { - new URL(text, "https://localhost"); - return true; - } catch (e) { - // invalid URL, bail out - } - return false; -} - -// Returns true if any chunk of text is URLish -const hasURLish = text => text.split(/[^\p{L}_.-:\/%~@$-]+/u).some(isURLish); + return opaqueKey; + }, + retrieve(key) { + let { opaqueKey, value, type } = this.payload; + if (opaqueKey === key) { + return { value, type }; + } + if (!MAIN_PROCESS) { + this.payload = Services.cpmm.sendSyncMessage( + "DragDropFilter:GetOpaqueDrag" + )[0]; + if (key === this.payload.opaqueKey) { + return this.retrieve(key); + } + } + return EMPTY_PAYLOAD; + }, +}; function DragDropFilter() { this.logger = Cc["@torproject.org/torbutton-logger;1"].getService( Ci.nsISupports ).wrappedJSObject; this.logger.log(3, "Component Load 0: New DragDropFilter."); - - try { - Services.obs.addObserver(this, "on-datatransfer-available"); - } catch (e) { - this.logger.log(5, "Failed to register drag observer"); + if (MAIN_PROCESS) { + // We want to update our status in the main process only, in order to + // serve the same opaque drag payload in every process. + try { + Services.obs.addObserver(this, "on-datatransfer-available"); + } catch (e) { + this.logger.log(5, "Failed to register drag observer"); + } } } @@ -109,23 +115,38 @@ DragDropFilter.prototype = { const types = aDataTransfer.mozTypesAt(i); for (const type of types) { this.logger.log(3, `Type is: ${type}.`); - if ( - URLISH_TYPES.includes(type) || - ((type === "text/plain" || type === "text/html") && - hasURLish(aDataTransfer.getData(type))) - ) { + if (URLISH_TYPES.includes(type)) { this.logger.log( 3, - `Removing transfer data ${aDataTransfer.getData(type)}` + `Removing transfer data ${aDataTransfer.mozGetDataAt(type, i)}` ); + const urlType = "text/x-moz-url"; + // Fallback url type, to be parsed by this browser but not externally + const INTERNAL_FALLBACK = "application/x-torbrowser-opaque"; + if (types.contains(urlType)) { + const link = aDataTransfer.mozGetDataAt(urlType, i); + const opaqueKey = OpaqueDrag.store(link, urlType); + aDataTransfer.mozSetDataAt(INTERNAL_FALLBACK, opaqueKey, i); + } for (const type of types) { - aDataTransfer.clearData(type); + if ( + type !== INTERNAL_FALLBACK && + type !== "text/x-moz-place" // don't touch bookmarks + ) { + aDataTransfer.mozClearDataAt(type, i); + } } break; } } } }, + + opaqueDrag: { + get(opaqueKey) { + return OpaqueDrag.retrieve(opaqueKey); + }, + }, }; // Assign factory to global object. View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbutton/-/commit/a5767f29c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbutton/-/commit/a5767f29c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0
by boklm (＠boklm) 13 Dec '22

13 Dec '22

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c74e0320 by Nicolas Vigier at 2022-12-13T19:54:42+01:00 Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0 - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -64,3 +64,6 @@ htaccess_rewrite_rules: release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] + # tor-browser-build#40678: Force all 11.5 users to update through 11.5.8 before 12.0 + RewriteRule ^[^/]+/[89]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/1[01]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-bundle-testsuite] branch main updated: The git.tpo repository is no longer updated, gitlab.tpo should be used instead
by gitolite role 13 Dec '22

13 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-bundle-testsuite. The following commit(s) were added to refs/heads/main by this push: new 0342091 The git.tpo repository is no longer updated, gitlab.tpo should be used instead 0342091 is described below commit 03420915806b22536cfb2f35315f169e3db50346 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Dec 13 15:15:52 2022 +0000 The git.tpo repository is no longer updated, gitlab.tpo should be used instead The repository at https://gitweb.torproject.org/tor-browser-bundle-testsuite.git/ (git.torproject.org and git-rw.torproject.org) is no longer updated. Please use the gitlab repository instead: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-spec] branch main updated: The git.tpo repository is no longer updated, gitlab.tpo should be used instead
by gitolite role 13 Dec '22

13 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-spec. The following commit(s) were added to refs/heads/main by this push: new 789b727 The git.tpo repository is no longer updated, gitlab.tpo should be used instead 789b727 is described below commit 789b727494c2e5435e77ed64a426aa15fbff8a53 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Dec 13 15:12:45 2022 +0000 The git.tpo repository is no longer updated, gitlab.tpo should be used instead The repository at https://gitweb.torproject.org/tor-browser-spec.git/ (git.torproject.org and git-rw.torproject.org) is no longer updated. Please use the gitlab repository instead: https://gitlab.torproject.org/tpo/applications/tor-browser-spec -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] 3 commits: fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 12 Dec '22

12 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5688cd7a by Pier Angelo Vendrame at 2022-12-12T20:17:45+01:00 fixup! Add TorStrings module for localization Bug 41375: Cleared unused strings - - - - - 6ae67e05 by Pier Angelo Vendrame at 2022-12-12T20:17:45+01:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Changed placeholders for strings as we switched from dtd to .properties. - - - - - 96d9ec71 by Pier Angelo Vendrame at 2022-12-12T20:17:45+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Changed placeholders for strings as we switched from dtd to .properties. - - - - - 18 changed files: - browser/components/torconnect/content/aboutTorConnect.js - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorStrings.jsm - toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd - toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd - toolkit/torbutton/chrome/locale/en-US/aboutTor.dtd - toolkit/torbutton/chrome/locale/en-US/brand.dtd - toolkit/torbutton/chrome/locale/en-US/brand.properties - toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties - + toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties - − toolkit/torbutton/chrome/locale/en-US/network-settings.dtd - + toolkit/torbutton/chrome/locale/en-US/onionLocation.properties - + toolkit/torbutton/chrome/locale/en-US/rulesets.properties - + toolkit/torbutton/chrome/locale/en-US/settings.properties - + toolkit/torbutton/chrome/locale/en-US/torConnect.properties - toolkit/torbutton/chrome/locale/en-US/torbutton.dtd - toolkit/torbutton/chrome/locale/en-US/torbutton.properties - toolkit/torbutton/chrome/locale/en-US/torlauncher.properties Changes: ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -1,4 +1,7 @@ // Copyright (c) 2021, The Tor Project, Inc. +// 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/. /* eslint-env mozilla/frame-script */ @@ -608,7 +611,7 @@ class AboutTorConnect { } showConfigureConnectionLink(text) { - const pieces = text.split("#1"); + const pieces = text.split("%S"); const link = document.createElement("a"); link.textContent = TorStrings.torConnect.configureConnection; link.setAttribute("href", "#"); ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1,3 +1,8 @@ +// Copyright (c) 2022, The Tor Project, Inc. +// 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/. + "use strict"; /* global Services, gSubDialog */ @@ -518,10 +523,10 @@ const gConnectionPane = (function() { details && details.transport !== undefined ? details.transport : "vanilla"; - for (const piece of idString.split(/(#[12])/)) { - if (piece == "#1") { + for (const piece of idString.split(/(%[12]\$S)/)) { + if (piece == "%1$S") { id.append(type); - } else if (piece == "#2") { + } else if (piece == "%2$S") { id.append(...emojis); } else { id.append(piece); ===================================== browser/modules/TorStrings.jsm ===================================== @@ -1,74 +1,20 @@ +// Copyright (c) 2022, The Tor Project, Inc. +// 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/. + "use strict"; var EXPORTED_SYMBOLS = ["TorStrings"]; -const { XPCOMUtils } = ChromeUtils.import( - "resource://gre/modules/XPCOMUtils.jsm" -); const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { AppConstants } = ChromeUtils.import( + "resource://gre/modules/AppConstants.jsm" +); const { getLocale } = ChromeUtils.import( "resource://torbutton/modules/utils.js" ); -XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); -XPCOMUtils.defineLazyGetter(this, "domParser", () => { - const parser = new DOMParser(); - parser.forceEnableDTD(); - return parser; -}); - -/* - Tor DTD String Bundle - - DTD strings loaded from torbutton/tor-launcher, but provide a fallback in case they aren't available -*/ -class TorDTDStringBundle { - constructor(aBundleURLs, aPrefix) { - const locations = []; - for (const [index, url] of aBundleURLs.entries()) { - locations.push(`<!ENTITY % dtd_${index} SYSTEM "${url}">%dtd_${index};`); - } - this._locations = locations; - this._prefix = aPrefix; - const idx = aBundleURLs.lastIndexOf("/"); - this._filename = idx === -1 ? aBundleURLs : aBundleURLs.substring(idx); - } - - // copied from testing/marionette/l10n.js - localizeEntity(urls, id) { - // Use the DOM parser to resolve the entity and extract its real value - const header = `<?xml version="1.0"?><!DOCTYPE elem [${this._locations.join( - "" - )}]>`; - const elem = `<elem id="elementID">&${id};</elem>`; - const doc = domParser.parseFromString(header + elem, "text/xml"); - const element = doc.querySelector("elem[id='elementID']"); - - if (element === null) { - throw new Error(`Entity with id='${id}' hasn't been found`); - } - - return element.textContent; - } - - getString(key, fallback) { - if (key) { - try { - return this.localizeEntity(this._bundleURLs, `${this._prefix}${key}`); - } catch (e) { - console.warn(`[TorStrings] Cannot get ${key} on ${this._filename}`, e); - } - } - - // on failure, assign the fallback if it exists - if (fallback) { - return fallback; - } - // otherwise return string key - return `$(${key})`; - } -} - /* Tor Property String Bundle @@ -78,16 +24,28 @@ class TorPropertyStringBundle { constructor(aBundleURL, aPrefix) { try { this._bundle = Services.strings.createBundle(aBundleURL); - } catch (e) {} + this._bundleURL = aBundleURL; + } catch (e) { + console.error(`[TorStrings] Cannot load ${aBundleURL}`, e); + } this._prefix = aPrefix; } getString(key, fallback) { + const reportError = + AppConstants.TOR_BROWSER_VERSION === "dev-build" && !!this._bundle; if (key) { try { return this._bundle.GetStringFromName(`${this._prefix}${key}`); - } catch (e) {} + } catch (e) { + if (reportError) { + console.warn( + `[TorStrings] Cannot get ${this._prefix}${key} from ${this._bundleURL}`, + e + ); + } + } } // on failure, assign the fallback if it exists @@ -97,6 +55,15 @@ class TorPropertyStringBundle { // otherwise return string key return `$(${key})`; } + + getStrings(strings) { + return Object.fromEntries( + Object.entries(strings).map(([key, fallback]) => [ + key, + this.getString(key, fallback), + ]) + ); + } } const Loader = { @@ -105,7 +72,7 @@ const Loader = { */ cryptoSafetyPrompt() { const tsb = new TorPropertyStringBundle( - "chrome://torbutton/locale/torbutton.properties", + "chrome://torbutton/locale/cryptoSafetyPrompt.properties", "cryptoSafetyPrompt." ); const getString = tsb.getString.bind(tsb); @@ -138,499 +105,209 @@ const Loader = { Tor about:preferences#connection Strings */ settings() { - const tsb = new TorDTDStringBundle( - ["chrome://torbutton/locale/network-settings.dtd"], - "" - ); - const getString = tsb.getString.bind(tsb); - - const retval = { - categoryTitle: getString("torPreferences.categoryTitle", "Connection"), + const strings = { + categoryTitle: "Connection", // Message box - torPreferencesDescription: getString( - "torPreferences.torSettingsDescription", - "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." - ), + torPreferencesDescription: + "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world.", // Status - statusInternetLabel: getString( - "torPreferences.statusInternetLabel", - "Internet:" - ), - statusInternetTest: getString( - "torPreferences.statusInternetTest", - "Test" - ), - statusInternetOnline: getString( - "torPreferences.statusInternetOnline", - "Online" - ), - statusInternetOffline: getString( - "torPreferences.statusInternetOffline", - "Offline" - ), - statusTorLabel: getString( - "torPreferences.statusTorLabel", - "Tor Network:" - ), - statusTorConnected: getString( - "torPreferences.statusTorConnected", - "Connected" - ), - statusTorNotConnected: getString( - "torPreferences.statusTorNotConnected", - "Not Connected" - ), - statusTorBlocked: getString( - "torPreferences.statusTorBlocked", - "Potentially Blocked" - ), - learnMore: getString("torPreferences.learnMore", "Learn more"), + statusInternetLabel: "Internet:", + statusInternetTest: "Test", + statusInternetOnline: "Online", + statusInternetOffline: "Offline", + statusTorLabel: "Tor Network:", + statusTorConnected: "Connected", + statusTorNotConnected: "Not Connected", + statusTorBlocked: "Potentially Blocked", + learnMore: "Learn more", // Quickstart - quickstartHeading: getString("torPreferences.quickstart", "Quickstart"), - quickstartDescription: getString( - "torPreferences.quickstartDescriptionLong", - "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings." - ), - quickstartCheckbox: getString( - "torPreferences.quickstartCheckbox", - "Always connect automatically" - ), + quickstartHeading: "Quickstart", + quickstartDescription: + "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.", + quickstartCheckbox: "Always connect automatically", // Bridge settings - bridgesHeading: getString("torPreferences.bridges", "Bridges"), - bridgesDescription: getString( - "torPreferences.bridgesDescription", - "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another." - ), - bridgeLocation: getString( - "torPreferences.bridgeLocation", - "Your location" - ), - bridgeLocationAutomatic: getString( - "torPreferences.bridgeLocationAutomatic", - "Automatic" - ), - bridgeLocationFrequent: getString( - "torPreferences.bridgeLocationFrequent", - "Frequently selected locations" - ), - bridgeLocationOther: getString( - "torPreferences.bridgeLocationOther", - "Other locations" - ), - bridgeChooseForMe: getString( - "torPreferences.bridgeChooseForMe", - "Choose a Bridge For Me\u2026" - ), - bridgeCurrent: getString( - "torPreferences.bridgeBadgeCurrent", - "Your Current Bridges" - ), - bridgeCurrentDescription: getString( - "torPreferences.bridgeBadgeCurrentDescription", - "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed." - ), - bridgeId: getString("torPreferences.bridgeId", "#1 bridge: #2"), - remove: getString("torPreferences.remove", "Remove"), - bridgeDisableBuiltIn: getString( - "torPreferences.bridgeDisableBuiltIn", - "Disable built-in bridges" - ), - bridgeShare: getString( - "torPreferences.bridgeShare", - "Share this bridge using the QR code or by copying its address:" - ), - bridgeCopy: getString("torPreferences.bridgeCopy", "Copy Bridge Address"), - copied: getString("torPreferences.copied", "Copied!"), - bridgeShowAll: getString( - "torPreferences.bridgeShowAll", - "Show All Bridges" - ), - bridgeRemoveAll: getString( - "torPreferences.bridgeRemoveAll", - "Remove All Bridges" - ), - bridgeAdd: getString("torPreferences.bridgeAdd", "Add a New Bridge"), - bridgeSelectBrowserBuiltin: getString( - "torPreferences.bridgeSelectBrowserBuiltin", - "Choose from one of Tor Browser’s built-in bridges" - ), - bridgeSelectBuiltin: getString( - "torPreferences.bridgeSelectBuiltin", - "Select a Built-In Bridge\u2026" - ), - bridgeRequestFromTorProject: getString( - "torsettings.useBridges.bridgeDB", - "Request a bridge from torproject.org" - ), - bridgeRequest: getString( - "torPreferences.bridgeRequest", - "Request a Bridge\u2026" - ), - bridgeEnterKnown: getString( - "torPreferences.bridgeEnterKnown", - "Enter a bridge address you already know" - ), - bridgeAddManually: getString( - "torPreferences.bridgeAddManually", - "Add a Bridge Manually\u2026" - ), + bridgesHeading: "Bridges", + bridgesDescription: + "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.", + bridgeLocation: "Your location", + bridgeLocationAutomatic: "Automatic", + bridgeLocationFrequent: "Frequently selected locations", + bridgeLocationOther: "Other locations", + bridgeChooseForMe: "Choose a Bridge For Me…", + bridgeCurrent: "Your Current Bridges", + bridgeCurrentDescription: + "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.", + bridgeId: "#1 bridge: #2", + remove: "Remove", + bridgeDisableBuiltIn: "Disable built-in bridges", + bridgeShare: + "Share this bridge using the QR code or by copying its address:", + bridgeCopy: "Copy Bridge Address", + copied: "Copied!", + bridgeShowAll: "Show All Bridges", + bridgeRemoveAll: "Remove All Bridges", + bridgeAdd: "Add a New Bridge", + bridgeSelectBrowserBuiltin: + "Choose from one of Tor Browser’s built-in bridges", + bridgeSelectBuiltin: "Select a Built-In Bridge…", + bridgeRequestFromTorProject: "Request a bridge from torproject.org", + bridgeRequest: "Request a Bridge…", + bridgeEnterKnown: "Enter a bridge address you already know", + bridgeAddManually: "Add a Bridge Manually…", // Advanced settings - advancedHeading: getString("torPreferences.advanced", "Advanced"), - advancedLabel: getString( - "torPreferences.advancedDescription", - "Configure how Tor Browser connects to the internet" - ), - advancedButton: getString( - "torPreferences.advancedButton", - "Settings\u2026" - ), - showTorDaemonLogs: getString( - "torPreferences.viewTorLogs", - "View the Tor logs" - ), - showLogs: getString("torPreferences.viewLogs", "View Logs\u2026"), + advancedHeading: "Advanced", + advancedLabel: "Configure how Tor Browser connects to the internet", + advancedButton: "Settings…", + showTorDaemonLogs: "View the Tor logs", + showLogs: "View Logs…", // Remove all bridges dialog - removeBridgesQuestion: getString( - "torPreferences.removeBridgesQuestion", - "Remove all the bridges?" - ), - removeBridgesWarning: getString( - "torPreferences.removeBridgesWarning", - "This action cannot be undone." - ), - cancel: getString("torPreferences.cancel", "Cancel"), + removeBridgesQuestion: "Remove all the bridges?", + removeBridgesWarning: "This action cannot be undone.", + cancel: "Cancel", // Scan bridge QR dialog - scanQrTitle: getString("torPreferences.scanQrTitle", "Scan the QR code"), + scanQrTitle: "Scan the QR code", // Builtin bridges dialog - builtinBridgeTitle: getString( - "torPreferences.builtinBridgeTitle", - "Built-In Bridges" - ), - builtinBridgeHeader: getString( - "torsettings.useBridges.default", - "Select a Built-In Bridge" - ), - builtinBridgeDescription: getString( - "torPreferences.builtinBridgeDescription", - "Tor Browser includes some specific types of bridges known as “pluggable transports”." - ), - builtinBridgeObfs4: getString( - "torPreferences.builtinBridgeObfs4", - "obfs4" - ), - builtinBridgeObfs4Description: getString( - "torPreferences.builtinBridgeObfs4Description", - "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges." - ), - builtinBridgeSnowflake: getString( - "torPreferences.builtinBridgeSnowflake", - "Snowflake" - ), - builtinBridgeSnowflakeDescription: getString( - "torPreferences.builtinBridgeSnowflakeDescription", - "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers." - ), - builtinBridgeMeekAzure: getString( - "torPreferences.builtinBridgeMeekAzure", - "meek-azure" - ), - builtinBridgeMeekAzureDescription: getString( - "torPreferences.builtinBridgeMeekAzureDescription", - "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor." - ), + builtinBridgeTitle: "Built-In Bridges", + builtinBridgeHeader: "Select a Built-In Bridge", + builtinBridgeDescription: + "Tor Browser includes some specific types of bridges known as “pluggable transports”.", + builtinBridgeObfs4: "obfs4", + builtinBridgeObfs4Description: + "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.", + builtinBridgeSnowflake: "Snowflake", + builtinBridgeSnowflakeDescription: + "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.", + builtinBridgeMeekAzure: "meek-azure", + builtinBridgeMeekAzureDescription: + "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.", // Request bridges dialog - requestBridgeDialogTitle: getString( - "torPreferences.requestBridgeDialogTitle", - "Request Bridge" - ), - submitCaptcha: getString( - "torsettings.useBridges.captchaSubmit", - "Submit" - ), - contactingBridgeDB: getString( - "torPreferences.requestBridgeDialogWaitPrompt", - "Contacting BridgeDB. Please Wait." - ), - solveTheCaptcha: getString( - "torPreferences.requestBridgeDialogSolvePrompt", - "Solve the CAPTCHA to request a bridge." - ), - captchaTextboxPlaceholder: getString( - "torsettings.useBridges.captchaSolution.placeholder", - "Enter the characters from the image" - ), - incorrectCaptcha: getString( - "torPreferences.requestBridgeErrorBadSolution", - "The solution is not correct. Please try again." - ), + requestBridgeDialogTitle: "Request Bridge", + submitCaptcha: "Submit", + contactingBridgeDB: "Contacting BridgeDB. Please Wait.", + solveTheCaptcha: "Solve the CAPTCHA to request a bridge.", + captchaTextboxPlaceholder: "Enter the characters from the image", + incorrectCaptcha: "The solution is not correct. Please try again.", // Provide bridge dialog - provideBridgeTitle: getString( - "torPreferences.provideBridgeTitle", - "Provide Bridge" - ), - provideBridgeHeader: getString( - "torPreferences.provideBridgeHeader", - "Enter bridge information from a trusted source" - ), - provideBridgePlaceholder: getString( - "torsettings.useBridges.placeholder", - "type address:port (one per line)" - ), + provideBridgeTitle: "Provide Bridge", + provideBridgeHeader: "Enter bridge information from a trusted source", + provideBridgePlaceholder: "type address:port (one per line)", // Connection settings dialog - connectionSettingsDialogTitle: getString( - "torPreferences.connectionSettingsDialogTitle", - "Connection Settings" - ), - connectionSettingsDialogHeader: getString( - "torPreferences.connectionSettingsDialogHeader", - "Configure how Tor Browser connects to the Internet" - ), - useLocalProxy: getString( - "torsettings.useProxy.checkbox", - "I use a proxy to connect to the Internet" - ), - proxyType: getString("torsettings.useProxy.type", "Proxy Type"), - proxyTypeSOCKS4: getString("torsettings.useProxy.type.socks4", "SOCKS4"), - proxyTypeSOCKS5: getString("torsettings.useProxy.type.socks5", "SOCKS5"), - proxyTypeHTTP: getString("torsettings.useProxy.type.http", "HTTP/HTTPS"), - proxyAddress: getString("torsettings.useProxy.address", "Address"), - proxyAddressPlaceholder: getString( - "torsettings.useProxy.address.placeholder", - "IP address or hostname" - ), - proxyPort: getString("torsettings.useProxy.port", "Port"), - proxyUsername: getString("torsettings.useProxy.username", "Username"), - proxyPassword: getString("torsettings.useProxy.password", "Password"), - proxyUsernamePasswordPlaceholder: getString( - "torsettings.optional", - "Optional" - ), - useFirewall: getString( - "torsettings.firewall.checkbox", - "This computer goes through a firewall that only allows connections to certain ports" - ), - allowedPorts: getString( - "torsettings.firewall.allowedPorts", - "Allowed Ports" - ), - allowedPortsPlaceholder: getString( - "torPreferences.firewallPortsPlaceholder", - "Comma-seperated values" - ), + connectionSettingsDialogTitle: "Connection Settings", + connectionSettingsDialogHeader: + "Configure how Tor Browser connects to the Internet", + useLocalProxy: "I use a proxy to connect to the Internet", + proxyType: "Proxy Type", + proxyTypeSOCKS4: "SOCKS4", + proxyTypeSOCKS5: "SOCKS5", + proxyTypeHTTP: "HTTP/HTTPS", + proxyAddress: "Address", + proxyAddressPlaceholder: "IP address or hostname", + proxyPort: "Port", + proxyUsername: "Username", + proxyPassword: "Password", + proxyUsernamePasswordPlaceholder: "Optional", + useFirewall: + "This computer goes through a firewall that only allows connections to certain ports", + allowedPorts: "Allowed Ports", + allowedPortsPlaceholder: "Comma-seperated values", // Log dialog - torLogDialogTitle: getString( - "torPreferences.torLogsDialogTitle", - "Tor Logs" - ), - copyLog: getString("torsettings.copyLog", "Copy Tor Log to Clipboard"), + torLogDialogTitle: "Tor Logs", + copyLog: "Copy Tor Log to Clipboard", + }; + const tsb = new TorPropertyStringBundle( + "chrome://torbutton/locale/settings.properties", + "settings." + ); + return { + ...tsb.getStrings(strings), learnMoreTorBrowserURL: "about:manual#about", learnMoreBridgesURL: "about:manual#bridges", learnMoreBridgesCardURL: "about:manual#bridges_bridge-moji", learnMoreCircumventionURL: "about:manual#circumvention", }; - - return retval; } /* Tor Network Settings Strings */, torConnect() { - const tsbNetwork = new TorDTDStringBundle( - ["chrome://torbutton/locale/network-settings.dtd"], - "" - ); - const tsbLauncher = new TorPropertyStringBundle( - "chrome://torbutton/locale/torlauncher.properties", - "torlauncher." - ); - const tsbCommon = new TorPropertyStringBundle( - "chrome://global/locale/commonDialogs.properties", - "" - ); - - const getStringNet = tsbNetwork.getString.bind(tsbNetwork); - const getStringLauncher = tsbLauncher.getString.bind(tsbLauncher); - const getStringCommon = tsbCommon.getString.bind(tsbCommon); - - return { - torConnect: getStringNet( - "torsettings.wizard.title.default", - "Connect to Tor" - ), - - torConnecting: getStringNet( - "torsettings.wizard.title.connecting", - "Establishing a Connection" - ), - - torNotConnectedConcise: getStringNet( - "torConnect.notConnectedConcise", - "Not Connected" - ), - - torConnectingConcise: getStringNet( - "torConnect.connectingConcise", - "Connecting…" - ), - - tryingAgain: getStringNet("torConnect.tryingAgain", "Trying again…"), - - noInternet: getStringNet( - "torConnect.noInternet", - "Tor Browser couldn’t reach the Internet" - ), + const strings = { + torConnect: "Connect to Tor", - noInternetDescription: getStringNet( - "torConnect.noInternetDescription", - "This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again." - ), + torConnecting: "Establishing a Connection", - torBootstrapFailed: getStringLauncher( - "tor_bootstrap_failed", - "Tor failed to establish a Tor network connection." - ), + torNotConnectedConcise: "Not Connected", - couldNotConnect: getStringNet( - "torConnect.couldNotConnect", - "Tor Browser could not connect to Tor" - ), + torConnectingConcise: "Connecting…", - configureConnection: getStringNet( - "torConnect.assistDescriptionConfigure", - "configure your connection" - ), + tryingAgain: "Trying again…", - assistDescription: getStringNet( - "torConnect.assistDescription", - "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead." - ), + noInternet: "Tor Browser couldn’t reach the Internet", + noInternetDescription: + "This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again.", + torBootstrapFailed: "Tor failed to establish a Tor network connection.", + couldNotConnect: "Tor Browser could not connect to Tor", + configureConnection: "configure your connection", + assistDescription: + "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead.", + tryingBridge: "Trying a bridge…", - tryingBridge: getStringNet("torConnect.tryingBridge", "Trying a bridge…"), + tryingBridgeAgain: "Trying one more time…", + errorLocation: "Tor Browser couldn’t locate you", + errorLocationDescription: + "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead.", + isLocationCorrect: "Are these location settings correct?", + isLocationCorrectDescription: + "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead.", + finalError: "Tor Browser still cannot connect", - tryingBridgeAgain: getStringNet( - "torConnect.tryingBridgeAgain", - "Trying one more time…" - ), + finalErrorDescription: + "Despite its best efforts, connection assist was not able to connect to Tor. Try troubleshooting your connection and adding a bridge manually instead.", + breadcrumbAssist: "Connection assist", + breadcrumbLocation: "Location settings", + breadcrumbTryBridge: "Try a bridge", - errorLocation: getStringNet( - "torConnect.errorLocation", - "Tor Browser couldn’t locate you" - ), + restartTorBrowser: "Restart Tor Browser", - errorLocationDescription: getStringNet( - "torConnect.errorLocationDescription", - "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead." - ), + torConfigure: "Configure Connection…", - isLocationCorrect: getStringNet( - "torConnect.isLocationCorrect", - "Are these location settings correct?" - ), + viewLog: "View logs…", - isLocationCorrectDescription: getStringNet( - "torConnect.isLocationCorrectDescription", - "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead." - ), + torConnectButton: "Connect", - finalError: getStringNet( - "torConnect.finalError", - "Tor Browser still cannot connect" - ), + cancel: "Cancel", - finalErrorDescription: getStringNet( - "torConnect.finalErrorDescription", - "Despite its best efforts, connection assist was not able to connect to Tor. Try troubleshooting your connection and adding a bridge manually instead." - ), + torConnected: "Connected to the Tor network", - breadcrumbAssist: getStringNet( - "torConnect.breadcrumbAssist", - "Connection assist" - ), - - breadcrumbLocation: getStringNet( - "torConnect.breadcrumbLocation", - "Location settings" - ), - - breadcrumbTryBridge: getStringNet( - "torConnect.breadcrumbTryBridge", - "Try a bridge" - ), - - restartTorBrowser: getStringNet( - "torConnect.restartTorBrowser", - "Restart Tor Browser" - ), - - torConfigure: getStringNet( - "torConnect.configureConnection", - "Configure Connection…" - ), + torConnectedConcise: "Connected", - viewLog: getStringNet("torConnect.viewLog", "View logs…"), - - torConnectButton: getStringNet("torSettings.connect", "Connect"), - - cancel: getStringCommon("Cancel", "Cancel"), - - torConnected: getStringLauncher( - "torlauncher.bootstrapStatus.done", - "Connected to the Tor network" - ), - - torConnectedConcise: getStringLauncher( - "torConnect.connectedConcise", - "Connected" - ), - - tryAgain: getStringNet("torConnect.tryAgain", "Try Again"), + tryAgain: "Try Again", // tor connect strings for message box in about:preferences#connection - connectMessage: getStringNet( - "torConnect.connectMessage", - "Changes to Tor Settings will not take effect until you connect" - ), - tryAgainMessage: getStringNet( - "torConnect.tryAgainMessage", - "Tor Browser has failed to establish a connection to the Tor Network" - ), + connectMessage: + "Changes to Tor Settings will not take effect until you connect", + tryAgainMessage: + "Tor Browser has failed to establish a connection to the Tor Network", + yourLocation: "Your Location", - yourLocation: getStringNet("torConnect.yourLocation", "Your Location"), + tryBridge: "Try a Bridge", - tryBridge: getStringNet("torConnect.tryBridge", "Try a Bridge"), - - automatic: getStringNet("torConnect.automatic", "Automatic"), - selectCountryRegion: getStringNet( - "torConnect.selectCountryRegion", - "Select Country or Region" - ), - frequentLocations: getStringNet( - "torConnect.frequentLocations", - "Frequently selected locations" - ), - otherLocations: getStringNet( - "torConnect.otherLocations", - "Other locations" - ), + automatic: "Automatic", + selectCountryRegion: "Select Country or Region", + frequentLocations: "Frequently selected locations", + otherLocations: "Other locations", // TorConnect.jsm error messages - offline: getStringNet("torConnect.offline", "Internet not reachable"), - autoBootstrappingFailed: getStringNet( - "torConnect.autoBootstrappingFailed", - "Automatic configuration failed" - ), - autoBootstrappingAllFailed: getStringNet( - "torConnect.autoBootstrappingFailed", - "None of the configurations we tried worked" - ), - cannotDetermineCountry: getStringNet( - "torConnect.cannotDetermineCountry", - "Unable to determine user country" - ), - noSettingsForCountry: getStringNet( - "torConnect.noSettingsForCountry", - "No settings available for your location" - ), + offline: "Internet not reachable", + autoBootstrappingFailed: "Automatic configuration failed", + autoBootstrappingAllFailed: "None of the configurations we tried worked", + cannotDetermineCountry: "Unable to determine user country", + noSettingsForCountry: "No settings available for your location", }; + + const tsb = new TorPropertyStringBundle( + "chrome://torbutton/locale/torConnect.properties", + "torConnect." + ); + return tsb.getStrings(strings); }, /* @@ -819,116 +496,81 @@ const Loader = { OnionLocation */ onionLocation() { + const strings = { + alwaysPrioritize: "Always Prioritize Onionsites", + alwaysPrioritizeAccessKey: "a", + notNow: "Not Now", + notNowAccessKey: "n", + description: + "Website publishers can protect users by adding a security layer. This prevents eavesdroppers from knowing that you are the one visiting that website.", + tryThis: "Try this: Onionsite", + onionAvailable: "Onionsite available", + learnMore: "Learn more", + always: "Always", + askEverytime: "Ask you every time", + prioritizeOnionsDescription: + "Prioritize onionsites when they are available.", + onionServicesTitle: "Onion Services", + }; + const tsb = new TorPropertyStringBundle( - ["chrome://torbutton/locale/torbutton.properties"], + ["chrome://torbutton/locale/onionLocation.properties"], "onionLocation." ); - const getString = tsb.getString.bind(tsb); - - const retval = { - alwaysPrioritize: getString( - "alwaysPrioritize", - "Always Prioritize Onionsites" - ), - alwaysPrioritizeAccessKey: getString("alwaysPrioritizeAccessKey", "a"), - notNow: getString("notNow", "Not Now"), - notNowAccessKey: getString("notNowAccessKey", "n"), - description: getString( - "description", - "Website publishers can protect users by adding a security layer. This prevents eavesdroppers from knowing that you are the one visiting that website." - ), - tryThis: getString("tryThis", "Try this: Onionsite"), - onionAvailable: getString("onionAvailable", "Onionsite available"), - learnMore: getString("learnMore", "Learn more"), + return { + ...tsb.getStrings(strings), learnMoreURL: "about:manual#onion-services", // XUL popups cannot open about: URLs, but we are online when showing the notification, so just use the online version learnMoreURLNotification: `https://tb-manual.torproject.org/${getLocale()}/onion-services/`, - always: getString("always", "Always"), - askEverytime: getString("askEverytime", "Ask you every time"), - prioritizeOnionsDescription: getString( - "prioritizeOnionsDescription", - "Prioritize onionsites when they are available." - ), - onionServicesTitle: getString("onionServicesTitle", "Onion Services"), }; - - return retval; } /* OnionLocation */, /* Rulesets */ rulesets() { - const tsb = new TorPropertyStringBundle( - ["chrome://torbutton/locale/torbutton.properties"], - "rulesets." - ); - const getString = tsb.getString.bind(tsb); - - const retval = { + const strings = { // Initial warning - warningTitle: getString("warningTitle", "Proceed with Caution"), - warningDescription: getString( - "warningDescription", - "Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing." - ), - warningEnable: getString( - "warningEnable", - "Warn me when I attempt to access these preferences" - ), - warningButton: getString("warningButton", "Accept the Risk and Continue"), + warningTitle: "Proceed with Caution", + warningDescription: + "Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing.", + warningEnable: "Warn me when I attempt to access these preferences", + warningButton: "Accept the Risk and Continue", // Ruleset list - rulesets: getString("rulesets", "Rulesets"), - noRulesets: getString("noRulesets", "No rulesets found"), - noRulesetsDescr: getString( - "noRulesetsDescr", - "When you save a ruleset in Tor Browser, it will show up here." - ), - lastUpdated: getString("lastUpdated", "Last updated %S"), - neverUpdated: getString( - "neverUpdated", - "Never updated, or last update failed" - ), - enabled: getString("enabled", "Enabled"), - disabled: getString("disabled", "Disabled"), + rulesets: "Rulesets", + noRulesets: "No rulesets found", + noRulesetsDescr: + "When you save a ruleset in Tor Browser, it will show up here.", + lastUpdated: "Last updated %S", + neverUpdated: "Never updated, or last update failed", + enabled: "Enabled", + disabled: "Disabled", // Ruleset details - edit: getString("edit", "Edit"), - name: getString("name", "Name"), - jwk: getString("jwk", "JWK"), - pathPrefix: getString("pathPrefix", "Path Prefix"), - scope: getString("scope", "Scope"), - enable: getString("enable", "Enable this ruleset"), - checkUpdates: getString("checkUpdates", "Check for Updates"), + edit: "Edit", + name: "Name", + jwk: "JWK", + pathPrefix: "Path Prefix", + scope: "Scope", + enable: "Enable this ruleset", + checkUpdates: "Check for Updates", // Add ruleset - jwkPlaceholder: getString( - "jwkPlaceholder", - "The key used to sign this ruleset in the JWK (JSON Web Key) format" - ), - jwkInvalid: getString( - "jwkInvalid", - "The JWK could not be parsed, or it is not a valid key" - ), - pathPrefixPlaceholder: getString( - "pathPrefixPlaceholder", - "URL prefix that contains the files needed by the ruleset" - ), - pathPrefixInvalid: getString( - "pathPrefixInvalid", - "The path prefix is not a valid HTTP(S) URL" - ), - scopePlaceholder: getString( - "scopePlaceholder", - "Regular expression for the scope of the rules" - ), - scopeInvalid: getString( - "scopeInvalid", - "The scope could not be parsed as a regular expression" - ), - save: getString("save", "Save"), - cancel: getString("cancel", "Cancel"), + jwkPlaceholder: + "The key used to sign this ruleset in the JWK (JSON Web Key) format", + jwkInvalid: "The JWK could not be parsed, or it is not a valid key", + pathPrefixPlaceholder: + "URL prefix that contains the files needed by the ruleset", + pathPrefixInvalid: "The path prefix is not a valid HTTP(S) URL", + scopePlaceholder: "Regular expression for the scope of the rules", + scopeInvalid: "The scope could not be parsed as a regular expression", + save: "Save", + cancel: "Cancel", }; - return retval; + const tsb = new TorPropertyStringBundle( + ["chrome://torbutton/locale/rulesets.properties"], + "rulesets." + ); + return tsb.getStrings(strings); } /* Rulesets */, }; ===================================== toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd ===================================== @@ -1,3 +1,8 @@ + + <!ENTITY project.start "&brandShortName; is developed by ">  <!ENTITY project.tpoLink "the &vendorShortName;"> ===================================== toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd ===================================== @@ -1,3 +1,8 @@ + + <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> <!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> <!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> ===================================== toolkit/torbutton/chrome/locale/en-US/aboutTor.dtd ===================================== @@ -1,8 +1,7 @@ - + <!ENTITY aboutTor.title "About Tor"> ===================================== toolkit/torbutton/chrome/locale/en-US/brand.dtd ===================================== @@ -1,19 +1,9 @@ - -<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> - -<!ENTITY brandProductName "Tor Browser"> - -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> + +<!ENTITY vendorShortName "Tor Project"> ===================================== toolkit/torbutton/chrome/locale/en-US/brand.properties ===================================== @@ -1,3 +1,4 @@ +# Copyright (c) 2022, The Tor Project, Inc. # 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/. @@ -5,16 +6,3 @@ brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser -# LOCALIZATION NOTE(brandProductName): -# This brand name can be used in messages where the product name needs to -# remain unchanged across different versions (Nightly, Beta, etc.). -brandProductName=Tor Browser -vendorShortName=Tor Project - -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S - -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: - -syncBrandShortName=Sync ===================================== toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties ===================================== @@ -1,6 +1,7 @@ # Copyright (c) 2019, The Tor Project, Inc. -# See LICENSE for licensing information. -# vim: set sw=2 sts=2 ts=8 et: +# 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/. onboarding.tour-tor-welcome=Welcome onboarding.tour-tor-welcome.title=You’re ready. ===================================== toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties ===================================== @@ -0,0 +1,14 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# 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/. + +# LOCALIZATION NOTE: %S will be replaced with the cryptocurrency address.. +cryptoSafetyPrompt.cryptoWarning=A cryptocurrency address (%S) has been copied from an insecure website. It could have been modified. +cryptoSafetyPrompt.whatCanHeading=What can you do about it? +cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to establish a secure connection, or accept the risk and dismiss this warning. +cryptoSafetyPrompt.learnMore=Learn more +cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit +cryptoSafetyPrompt.primaryActionAccessKey=R +cryptoSafetyPrompt.secondaryAction=Dismiss Warning +cryptoSafetyPrompt.secondaryActionAccessKey=B ===================================== toolkit/torbutton/chrome/locale/en-US/network-settings.dtd deleted ===================================== @@ -1,179 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> - - -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> - - - -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> - -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username "Username"> -<!ENTITY torsettings.useProxy.password "Password"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a Built-In Bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> - -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> - - -<!ENTITY torPreferences.categoryTitle "Connection"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > -<!ENTITY torPreferences.learnMore "Learn more"> - -<!ENTITY torPreferences.statusInternetLabel "Internet:"> -<!ENTITY torPreferences.statusInternetTest "Test"> -<!ENTITY torPreferences.statusInternetOnline "Online"> -<!ENTITY torPreferences.statusInternetOffline "Offline"> -<!ENTITY torPreferences.statusTorLabel "Tor Network:"> -<!ENTITY torPreferences.statusTorConnected "Connected"> -<!ENTITY torPreferences.statusTorNotConnected "Not Connected"> -<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked"> -<!ENTITY torPreferences.learnMore "Learn more"> - -<!ENTITY torPreferences.quickstart "Quickstart"> -<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings."> -<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically"> - -<!ENTITY torPreferences.bridges "Bridges"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.bridgeLocation "Your location"> -<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic"> -<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations"> -<!ENTITY torPreferences.bridgeLocationOther "Other locations"> -<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…"> -<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges"> -<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can save one or more bridges, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed."> -<!ENTITY torPreferences.bridgeId "#1 bridge: #2">  -<!ENTITY torPreferences.remove "Remove"> -<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges"> -<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:"> -<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address"> -<!ENTITY torPreferences.copied "Copied!"> -<!ENTITY torPreferences.bridgeShowAll "Show All Bridges"> -<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges"> -<!ENTITY torPreferences.bridgeAdd "Add a New Bridge"> -<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges"> -<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…"> -<!ENTITY torPreferences.bridgeRequest "Request a Bridge…"> -<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know"> -<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…"> - -<!ENTITY torPreferences.advanced "Advanced"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet"> -<!ENTITY torPreferences.advancedButton "Settings…"> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs"> -<!ENTITY torPreferences.viewLogs "View Logs…"> - -<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?"> -<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone."> -<!ENTITY torPreferences.cancel "Cancel"> - -<!ENTITY torPreferences.scanQrTitle "Scan the QR code"> - -<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges"> -<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”."> -<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4"> -<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges."> -<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake"> -<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers."> -<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure"> -<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor."> - -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> -<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> - -<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge"> -<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source"> - -<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings"> -<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet"> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values"> - -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> - - -<!ENTITY torConnect.notConnectedConcise "Not Connected"> -<!ENTITY torConnect.connectingConcise "Connecting…"> -<!ENTITY torConnect.tryingAgain "Trying again…"> -<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet"> -<!ENTITY torConnect.noInternetDescription "This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again."> -<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor"> -<!ENTITY torConnect.assistDescriptionConfigure "configure your connection">  -<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead.">  -<!ENTITY torConnect.tryingBridge "Trying a bridge…"> -<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…"> -<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you"> -<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead.">  -<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?"> -<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead.">  -<!ENTITY torConnect.finalError "Tor Browser still cannot connect"> -<!ENTITY torConnect.finalErrorDescription "Despite its best efforts, connection assist was not able to connect to Tor. Try troubleshooting your connection and adding a bridge manually instead."> -<!ENTITY torConnect.breadcrumbAssist "Connection assist"> -<!ENTITY torConnect.breadcrumbLocation "Location settings"> -<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge"> -<!ENTITY torConnect.automatic "Automatic"> -<!ENTITY torConnect.selectCountryRegion "Select Country or Region"> -<!ENTITY torConnect.frequentLocations "Frequently selected locations"> -<!ENTITY torConnect.otherLocations "Other locations"> -<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser"> -<!ENTITY torConnect.configureConnection "Configure Connection…"> -<!ENTITY torConnect.viewLog "View logs…"> -<!ENTITY torConnect.tryAgain "Try Again"> -<!ENTITY torConnect.offline "Internet not reachable"> -<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect"> -<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> -<!ENTITY torConnect.yourLocation "Your Location"> -<!ENTITY torConnect.tryBridge "Try a Bridge"> -<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed"> -<!ENTITY torConnect.autoBootstrappingFailed "None of the configurations we tried worked"> -<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country"> -<!ENTITY torConnect.noSettingsForCountry "No settings available for your location"> ===================================== toolkit/torbutton/chrome/locale/en-US/onionLocation.properties ===================================== @@ -0,0 +1,18 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# 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/. + +# Onion-Location strings. +onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritizeAccessKey=a +onionLocation.notNow=Not Now +onionLocation.notNowAccessKey=n +onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +onionLocation.tryThis=Try Onion Services +onionLocation.onionAvailable=.onion available +onionLocation.learnMore=Learn more… +onionLocation.always=Always +onionLocation.askEverytime=Ask every time +onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.onionServicesTitle=Onion Services ===================================== toolkit/torbutton/chrome/locale/en-US/rulesets.properties ===================================== @@ -0,0 +1,35 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# 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/. + +# about:rulesets strings. +rulesets.warningTitle=Proceed with Caution +rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing. +rulesets.warningEnable=Warn me when I attempt to access these preferences +rulesets.warningButton=Accept the Risk and Continue +# Ruleset list +rulesets.rulesets=Rulesets +rulesets.noRulesets=No rulesets found +rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here. +# LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component) +rulesets.lastUpdated=Last updated %S +rulesets.neverUpdated=Never updated, or last update failed +rulesets.enabled=Enabled +rulesets.disabled=Disabled +# Ruleset details/edit ruleset +rulesets.edit=Edit +rulesets.name=Name +rulesets.jwk=JWK +rulesets.pathPrefix=Path Prefix +rulesets.scope=Scope +rulesets.enable=Enable this ruleset +rulesets.checkUpdates=Check for Updates +rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format +rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key +rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset +rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL +rulesets.scopePlaceholder=Regular expression for the scope of the rules +rulesets.scopeInvalid=The scope could not be parsed as a regular expression +rulesets.save=Save +rulesets.cancel=Cancel ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -0,0 +1,114 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# 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/. + +settings.categoryTitle=Connection + +# Message box +settings.torPreferencesDescription=Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. + +# Status +settings.statusInternetLabel=Internet: +settings.statusInternetTest=Test +settings.statusInternetOnline=Online +settings.statusInternetOffline=Offline +settings.statusTorLabel=Tor Network: +settings.statusTorConnected=Connected +settings.statusTorNotConnected=Not Connected +settings.statusTorBlocked=Potentially Blocked +settings.learnMore=Learn more + +# Quickstart +settings.quickstartHeading=Quickstart +settings.quickstartDescription=Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings. +settings.quickstartCheckbox=Always connect automatically + +# Bridge settings +settings.bridgesHeading=Bridges +settings.bridgesDescription=Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another. +settings.bridgeLocation=Your location +settings.bridgeLocationAutomatic=Automatic +settings.bridgeLocationFrequent=Frequently selected locations +settings.bridgeLocationOther=Other locations +settings.bridgeChooseForMe=Choose a Bridge For Me… +settings.bridgeCurrent=Your Current Bridges +settings.bridgeCurrentDescription=You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed. + +# Translation note: %1$S = bridge type; %2$S = bridge emoji id +settings.bridgeId=%1$S bridge: %2$S +settings.remove=Remove +settings.bridgeDisableBuiltIn=Disable built-in bridges +settings.bridgeShare=Share this bridge using the QR code or by copying its address: +settings.bridgeCopy=Copy Bridge Address +settings.copied=Copied! +settings.bridgeShowAll=Show All Bridges +settings.bridgeRemoveAll=Remove All Bridges +settings.bridgeAdd=Add a New Bridge +settings.bridgeSelectBrowserBuiltin=Choose from one of Tor Browser’s built-in bridges +settings.bridgeSelectBuiltin=Select a Built-In Bridge… +settings.bridgeRequestFromTorProject=Request a bridge from torproject.org +settings.bridgeRequest=Request a Bridge… +settings.bridgeEnterKnown=Enter a bridge address you already know +settings.bridgeAddManually=Add a Bridge Manually… + +# Advanced settings +settings.advancedHeading=Advanced +settings.advancedLabel=Configure how Tor Browser connects to the internet +settings.advancedButton=Settings… +settings.showTorDaemonLogs=View the Tor logs +settings.showLogs=View Logs… + +# Remove all bridges dialog +settings.removeBridgesQuestion=Remove all the bridges? +settings.removeBridgesWarning=This action cannot be undone. +settings.cancel=Cancel + +# Scan bridge QR dialog +settings.scanQrTitle=Scan the QR code + +# Builtin bridges dialog +settings.builtinBridgeTitle=Built-In Bridges +settings.builtinBridgeHeader=Select a Built-In Bridge +settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”. +settings.builtinBridgeObfs4=obfs4 +settings.builtinBridgeObfs4Description=obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges. +settings.builtinBridgeSnowflake=Snowflake +settings.builtinBridgeSnowflakeDescription=Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers. +settings.builtinBridgeMeekAzure=meek-azure +settings.builtinBridgeMeekAzureDescription=meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor. + +# Request bridges dialog +settings.requestBridgeDialogTitle=Request Bridge +settings.submitCaptcha=Submit +settings.contactingBridgeDB=Contacting BridgeDB. Please Wait. +settings.solveTheCaptcha=Solve the CAPTCHA to request a bridge. +settings.captchaTextboxPlaceholder=Enter the characters from the image +settings.incorrectCaptcha=The solution is not correct. Please try again. + +# Provide bridge dialog +settings.provideBridgeTitle=Provide Bridge +settings.provideBridgeHeader=Enter bridge information from a trusted source +settings.provideBridgePlaceholder=type address:port (one per line) + +# Connection settings dialog +settings.connectionSettingsDialogTitle=Connection Settings +settings.connectionSettingsDialogHeader=Configure how Tor Browser connects to the Internet +settings.useLocalProxy=I use a proxy to connect to the Internet +settings.proxyType=Proxy Type +settings.proxyTypeSOCKS4=SOCKS4 +settings.proxyTypeSOCKS5=SOCKS5 +settings.proxyTypeHTTP=HTTP/HTTPS +settings.proxyAddress=Address +settings.proxyAddressPlaceholder=IP address or hostname +settings.proxyPort=Port +settings.proxyUsername=Username +settings.proxyPassword=Password +settings.proxyUsernamePasswordPlaceholder=Optional +settings.useFirewall=This computer goes through a firewall that only allows connections to certain ports +settings.allowedPorts=Allowed Ports +settings.allowedPortsPlaceholder=Comma-seperated values + +# Log dialog +settings.torLogDialogTitle=Tor Logs +settings.copyLog=Copy Tor Log to Clipboard ===================================== toolkit/torbutton/chrome/locale/en-US/torConnect.properties ===================================== @@ -0,0 +1,52 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# 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/. + +torConnect.torConnect=Connect to Tor +torConnect.torConnecting=Establishing a Connection +torConnect.torNotConnectedConcise=Not Connected +torConnect.torConnectingConcise=Connecting… +torConnect.tryingAgain=Trying again… +torConnect.noInternet=Tor Browser couldn’t reach the Internet +torConnect.noInternetDescription=This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again. +torConnect.torBootstrapFailed=Tor failed to establish a Tor network connection. +torConnect.couldNotConnect=Tor Browser could not connect to Tor +# Translation note: used as a text to insert as a link on several strings (%S) +torConnect.configureConnection=configure your connection +# Translation note: %S = "configure your connection" link +torConnect.assistDescription=If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can %S manually instead. +torConnect.tryingBridge=Trying a bridge… +torConnect.tryingBridgeAgain=Trying one more time… +torConnect.errorLocation=Tor Browser couldn’t locate you +# Translation note: %S = "configure your connection" link +torConnect.errorLocationDescription=Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, %S manually instead. +torConnect.isLocationCorrect=Are these location settings correct? +# Translation note: %S = "configure your connection" link +torConnect.isLocationCorrectDescription=Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or %S instead. +torConnect.finalError=Tor Browser still cannot connect +torConnect.finalErrorDescription=Despite its best efforts, connection assist was not able to connect to Tor. Try troubleshooting your connection and adding a bridge manually instead. +torConnect.breadcrumbAssist=Connection assist +torConnect.breadcrumbLocation=Location settings +torConnect.breadcrumbTryBridge=Try a bridge +torConnect.restartTorBrowser=Restart Tor Browser +torConnect.torConfigure=Configure Connection… +torConnect.viewLog=View logs… +torConnect.torConnectButton=Connect +torConnect.cancel=Cancel +torConnect.torConnected=Connected to the Tor network! +torConnect.torConnectedConcise=Connected +torConnect.tryAgain=Try Again +torConnect.connectMessage=Changes to Tor Settings will not take effect until you connect +torConnect.tryAgainMessage=Tor Browser has failed to establish a connection to the Tor Network +torConnect.yourLocation=Your Location +torConnect.tryBridge=Try a Bridge +torConnect.automatic=Automatic +torConnect.selectCountryRegion=Select Country or Region +torConnect.frequentLocations=Frequently selected locations +torConnect.otherLocations=Other locations +torConnect.offline=Internet not reachable +torConnect.autoBootstrappingFailed=Automatic configuration failed +torConnect.autoBootstrappingAllFailed=None of the configurations we tried worked +torConnect.cannotDetermineCountry=Unable to determine user country +torConnect.noSettingsForCountry=No settings available for your location ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.dtd ===================================== @@ -1,28 +1,20 @@ -<!ENTITY torbutton.context_menu.new_identity "New Identity"> -<!ENTITY torbutton.context_menu.new_identity_sentence_case "New identity"> -<!ENTITY torbutton.context_menu.new_identity_key "I"> + + <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> <!ENTITY torbutton.context_menu.new_circuit_sentence_case "New Tor circuit for this site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> -<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> + +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> + + +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> + <!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> -<!ENTITY torbutton.cookiedialog.nameCol "Name"> -<!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.sec_caption "Security Level"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> <!ENTITY torbutton.prefs.sec_standard_label "Standard"> @@ -48,9 +40,3 @@ <!ENTITY torbutton.prefs.sec_restore_defaults "Restore Defaults"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> <!ENTITY torbutton.prefs.sec_change "Change…"> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> - - -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.properties ===================================== @@ -1,6 +1,9 @@ -torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.onion_site = Onion site +# Copyright (c) 2022, The Tor Project, Inc. +# 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/. + +# Circuit display torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge @@ -10,8 +13,8 @@ torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = Learn more torbutton.circuit_display.click_to_copy = Click to Copy torbutton.circuit_display.copied = Copied! -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. -extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. + +# External app blocker torbutton.popup.external.title = Download an external file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n @@ -19,47 +22,37 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f torbutton.popup.launch = Download file torbutton.popup.cancel = Cancel torbutton.popup.dontask = Automatically download files from now on -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.security_settings.menu.title = Security Settings -torbutton.title.prompt_torbrowser = Important Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. -torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. - -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. - -# Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now -canvas.notNowAccessKey=N -canvas.allow=Allow in the future -canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) -canvas.neverAccessKey=e - -# Profile/startup error messages. Strings are kept here for ease of translation. -# LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. - -# "Downloading update" string for the hamburger menu (see #28885). -# This string is kept here for ease of translation. -# LOCALIZATION NOTE: %S is the application name. -updateDownloadingPanelUILabel=Downloading %S update - -# .Onion Page Info prompt. Strings are kept here for ease of translation. +# .Onion Page Info prompt. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Connection Encrypted (Onion Service) -pageInfo_OnionName=Onion Name: -# Onion services strings. Strings are kept here for ease of translation.. +# Shared between Onion Auth prompt and preferences onionServices.learnMore=Learn more + +# Onion Services Authentication prompt +# LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.done=Done +onionServices.authPrompt.doneAccessKey=d +onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) +onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key + +# Onion Services Authentication preferences +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Key +onionServices.authPreferences.remove=Remove +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key + +# Onion services error strings. onionServices.errorPage.browser=Browser onionServices.errorPage.network=Network onionServices.errorPage.onionSite=Onionsite @@ -105,83 +98,23 @@ onionServices.introTimedOut.pageTitle=Problem Loading Onionsite onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. -# -# LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service -onionServices.authPrompt.done=Done -onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite -onionServices.authPreferences.onionKey=Key -onionServices.authPreferences.remove=Remove -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key -onionServices.v2Deprecated.pageTitle=V2 Onion Site Deprecation Warning -onionServices.v2Deprecated.header=Version 2 Onion Sites will be deprecated soon -onionServices.v2Deprecated=This onion site will not be reachable soon. Please contact the site administrator and encourage them to upgrade. -onionServices.v2Deprecated.longDescription=Tor is ending its support for version 2 onion services beginning in July 2021, and this onion site will no longer be reachable at this address. If you are the site administrator, upgrade to a version 3 onion service soon. -onionServices.v2Deprecated.tryAgain=Got it -onionServices.v2Deprecated.tooltip=This onion site will not be reachable soon -# Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions -onionLocation.alwaysPrioritizeAccessKey=a -onionLocation.notNow=Not Now -onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. -onionLocation.onionServicesTitle=Onion Services +# Profile/startup error messages. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S Profile Problem +profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. +profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. +profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. + +# New identity warning +torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? + + +## Legacy -# LOCALIZATION NOTE: %S will be replaced with the cryptocurrency address.. -cryptoSafetyPrompt.cryptoWarning=A cryptocurrency address (%S) has been copied from an insecure website. It could have been modified. -cryptoSafetyPrompt.whatCanHeading=What can you do about it? -cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to establish a secure connection, or accept the risk and dismiss this warning. -cryptoSafetyPrompt.learnMore=Learn more -cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit -cryptoSafetyPrompt.primaryActionAccessKey=R -cryptoSafetyPrompt.secondaryAction=Dismiss Warning -cryptoSafetyPrompt.secondaryActionAccessKey=B +# Preferences for mobile: these strings are still referenced, but we should +# check whether this feature is still used +torbutton.security_settings.menu.title = Security Settings -# about:rulesets strings. -rulesets.warningTitle=Proceed with Caution -rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing. -rulesets.warningEnable=Warn me when I attempt to access these preferences -rulesets.warningButton=Accept the Risk and Continue -# Ruleset list -rulesets.rulesets=Rulesets -rulesets.noRulesets=No rulesets found -rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here. -# LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component) -rulesets.lastUpdated=Last updated %S -rulesets.neverUpdated=Never updated, or last update failed -rulesets.enabled=Enabled -rulesets.disabled=Disabled -# Ruleset details/edit ruleset -rulesets.edit=Edit -rulesets.name=Name -rulesets.jwk=JWK -rulesets.pathPrefix=Path Prefix -rulesets.scope=Scope -rulesets.enable=Enable this ruleset -rulesets.checkUpdates=Check for Updates -rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format -rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key -rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset -rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL -rulesets.scopePlaceholder=Regular expression for the scope of the rules -rulesets.scopeInvalid=The scope could not be parsed as a regular expression -rulesets.save=Save -rulesets.cancel=Cancel \ No newline at end of file +# Other legacy stuff we might just remove since we are using letterbox +torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. ===================================== toolkit/torbutton/chrome/locale/en-US/torlauncher.properties ===================================== @@ -1,14 +1,15 @@ -### Copyright (c) 2020, The Tor Project, Inc. -### See LICENSE for licensing information. +# Copyright (c) 2022, The Tor Project, Inc. +# 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/. torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, Tor Browser will not be able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.restart_tor=Restart Tor torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). @@ -19,40 +20,6 @@ torlauncher.datadir_missing=The Tor data directory does not exist and could not torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges.. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) - -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. - -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - torlauncher.bootstrapStatus.starting=Starting torlauncher.bootstrapStatus.conn_pt=Connecting to bridge torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge @@ -93,5 +60,3 @@ torlauncher.bootstrapWarning.pt_missing=missing pluggable transport torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. - -torlauncher.copiedNLogMessagesShort=Copied %S Logs View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3844f0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3844f0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 12 Dec '22

12 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 3844f07c by Poncho at 2022-12-12T20:13:26+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41519: honor the TOR_SOCKS_IPC_PATH variable Add back FileUtils which was accidentaly removed in 004b629b Fixes: "ReferenceError: FileUtils is not defined startup-observer.js:121" - - - - - 1 changed file: - toolkit/torbutton/components/startup-observer.js Changes: ===================================== toolkit/torbutton/components/startup-observer.js ===================================== @@ -26,6 +26,7 @@ const { TorProtocolService } = ChromeUtils.import( XPCOMUtils.defineLazyModuleGetters(this, { ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", + FileUtils: "resource://gre/modules/FileUtils.jsm", }); // Module specific constants View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3844f07… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3844f07… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.6.0esr-12.0-1-build1
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.6.0esr-12.0-1-build1
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

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

1 0

[Git][tpo/applications/tor-browser][base-browser-102.6.0esr-12.0-1] 60 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed to branch base-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: a9a347c6 by Pier Angelo Vendrame at 2022-12-09T12:46:57+01:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - 8e214a62 by Pier Angelo Vendrame at 2022-12-09T12:46:57+01:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - 490a43f2 by Jamie Nicol at 2022-12-09T12:46:58+01:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 61a55f43 by Pier Angelo Vendrame at 2022-12-09T12:46:58+01:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 3e073dda by Neill Miller at 2022-12-09T12:46:59+01:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - cfaaf97a by Gabriele Svelto at 2022-12-09T12:46:59+01:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - aedce60f by Gabriele Svelto at 2022-12-09T12:47:00+01:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - d1b2d56b by Gabriele Svelto at 2022-12-09T12:47:00+01:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - e8dd566c by Gabriele Svelto at 2022-12-09T12:47:01+01:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 5abe5207 by Georg Koppen at 2022-12-09T12:47:01+01:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - dba28f2f by Richard Pospesel at 2022-12-09T12:47:02+01:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - a8fc0774 by Henry Wilkes at 2022-12-09T12:47:02+01:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 9fdb1fb1 by Pier Angelo Vendrame at 2022-12-09T12:47:03+01: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. - - - - - bc6864d5 by Pier Angelo Vendrame at 2022-12-09T12:47:03+01:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 99d96677 by Dan Ballard at 2022-12-09T12:47:04+01:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restpre email link on mac - - - - - bdc67678 by Gaba at 2022-12-09T12:47:04+01:00 Adding issue template for bugs. - - - - - bdf5e0ee by Pier Angelo Vendrame at 2022-12-09T12:47:05+01:00 Base Browser's .mozconfigs. - - - - - 1c547bae by Pier Angelo Vendrame at 2022-12-09T12:47:05+01:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 5af007ef by Dan Ballard at 2022-12-09T12:47:06+01:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - ba175aeb by Matthew Finkel at 2022-12-09T12:47:06+01:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 42b18efc by Matthew Finkel at 2022-12-09T12:47:06+01:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 301dd582 by Matthew Finkel at 2022-12-09T12:47:07+01:00 Bug 28125: Prevent non-Necko network connections - - - - - cb7c318d by Mike Perry at 2022-12-09T12:47:07+01:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 2096a7c2 by Alex Catarineu at 2022-12-09T12:47:08+01:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - fc0e1f62 by Georg Koppen at 2022-12-09T12:47:08+01:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 3acb261c by Kathy Brade at 2022-12-09T12:47:09+01:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 33869162 by Kathy Brade at 2022-12-09T12:47:09+01:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 656bb482 by Alex Catarineu at 2022-12-09T12:47:10+01:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 21bd3448 by Kathy Brade at 2022-12-09T12:47:10+01:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. - - - - - 1a66a537 by Arthur Edelstein at 2022-12-09T12:47:11+01:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 7a45a690 by Alex Catarineu at 2022-12-09T12:47:11+01:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - c97b6977 by Georg Koppen at 2022-12-09T12:47:12+01:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 681466cd by Alex Catarineu at 2022-12-09T12:47:12+01:00 Bug 28369: Stop shipping pingsender executable - - - - - 771dd9df by Alex Catarineu at 2022-12-09T12:47:12+01:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - d03ee771 by Mike Perry at 2022-12-09T12:47:13+01:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - baa5d166 by Pier Angelo Vendrame at 2022-12-09T12:47:13+01:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - e57cc939 by Alex Catarineu at 2022-12-09T12:47:14+01:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 7a9c7653 by Alex Catarineu at 2022-12-09T12:47:14+01:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - add753b6 by Alex Catarineu at 2022-12-09T12:47:15+01:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 52611f3d by Alex Catarineu at 2022-12-09T12:47:15+01:00 Bug 26345: Hide tracking protection UI - - - - - 0d9069de by Kathy Brade at 2022-12-09T12:47:16+01:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - 32988ddc by Kathy Brade at 2022-12-09T12:47:16+01:00 Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1769028 - - - - - c9fb214b by Alex Catarineu at 2022-12-09T12:47:17+01:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 45c7a08f by Mike Perry at 2022-12-09T12:47:17+01:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 6b3ee7fd by Kathy Brade at 2022-12-09T12:47:18+01:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 33277907 by Igor Oliveira at 2022-12-09T12:47:18+01:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - 1c1a67ef by Pier Angelo Vendrame at 2022-12-09T12:47:18+01:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 135eb036 by Matthew Finkel at 2022-12-09T12:47:19+01:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - ab6f6e86 by hackademix at 2022-12-09T12:47:19+01:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 906f8dca by hackademix at 2022-12-09T12:47:20+01:00 Bug 41434: Letterboxing, improve logging. - - - - - 6606bb8e by hackademix at 2022-12-09T12:47:20+01:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - f3cbba4e by hackademix at 2022-12-09T12:47:21+01:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 8affcce7 by Richard Pospesel at 2022-12-09T12:47:21+01:00 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and outline are tied to the currently selected theme. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1594455 - - - - - 088bb96b by Alex Catarineu at 2022-12-09T12:47:22+01:00 Bug 40069: Add helpers for message passing with extensions - - - - - fb5b5683 by Matthew Finkel at 2022-12-09T12:47:22+01:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 0bf39c39 by Pier Angelo Vendrame at 2022-12-09T12:47:23+01:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 72248ce8 by Henry Wilkes at 2022-12-09T12:47:23+01:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - 7d7c220f by Pier Angelo Vendrame at 2022-12-09T12:47:24+01:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - bfe4c248 by Pier Angelo Vendrame at 2022-12-09T12:47:24+01:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - bc629c0c by Pier Angelo Vendrame at 2022-12-09T12:47:25+01:00 Bug 40926: Implemented the New Identity feature - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/jar.mn - + browser/branding/alpha/document_pdf.ico - browser/components/BrowserGlue.jsm - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/aboutlogins/AboutLoginsParent.jsm - browser/components/aboutlogins/content/aboutLogins.css - browser/components/aboutlogins/content/aboutLogins.js - browser/components/aboutlogins/content/components/fxaccounts-button.css - browser/components/moz.build - + browser/components/newidentity/content/newidentity.js - + browser/components/newidentity/jar.mn - + browser/components/newidentity/locale/en-US/newIdentity.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 91 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

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

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 62a1f93c by Richard Pospesel at 2022-12-09T11:22:21+00:00 Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe - - - - - 1 changed file: - projects/tor/config Changes: ===================================== projects/tor/config ===================================== @@ -15,6 +15,10 @@ targets: git_hash: main tag_gpg_id: 0 + windows: + var: + flag_mwindows: '-Wl,--subsystem,console' + linux-i686: var: libdir: lib32 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4068fc29 by Richard Pospesel at 2022-12-09T11:20:10+00:00 Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe - - - - - 1 changed file: - projects/tor/config Changes: ===================================== projects/tor/config ===================================== @@ -15,6 +15,10 @@ targets: git_hash: main tag_gpg_id: 0 + windows: + var: + flag_mwindows: '-Wl,--subsystem,console' + linux-i686: var: libdir: lib32 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-102.6.0esr-12.0-1
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

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

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] 4 commits: Bug 40689: Update Ubuntu version in projects/mmdebstrap-image to 22.04.1
by boklm (＠boklm) 09 Dec '22

09 Dec '22

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 530ece27 by Nicolas Vigier at 2022-12-09T11:30:15+01:00 Bug 40689: Update Ubuntu version in projects/mmdebstrap-image to 22.04.1 - - - - - 6b48ead1 by Nicolas Vigier at 2022-12-09T11:30:50+01:00 Bug 40693: Patch apt-key to accept expired keys for jessie - - - - - bf8ef3b5 by Nicolas Vigier at 2022-12-09T11:30:55+01:00 Bug 40693: use faketime to run `apt-get update` on jessie - - - - - 4d2e38cd by Pier Angelo Vendrame at 2022-12-09T11:31:31+01:00 Bug 40653: Do not build compiler-rt with Clang Specifying compiler-rt as a project in LLVM is going to be deprecated. It should be compiled with runtimes, instead, or alone, if it will be still allowed. The only platform in which we were compiling compiler-rt with LLVM was Linux. But Firefox seems not to actually use it, and just use GCC's runtime, instead. However, we were also compiling compiler-rt for Android in the same project, which prevents to share the artifact with Windows and macOS. So, I have moved it to another project on its own. - - - - - 9 changed files: - projects/clang/build - projects/clang/config - + projects/compiler-rt/build - + projects/compiler-rt/config - projects/container-image/config - projects/geckoview/build - projects/geckoview/config - + projects/mmdebstrap-image/apt-key-allow-expired-key.patch - projects/mmdebstrap-image/config Changes: ===================================== projects/clang/build ===================================== @@ -3,16 +3,12 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] -export PATH="/var/tmp/dist/cmake/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" [% IF c("var/linux") %] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), hardened_gcc => 0 }) %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] -[% END -%] -[% IF c("var/android") %] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] -[% IF c("var/linux") || c("var/android") -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] @@ -25,57 +21,15 @@ mkdir build cd build # LLVM_ENABLE_ZLIB solves the "contains a compressed section, but zlib is not available" on lld # LLVM_INSTALL_UTILS allows this LLVM to be used to compile Rust -cmake ../llvm -G "Unix Makefiles" \ +cmake ../llvm -GNinja \ -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE=Release \ - [% IF c("var/android") || c("var/macos") -%] - -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ - [% END -%] - [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \ - -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;lld" \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64[% IF c("var/rlbox") -%];WebAssembly[% END %]" \ + -DLLVM_ENABLE_PROJECTS="clang;lld" \ -DLLVM_ENABLE_ZLIB=ON \ -DLLVM_INSTALL_UTILS=ON \ -make -j[% c("num_procs") %] -make install -cd .. - -[% IF c("var/android") -%] - echo "Compiling compiler-rt (Android only)" - rtdistdir=/var/tmp/build/rtdist - mkdir $rtdistdir - - make_compilerrt () { - mkdir "build-compilerrt-$1" - cd "build-compilerrt-$1" - cmake ../compiler-rt/ -G "Unix Makefiles" \ - -DCMAKE_INSTALL_PREFIX=$rtdistdir \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SYSTEM_NAME=Android \ - -DCMAKE_ANDROID_ARCH_ABI=$1 \ - -DCMAKE_ANDROID_NDK="$ANDROID_NDK_HOME" \ - -DCMAKE_C_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ - -DCMAKE_CXX_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ - -DCMAKE_EXE_LINKER_FLAGS="-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/$2" \ - -DCOMPILER_RT_BUILD_BUILTINS=ON \ - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ - -DCOMPILER_RT_BUILD_MEMPROF=OFF \ - -DCOMPILER_RT_BUILD_ORC=OFF \ - -DCOMPILER_RT_BUILD_PROFILE=OFF \ - -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ - -DCOMPILER_RT_BUILD_XRAY=OFF - make -j[% c("num_procs") %] - make install - cd .. - } - - make_compilerrt "armeabi-v7a" "arm-linux-androideabi/lib" "-DARMEABI_V7A" - make_compilerrt "arm64-v8a" "aarch64-linux-android/lib64" - make_compilerrt "x86" "i686-linux-android/lib" - make_compilerrt "x86_64" "x86_64-linux-android/lib64" - - mv $rtdistdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ -[% END -%] +ninja -j[% c("num_procs") %] -v install cd /var/tmp/dist [% c('tar', { ===================================== projects/clang/config ===================================== @@ -11,14 +11,16 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - enable: '[% c("var/linux") || c("var/android") %]' + enable: '[% c("var/linux") %]' - name: binutils project: binutils - enable: '[% c("var/linux") || c("var/android") %]' + enable: '[% c("var/linux") %]' - project: cmake name: cmake - project: llvm-project name: clang-source + - project: ninja + name: ninja - project: python name: python enable: '[% c("var/linux") %]' ===================================== projects/compiler-rt/build ===================================== @@ -0,0 +1,51 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" + +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +export PATH="/var/tmp/dist/binutils/bin:$PATH" + +mkdir -p /var/tmp/build +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +cd clang-source +export LLVM_HOME=$(pwd) +mkdir build +cd build + +installdir=/var/tmp/build/install +mkdir -p $installdir + +cmake ../compiler-rt/ -GNinja \ + -DCMAKE_INSTALL_PREFIX=$installdir \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SYSTEM_NAME=Android \ + -DCMAKE_ANDROID_ARCH_ABI="[% c('var/abi') %]" \ + -DCMAKE_ANDROID_NDK="$ANDROID_NDK_HOME" \ + -DCMAKE_C_FLAGS="-fuse-ld=lld --rtlib=compiler-rt $defines" \ + -DCMAKE_CXX_FLAGS="-fuse-ld=lld --rtlib=compiler-rt $defines" \ + -DCMAKE_EXE_LINKER_FLAGS="-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/[% c('var/libdir') %]" \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ + -DCOMPILER_RT_BUILD_MEMPROF=OFF \ + -DCOMPILER_RT_BUILD_ORC=OFF \ + -DCOMPILER_RT_BUILD_PROFILE=OFF \ + -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ + -DCOMPILER_RT_BUILD_XRAY=OFF + +ninja -j[% c("num_procs") %] -v install + +mkdir -p $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ +mv $installdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/compiler-rt/config ===================================== @@ -0,0 +1,38 @@ +# vim: filetype=yaml sw=2 +version: '[% c("var/llvm_version") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 + +var: + llvm_version: '[% pc("llvm-project", "version") %]' + +targets: + android-armv7: + var: + libdir: 'arm-linux-androideabi/lib' + android-aarch64: + var: + libdir: 'aarch64-linux-android/lib64' + android-x86: + var: + libdir: 'i686-linux-android/lib' + android-x86_64: + var: + libdir: 'x86_64-linux-android/lib64' + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: binutils + project: binutils + - project: cmake + name: cmake + - project: llvm-project + name: clang-source + - project: ninja + name: ninja + - project: python + name: python + enable: '[% c("var/linux") %]' ===================================== projects/container-image/config ===================================== @@ -37,9 +37,14 @@ pre: | [% IF c("var/linux-cross") -%] dpkg --add-architecture [% c("var/arch_debian") %] [% END -%] + [% IF c("var/container/suite") == "jessie" -%] + # We need to use faketime to run `apt-get update` on jessie, because of + # expired key. See tor-browser-build#40693 + dpkg -i ./libfaketime_0.9.6-3_amd64.deb ./faketime_0.9.6-3_amd64.deb + [% END -%] # Update the package cache again because `pre_pkginst` may change the # package manager configuration. - apt-get update -y -q + [% IF c("var/container/suite") == "jessie" %]faketime '2018-12-24 08:15:42' [% END %]apt-get update -y -q [% END -%] apt-get upgrade -y -q [% @@ -82,3 +87,9 @@ input_files: - project: mmdebstrap-image target: - '[% c("var/container/suite") %]-[% c("var/container/arch") %]' + - URL: http://deb.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd64.deb + sha256sum: 19b2a01a2fae7e6d5a8b741fc0bc626451cb4c2cc884ee79f1136dd3c2c26213 + enable: '[% c("var/container/suite") == "jessie" %]' + - URL: http://deb.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_amd64… + sha256sum: 82747d5815b226cfed7f6f9a751bf8c20d457f3ba786add6017d6904dea4fdb4 + enable: '[% c("var/container/suite") == "jessie" %]' ===================================== projects/geckoview/build ===================================== @@ -21,6 +21,8 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/compiler-rt') %] +cp -r /var/tmp/dist/compiler-rt/* /var/tmp/dist/clang/ tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH" ===================================== projects/geckoview/config ===================================== @@ -171,6 +171,8 @@ input_files: name: nasm - project: clang name: clang + - project: 'compiler-rt' + name: 'compiler-rt' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/mmdebstrap-image/apt-key-allow-expired-key.patch ===================================== @@ -0,0 +1,23 @@ +--- o/apt-key 2022-11-30 14:57:12.742026261 +0000 ++++ n/apt-key 2022-12-01 08:38:08.170140893 +0000 +@@ -815,11 +815,18 @@ + create_gpg_home + fi + setup_merged_keyring ++ tmpfile=$(mktemp) ++ set +e + if [ -n "$FORCED_KEYRING" ]; then +- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@" ++ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@") + else +- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@" ++ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@") + fi ++ err=$? ++ set -e ++ cat "$tmpfile" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' >&${GPGSTATUSFD} ++ rm -f "$tmpfile" ++ exit $err + ;; + help) + usage ===================================== projects/mmdebstrap-image/config ===================================== @@ -6,7 +6,7 @@ container: use_container: 1 var: - ubuntu_version: 22.04 + ubuntu_version: 22.04.1 pre: | #!/bin/sh @@ -16,6 +16,14 @@ pre: | apt-get update -y -q apt-get install -y -q debian-archive-keyring ubuntu-keyring mmdebstrap gnupg + [% IF c("var/container/suite") == "jessie" -%] + apt-get install -y -q patch + cd /usr/bin + # The gpg key for jessie is expired. We patch apt-key to accept expired keys. + patch -p1 < $rootdir/apt-key-allow-expired-key.patch + cd $rootdir + [% END -%] + export SOURCE_DATE_EPOCH='[% c("timestamp") %]' tar -xf [% c('input_files_by_name/mmdebstrap') %] ./mmdebstrap/mmdebstrap --mode=unshare [% c("var/container/mmdebstrap_opt") %] [% c("var/container/suite") %] output.tar.gz [% c("var/container/debian_mirror") %] @@ -55,4 +63,6 @@ input_files: name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: df6fe77cee11bd216ac532f0ee082bdc4da3c0cc1f1d9cb20f3f743196bc4b07 + sha256sum: e1f9200c99da008a473c9ae7b51e13f5ea05dc4c2e12beb43f0f9cbbbf6216f4 + - filename: apt-key-allow-expired-key.patch + enable: '[% c("var/container/suite") == "jessie" %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40683: Reduce the number of custom containers
by boklm (＠boklm) 09 Dec '22

09 Dec '22

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: b5077a28 by Nicolas Vigier at 2022-12-09T11:27:58+01:00 Bug 40683: Reduce the number of custom containers Install a few more packages in the default containers to reduce the number of custom containers we use. - - - - - 14 changed files: - projects/android-components/config - projects/android-toolchain/config - projects/application-services/config - projects/bison/config - projects/browser/config - projects/fenix/config - projects/gradle/config - projects/libevent/config - projects/rust/config - projects/tor-android-service/config - projects/tor-onion-proxy-library/config - projects/tor/config - projects/wasi-sysroot/config - rbm.conf Changes: ===================================== projects/android-components/config ===================================== @@ -19,8 +19,6 @@ var: gradle_version: 7.0.2 glean_parser: 5.0.1 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' - arch_deps: - - python3-venv targets: nightly: ===================================== projects/android-toolchain/config ===================================== @@ -8,9 +8,6 @@ var: version_30: 30.0.2 version_29: 29.0.2 version_28: 28.0.3 - deps: - - unzip - - python3 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] ===================================== projects/application-services/config ===================================== @@ -13,8 +13,6 @@ var: gradle_dependencies_version: 9 gradle_version: 6.7.1 glean_parser: 4.0.0 - arch_deps: - - python3-venv input_files: - project: container-image ===================================== projects/bison/config ===================================== @@ -3,9 +3,6 @@ version: 3.8.2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 - deps: - - build_essential - - xz-utils input_files: - URL: https://ftp.gnu.org/gnu/bison/bison-[% c("version") %].tar.xz ===================================== projects/browser/config ===================================== @@ -17,12 +17,16 @@ var: - patch targets: - linux-i686: + linux: var: - mar_osname: linux32 arch_deps: - # Install libc6-i386 to be able to run 32bit mar tools (bug 29812) + # Install libc6-i386 to be able to run 32bit mar tools in linux-i686 + # builds (bug 29812). We don't need it in x86_64 builds, but we + # share the container to reduce space used. - libc6-i386 + linux-i686: + var: + mar_osname: linux32 linux-x86_64: var: mar_osname: linux64 ===================================== projects/fenix/config ===================================== @@ -20,8 +20,6 @@ var: gradle_dependencies_version: 37 gradle_version: 7.0.2 glean_parser: 5.0.1 - arch_deps: - - python3-venv targets: release: ===================================== projects/gradle/config ===================================== @@ -5,8 +5,6 @@ container: use_container: 1 var: - deps: - - unzip gradle_sha256sum: 5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d ===================================== projects/libevent/config ===================================== @@ -12,10 +12,6 @@ var: configure_opt_project: --disable-static targets: - macos: - var: - arch_deps: - - faketime windows: var: configure_opt_project: --disable-shared ===================================== projects/rust/config ===================================== @@ -7,23 +7,10 @@ container: targets: android: var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,armv7-linux-androideabi,thumbv7neon-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.armv7-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.thumbv7neon-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=aarch64-linux-android-ar --set=target.i686-linux-android.cc=i686-linux-android16-clang --set=target.i686-linux-android.ar=i686-linux-android-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=x86_64-linux-android-ar linux: var: - deps: - - libc6-dev-i386 - - lib32stdc++6 - - build-essential - - python - - automake - - libssl-dev - - pkg-config - - hardening-wrapper # We use # `--enable-local-rust` to avoid downloading the required compiler during # build time @@ -58,21 +45,17 @@ targets: macos: var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib arch_deps: - - libssl-dev - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib windows: var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev # See tor-browser-build#29320 compiler: mingw-w64 configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --target=x86_64-unknown-linux-gnu,[% c("arch") %]-pc-windows-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib + arch_deps: + - pkg-config input_files: - project: container-image ===================================== projects/tor-android-service/config ===================================== @@ -8,9 +8,6 @@ container: use_container: 1 var: - deps: - - build-essential - - unzip # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4 ===================================== projects/tor-onion-proxy-library/config ===================================== @@ -8,10 +8,6 @@ container: use_container: 1 var: - deps: - - build-essential - - unzip - - zip # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4 ===================================== projects/tor/config ===================================== @@ -9,13 +9,6 @@ tag_gpg_id: 1 container: use_container: 1 -var: - deps: - - build-essential - - automake - - zip - - unzip - targets: nightly: version: '[% c("abbrev") %]' @@ -27,25 +20,15 @@ targets: libdir: lib32 sort_deps: 0 arch_deps: - - libtool - zlib1g-dev:i386 - - hardening-wrapper linux-x86_64: var: libdir: lib64 arch_deps: - - libtool - zlib1g-dev - - hardening-wrapper - macos: - var: - arch_deps: - - faketime android: var: configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc' - arch_deps: - - libtinfo5 input_files: - project: container-image ===================================== projects/wasi-sysroot/config ===================================== @@ -8,12 +8,6 @@ git_submodule: 1 container: use_container: 1 -targets: - linux: - var: - arch_deps: - - patch - input_files: - project: container-image - name: binutils ===================================== rbm.conf ===================================== @@ -337,11 +337,15 @@ targets: - bison - python3 - python3-distutils + - python3-venv - automake - libtool - zip - unzip - libtinfo5 + - libssl-dev + - pkg-config + - zlib1g-dev configure_opt: '--host=[% c("var/cross_prefix") %] CC=[% c("var/CC") %] [% c("var/configure_opt_project") %]' pre_pkginst: | @@ -434,6 +438,8 @@ targets: deps: - libc6-dev-i386 - lib32stdc++6 + - pkg-config + - libssl-dev - build-essential - python - bison @@ -442,6 +448,8 @@ targets: - libtool - zip - unzip + - xz-utils + - patch linux-asan: var: asan: 1 @@ -500,6 +508,8 @@ targets: - libtool - zip - unzip + - libssl-dev + - zlib1g-dev torbrowser-macos: - macos-universal @@ -554,6 +564,7 @@ targets: rlbox: 0 deps: - build-essential + - faketime - python3 - python3-distutils - automake @@ -561,6 +572,8 @@ targets: - libtool - zip - unzip + - libssl-dev + - zlib1g-dev faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # The no_build_id target can be useful if you want to quickly display View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40681: Run `apt-get clean` after installing packages
by boklm (＠boklm) 09 Dec '22

09 Dec '22

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 8fa7b5e1 by Nicolas Vigier at 2022-12-09T11:22:09+01:00 Bug 40681: Run `apt-get clean` after installing packages - - - - - 1 changed file: - projects/container-image/config Changes: ===================================== projects/container-image/config ===================================== @@ -66,6 +66,7 @@ pre: | [% IF pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) -%] [% pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) %] [% END -%] + apt-get clean remote_get: | #!/bin/sh View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 6 commits: Bug 40681: Run `apt-get clean` after installing packages
by boklm (＠boklm) 09 Dec '22

09 Dec '22

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 1e4d64eb by Nicolas Vigier at 2022-12-09T11:12:31+01:00 Bug 40681: Run `apt-get clean` after installing packages - - - - - b3972182 by Nicolas Vigier at 2022-12-09T11:12:33+01:00 Bug 40683: Reduce the number of custom containers Install a few more packages in the default containers to reduce the number of custom containers we use. - - - - - ad51122f by Nicolas Vigier at 2022-12-09T11:12:34+01:00 Bug 40689: Update Ubuntu version in projects/mmdebstrap-image to 22.04.1 - - - - - 1c5314b5 by Nicolas Vigier at 2022-12-09T11:12:36+01:00 Bug 40693: Patch apt-key to accept expired keys for jessie - - - - - 5d387c8f by Nicolas Vigier at 2022-12-09T11:12:38+01:00 Bug 40693: use faketime to run `apt-get update` on jessie - - - - - 228a1188 by Pier Angelo Vendrame at 2022-12-09T11:12:39+01:00 Bug 40653: Do not build compiler-rt with Clang Specifying compiler-rt as a project in LLVM is going to be deprecated. It should be compiled with runtimes, instead, or alone, if it will be still allowed. The only platform in which we were compiling compiler-rt with LLVM was Linux. But Firefox seems not to actually use it, and just use GCC's runtime, instead. However, we were also compiling compiler-rt for Android in the same project, which prevents to share the artifact with Windows and macOS. So, I have moved it to another project on its own. - - - - - 23 changed files: - projects/android-components/config - projects/android-toolchain/config - projects/application-services/config - projects/bison/config - projects/browser/config - projects/clang/build - projects/clang/config - + projects/compiler-rt/build - + projects/compiler-rt/config - projects/container-image/config - projects/fenix/config - projects/geckoview/build - projects/geckoview/config - projects/gradle/config - projects/libevent/config - + projects/mmdebstrap-image/apt-key-allow-expired-key.patch - projects/mmdebstrap-image/config - projects/rust/config - projects/tor-android-service/config - projects/tor-onion-proxy-library/config - projects/tor/config - projects/wasi-sysroot/config - rbm.conf Changes: ===================================== projects/android-components/config ===================================== @@ -19,8 +19,6 @@ var: gradle_version: 7.0.2 glean_parser: 5.0.1 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' - arch_deps: - - python3-venv targets: nightly: ===================================== projects/android-toolchain/config ===================================== @@ -8,9 +8,6 @@ var: version_30: 30.0.2 version_29: 29.0.2 version_28: 28.0.3 - deps: - - unzip - - python3 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] ===================================== projects/application-services/config ===================================== @@ -13,8 +13,6 @@ var: gradle_dependencies_version: 9 gradle_version: 6.7.1 glean_parser: 4.0.0 - arch_deps: - - python3-venv input_files: - project: container-image ===================================== projects/bison/config ===================================== @@ -3,9 +3,6 @@ version: 3.8.2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 - deps: - - build_essential - - xz-utils input_files: - URL: https://ftp.gnu.org/gnu/bison/bison-[% c("version") %].tar.xz ===================================== projects/browser/config ===================================== @@ -17,12 +17,16 @@ var: - patch targets: - linux-i686: + linux: var: - mar_osname: linux32 arch_deps: - # Install libc6-i386 to be able to run 32bit mar tools (bug 29812) + # Install libc6-i386 to be able to run 32bit mar tools in linux-i686 + # builds (bug 29812). We don't need it in x86_64 builds, but we + # share the container to reduce space used. - libc6-i386 + linux-i686: + var: + mar_osname: linux32 linux-x86_64: var: mar_osname: linux64 ===================================== projects/clang/build ===================================== @@ -3,16 +3,12 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] -export PATH="/var/tmp/dist/cmake/bin:$PATH" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" [% IF c("var/linux") %] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'), hardened_gcc => 0 }) %] [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] -[% END -%] -[% IF c("var/android") %] - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -[% END -%] -[% IF c("var/linux") || c("var/android") -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] @@ -25,57 +21,15 @@ mkdir build cd build # LLVM_ENABLE_ZLIB solves the "contains a compressed section, but zlib is not available" on lld # LLVM_INSTALL_UTILS allows this LLVM to be used to compile Rust -cmake ../llvm -G "Unix Makefiles" \ +cmake ../llvm -GNinja \ -DCMAKE_INSTALL_PREFIX=$distdir \ -DCMAKE_BUILD_TYPE=Release \ - [% IF c("var/android") || c("var/macos") -%] - -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ - [% END -%] - [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly[% END %] \ - -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;lld" \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64[% IF c("var/rlbox") -%];WebAssembly[% END %]" \ + -DLLVM_ENABLE_PROJECTS="clang;lld" \ -DLLVM_ENABLE_ZLIB=ON \ -DLLVM_INSTALL_UTILS=ON \ -make -j[% c("num_procs") %] -make install -cd .. - -[% IF c("var/android") -%] - echo "Compiling compiler-rt (Android only)" - rtdistdir=/var/tmp/build/rtdist - mkdir $rtdistdir - - make_compilerrt () { - mkdir "build-compilerrt-$1" - cd "build-compilerrt-$1" - cmake ../compiler-rt/ -G "Unix Makefiles" \ - -DCMAKE_INSTALL_PREFIX=$rtdistdir \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SYSTEM_NAME=Android \ - -DCMAKE_ANDROID_ARCH_ABI=$1 \ - -DCMAKE_ANDROID_NDK="$ANDROID_NDK_HOME" \ - -DCMAKE_C_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ - -DCMAKE_CXX_FLAGS="$3 -fuse-ld=lld --rtlib=compiler-rt" \ - -DCMAKE_EXE_LINKER_FLAGS="-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/$2" \ - -DCOMPILER_RT_BUILD_BUILTINS=ON \ - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ - -DCOMPILER_RT_BUILD_MEMPROF=OFF \ - -DCOMPILER_RT_BUILD_ORC=OFF \ - -DCOMPILER_RT_BUILD_PROFILE=OFF \ - -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ - -DCOMPILER_RT_BUILD_XRAY=OFF - make -j[% c("num_procs") %] - make install - cd .. - } - - make_compilerrt "armeabi-v7a" "arm-linux-androideabi/lib" "-DARMEABI_V7A" - make_compilerrt "arm64-v8a" "aarch64-linux-android/lib64" - make_compilerrt "x86" "i686-linux-android/lib" - make_compilerrt "x86_64" "x86_64-linux-android/lib64" - - mv $rtdistdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ -[% END -%] +ninja -j[% c("num_procs") %] -v install cd /var/tmp/dist [% c('tar', { ===================================== projects/clang/config ===================================== @@ -11,14 +11,16 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - enable: '[% c("var/linux") || c("var/android") %]' + enable: '[% c("var/linux") %]' - name: binutils project: binutils - enable: '[% c("var/linux") || c("var/android") %]' + enable: '[% c("var/linux") %]' - project: cmake name: cmake - project: llvm-project name: clang-source + - project: ninja + name: ninja - project: python name: python enable: '[% c("var/linux") %]' ===================================== projects/compiler-rt/build ===================================== @@ -0,0 +1,51 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$PATH" + +[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] +export PATH="/var/tmp/dist/binutils/bin:$PATH" + +mkdir -p /var/tmp/build +cd /var/tmp/build +tar -xf $rootdir/[% c('input_files_by_name/clang-source') %] +cd clang-source +export LLVM_HOME=$(pwd) +mkdir build +cd build + +installdir=/var/tmp/build/install +mkdir -p $installdir + +cmake ../compiler-rt/ -GNinja \ + -DCMAKE_INSTALL_PREFIX=$installdir \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SYSTEM_NAME=Android \ + -DCMAKE_ANDROID_ARCH_ABI="[% c('var/abi') %]" \ + -DCMAKE_ANDROID_NDK="$ANDROID_NDK_HOME" \ + -DCMAKE_C_FLAGS="-fuse-ld=lld --rtlib=compiler-rt $defines" \ + -DCMAKE_CXX_FLAGS="-fuse-ld=lld --rtlib=compiler-rt $defines" \ + -DCMAKE_EXE_LINKER_FLAGS="-L$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/[% c('var/libdir') %]" \ + -DCOMPILER_RT_BUILD_BUILTINS=ON \ + -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ + -DCOMPILER_RT_BUILD_MEMPROF=OFF \ + -DCOMPILER_RT_BUILD_ORC=OFF \ + -DCOMPILER_RT_BUILD_PROFILE=OFF \ + -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ + -DCOMPILER_RT_BUILD_XRAY=OFF + +ninja -j[% c("num_procs") %] -v install + +mkdir -p $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ +mv $installdir/lib/linux/libclang_rt.builtins-*-android.a $distdir/lib/clang/[% c("var/llvm_version") %]/lib/linux/ + +cd /var/tmp/dist +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/compiler-rt/config ===================================== @@ -0,0 +1,38 @@ +# vim: filetype=yaml sw=2 +version: '[% c("var/llvm_version") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 + +var: + llvm_version: '[% pc("llvm-project", "version") %]' + +targets: + android-armv7: + var: + libdir: 'arm-linux-androideabi/lib' + android-aarch64: + var: + libdir: 'aarch64-linux-android/lib64' + android-x86: + var: + libdir: 'i686-linux-android/lib' + android-x86_64: + var: + libdir: 'x86_64-linux-android/lib64' + +input_files: + - project: container-image + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + - name: binutils + project: binutils + - project: cmake + name: cmake + - project: llvm-project + name: clang-source + - project: ninja + name: ninja + - project: python + name: python + enable: '[% c("var/linux") %]' ===================================== projects/container-image/config ===================================== @@ -37,9 +37,14 @@ pre: | [% IF c("var/linux-cross") -%] dpkg --add-architecture [% c("var/arch_debian") %] [% END -%] + [% IF c("var/container/suite") == "jessie" -%] + # We need to use faketime to run `apt-get update` on jessie, because of + # expired key. See tor-browser-build#40693 + dpkg -i ./libfaketime_0.9.6-3_amd64.deb ./faketime_0.9.6-3_amd64.deb + [% END -%] # Update the package cache again because `pre_pkginst` may change the # package manager configuration. - apt-get update -y -q + [% IF c("var/container/suite") == "jessie" %]faketime '2018-12-24 08:15:42' [% END %]apt-get update -y -q [% END -%] apt-get upgrade -y -q [% @@ -66,6 +71,7 @@ pre: | [% IF pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) -%] [% pc(c('origin_project'), 'var/post_pkginst', { step => c('origin_step') }) %] [% END -%] + apt-get clean remote_get: | #!/bin/sh @@ -81,3 +87,9 @@ input_files: - project: mmdebstrap-image target: - '[% c("var/container/suite") %]-[% c("var/container/arch") %]' + - URL: http://deb.debian.org/debian/pool/main/f/faketime/faketime_0.9.6-3_amd64.deb + sha256sum: 19b2a01a2fae7e6d5a8b741fc0bc626451cb4c2cc884ee79f1136dd3c2c26213 + enable: '[% c("var/container/suite") == "jessie" %]' + - URL: http://deb.debian.org/debian/pool/main/f/faketime/libfaketime_0.9.6-3_amd64… + sha256sum: 82747d5815b226cfed7f6f9a751bf8c20d457f3ba786add6017d6904dea4fdb4 + enable: '[% c("var/container/suite") == "jessie" %]' ===================================== projects/fenix/config ===================================== @@ -20,8 +20,6 @@ var: gradle_dependencies_version: 37 gradle_version: 7.0.2 glean_parser: 5.0.1 - arch_deps: - - python3-venv targets: release: ===================================== projects/geckoview/build ===================================== @@ -21,6 +21,8 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/compiler-rt') %] +cp -r /var/tmp/dist/compiler-rt/* /var/tmp/dist/clang/ tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH" ===================================== projects/geckoview/config ===================================== @@ -171,6 +171,8 @@ input_files: name: nasm - project: clang name: clang + - project: 'compiler-rt' + name: 'compiler-rt' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/gradle/config ===================================== @@ -5,8 +5,6 @@ container: use_container: 1 var: - deps: - - unzip gradle_sha256sum: 5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d ===================================== projects/libevent/config ===================================== @@ -12,10 +12,6 @@ var: configure_opt_project: --disable-static targets: - macos: - var: - arch_deps: - - faketime windows: var: configure_opt_project: --disable-shared ===================================== projects/mmdebstrap-image/apt-key-allow-expired-key.patch ===================================== @@ -0,0 +1,23 @@ +--- o/apt-key 2022-11-30 14:57:12.742026261 +0000 ++++ n/apt-key 2022-12-01 08:38:08.170140893 +0000 +@@ -815,11 +815,18 @@ + create_gpg_home + fi + setup_merged_keyring ++ tmpfile=$(mktemp) ++ set +e + if [ -n "$FORCED_KEYRING" ]; then +- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@" ++ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "$(dearmor_filename "${FORCED_KEYRING}")" --ignore-time-conflict "$@") + else +- "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@" ++ (eval "exec ${GPGSTATUSFD}>$tmpfile"; "$GPGV" --homedir "${GPGHOMEDIR}" --keyring "${GPGHOMEDIR}/pubring.gpg" --ignore-time-conflict "$@") + fi ++ err=$? ++ set -e ++ cat "$tmpfile" | sed 's/^\[GNUPG:\] EXPKEYSIG /\[GNUPG:\] GOODSIG /' >&${GPGSTATUSFD} ++ rm -f "$tmpfile" ++ exit $err + ;; + help) + usage ===================================== projects/mmdebstrap-image/config ===================================== @@ -6,7 +6,7 @@ container: use_container: 1 var: - ubuntu_version: 22.04 + ubuntu_version: 22.04.1 pre: | #!/bin/sh @@ -16,6 +16,14 @@ pre: | apt-get update -y -q apt-get install -y -q debian-archive-keyring ubuntu-keyring mmdebstrap gnupg + [% IF c("var/container/suite") == "jessie" -%] + apt-get install -y -q patch + cd /usr/bin + # The gpg key for jessie is expired. We patch apt-key to accept expired keys. + patch -p1 < $rootdir/apt-key-allow-expired-key.patch + cd $rootdir + [% END -%] + export SOURCE_DATE_EPOCH='[% c("timestamp") %]' tar -xf [% c('input_files_by_name/mmdebstrap') %] ./mmdebstrap/mmdebstrap --mode=unshare [% c("var/container/mmdebstrap_opt") %] [% c("var/container/suite") %] output.tar.gz [% c("var/container/debian_mirror") %] @@ -55,4 +63,6 @@ input_files: name: mmdebstrap - URL: 'https://cdimage.ubuntu.com/ubuntu-base/releases/[% c("var/ubuntu_version") %]/release/ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' filename: 'container-image_ubuntu-base-[% c("var/ubuntu_version") %]-base-amd64.tar.gz' - sha256sum: df6fe77cee11bd216ac532f0ee082bdc4da3c0cc1f1d9cb20f3f743196bc4b07 + sha256sum: e1f9200c99da008a473c9ae7b51e13f5ea05dc4c2e12beb43f0f9cbbbf6216f4 + - filename: apt-key-allow-expired-key.patch + enable: '[% c("var/container/suite") == "jessie" %]' ===================================== projects/rust/config ===================================== @@ -7,23 +7,10 @@ container: targets: android: var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,armv7-linux-androideabi,thumbv7neon-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.armv7-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.thumbv7neon-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=aarch64-linux-android-ar --set=target.i686-linux-android.cc=i686-linux-android16-clang --set=target.i686-linux-android.ar=i686-linux-android-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=x86_64-linux-android-ar linux: var: - deps: - - libc6-dev-i386 - - lib32stdc++6 - - build-essential - - python - - automake - - libssl-dev - - pkg-config - - hardening-wrapper # We use # `--enable-local-rust` to avoid downloading the required compiler during # build time @@ -58,21 +45,17 @@ targets: macos: var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib arch_deps: - - libssl-dev - pkg-config - - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib windows: var: - arch_deps: - - libssl-dev - - pkg-config - - zlib1g-dev # See tor-browser-build#29320 compiler: mingw-w64 configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --target=x86_64-unknown-linux-gnu,[% c("arch") %]-pc-windows-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib + arch_deps: + - pkg-config input_files: - project: container-image ===================================== projects/tor-android-service/config ===================================== @@ -8,9 +8,6 @@ container: use_container: 1 var: - deps: - - build-essential - - unzip # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4 ===================================== projects/tor-onion-proxy-library/config ===================================== @@ -8,10 +8,6 @@ container: use_container: 1 var: - deps: - - build-essential - - unzip - - zip # this should be updated when the list of gradle dependencies is changed gradle_dependencies_version: 5 gradle_version: 5.6.4 ===================================== projects/tor/config ===================================== @@ -9,13 +9,6 @@ tag_gpg_id: 1 container: use_container: 1 -var: - deps: - - build-essential - - automake - - zip - - unzip - targets: nightly: version: '[% c("abbrev") %]' @@ -27,25 +20,15 @@ targets: libdir: lib32 sort_deps: 0 arch_deps: - - libtool - zlib1g-dev:i386 - - hardening-wrapper linux-x86_64: var: libdir: lib64 arch_deps: - - libtool - zlib1g-dev - - hardening-wrapper - macos: - var: - arch_deps: - - faketime android: var: configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc' - arch_deps: - - libtinfo5 input_files: - project: container-image ===================================== projects/wasi-sysroot/config ===================================== @@ -8,12 +8,6 @@ git_submodule: 1 container: use_container: 1 -targets: - linux: - var: - arch_deps: - - patch - input_files: - project: container-image - name: binutils ===================================== rbm.conf ===================================== @@ -337,11 +337,15 @@ targets: - bison - python3 - python3-distutils + - python3-venv - automake - libtool - zip - unzip - libtinfo5 + - libssl-dev + - pkg-config + - zlib1g-dev configure_opt: '--host=[% c("var/cross_prefix") %] CC=[% c("var/CC") %] [% c("var/configure_opt_project") %]' pre_pkginst: | @@ -434,6 +438,8 @@ targets: deps: - libc6-dev-i386 - lib32stdc++6 + - pkg-config + - libssl-dev - build-essential - python - bison @@ -442,6 +448,8 @@ targets: - libtool - zip - unzip + - xz-utils + - patch linux-asan: var: asan: 1 @@ -500,6 +508,8 @@ targets: - libtool - zip - unzip + - libssl-dev + - zlib1g-dev torbrowser-macos: - macos-universal @@ -554,6 +564,7 @@ targets: rlbox: 0 deps: - build-essential + - faketime - python3 - python3-distutils - automake @@ -561,6 +572,8 @@ targets: - libtool - zip - unzip + - libssl-dev + - zlib1g-dev faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 # The no_build_id target can be useful if you want to quickly display View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0