- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-13.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 01e38a05 by Henry Wilkes at 2023-06-14T10:04:00+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41848 - Consistently disable the accept/connect button in the bridge dialogs until the user gives some input. (cherry picked from commit 0d458af9bf952c1b6f4f685e7c1397156ae8b69c) - - - - - 3 changed files: - browser/components/torpreferences/content/builtinBridgeDialog.jsm - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/provideBridgeDialog.jsm Changes: ===================================== browser/components/torpreferences/content/builtinBridgeDialog.jsm ===================================== @@ -26,6 +26,7 @@ class BuiltinBridgeDialog { constructor(onSubmit) { this.onSubmit = onSubmit; this._acceptButton = null; + this._radioGroup = null; } _populateXUL(window, dialog) { @@ -36,7 +37,7 @@ class BuiltinBridgeDialog { "#torPreferences-builtinBridge-description" ).textContent = TorStrings.settings.builtinBridgeDescription2; - const radioGroup = dialog.querySelector( + this._radioGroup = dialog.querySelector( "#torPreferences-builtinBridge-typeSelection" ); @@ -60,13 +61,8 @@ class BuiltinBridgeDialog { TorSettings.bridges.source == TorBridgeSource.BuiltIn ? TorSettings.bridges.builtin_type : null; - if (currentBuiltinType) { - radioGroup.value = currentBuiltinType; - } else { - radioGroup.selectedItem = null; - } - for (const optionEl of radioGroup.querySelectorAll( + for (const optionEl of this._radioGroup.querySelectorAll( ".builtin-bridges-option" )) { const radio = optionEl.querySelector("radio"); @@ -85,8 +81,15 @@ class BuiltinBridgeDialog { ); } + if (currentBuiltinType) { + this._radioGroup.value = currentBuiltinType; + } else { + this._radioGroup.selectedItem = null; + } + + this._radioGroup.addEventListener("select", () => this.onSelectChange()); dialog.addEventListener("dialogaccept", () => { - this.onSubmit(radioGroup.value, TorConnect.canBeginBootstrap); + this.onSubmit(this._radioGroup.value, TorConnect.canBeginBootstrap); }); dialog.addEventListener("dialoghelp", e => { window.top.openTrustedLinkIn( @@ -102,9 +105,15 @@ class BuiltinBridgeDialog { this._acceptButton = dialog.getButton("accept"); Services.obs.addObserver(this, TorConnectTopics.StateChange); + + this.onSelectChange(); this.onAcceptStateChange(); } + onSelectChange() { + this._acceptButton.disabled = !this._radioGroup.value; + } + onAcceptStateChange() { this._acceptButton.setAttribute( "label", ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1088,14 +1088,9 @@ const gConnectionPane = (function() { onAddBuiltinBridge() { const builtinBridgeDialog = new BuiltinBridgeDialog( (bridgeType, connect) => { - if (!bridgeType) { - TorSettings.bridges.enabled = false; - TorSettings.bridges.builtin_type = ""; - } else { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.BuiltIn; - TorSettings.bridges.builtin_type = bridgeType; - } + TorSettings.bridges.enabled = true; + TorSettings.bridges.source = TorBridgeSource.BuiltIn; + TorSettings.bridges.builtin_type = bridgeType; this.saveBridgeSettings(connect); } @@ -1124,15 +1119,9 @@ const gConnectionPane = (function() { onAddBridgeManually() { const provideBridgeDialog = new ProvideBridgeDialog( (aBridgeString, connect) => { - if (aBridgeString) { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.UserProvided; - TorSettings.bridges.bridge_strings = aBridgeString; - } else { - TorSettings.bridges.enabled = false; - TorSettings.bridges.source = TorBridgeSource.Invalid; - TorSettings.bridges.bridge_strings = ""; - } + TorSettings.bridges.enabled = true; + TorSettings.bridges.source = TorBridgeSource.UserProvided; + TorSettings.bridges.bridge_strings = aBridgeString; this.saveBridgeSettings(connect); } ===================================== browser/components/torpreferences/content/provideBridgeDialog.jsm ===================================== @@ -56,32 +56,35 @@ class ProvideBridgeDialog { "placeholder", TorStrings.settings.provideBridgePlaceholder ); - this._textarea.addEventListener("input", () => { - this.onAcceptStateChange(); - }); + + this._textarea.addEventListener("input", () => this.onValueChange()); if (TorSettings.bridges.source == TorBridgeSource.UserProvided) { this._textarea.value = TorSettings.bridges.bridge_strings.join("\n"); } this._dialog.addEventListener("dialogaccept", e => { - let value = this._textarea.value; - if (!value.trim()) { - value = null; - } - this.onSubmit(value, value && TorConnect.canBeginBootstrap); + this.onSubmit(this._textarea.value, TorConnect.canBeginBootstrap); }); this._dialog.addEventListener("dialoghelp", openHelp); this._acceptButton = this._dialog.getButton("accept"); Services.obs.addObserver(this, TorConnectTopics.StateChange); + + this.onValueChange(); this.onAcceptStateChange(); } + onValueChange() { + // TODO: Do some proper value parsing and error reporting. See + // tor-browser#40552. + this._acceptButton.disabled = !this._textarea.value.trim(); + } + onAcceptStateChange() { this._acceptButton.setAttribute( "label", - this._textarea.value.trim() && TorConnect.canBeginBootstrap + TorConnect.canBeginBootstrap ? TorStrings.settings.bridgeButtonConnect : TorStrings.settings.bridgeButtonAccept ); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/01e38a0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/01e38a0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 0d458af9 by Henry Wilkes at 2023-06-14T10:18:34+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41848 - Consistently disable the accept/connect button in the bridge dialogs until the user gives some input. - - - - - 3 changed files: - browser/components/torpreferences/content/builtinBridgeDialog.jsm - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/provideBridgeDialog.jsm Changes: ===================================== browser/components/torpreferences/content/builtinBridgeDialog.jsm ===================================== @@ -26,6 +26,7 @@ class BuiltinBridgeDialog { constructor(onSubmit) { this.onSubmit = onSubmit; this._acceptButton = null; + this._radioGroup = null; } _populateXUL(window, dialog) { @@ -36,7 +37,7 @@ class BuiltinBridgeDialog { "#torPreferences-builtinBridge-description" ).textContent = TorStrings.settings.builtinBridgeDescription2; - const radioGroup = dialog.querySelector( + this._radioGroup = dialog.querySelector( "#torPreferences-builtinBridge-typeSelection" ); @@ -60,13 +61,8 @@ class BuiltinBridgeDialog { TorSettings.bridges.source == TorBridgeSource.BuiltIn ? TorSettings.bridges.builtin_type : null; - if (currentBuiltinType) { - radioGroup.value = currentBuiltinType; - } else { - radioGroup.selectedItem = null; - } - for (const optionEl of radioGroup.querySelectorAll( + for (const optionEl of this._radioGroup.querySelectorAll( ".builtin-bridges-option" )) { const radio = optionEl.querySelector("radio"); @@ -85,8 +81,15 @@ class BuiltinBridgeDialog { ); } + if (currentBuiltinType) { + this._radioGroup.value = currentBuiltinType; + } else { + this._radioGroup.selectedItem = null; + } + + this._radioGroup.addEventListener("select", () => this.onSelectChange()); dialog.addEventListener("dialogaccept", () => { - this.onSubmit(radioGroup.value, TorConnect.canBeginBootstrap); + this.onSubmit(this._radioGroup.value, TorConnect.canBeginBootstrap); }); dialog.addEventListener("dialoghelp", e => { window.top.openTrustedLinkIn( @@ -102,9 +105,15 @@ class BuiltinBridgeDialog { this._acceptButton = dialog.getButton("accept"); Services.obs.addObserver(this, TorConnectTopics.StateChange); + + this.onSelectChange(); this.onAcceptStateChange(); } + onSelectChange() { + this._acceptButton.disabled = !this._radioGroup.value; + } + onAcceptStateChange() { this._acceptButton.setAttribute( "label", ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1088,14 +1088,9 @@ const gConnectionPane = (function() { onAddBuiltinBridge() { const builtinBridgeDialog = new BuiltinBridgeDialog( (bridgeType, connect) => { - if (!bridgeType) { - TorSettings.bridges.enabled = false; - TorSettings.bridges.builtin_type = ""; - } else { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.BuiltIn; - TorSettings.bridges.builtin_type = bridgeType; - } + TorSettings.bridges.enabled = true; + TorSettings.bridges.source = TorBridgeSource.BuiltIn; + TorSettings.bridges.builtin_type = bridgeType; this.saveBridgeSettings(connect); } @@ -1124,15 +1119,9 @@ const gConnectionPane = (function() { onAddBridgeManually() { const provideBridgeDialog = new ProvideBridgeDialog( (aBridgeString, connect) => { - if (aBridgeString) { - TorSettings.bridges.enabled = true; - TorSettings.bridges.source = TorBridgeSource.UserProvided; - TorSettings.bridges.bridge_strings = aBridgeString; - } else { - TorSettings.bridges.enabled = false; - TorSettings.bridges.source = TorBridgeSource.Invalid; - TorSettings.bridges.bridge_strings = ""; - } + TorSettings.bridges.enabled = true; + TorSettings.bridges.source = TorBridgeSource.UserProvided; + TorSettings.bridges.bridge_strings = aBridgeString; this.saveBridgeSettings(connect); } ===================================== browser/components/torpreferences/content/provideBridgeDialog.jsm ===================================== @@ -56,32 +56,35 @@ class ProvideBridgeDialog { "placeholder", TorStrings.settings.provideBridgePlaceholder ); - this._textarea.addEventListener("input", () => { - this.onAcceptStateChange(); - }); + + this._textarea.addEventListener("input", () => this.onValueChange()); if (TorSettings.bridges.source == TorBridgeSource.UserProvided) { this._textarea.value = TorSettings.bridges.bridge_strings.join("\n"); } this._dialog.addEventListener("dialogaccept", e => { - let value = this._textarea.value; - if (!value.trim()) { - value = null; - } - this.onSubmit(value, value && TorConnect.canBeginBootstrap); + this.onSubmit(this._textarea.value, TorConnect.canBeginBootstrap); }); this._dialog.addEventListener("dialoghelp", openHelp); this._acceptButton = this._dialog.getButton("accept"); Services.obs.addObserver(this, TorConnectTopics.StateChange); + + this.onValueChange(); this.onAcceptStateChange(); } + onValueChange() { + // TODO: Do some proper value parsing and error reporting. See + // tor-browser#40552. + this._acceptButton.disabled = !this._textarea.value.trim(); + } + onAcceptStateChange() { this._acceptButton.setAttribute( "label", - this._textarea.value.trim() && TorConnect.canBeginBootstrap + TorConnect.canBeginBootstrap ? TorStrings.settings.bridgeButtonConnect : TorStrings.settings.bridgeButtonAccept ); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0d458af… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0d458af… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.0b5-13.0-1
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

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

1 0

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

14 Jun '23

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_0b5_RELEASE
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed new tag FIREFOX_115_0b5_RELEASE 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-build][main] Bug 40879: Mullvad Browser 12.5a7
by Pier Angelo Vendrame (＠pierov) 14 Jun '23

14 Jun '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 0c27c294 by Richard Pospesel at 2023-06-13T01:11:51+00:00 Bug 40879: Mullvad Browser 12.5a7 - - - - - 1 changed file: - rbm.conf Changes: ===================================== rbm.conf ===================================== @@ -278,7 +278,7 @@ targets: mar_channel_id: '[% c("var/projectname") %]-mullvad-[% c("var/channel") %]' locales: [] torbrowser_incremental_from: - - 12.0a10 + - 12.5a6 torbrowser-testbuild: - testbuild 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] Pushed new branch maint-12.5
by richard (＠richard) 13 Jun '23

13 Jun '23

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

1 0

[Git][tpo/applications/tor-browser][base-browser-115.0a1-13.0-1] 94 commits: Bug 1828939 - Remove Share URL menu item when MOZ_PROXY_BYPASS_PROTECTION and...
by Pier Angelo Vendrame (＠pierov) 13 Jun '23

13 Jun '23

Pier Angelo Vendrame pushed to branch base-browser-115.0a1-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 863467c1 by Dan Ballard at 2023-06-01T15:40:13+02:00 Bug 1828939 - Remove Share URL menu item when MOZ_PROXY_BYPASS_PROTECTION and restore Share by Email. r=mossop Differential Revision: https://phabricator.services.mozilla.com/D175941 - - - - - 48fa2184 by Henry Wilkes at 2023-06-01T15:40:14+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 26762bb9 by Henry Wilkes at 2023-06-01T15:40:14+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - 0fb789f4 by Pier Angelo Vendrame at 2023-06-01T15:40:15+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - 86f838d1 by Marco Simonelli at 2023-06-01T15:40:15+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - bc10660a by Marco Simonelli at 2023-06-01T15:40:15+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - e7f28bd5 by Marco Simonelli at 2023-06-01T15:40:16+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 6aaeed79 by Marco Simonelli at 2023-06-01T15:40:16+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - 4e3262de by Marco Simonelli at 2023-06-01T15:40:17+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 2d7b4ecd by Marco Simonelli at 2023-06-01T15:40:17+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - 4e71a85c by Gaba at 2023-06-01T15:40:18+02:00 Adding issue and merge request templates - - - - - 2679886d by Pier Angelo Vendrame at 2023-06-01T15:40:18+02:00 Base Browser's .mozconfigs. Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - d84eccef by Pier Angelo Vendrame at 2023-06-01T15:40:19+02:00 fixup! Base Browser's .mozconfigs. Do not specify --{enable,disable}-verify-mar in mozconfigs, as this option does not exist anymore, and signed mars are enabled by default. - - - - - aae91d81 by Pier Angelo Vendrame at 2023-06-01T15:40:19+02:00 fixup! Base Browser's .mozconfigs. Use the new flag upstream to replace the Bug 41542 commit. - - - - - 15d6b449 by Pier Angelo Vendrame at 2023-06-01T15:40:19+02:00 fixup! Base Browser's .mozconfigs. Disable the notification server because of the upstream Bug 1782837. - - - - - f2a42eb4 by Pier Angelo Vendrame at 2023-06-01T15:40:20+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 8ba5276d by Pier Angelo Vendrame at 2023-06-01T15:40:20+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 86365dcf by Dan Ballard at 2023-06-01T15:40:21+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - 168c58bb by Matthew Finkel at 2023-06-01T15:40:21+02:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 734c66a5 by Matthew Finkel at 2023-06-01T15:40:22+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 8496c1ac by Mike Perry at 2023-06-01T15:40:22+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - ed7359cd by Alex Catarineu at 2023-06-01T15:40:22+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 002656c0 by Georg Koppen at 2023-06-01T15:40:23+02:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - d8d9cd9b by Kathy Brade at 2023-06-01T15:40:23+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 8d63d44e by Kathy Brade at 2023-06-01T15:40:24+02:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 45f5b62f by Alex Catarineu at 2023-06-01T15:40:24+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 64c7844e by Kathy Brade at 2023-06-01T15:40:25+02:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - 41cf4ca6 by Arthur Edelstein at 2023-06-01T15:40:25+02:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 877fcb49 by Alex Catarineu at 2023-06-01T15:40:26+02:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - 8895d464 by Pier Angelo Vendrame at 2023-06-01T15:40:26+02:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Linted - - - - - 9c7825b7 by Pier Angelo Vendrame at 2023-06-01T15:40:26+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 09359fb0 by Georg Koppen at 2023-06-01T15:40:27+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - acf31eaa by Pier Angelo Vendrame at 2023-06-01T15:40:27+02:00 fixup! Bug 30541: Disable WebGL readPixel() for web content - - - - - 48b58e8a by Alex Catarineu at 2023-06-01T15:40:28+02:00 Bug 28369: Stop shipping pingsender executable - - - - - ebea1302 by Pier Angelo Vendrame at 2023-06-01T15:40:30+02:00 fixup! Bug 28369: Stop shipping pingsender executable Linted - - - - - b0df863c by cypherpunks1 at 2023-06-01T15:40:30+02:00 Bug 41568: Disable LaterRun - - - - - 069ed629 by cypherpunks1 at 2023-06-01T15:40:31+02:00 Bug 40717: Hide Windows SSO in settings - - - - - f0df7133 by Pier Angelo Vendrame at 2023-06-01T15:40:31+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 5a368d29 by Mike Perry at 2023-06-01T15:40:32+02:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - c76da5f9 by Pier Angelo Vendrame at 2023-06-01T15:40:32+02:00 fixup! Firefox preference overrides. Bug 41738: Drop the patch to disable live reload and use the pref - - - - - 08b83b61 by Henry Wilkes at 2023-06-01T15:40:32+02:00 fixup! Firefox preference overrides. Bug 41736 - Stop setting the browser.uiCustomization.state preference. - - - - - 31c39c04 by Pier Angelo Vendrame at 2023-06-01T15:40:33+02:00 fixup! Firefox preference overrides. - - - - - 68af2caa by Richard Pospesel at 2023-06-01T15:40:33+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 0a92b74e by Pier Angelo Vendrame at 2023-06-01T15:40:34+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 119a9697 by Alex Catarineu at 2023-06-01T15:40:34+02:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 022f6236 by Alex Catarineu at 2023-06-01T15:40:35+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 2881c783 by Alex Catarineu at 2023-06-01T15:40:35+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 34907f7b by Alex Catarineu at 2023-06-01T15:40:35+02:00 Bug 26345: Hide tracking protection UI - - - - - b8a4a098 by Pier Angelo Vendrame at 2023-06-09T09:54:28+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 719fbdc6 by Alex Catarineu at 2023-06-09T09:54:33+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 187cf170 by Mike Perry at 2023-06-09T09:54:33+02:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 6bdafd8f by Igor Oliveira at 2023-06-09T09:54:34+02:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height. - - - - - c99c6930 by Pier Angelo Vendrame at 2023-06-09T09:54:34+02:00 fixup! Bug 23104: Add a default line height compensation - - - - - fd420dd4 by Pier Angelo Vendrame at 2023-06-09T09:54:35+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 14a048a2 by Matthew Finkel at 2023-06-09T09:54:35+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - 4713ef6c by Pier Angelo Vendrame at 2023-06-09T09:54:36+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - 0f72660b by hackademix at 2023-06-09T09:54:36+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 8840e002 by hackademix at 2023-06-09T09:54:37+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 33670127 by hackademix at 2023-06-09T09:54:37+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - ea90e791 by hackademix at 2023-06-09T09:54:37+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - e6c603b8 by hackademix at 2023-06-09T09:54:38+02:00 Bug 32308: use direct browser sizing for letterboxing. - - - - - e9baf7af by hackademix at 2023-06-09T09:54:38+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - 6bcfdbc0 by hackademix at 2023-06-09T09:54:39+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - dc6a8272 by Pier Angelo Vendrame at 2023-06-09T09:54:39+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 7a5cf1d0 by p13dz at 2023-06-09T09:54:40+02:00 Bug 40283: Workaround for the file upload bug - - - - - a939aa52 by Arthur Edelstein at 2023-06-09T09:54:40+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 99859ac9 by Pier Angelo Vendrame at 2023-06-09T09:54:40+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - ea2ed25b by Henry Wilkes at 2023-06-09T09:54:41+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - db818955 by Kathy Brade at 2023-06-09T09:54:41+02:00 Bug 13379: Allow using NSS to sign and verify MAR signatures Allow using NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, the default on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that can vary. - - - - - 25f0da6e by Kathy Brade at 2023-06-09T09:54:42+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix bug 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Base Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 69a28905 by Pier Angelo Vendrame at 2023-06-09T09:54:42+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41654: Move UpdateInfo into Data again - - - - - 82849a68 by Pier Angelo Vendrame at 2023-06-09T09:54:43+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Linted - - - - - de7986d3 by Pier Angelo Vendrame at 2023-06-09T09:54:43+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp. They are already defined in toolkit/xre/nsUpdateDriver.h. - - - - - 36a5277d by Nicolas Vigier at 2023-06-09T09:54:43+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - 272c4039 by hackademix at 2023-06-09T09:54:44+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 470251d3 by Pier Angelo Vendrame at 2023-06-09T09:54:47+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - df0a9601 by Alex Catarineu at 2023-06-09T09:54:47+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - fde2f5cb by Matthew Finkel at 2023-06-09T09:54:48+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 9c257635 by Pier Angelo Vendrame at 2023-06-09T09:54:48+02:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - 133e4dc5 by Pier Angelo Vendrame at 2023-06-09T09:54:49+02:00 fixup! Bug 40925: Implemented the Security Level component Linted - - - - - d6c7dc25 by Pier Angelo Vendrame at 2023-06-09T09:54:49+02:00 Bug 40926: Implemented the New Identity feature - - - - - f78c438d by Henry Wilkes at 2023-06-09T09:54:49+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - b52ab0a1 by hackademix at 2023-06-09T09:54:50+02:00 fixup! Firefox preference overrides. tor-browser#41764, prevent automatic download stuffing / DOS - - - - - b57d3032 by Pier Angelo Vendrame at 2023-06-09T09:54:50+02:00 fixup! Firefox preference overrides. Missing comments on tor-browser.git. To be moved there. - - - - - e899ae67 by Pier Angelo Vendrame at 2023-06-09T09:54:51+02:00 fixup! Bug 41116: Normalize system fonts. Update to the latest proposal to upstream. It fixes build issues on macOS. - - - - - ce757c34 by Pier Angelo Vendrame at 2023-06-09T09:54:51+02:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Fix another build error on macOS - - - - - 7f074105 by Pier Angelo Vendrame at 2023-06-09T09:54:52+02:00 fixup! Firefox preference overrides. Remove other references to Tor Browser prefs - - - - - ee0544d9 by Pier Angelo Vendrame at 2023-06-09T09:54:52+02:00 fixup! Bug 41459: WebRTC fails to build under mingw (Part 2) Reworked the _com_error conversion to string, to use functions that are available also to mingw. - - - - - 1da421fe by Pier Angelo Vendrame at 2023-06-09T09:54:52+02:00 fixup! Bug 41459: WebRTC fails to build under mingw (Part 4) Define _CRT_RAND_S as a compiler flag, to avoid problems due to unified sources. - - - - - 02201191 by Pier Angelo Vendrame at 2023-06-09T09:54:53+02:00 fixup! Firefox preference overrides. Ignore 001-base-profile.js during linting. - - - - - 9ff8aa99 by Pier Angelo Vendrame at 2023-06-09T09:54:53+02:00 fixup! Firefox preference overrides. Pref name change after uplifting. - - - - - 3d7fe87d by Pier Angelo Vendrame at 2023-06-09T09:54:54+02:00 fixup! Base Browser's .mozconfigs. Explicitly say we want verified updates. - - - - - c3ee5d2d by hackademix at 2023-06-12T10:46:03+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. - - - - - dd26af78 by Pier Angelo Vendrame at 2023-06-12T16:59:54+02:00 fixup! Bug 23104: Add a default line height compensation Get the document from aPresContext, which Moz already checks and see it isn't null. - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-safebrowsing.js - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/jar.mn - browser/base/moz.build - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/about/AboutRedirector.cpp The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2d404e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2d404e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[torspec] branch main updated (4a14d01 -> 8961bb4)
by gitolite role 13 Jun '23

13 Jun '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository torspec. from 4a14d01 Merge branch 'tor-gitlab/mr/139' new 21d7e9a prop340: Tweak how we handle optional stream IDs new 8961bb4 prop340: Change the ntorv3 data format The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: proposals/340-packed-and-fragmented.md | 257 +++++++++++++++++---------------- 1 file changed, 134 insertions(+), 123 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[tor] branch main updated: More fixes for compile-time warnings in equix and hashx
by gitolite role 13 Jun '23

13 Jun '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new cfbf74352f More fixes for compile-time warnings in equix and hashx new d5306e107f Merge branch 'tor-gitlab/mr/715' cfbf74352f is described below commit cfbf74352fece087f1080d87f939b226c3cf205b Author: Micah Elizabeth Scott <beth(a)torproject.org> AuthorDate: Thu Jun 1 11:30:40 2023 -0700 More fixes for compile-time warnings in equix and hashx This addresses issue #40800 and a couple other problems I noticed while trying to reproduce that one. The original issue is just a missing cast to void* on the args of __builtin___clear_cache(), and clang is picky about the implicit cast between what it considers to be char of different signedness. Original report is from MacOS but it's also reproducible on other clang targets. The cmake-based original build system for equix and hashx was a handy way to run tests, but it suffered from some warnings due to incorrect application of include_directories(). And lastly, there were some return codes from hashx_exec() that get ignored on equix when asserts are disabled. It bugged me too much to just silence this with a (void) cast, since even though this is in the realm of low-likelyhood programming errors and not true runtime errors, I don't want to make it easy for the hashx_exec() wrappers to return values that are dangerously wrong if an error is ignored. I made sure that even if asserts are disabled, we return values that will cause the solver and verifier to both fail to validate a potential solution. Signed-off-by: Micah Elizabeth Scott <beth(a)torproject.org> --- changes/ticket40800 | 3 +++ src/ext/equix/CMakeLists.txt | 18 +++++------------- src/ext/equix/hashx/CMakeLists.txt | 8 ++------ src/ext/equix/hashx/src/compiler_a64.c | 2 +- src/ext/equix/src/equix.c | 7 +++++-- src/ext/equix/src/solver.c | 15 +++++++++++---- 6 files changed, 27 insertions(+), 26 deletions(-) diff --git a/changes/ticket40800 b/changes/ticket40800 new file mode 100644 index 0000000000..e2ebc80ee8 --- /dev/null +++ b/changes/ticket40800 @@ -0,0 +1,3 @@ + o Minor feature (hs): + - Fix compiler warnings in equix and hashx when building with clang. + Closes ticket 40800. diff --git a/src/ext/equix/CMakeLists.txt b/src/ext/equix/CMakeLists.txt index 032989d804..3c4606566f 100644 --- a/src/ext/equix/CMakeLists.txt +++ b/src/ext/equix/CMakeLists.txt @@ -24,13 +24,14 @@ if(NOT CMAKE_BUILD_TYPE) message(STATUS "Setting default build type: ${CMAKE_BUILD_TYPE}") endif() -add_library(equix SHARED ${equix_sources}) -set_property(TARGET equix PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET equix PROPERTY PUBLIC_HEADER include/equix.h) -include_directories(equix +include_directories( include/ hashx/include/ hashx/src/) + +add_library(equix SHARED ${equix_sources}) +set_property(TARGET equix PROPERTY POSITION_INDEPENDENT_CODE ON) +set_property(TARGET equix PROPERTY PUBLIC_HEADER include/equix.h) target_compile_definitions(equix PRIVATE HASHX_STATIC) target_compile_definitions(equix PRIVATE EQUIX_SHARED) target_link_libraries(equix @@ -43,10 +44,6 @@ set_property(TARGET equix_static PROPERTY POSITION_INDEPENDENT_CODE ON) set_target_properties(equix_static PROPERTIES OUTPUT_NAME equix) target_compile_definitions(equix_static PRIVATE HASHX_STATIC) target_compile_definitions(equix_static PRIVATE EQUIX_STATIC) -include_directories(equix_static - include/ - hashx/include/ - hashx/src/) target_link_libraries(equix_static PRIVATE hashx_static) @@ -58,8 +55,6 @@ install(TARGETS equix equix_static add_executable(equix-tests src/tests.c) -include_directories(equix-tests - include/) target_compile_definitions(equix-tests PRIVATE EQUIX_STATIC) target_link_libraries(equix-tests PRIVATE equix_static) @@ -73,9 +68,6 @@ add_executable(equix-bench src/bench.c hashx/src/hashx_thread.c hashx/src/hashx_time.c) -include_directories(equix-bench - include/ - hashx/src/) target_compile_definitions(equix-bench PRIVATE EQUIX_STATIC) target_link_libraries(equix-bench PRIVATE equix_static diff --git a/src/ext/equix/hashx/CMakeLists.txt b/src/ext/equix/hashx/CMakeLists.txt index 742a5a8523..1e8fe2fd6c 100644 --- a/src/ext/equix/hashx/CMakeLists.txt +++ b/src/ext/equix/hashx/CMakeLists.txt @@ -55,11 +55,11 @@ if(HASHX_SALT) endif() endif() +include_directories(include/) + add_library(hashx SHARED ${hashx_sources}) set_property(TARGET hashx PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET hashx PROPERTY PUBLIC_HEADER include/hashx.h) -include_directories(hashx - include/) target_compile_definitions(hashx PRIVATE HASHX_SHARED) set_target_properties(hashx PROPERTIES VERSION ${HASHX_VERSION_STR} SOVERSION ${HASHX_VERSION}) @@ -76,8 +76,6 @@ install(TARGETS hashx hashx_static add_executable(hashx-tests src/tests.c) -include_directories(hashx-tests - include/) target_compile_definitions(hashx-tests PRIVATE HASHX_STATIC) target_link_libraries(hashx-tests PRIVATE hashx_static) @@ -91,8 +89,6 @@ add_executable(hashx-bench src/bench.c src/hashx_thread.c src/hashx_time.c) -include_directories(hashx-bench - include/) target_compile_definitions(hashx-bench PRIVATE HASHX_STATIC) target_link_libraries(hashx-bench PRIVATE hashx_static diff --git a/src/ext/equix/hashx/src/compiler_a64.c b/src/ext/equix/hashx/src/compiler_a64.c index 94635ad1b7..1b7081f537 100644 --- a/src/ext/equix/hashx/src/compiler_a64.c +++ b/src/ext/equix/hashx/src/compiler_a64.c @@ -149,7 +149,7 @@ bool hashx_compile_a64(const hashx_program* program, uint8_t* code) { if (!hashx_vm_rx(code, COMP_CODE_SIZE)) return false; #ifdef __GNUC__ - __builtin___clear_cache(code, pos); + __builtin___clear_cache((void*)code, (void*)pos); #endif return true; } diff --git a/src/ext/equix/src/equix.c b/src/ext/equix/src/equix.c index a254261509..5511201695 100644 --- a/src/ext/equix/src/equix.c +++ b/src/ext/equix/src/equix.c @@ -28,8 +28,11 @@ static uint64_t sum_pair(hashx_ctx* hash_func, equix_idx left, equix_idx right) uint8_t hash_right[HASHX_SIZE]; hashx_result r_left = hashx_exec(hash_func, left, hash_left); hashx_result r_right = hashx_exec(hash_func, right, hash_right); - assert(r_left == HASHX_OK && r_right == HASHX_OK); - return load64(hash_left) + load64(hash_right); + if (r_left == HASHX_OK && r_right == HASHX_OK) { + return load64(hash_left) + load64(hash_right); + } + assert(false); + return ~(uint64_t)0; } static equix_result verify_internal(hashx_ctx* hash_func, const equix_solution* solution) { diff --git a/src/ext/equix/src/solver.c b/src/ext/equix/src/solver.c index 1beda06c74..618c6e1130 100644 --- a/src/ext/equix/src/solver.c +++ b/src/ext/equix/src/solver.c @@ -47,11 +47,16 @@ typedef stage1_idx_item s1_idx; typedef stage2_idx_item s2_idx; typedef stage3_idx_item s3_idx; -static FORCE_INLINE uint64_t hash_value(hashx_ctx* hash_func, equix_idx index) { +static FORCE_INLINE bool hash_value(hashx_ctx* hash_func, equix_idx index, uint64_t *value_out) { char hash[HASHX_SIZE]; hashx_result result = hashx_exec(hash_func, index, hash); - assert(result == HASHX_OK); - return load64(hash); + if (result == HASHX_OK) { + *value_out = load64(hash); + return true; + } else { + assert(false); + return false; + } } static void build_solution_stage1(equix_idx* output, solver_heap* heap, s2_idx root) { @@ -97,7 +102,9 @@ static void build_solution(equix_solution* solution, solver_heap* heap, s3_idx l static void solve_stage0(hashx_ctx* hash_func, solver_heap* heap) { CLEAR(heap->stage1_indices.counts); for (u32 i = 0; i < INDEX_SPACE; ++i) { - uint64_t value = hash_value(hash_func, i); + uint64_t value; + if (!hash_value(hash_func, i, &value)) + break; u32 bucket_idx = value % NUM_COARSE_BUCKETS; u32 item_idx = STAGE1_SIZE(bucket_idx); if (item_idx >= COARSE_BUCKET_ITEMS) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0