June 2023 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by richard (＠richard) 14 Jun '23

14 Jun '23

richard pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ba957145 by Henry Wilkes at 2023-06-14T15:40:56+01:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41850: Don't show tor connection animation for new windows. - - - - - 2 changed files: - browser/components/torconnect/content/torConnectTitlebarStatus.css - browser/components/torconnect/content/torConnectTitlebarStatus.js Changes: ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.css ===================================== @@ -64,11 +64,11 @@ } @media (prefers-reduced-motion: no-preference) { - #tor-connect-titlebar-status.tor-connect-status-connected { + #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition { transition: color 1000ms; } - #tor-connect-titlebar-status.tor-connect-status-connected img { + #tor-connect-titlebar-status.tor-connect-status-connected.tor-connect-status-animate-transition img { animation-name: onion-not-connected-to-connected; animation-delay: 200ms; animation-fill-mode: both; ===================================== browser/components/torconnect/content/torConnectTitlebarStatus.js ===================================== @@ -16,6 +16,12 @@ var gTorConnectTitlebarStatus = { * @type {Element} */ label: null, + /** + * Whether we are connected, or null if the connection state is not yet known. + * + * @type {bool?} + */ + connected: null, /** * Initialize the component. @@ -84,7 +90,31 @@ var gTorConnectTitlebarStatus = { break; } this.label.textContent = this._strings[textId]; - this.node.classList.toggle("tor-connect-status-connected", connected); + if (this.connected !== connected) { + // When we are transitioning from + // this.connected = false + // to + // this.connected = true + // we want to animate the transition from the not connected state to the + // connected state (provided prefers-reduced-motion is not set). + // + // If instead we are transitioning directly from the initial state + // this.connected = null + // to + // this.connected = true + // we want to immediately show the connected state without any transition. + // + // In both cases, the status will eventually be hidden. + // + // We only expect this latter case when opening a new window after + // bootstrapping has already completed. See tor-browser#41850. + this.node.classList.toggle( + "tor-connect-status-animate-transition", + connected && this.connected !== null + ); + this.node.classList.toggle("tor-connect-status-connected", connected); + this.connected = connected; + } this.node.classList.toggle( "tor-connect-status-potentially-blocked", potentiallyBlocked View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba95714… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba95714… 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-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: fc3e82b2 by Henry Wilkes at 2023-06-14T12:50:56+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41849: Use the firefox check.svg since we removed our own equivalent check.svg in tor-browser!663. (cherry picked from commit 4e9c03457f775b9d98945d73b1b876b50b5340c9) - - - - - 1 changed file: - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -210,7 +210,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { .torPreferences-current-bridge-icon { margin-inline-start: 1px; margin-inline-end: 7px; - list-style-image: url("chrome://browser/content/torpreferences/check.svg"); + list-style-image: url("chrome://global/skin/icons/check.svg"); -moz-context-properties: fill; fill: currentColor; flex: 0 0 auto; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fc3e82b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fc3e82b… 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: 4e9c0345 by Henry Wilkes at 2023-06-14T12:50:20+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41849: Use the firefox check.svg since we removed our own equivalent check.svg in tor-browser!663. - - - - - 1 changed file: - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -210,7 +210,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before { .torPreferences-current-bridge-icon { margin-inline-start: 1px; margin-inline-end: 7px; - list-style-image: url("chrome://browser/content/torpreferences/check.svg"); + list-style-image: url("chrome://global/skin/icons/check.svg"); -moz-context-properties: fill; fill: currentColor; flex: 0 0 auto; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4e9c034… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4e9c034… 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-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