- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_128_9_0esr_BUILD2
by Pier Angelo Vendrame (＠pierov) 31 Mar '25

31 Mar '25

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.22.0esr-13.5-1] 3 commits: No bug - Tagging a2f45243dae44717e5f46540c764d4015544c004 with...
by Pier Angelo Vendrame (＠pierov) 31 Mar '25

31 Mar '25

Pier Angelo Vendrame pushed to branch tor-browser-115.22.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 79ba5da1 by Mozilla Releng Treescript at 2025-03-25T13:19:10+00:00 No bug - Tagging a2f45243dae44717e5f46540c764d4015544c004 with FIREFOX_115_22_0esr_BUILD1 a=release CLOSED TREE DONTBUILD - - - - - aa7b351b by Mozilla Releng Treescript at 2025-03-27T04:41:24+00:00 No bug - Tagging 5ee62877b9cf66efc794f87f225257dd82c42ae7 with FIREFOX_115_21_1esr_BUILD1 a=release CLOSED TREE DONTBUILD - - - - - dbc65808 by Yannis Juglaret at 2025-03-26T21:01:45+00:00 Bug 1956398 - Avoid duplicating pseudo-handles in ipc_channel_win.cc. r=nika a=dmeehan Differential Revision: https://phabricator.services.mozilla.com/D243189 - - - - - 2 changed files: - .hgtags - ipc/chromium/src/chrome/common/ipc_channel_win.cc Changes: ===================================== .hgtags ===================================== @@ -4430,3 +4430,5 @@ ddfd872425d03ecb89860f62f8f03c737728f501 FIREFOX_115_20_0esr_BUILD1 ddfd872425d03ecb89860f62f8f03c737728f501 FIREFOX_115_20_0esr_RELEASE ba3c2022649eb785fe436d01b0b8c9d67b67d775 FIREFOX_115_21_0esr_BUILD1 ba3c2022649eb785fe436d01b0b8c9d67b67d775 FIREFOX_115_21_0esr_RELEASE +a2f45243dae44717e5f46540c764d4015544c004 FIREFOX_115_22_0esr_BUILD1 +5ee62877b9cf66efc794f87f225257dd82c42ae7 FIREFOX_115_21_1esr_BUILD1 ===================================== ipc/chromium/src/chrome/common/ipc_channel_win.cc ===================================== @@ -27,6 +27,34 @@ using namespace mozilla::ipc; +namespace { + +// This logic is borrowed from Chromium's `base/win/win_util.h`. It allows us +// to distinguish pseudo-handle values, such as returned by GetCurrentProcess() +// (-1), GetCurrentThread() (-2), and potentially more. The code there claims +// that fuzzers have found issues up until -12 with DuplicateHandle. +// +// https://source.chromium.org/chromium/chromium/src/+/36dbbf38697dd1e23ef8944… +inline bool IsPseudoHandle(HANDLE handle) { + auto handleValue = static_cast<int32_t>(reinterpret_cast<uintptr_t>(handle)); + return -12 <= handleValue && handleValue < 0; +} + +// A real handle is a handle that is not a pseudo-handle. Always preferably use +// this variant over ::DuplicateHandle. Only use stock ::DuplicateHandle if you +// explicitly need the ability to duplicate a pseudo-handle. +inline bool DuplicateRealHandle(HANDLE source_process, HANDLE source_handle, + HANDLE target_process, LPHANDLE target_handle, + DWORD desired_access, BOOL inherit_handle, + DWORD options) { + MOZ_RELEASE_ASSERT(!IsPseudoHandle(source_handle)); + return static_cast<bool>(::DuplicateHandle( + source_process, source_handle, target_process, target_handle, + desired_access, inherit_handle, options)); +} + +} // namespace + namespace IPC { //------------------------------------------------------------------------------ @@ -732,9 +760,9 @@ bool Channel::ChannelImpl::AcceptHandles(Message& msg) { CHROMIUM_LOG(ERROR) << "other_process_ is invalid in AcceptHandles"; return false; } - if (!::DuplicateHandle(other_process_, handle, GetCurrentProcess(), - &handle, 0, FALSE, - DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) { + if (!::DuplicateRealHandle( + other_process_, handle, GetCurrentProcess(), &handle, 0, FALSE, + DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) { CHROMIUM_LOG(ERROR) << "DuplicateHandle failed for handle " << handle << " in AcceptHandles"; return false; @@ -787,9 +815,9 @@ bool Channel::ChannelImpl::TransferHandles(Message& msg) { CHROMIUM_LOG(ERROR) << "other_process_ is invalid in TransferHandles"; return false; } - if (!::DuplicateHandle(GetCurrentProcess(), handle, other_process_, - &handle, 0, FALSE, - DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) { + if (!::DuplicateRealHandle( + GetCurrentProcess(), handle, other_process_, &handle, 0, FALSE, + DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE)) { CHROMIUM_LOG(ERROR) << "DuplicateHandle failed for handle " << handle << " in TransferHandles"; return false; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2802cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2802cd… 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_22_0esr_BUILD2
by Pier Angelo Vendrame (＠pierov) 31 Mar '25

31 Mar '25

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

1 0

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40083
by boklm (＠boklm) 28 Mar '25

28 Mar '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2793b655 by Nicolas Vigier at 2025-03-28T08:46:47+01:00 Update rbm for rbm#40083 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit 9dedbe520adc16f53935cebc98c85022d410249d +Subproject commit f04c4f217ad8dbd0caa87d45713a6de576cf0534 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41419: Add comment in downloads.json to mention that the file is deprecated
by morgan (＠morgan) 27 Mar '25

27 Mar '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 52b0e12f by Nicolas Vigier at 2025-03-27T15:10:19+00:00 Bug 41419: Add comment in downloads.json to mention that the file is deprecated - - - - - 1 changed file: - tools/update-responses/update_responses Changes: ===================================== tools/update-responses/update_responses ===================================== @@ -463,6 +463,7 @@ sub write_downloads_json { version => "$version", tag => "$tag", downloads => get_version_downloads($config, $version), + comment => 'This file is deprecated and should not be used. Please use the files download-$platform.json instead.', }; write_htdocs($channel, '.', 'downloads.json', JSON->new->utf8->canonical->pretty->encode($data)); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] Bug 40083: Make remote_mktemp create directory with mode 0755
by morgan (＠morgan) 27 Mar '25

27 Mar '25

morgan pushed to branch main at The Tor Project / Applications / RBM Commits: f04c4f21 by Nicolas Vigier at 2025-03-27T14:37:06+01:00 Bug 40083: Make remote_mktemp create directory with mode 0755 In order to make the permission on out/$project be 0755 (see tor-browser-build#41418), change the permission to 0755 on directories created by `remote_mktemp`. - - - - - 1 changed file: - lib/RBM.pm Changes: ===================================== lib/RBM.pm ===================================== @@ -1209,7 +1209,8 @@ sub build_run { $cmd = project_config($project, "remote_exec", { %$options, exec_cmd => project_config($project, - "remote_mktemp", $options) || 'mktemp -d -p /var/tmp', + "remote_mktemp", $options) || + 'tmpdir=$(mktemp -d -p /var/tmp); chmod 0755 "$tmpdir"; echo "$tmpdir"', exec_name => 'mktemp', exec_as_root => 0, }); View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/f04c4f217ad8dbd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/f04c4f217ad8dbd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] MB 415: Load apparmor profile when configuring deb package
by morgan (＠morgan) 27 Mar '25

27 Mar '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 27246fb1 by Nicolas Vigier at 2025-03-27T15:03:36+00:00 MB 415: Load apparmor profile when configuring deb package Use the command from /usr/share/debhelper/autoscripts/postinst-apparmor (from dh-apparmor package). - - - - - 1 changed file: - projects/linux-packages/debian/postinst.in Changes: ===================================== projects/linux-packages/debian/postinst.in ===================================== @@ -2,11 +2,22 @@ set -e +apparmor_profile='/etc/apparmor.d/[% c("var/system_pkg/pkg_name") %]' + case "$1" in install|upgrade|configure) # If abi 4.0 is not present, then remove the apparmor profile config if [ ! -e /etc/apparmor.d/abi/4.0 ]; then - rm -f /etc/apparmor.d/[% c("var/system_pkg/pkg_name") %] + rm -f "$apparmor_profile" fi ;; esac + +if [ "$1" = "configure" ]; then + if [ -f "$apparmor_profile" ]; then + # Reload the profile, including any abstraction updates + if aa-enabled --quiet 2>/dev/null; then + apparmor_parser -r -T -W "$apparmor_profile" || true + fi + fi +fi 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/mullvad-browser-update-responses][main] 2 commits: release: indent downloads.json
by boklm (＠boklm) 27 Mar '25

27 Mar '25

boklm pushed to branch main at The Tor Project / Applications / mullvad-browser-update-responses Commits: e465dbd5 by Nicolas Vigier at 2025-03-27T14:00:06+01:00 release: indent downloads.json - - - - - 507299fd by Nicolas Vigier at 2025-03-27T14:01:19+01:00 release: add linux-x86_64 and macos URLs to downloads.json - - - - - 1 changed file: - update_1/release/downloads.json Changes: ===================================== update_1/release/downloads.json ===================================== @@ -1 +1,24 @@ -{"downloads":{"win64":{"ALL":{"binary":"https://cdn.mullvad.net/browser/14.0.8/mullvad-browser-windows-x86_64-14.0.…","sig":"https://cdn.mullvad.net/browser/14.0.8/mullvad-browser-windows-x86_64-14.0.…"}}},"tag":"mb-14.0.8-build1","version":"14.0.8"} \ No newline at end of file +{ + "downloads": { + "win64": { + "ALL": { + "binary": "https://cdn.mullvad.net/browser/14.0.8/mullvad-browser-windows-x86_64-14.0.…", + "sig": "https://cdn.mullvad.net/browser/14.0.8/mullvad-browser-windows-x86_64-14.0.…" + } + }, + "linux-x86_64": { + "ALL": { + "binary": "https://cdn.mullvad.net/browser/14.0.7/mullvad-browser-linux-x86_64-14.0.7.…", + "sig": "https://cdn.mullvad.net/browser/14.0.7/mullvad-browser-linux-x86_64-14.0.7.…" + } + }, + "macos": { + "ALL": { + "binary": "https://cdn.mullvad.net/browser/14.0.7/mullvad-browser-macos-14.0.7.dmg", + "sig": "https://cdn.mullvad.net/browser/14.0.7/mullvad-browser-macos-14.0.7.dmg.asc" + } + } + }, + "tag": "mb-14.0.8-build1", + "version": "14.0.8" +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-respo… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41407: Remove the Snowflake vendoring Makefile target.
by Pier Angelo Vendrame (＠pierov) 27 Mar '25

27 Mar '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: fa1f4974 by Pier Angelo Vendrame at 2025-03-26T19:21:22+01:00 Bug 41407: Remove the Snowflake vendoring Makefile target. - - - - - 1 changed file: - Makefile Changes: ===================================== Makefile ===================================== @@ -650,9 +650,6 @@ cargo_vendor-lox: submodule-update cargo_vendor-uniffi-rs: submodule-update $(rbm) build uniffi-rs --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 -go_vendor-snowflake: submodule-update - $(rbm) build snowflake --step go_vendor --target alpha --target torbrowser-linux-x86_64 - go_vendor-conjure: submodule-update $(rbm) build conjure --step go_vendor --target alpha --target torbrowser-linux-x86_64 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][tor-browser-128.8.0esr-14.5-1] 4 commits: fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 27 Mar '25

27 Mar '25

Pier Angelo Vendrame pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: e54a67ba by Henry Wilkes at 2025-03-27T09:59:37+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43563: Use TorConnect.getRegionNames rather than TorConnect.countryNames. Also, add a note regarding changing app locales. - - - - - c71487dc by Henry Wilkes at 2025-03-27T09:59:37+00:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 43563: Re-fill the list of region names when the app locale changes. We also clean up some of the corresponding code. - - - - - 31ac7a09 by Henry Wilkes at 2025-03-27T09:59:37+00:00 fixup! TB 40597: Implement TorSettings module TB 43563: Rebuild TorConnect region names when the app locale changes. Also rename TorConnect.countryNames to TorConnect.getRegionNames. - - - - - d24a4c8c by Henry Wilkes at 2025-03-27T09:59:37+00:00 fixup! TB 42247: Android helpers for the TorProvider TB 43563: Use TorConnect.getRegionNames rather than TorConnect.countryNames. - - - - - 7 changed files: - browser/components/torpreferences/content/connectionPane.js - toolkit/components/torconnect/TorConnectParent.sys.mjs - toolkit/components/torconnect/content/aboutTorConnect.html - toolkit/components/torconnect/content/aboutTorConnect.js - toolkit/modules/RemotePageAccessManager.sys.mjs - toolkit/modules/TorAndroidIntegration.sys.mjs - toolkit/modules/TorConnect.sys.mjs Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -2545,17 +2545,14 @@ const gConnectionPane = (function () { } return item; }; + + // TODO: Re-fetch when intl:app-locales-changed is fired, if we keep + // this after tor-browser#42477. + const regionNames = TorConnect.getRegionNames(); const addLocations = codes => { const items = []; for (const code of codes) { - items.push( - createItem( - code, - TorConnect.countryNames[code] - ? TorConnect.countryNames[code] - : code - ) - ); + items.push(createItem(code, regionNames[code] || code)); } items.sort((left, right) => left.label.localeCompare(right.label)); locationEntries.append(...items); @@ -2573,7 +2570,7 @@ const gConnectionPane = (function () { locationEntries.append( createItem("", TorStrings.settings.bridgeLocationOther, true) ); - addLocations(Object.keys(TorConnect.countryNames)); + addLocations(Object.keys(regionNames)); }); this._showAutoconfiguration = () => { locationGroup.hidden = ===================================== toolkit/components/torconnect/TorConnectParent.sys.mjs ===================================== @@ -53,6 +53,9 @@ export class TorConnectParent extends JSWindowActorParent { TorConnect.quickstart ); break; + case TorConnectTopics.RegionNamesChange: + self.sendAsyncMessage("torconnect:region-names-change"); + break; } }, }; @@ -69,6 +72,10 @@ export class TorConnectParent extends JSWindowActorParent { this.torConnectObserver, TorConnectTopics.QuickstartChange ); + Services.obs.addObserver( + this.torConnectObserver, + TorConnectTopics.RegionNamesChange + ); } didDestroy() { @@ -84,6 +91,10 @@ export class TorConnectParent extends JSWindowActorParent { this.torConnectObserver, TorConnectTopics.QuickstartChange ); + Services.obs.removeObserver( + this.torConnectObserver, + TorConnectTopics.RegionNamesChange + ); } async receiveMessage(message) { @@ -134,7 +145,6 @@ export class TorConnectParent extends JSWindowActorParent { return { TorStrings, Direction: Services.locale.isAppLocaleRTL ? "rtl" : "ltr", - CountryNames: TorConnect.countryNames, stage: TorConnect.stage, userHasEverClickedConnect: Services.prefs.getBoolPref( userHasEverClickedConnectPref, @@ -142,8 +152,10 @@ export class TorConnectParent extends JSWindowActorParent { ), quickstartEnabled: TorConnect.quickstart, }; - case "torconnect:get-frequent-regions": - return TorConnect.getFrequentRegions(); + case "torconnect:get-regions": + return TorConnect.getFrequentRegions().then(frequent => { + return { names: TorConnect.getRegionNames(), frequent }; + }); } return undefined; } ===================================== toolkit/components/torconnect/content/aboutTorConnect.html ===================================== @@ -68,7 +68,11 @@ <div class="button-container"> <label id="locationDropdownLabel" for="countries"></label> <form id="locationDropdown" hidden="true"> - <select id="countries"></select> + <select id="regions-select"> + <option id="first-region-option"></option> + <optgroup id="frequent-regions-option-group"></optgroup> + <optgroup id="full-regions-option-group"></optgroup> + </select> </form> <span id="buttonPadding"></span> <span id="connectButtonContainer"> ===================================== toolkit/components/torconnect/content/aboutTorConnect.js ===================================== @@ -70,7 +70,7 @@ class AboutTorConnect { tryBridge: "button#tryBridgeButton", locationDropdownLabel: "#locationDropdownLabel", locationDropdown: "#locationDropdown", - locationDropdownSelect: "#locationDropdown select", + locationDropdownSelect: "#regions-select", }, }); @@ -129,13 +129,38 @@ class AboutTorConnect { locationDropdownSelect: document.querySelector( this.selectors.buttons.locationDropdownSelect ), + firstRegionOption: document.getElementById("first-region-option"), + frequentRegionsOptionGroup: document.getElementById( + "frequent-regions-option-group" + ), + fullRegionsOptionGroup: document.getElementById( + "full-regions-option-group" + ), tryBridgeButton: document.querySelector(this.selectors.buttons.tryBridge), }); - selectedLocation; + /** + * The currently shown stage, or `null` if the page in uninitialised. + * + * @type {?string} + */ shownStage = null; - locations = {}; + /** + * A promise that resolves to a list of region names and frequent regions, or + * `null` if this needs to be re-fetched from the TorConnectParent. + * + * @type {?Promise<object>} + */ + regions = null; + + /** + * The option value that *should* be selected when the list of regions is + * populated. + * + * @type {string} + */ + selectedRegion = ""; /** * Whether the user requested a cancellation of the bootstrap from *this* @@ -201,89 +226,6 @@ class AboutTorConnect { this.hide(this.elements.tryBridgeButton); } - populateLocations() { - const selectCountryRegion = document.createElement("option"); - selectCountryRegion.textContent = TorStrings.torConnect.selectCountryRegion; - selectCountryRegion.value = ""; - - // get all codes and names from TorStrings - const locationNodes = []; - for (const [code, name] of Object.entries(this.locations)) { - let option = document.createElement("option"); - option.value = code; - option.textContent = name; - locationNodes.push(option); - } - // locale sort by name - locationNodes.sort((left, right) => - left.textContent.localeCompare(right.textContent) - ); - this.elements.locationDropdownSelect.append( - selectCountryRegion, - ...locationNodes - ); - } - - populateFrequentLocations(locations) { - this.removeFrequentLocations(); - if (!locations || !locations.length) { - return; - } - - const locationNodes = []; - for (const code of locations) { - const option = document.createElement("option"); - option.value = code; - option.className = "frequent-location"; - // codes (partially) come from rdsys service, so make sure we have a - // string defined for it - let name = this.locations[code]; - if (!name) { - name = code; - } - option.textContent = name; - locationNodes.push(option); - } - // locale sort by name - locationNodes.sort((left, right) => - left.textContent.localeCompare(right.textContent) - ); - - const frequentGroup = document.createElement("optgroup"); - frequentGroup.setAttribute( - "label", - TorStrings.torConnect.frequentLocations - ); - frequentGroup.className = "frequent-location"; - const locationGroup = document.createElement("optgroup"); - locationGroup.setAttribute("label", TorStrings.torConnect.otherLocations); - locationGroup.className = "frequent-location"; - // options[0] is either "Select Country or Region" or "Automatic" - this.elements.locationDropdownSelect.options[0].after( - frequentGroup, - ...locationNodes, - locationGroup - ); - } - - removeFrequentLocations() { - const select = this.elements.locationDropdownSelect; - for (const option of select.querySelectorAll(".frequent-location")) { - option.remove(); - } - } - - validateLocation() { - const selectedIndex = this.elements.locationDropdownSelect.selectedIndex; - const selectedOption = - this.elements.locationDropdownSelect.options[selectedIndex]; - if (!selectedOption.value) { - this.elements.tryBridgeButton.setAttribute("disabled", "disabled"); - } else { - this.elements.tryBridgeButton.removeAttribute("disabled"); - } - } - setTitle(title, className) { this.elements.heading.textContent = title; this.elements.title.className = "title"; @@ -407,7 +349,9 @@ class AboutTorConnect { const prevStage = this.shownStage; this.shownStage = stage.name; - this.selectedLocation = stage.defaultRegion; + // Make a request to change the selected region in the next call to + // selectRegionOption. + this.selectedRegion = stage.defaultRegion; // By default we want to reset the focus to the top of the page when // changing the displayed page since we want a user to read the new page @@ -708,24 +652,105 @@ class AboutTorConnect { } } + /** + * Try and select the region specified in `selectedRegion`. + */ + selectRegionOption() { + // NOTE: If the region appears in both the frequent list and the full list, + // then this will select the region option in + // frequentRegionsOptionGroup, even if the user had prior selected the + // option from fullRegionsOptionGroup. But the overall value should be the + // same. + this.elements.locationDropdownSelect.value = this.selectedRegion; + if (this.elements.locationDropdownSelect.selectedIndex === -1) { + // Select the first, as a fallback. E.g. in RegionNotFound the + // selectedRegion may still be "automatic", but this is no longer + // available. + this.elements.locationDropdownSelect.selectedIndex = 0; + } + this.validateRegion(); + } + + /** + * Ensure that the current selected region is valid for the shown stage. + */ + validateRegion() { + this.elements.tryBridgeButton.toggleAttribute( + "disabled", + !this.elements.locationDropdownSelect.value + ); + } + + /** + * Populate the full list of regions, if necessary. + */ + async populateDelayedRegionOptions() { + if (this.regions) { + // Already populated, or about to populate. + return; + } + + this.regions = RPMSendQuery("torconnect:get-regions"); + const regions = this.regions; + const { names, frequent } = await regions; + + if (regions !== this.regions) { + // Replaced by a new call. + return; + } + + this.setRegionOptions( + this.elements.frequentRegionsOptionGroup, + frequent.map(code => [code, names[code]]) + ); + + this.setRegionOptions( + this.elements.fullRegionsOptionGroup, + Object.entries(names) + ); + + // Now that the list has been re-populated we want to re-select the + // requested region. + this.selectRegionOption(); + } + + /** + * Set the shown region options. + * + * @param {HTMLOptGroupElement} group - The group to set the children of. + * @param {[string, string|undefined][]} regions - The list of region + * key-value entries to fill the group with. The key is the region code and + * the value is the region's localised name. + */ + setRegionOptions(group, regions) { + const regionNodes = regions + .sort(([_code1, name1], [_code2, name2]) => name1.localeCompare(name2)) + .map(([code, name]) => { + const option = document.createElement("option"); + option.value = code; + // If the name is unexpectedly empty or undefined we use the code + // instead. + option.textContent = name || code; + return option; + }); + group.replaceChildren(...regionNodes); + } + showLocationForm(isChoose, buttonLabel) { this.hideButtons(); - RPMSendQuery("torconnect:get-frequent-regions").then(codes => { - if (codes && codes.length) { - this.populateFrequentLocations(codes); - this.setLocation(); - } - }); - let firstOpt = this.elements.locationDropdownSelect.options[0]; - if (isChoose) { - firstOpt.value = "automatic"; - firstOpt.textContent = TorStrings.torConnect.automatic; - } else { - firstOpt.value = ""; - firstOpt.textContent = TorStrings.torConnect.selectCountryRegion; - } - this.setLocation(); - this.validateLocation(); + + this.elements.firstRegionOption.textContent = isChoose + ? TorStrings.torConnect.automatic + : TorStrings.torConnect.selectCountryRegion; + this.elements.firstRegionOption.value = isChoose ? "automatic" : ""; + + // Try and select the region now, prior to waiting for + // populateDelayedRegionOptions. + this.selectRegionOption(); + + // Async fill the rest of the region options, if needed. + this.populateDelayedRegionOptions(); + this.show(this.elements.locationDropdownLabel); this.show(this.elements.locationDropdown); this.elements.locationDropdownLabel.classList.toggle("error", !isChoose); @@ -735,29 +760,6 @@ class AboutTorConnect { } } - getLocation() { - const selectedIndex = this.elements.locationDropdownSelect.selectedIndex; - return this.elements.locationDropdownSelect.options[selectedIndex].value; - } - - setLocation() { - const code = this.selectedLocation; - if (this.getLocation() === code) { - return; - } - const options = this.elements.locationDropdownSelect.options; - // We need to do this way, because we have repeated values that break - // the .value way to select (which would however require the label, - // rather than the code)... - for (let i = 0; i < options.length; i++) { - if (options[i].value === code) { - this.elements.locationDropdownSelect.selectedIndex = i; - break; - } - } - this.validateLocation(); - } - initElements(direction) { const isAndroid = navigator.userAgent.includes("Android"); document.body.classList.toggle("android", isAndroid); @@ -826,17 +828,32 @@ class AboutTorConnect { this.beginBootstrapping(this.shownStage === "Start"); }); - this.populateLocations(); this.elements.locationDropdownSelect.addEventListener("change", () => { - this.validateLocation(); + // Overwrite the stage requested selectedRegion. + // NOTE: This should not fire in response to a programmatic change in + // value. + // E.g. if the user selects a region, then changes locale, we want the + // same region to be re-selected after the option list is rebuilt. + this.selectedRegion = this.elements.locationDropdownSelect.value; + + this.validateRegion(); }); this.elements.locationDropdownLabel.textContent = TorStrings.torConnect.unblockInternetIn; + this.elements.frequentRegionsOptionGroup.setAttribute( + "label", + TorStrings.torConnect.frequentLocations + ); + this.elements.fullRegionsOptionGroup.setAttribute( + "label", + TorStrings.torConnect.otherLocations + ); + this.elements.tryBridgeButton.textContent = TorStrings.torConnect.tryBridge; this.elements.tryBridgeButton.addEventListener("click", () => { - const value = this.getLocation(); + const value = this.elements.locationDropdownSelect.value; if (value) { this.beginAutoBootstrapping(value); } @@ -879,6 +896,15 @@ class AboutTorConnect { RPMAddMessageListener("torconnect:quickstart-change", ({ data }) => { this.updateQuickstart(data); }); + RPMAddMessageListener("torconnect:region-names-change", () => { + // Reset the regions list. + this.regions = null; + if (!this.elements.locationDropdown.hidden) { + // Re-populate immediately. + this.populateDelayedRegionOptions(); + } + // Else, wait until we show the region select to re-populate. + }); } initKeyboardShortcuts() { @@ -897,7 +923,6 @@ class AboutTorConnect { // various constants TorStrings = Object.freeze(args.TorStrings); - this.locations = args.CountryNames; this.initElements(args.Direction); this.initObservers(); ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -242,6 +242,7 @@ export let RemotePageAccessManager = { "torconnect:stage-change", "torconnect:bootstrap-progress", "torconnect:quickstart-change", + "torconnect:region-names-change", ], RPMSendAsyncMessage: [ "torconnect:open-tor-preferences", @@ -253,10 +254,7 @@ export let RemotePageAccessManager = { "torconnect:start-again", "torconnect:choose-region", ], - RPMSendQuery: [ - "torconnect:get-init-args", - "torconnect:get-frequent-regions", - ], + RPMSendQuery: ["torconnect:get-init-args", "torconnect:get-regions"], }, "about:welcome": { RPMSendAsyncMessage: ["ActivityStream:ContentToMain"], ===================================== toolkit/modules/TorAndroidIntegration.sys.mjs ===================================== @@ -115,6 +115,10 @@ class TorAndroidIntegrationImpl { stage: subj.wrappedJSObject ?? "", }); break; + case lazy.TorConnectTopics.RegionNamesChange: + // TODO: Respond to change in region names if we are showing a + // TorConnectStage that uses them. + break; case lazy.TorConnectTopics.BootstrapProgress: lazy.EventDispatcher.instance.sendRequest({ type: EmittedEvents.bootstrapProgress, @@ -202,7 +206,7 @@ class TorAndroidIntegrationImpl { lazy.TorConnect.quickstart = data.enabled; break; case ListenedEvents.countryNamesGet: - callback?.onSuccess(lazy.TorConnect.countryNames); + callback?.onSuccess(lazy.TorConnect.getRegionNames()); return; } callback?.onSuccess(); ===================================== toolkit/modules/TorConnect.sys.mjs ===================================== @@ -89,6 +89,7 @@ export const TorConnectTopics = Object.freeze({ StateChange: "torconnect:state-change", QuickstartChange: "torconnect:quickstart-change", InternetStatusChange: "torconnect:internet-status-change", + RegionNamesChange: "torconnect:region-names-change", BootstrapProgress: "torconnect:bootstrap-progress", BootstrapComplete: "torconnect:bootstrap-complete", // TODO: Remove torconnect:error when pages have switched to stage. @@ -842,17 +843,13 @@ export const TorConnect = { */ _moatRegionsPromise: null, - _countryNames: Object.freeze( - (() => { - const codes = Services.intl.getAvailableLocaleDisplayNames("region"); - const names = Services.intl.getRegionDisplayNames(undefined, codes); - let codesNames = {}; - for (let i = 0; i < codes.length; i++) { - codesNames[codes[i]] = names[i]; - } - return codesNames; - })() - ), + /** + * The map of all regions and their localized names. Or `null` when + * uninitialized. + * + * @type {?object} + */ + _regionNames: null, /** * The status of the most recent bootstrap attempt. @@ -937,6 +934,7 @@ export const TorConnect = { observeTopic(lazy.TorProviderTopics.HasWarnOrErr); observeTopic(lazy.TorSettingsTopics.SettingsChanged); observeTopic(NETWORK_LINK_TOPIC); + observeTopic("intl:app-locales-changed"); this._updateInternetStatus(); @@ -1003,6 +1001,12 @@ export const TorConnect = { case NETWORK_LINK_TOPIC: this._updateInternetStatus(); break; + case "intl:app-locales-changed": + // Unset the regionNames to use the new app locale when requested. + this._regionNames = null; + // Let consumers know that the list of names has changed. + Services.obs.notifyObservers(null, TorConnectTopics.RegionNamesChange); + break; } }, @@ -1148,8 +1152,22 @@ export const TorConnect = { return null; }, - get countryNames() { - return this._countryNames; + /** + * Get a map of all region codes and their localized names. + * + * @returns {object} - The region names in the current locale. + */ + getRegionNames() { + if (!this._regionNames) { + this._regionNames = {}; + const codes = Services.intl.getAvailableLocaleDisplayNames("region"); + // Get the localised names, for the current app locale. + const names = Services.intl.getRegionDisplayNames(undefined, codes); + for (let i = 0; i < codes.length; i++) { + this._regionNames[codes[i]] = names[i]; + } + } + return structuredClone(this._regionNames); }, /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/375a8c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/375a8c… You're receiving this email because of your account on gitlab.torproject.org.

1 0