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

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 2 commits: fixup! Add TorStrings module for localization
by Richard Pospesel (＠richard) 15 Apr '23

15 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 84b47639 by Dan Ballard at 2023-04-14T20:35:41+00:00 fixup! Add TorStrings module for localization Bug 41617: Improve the UX of the built-in bridges dialog - - - - - f0df6486 by Dan Ballard at 2023-04-14T21:02:03+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41617: Improve the UX of the built-in bridges dialog - - - - - 5 changed files: - browser/components/torpreferences/content/builtinBridgeDialog.jsm - browser/components/torpreferences/content/builtinBridgeDialog.xhtml - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorStrings.jsm - toolkit/torbutton/chrome/locale/en-US/settings.properties Changes: ===================================== browser/components/torpreferences/content/builtinBridgeDialog.jsm ===================================== @@ -1,19 +1,30 @@ "use strict"; +const obs = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService); + var EXPORTED_SYMBOLS = ["BuiltinBridgeDialog"]; const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); const { TorSettings, + TorSettingsTopics, TorBridgeSource, TorBuiltinBridgeTypes, } = ChromeUtils.import("resource:///modules/TorSettings.jsm"); +const { + TorConnect, + TorConnectTopics, + TorConnectState, +} = ChromeUtils.import("resource:///modules/TorConnect.jsm"); + class BuiltinBridgeDialog { constructor(onSubmit) { this.onSubmit = onSubmit; this._dialog = null; + this._window = null; + this._acceptButton = null; } static get selectors() { @@ -27,27 +38,31 @@ class BuiltinBridgeDialog { snowflakeDescr: "#torPreferences-builtinBridges-descrSnowflake", meekAzureRadio: "#torPreferences-builtinBridges-radioMeekAzure", meekAzureDescr: "#torPreferences-builtinBridges-descrMeekAzure", + acceptButton: "accept" /* not really a selector but a key for dialog's getButton */, }; } _populateXUL(window, aDialog) { const selectors = BuiltinBridgeDialog.selectors; + this._window = window; this._dialog = aDialog; const dialogWin = this._dialog.parentElement; - dialogWin.setAttribute("title", TorStrings.settings.builtinBridgeTitle); + dialogWin.setAttribute("title", TorStrings.settings.builtinBridgeHeader); - this._dialog.querySelector(selectors.header).textContent = - TorStrings.settings.builtinBridgeHeader; this._dialog.querySelector(selectors.description).textContent = TorStrings.settings.builtinBridgeDescription; + + this._acceptButton = this._dialog.getButton(selectors.acceptButton); + this.onTorStateChange(); + let radioGroup = this._dialog.querySelector(selectors.radiogroup); let types = { obfs4: { elemRadio: this._dialog.querySelector(selectors.obfsRadio), elemDescr: this._dialog.querySelector(selectors.obfsDescr), - label: TorStrings.settings.builtinBridgeObfs4, + label: TorStrings.settings.builtinBridgeObfs4Title, descr: TorStrings.settings.builtinBridgeObfs4Description, }, snowflake: { @@ -94,6 +109,16 @@ class BuiltinBridgeDialog { // Hack: see the CSS this._dialog.style.minWidth = "0"; this._dialog.style.minHeight = "0"; + + obs.addObserver(this, TorConnectTopics.StateChange); + } + + onTorStateChange() { + if (TorConnect.state === TorConnectState.Configuring) { + this._acceptButton.setAttribute("label", TorStrings.settings.bridgeButtonConnect); + } else { + this._acceptButton.setAttribute("label", TorStrings.settings.bridgeButtonAccept); + } } init(window, aDialog) { @@ -103,10 +128,27 @@ class BuiltinBridgeDialog { }, 0); } + observe(subject, topic, data) { + switch (topic) { + case TorConnectTopics.StateChange: { + this.onTorStateChange(); + break; + } + } + } + + close() { + // unregister our observer topics + obs.removeObserver(this, TorConnectTopics.StateChange); + } + openDialog(gSubDialog) { gSubDialog.open( "chrome://browser/content/torpreferences/builtinBridgeDialog.xhtml", - { features: "resizable=yes" }, + { features: "resizable=yes", + closingCallback: () => { + this.close(); + },}, this ); } ===================================== browser/components/torpreferences/content/builtinBridgeDialog.xhtml ===================================== @@ -8,7 +8,6 @@ xmlns:html="http://www.w3.org/1999/xhtml"> <dialog id="torPreferences-builtinBridge-dialog" buttons="help,accept,cancel"> - <html:h3 id="torPreferences-builtinBridge-header"></html:h3> <description> <html:div id="torPreferences-builtinBridge-description"><br/></html:div> </description> ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1071,6 +1071,11 @@ const gConnectionPane = (function() { TorSettings.applySettings().then(result => { this._populateBridgeCards(); }); + // The bridge dialog button is "connect" when Tor is not bootstrapped, + // so do the connect + if (TorConnect.state == TorConnectState.Configuring) { + TorConnect.openTorConnect({ beginBootstrap: true }) + } }); builtinBridgeDialog.openDialog(gSubDialog); }, ===================================== browser/modules/TorStrings.jsm ===================================== @@ -95,7 +95,7 @@ const Loader = { // Bridge settings bridgesHeading: "Bridges", bridgesDescription: - "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.", + "Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.", bridgeLocation: "Your location", bridgeLocationAutomatic: "Automatic", bridgeLocationFrequent: "Frequently selected locations", @@ -141,16 +141,19 @@ const Loader = { builtinBridgeTitle: "Built-In Bridges", builtinBridgeHeader: "Select a Built-In Bridge", builtinBridgeDescription: - "Tor Browser includes some specific types of bridges known as “pluggable transports”.", + "Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor.", builtinBridgeObfs4: "obfs4", + builtinBridgeObfs4Title: "obfs4 (Built-in)", builtinBridgeObfs4Description: - "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.", + "Makes your Tor traffic look like random data. May not work in heavily censored regions.", builtinBridgeSnowflake: "Snowflake", builtinBridgeSnowflakeDescription: - "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.", + "Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example.", builtinBridgeMeekAzure: "meek-azure", builtinBridgeMeekAzureDescription: - "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.", + "Makes it look like you’re connected to a Microsoft web site, instead of using Tor. May work in heavily censored regions, but is usually very slow.", + bridgeButtonConnect: "Connect", + bridgeButtonAccept: "OK", // Request bridges dialog requestBridgeDialogTitle: "Request Bridge", submitCaptcha: "Submit", ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -26,7 +26,7 @@ settings.quickstartCheckbox=Always connect automatically # Bridge settings settings.bridgesHeading=Bridges -settings.bridgesDescription=Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another. +settings.bridgesDescription=Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another. settings.bridgeLocation=Your location settings.bridgeLocationAutomatic=Automatic settings.bridgeLocationFrequent=Frequently selected locations @@ -73,14 +73,18 @@ settings.scanQrTitle=Scan the QR code # Builtin bridges dialog settings.builtinBridgeTitle=Built-In Bridges +# Bug 41617: Todo - delete builtinBridgeHeader, no longer user settings.builtinBridgeHeader=Select a Built-In Bridge -settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”. +settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor. settings.builtinBridgeObfs4=obfs4 -settings.builtinBridgeObfs4Description=obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges. +settings.builtinBridgeObfs4Title=obfs4 (Built-in) +settings.builtinBridgeObfs4Description=Makes your Tor traffic look like random data. May not work in heavily censored regions. settings.builtinBridgeSnowflake=Snowflake -settings.builtinBridgeSnowflakeDescription=Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers. +settings.builtinBridgeSnowflakeDescription=Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example. settings.builtinBridgeMeekAzure=meek-azure -settings.builtinBridgeMeekAzureDescription=meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor. +settings.builtinBridgeMeekAzureDescription=Makes it look like you’re connected to a Microsoft web site, instead of using Tor. May work in heavily censored regions, but is usually very slow. +settings.bridgeButtonConnect=Connect +settings.bridgeButtonAccept=OK # Request bridges dialog settings.requestBridgeDialogTitle=Request Bridge View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/314794… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/314794… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 2 commits: fixup! Add TorStrings module for localization
by Richard Pospesel (＠richard) 15 Apr '23

15 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f518efb1 by Dan Ballard at 2023-04-14T20:01:32+00:00 fixup! Add TorStrings module for localization Bug 41714: 'Show Fewer Bridges' button missing from refactored remove all bridges UI - - - - - 314794b1 by Dan Ballard at 2023-04-14T20:01:32+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41714: 'Show Fewer Bridges' button missing from refactored remove all bridges UI. Bug 41713: 'Remove All Bridges' button only appears after hitting 'Show All Bridges' - - - - - 3 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml - browser/modules/TorStrings.jsm Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -659,8 +659,11 @@ const gConnectionPane = (function() { const showAll = prefpane.querySelector(selectors.bridges.showAll); showAll.setAttribute("label", TorStrings.settings.bridgeShowAll); showAll.addEventListener("command", () => { - this._currentBridgesExpanded = true; + this._currentBridgesExpanded = !this._currentBridgesExpanded; this._populateBridgeCards(); + if (!this._currentBridgesExpanded) { + bridgeSwitch.scrollIntoView({ behavior: "smooth" }); + } }); const removeAll = prefpane.querySelector(selectors.bridges.removeAll); removeAll.setAttribute("label", TorStrings.settings.bridgeRemoveAll); @@ -673,17 +676,17 @@ const gConnectionPane = (function() { const newStrings = new Set(TorSettings.bridges.bridge_strings); const numBridges = newStrings.size; if (!newStrings.size) { - bridgeHeader.setAttribute("hidden", "true"); - bridgeDescription.setAttribute("hidden", "true"); - bridgeCards.setAttribute("hidden", "true"); - showAll.setAttribute("hidden", "true"); - removeAll.setAttribute("hidden", "true"); + bridgeHeader.hidden = true; + bridgeDescription.hidden = true; + bridgeCards.hidden = true; + showAll.hidden = true; + removeAll.hidden = true; bridgeCards.textContent = ""; return; } - bridgeHeader.removeAttribute("hidden"); - bridgeDescription.removeAttribute("hidden"); - bridgeCards.removeAttribute("hidden"); + bridgeHeader.hidden = false; + bridgeDescription.hidden = false; + bridgeCards.hidden = false; bridgeSwitch.checked = TorSettings.bridges.enabled; bridgeCards.classList.toggle("disabled", !TorSettings.bridges.enabled); bridgeCards.classList.toggle("single-card", numBridges === 1); @@ -729,22 +732,32 @@ const gConnectionPane = (function() { } // And finally update the buttons - if (numBridges > collapseThreshold && !this._currentBridgesExpanded) { - showAll.removeAttribute("hidden"); - if (TorSettings.bridges.enabled) { - showAll.classList.add("primary"); - } else { - showAll.classList.remove("primary"); - } - removeAll.setAttribute("hidden", "true"); - if (TorSettings.bridges.enabled) { - // We do not want both collapsed and disabled at the same time, - // because we use collapsed only to display a gradient on the list. - bridgeCards.classList.add("list-collapsed"); - } + removeAll.hidden = false; + showAll.classList.toggle("primary", TorSettings.bridges.enabled); + if (numBridges > collapseThreshold) { + showAll.hidden = false; + showAll.setAttribute( + "aria-expanded", + // Boolean value gets converted to string "true" or "false". + this._currentBridgesExpanded + ); + showAll.setAttribute( + "label", + this._currentBridgesExpanded + ? TorStrings.settings.bridgeShowFewer + : TorStrings.settings.bridgeShowAll + ); + // We do not want both collapsed and disabled at the same time, + // because we use collapsed only to display a gradient on the list. + bridgeCards.classList.toggle( + "list-collapsed", + !this._currentBridgesExpanded && TorSettings.bridges.enabled + ); } else { - showAll.setAttribute("hidden", "true"); - removeAll.removeAttribute("hidden"); + // NOTE: We do not expect the showAll button to have focus when we + // hide it since we do not expect `numBridges` to decrease whilst + // this button is focused. + showAll.hidden = true; bridgeCards.classList.remove("list-collapsed"); } }; ===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -138,7 +138,8 @@ </vbox> <vbox id="torPreferences-currentBridges-cards"></vbox> <vbox align="center"> - <button id="torPreferences-currentBridges-showAll"/> + <button id="torPreferences-currentBridges-showAll" + aria-controls="torPreferences-currentBridges-cards"/> </vbox> <html:h2 id="torPreferences-addBridge-header"></html:h2> <hbox align="center"> ===================================== browser/modules/TorStrings.jsm ===================================== @@ -112,6 +112,7 @@ const Loader = { bridgeCopy: "Copy Bridge Address", copied: "Copied!", bridgeShowAll: "Show All Bridges", + bridgeShowFewer: "Show Fewer Bridges", allBridgesEnabled: "Use current bridges", bridgeRemoveAll: "Remove All Bridges", bridgeRemoveAllDialogTitle: "Remove all bridges?", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/adfc97… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/adfc97… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.0-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Richard Pospesel (＠richard) 15 Apr '23

15 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 77a7ec15 by Richard Pospesel at 2023-04-14T19:56:46+00:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date - - - - - 1 changed file: - tools/torbrowser/bridges.js Changes: ===================================== tools/torbrowser/bridges.js ===================================== @@ -7,71 +7,56 @@ pref( ); pref( "extensions.torlauncher.default_bridge.obfs4.2", - "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.3", - "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.5", + "extensions.torlauncher.default_bridge.obfs4.3", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.6", + "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.7", - "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.8", + "extensions.torlauncher.default_bridge.obfs4.5", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.9", + "extensions.torlauncher.default_bridge.obfs4.6", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.10", + "extensions.torlauncher.default_bridge.obfs4.7", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.11", + "extensions.torlauncher.default_bridge.obfs4.8", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.12", + "extensions.torlauncher.default_bridge.obfs4.9", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.13", + "extensions.torlauncher.default_bridge.obfs4.10", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.14", - "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.15", + "extensions.torlauncher.default_bridge.obfs4.11", "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ); -pref( - "extensions.torlauncher.default_bridge.obfs4.16", - "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2" -); pref( "extensions.torlauncher.default_bridge.meek-azure.1", - "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" + "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" ); pref( "extensions.torlauncher.default_bridge.snowflake.1", - "snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" +); + +pref( + "extensions.torlauncher.default_bridge.snowflake.2", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" ); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/77a7ec1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/77a7ec1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by Richard Pospesel (＠richard) 15 Apr '23

15 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: adfc97d5 by Richard Pospesel at 2023-04-14T19:47:31+00:00 fixup! Bug 41089: Add tor-browser build scripts + Makefile to tor-browser Bug 41730: Bridge lines in tools/torbrowser/bridges.js out of date - - - - - 1 changed file: - tools/torbrowser/bridges.js Changes: ===================================== tools/torbrowser/bridges.js ===================================== @@ -7,71 +7,56 @@ pref( ); pref( "extensions.torlauncher.default_bridge.obfs4.2", - "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.3", - "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.5", + "extensions.torlauncher.default_bridge.obfs4.3", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.6", + "extensions.torlauncher.default_bridge.obfs4.4", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.7", - "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.8", + "extensions.torlauncher.default_bridge.obfs4.5", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.9", + "extensions.torlauncher.default_bridge.obfs4.6", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.10", + "extensions.torlauncher.default_bridge.obfs4.7", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.11", + "extensions.torlauncher.default_bridge.obfs4.8", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.12", + "extensions.torlauncher.default_bridge.obfs4.9", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.13", + "extensions.torlauncher.default_bridge.obfs4.10", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" ); pref( - "extensions.torlauncher.default_bridge.obfs4.14", - "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" -); -pref( - "extensions.torlauncher.default_bridge.obfs4.15", + "extensions.torlauncher.default_bridge.obfs4.11", "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" ); -pref( - "extensions.torlauncher.default_bridge.obfs4.16", - "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2" -); pref( "extensions.torlauncher.default_bridge.meek-azure.1", - "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" + "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" ); pref( "extensions.torlauncher.default_bridge.snowflake.1", - "snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72" + "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" +); + +pref( + "extensions.torlauncher.default_bridge.snowflake.2", + "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn" ); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adfc97d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/adfc97d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.0.5-build2
by Richard Pospesel (＠richard) 15 Apr '23

15 Apr '23

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

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch 12.0.5-build2
by Richard Pospesel (＠richard) 15 Apr '23

15 Apr '23

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

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] fixup! Bug 40814: Prepare stable release 12.0.5
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: b6a60199 by Richard Pospesel at 2023-04-12T16:06:53+00:00 fixup! Bug 40814: Prepare stable release 12.0.5 - - - - - 4 changed files: - projects/browser/Bundle-Data/Docs/ChangeLog.txt - projects/fenix/config - projects/firefox/config - projects/geckoview/config Changes: ===================================== projects/browser/Bundle-Data/Docs/ChangeLog.txt ===================================== @@ -1,4 +1,4 @@ -Tor Browser 12.0.5 - April 06 2023 +Tor Browser 12.0.5 - April 12 2023 * All Platforms * Updated Translations * Updated NoScript to 11.4.21 @@ -9,6 +9,7 @@ Tor Browser 12.0.5 - April 06 2023 * Bug 41526: "Cancel" button when establishing a connection should be grey [tor-browser] * Android * Updated GeckoView to 102.10esr + * Bug 41724: Backport Android-specific security fixes from Firefox 112 to ESR 102.10-based Tor Browser [tor-browser] * Build System * Windows * Bug 40822: The Tor Browser installer doesn't run with mandatory ASLR on (0xc000007b) [tor-browser-build] ===================================== projects/fenix/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build3' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build4' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: ===================================== projects/firefox/config ===================================== @@ -15,7 +15,7 @@ var: firefox_platform_version: 102.10.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.0-1' - browser_build: 1 + browser_build: 2 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -14,7 +14,7 @@ container: var: geckoview_version: 102.10.0esr torbrowser_branch: 12.0-1 - browser_build: 1 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] 8 commits: fixup! Bug 40597: Implement TorSettings module
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 1222e90d by Henry Wilkes at 2023-04-13T19:07:38+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. Rename the `hasBootstrapEverFailed` to `potentiallyBlocked` as a specific failure state. Add the `hasEverFailed` boolean property as a catch-all failure state. Add an `enabled` boolean property, which just maps to whether we own the tor process. - - - - - b652316e by Henry Wilkes at 2023-04-13T19:07:39+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. Just use the HasEverFailed state to determine whether to show "Try Again" or to show breadcrumbs. - - - - - 60d18fa7 by Henry Wilkes at 2023-04-13T19:07:39+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Tidy up the TorConnect API for broad error states that the different UI components can share. No longer import TorMonitorService, and just use TorConnect instead. + Use TorConnect.enabled to determine whether to show the settings. + Use TorConnect.hasEverFailed state rather than TorMonitorService.bootstrapErrorOccurred to determine whether to show "Try Again". + Use TorConnect.potentiallyBlocked to determine whether to show the location selector. E.g. we don't want to show this if we just failed an internet connection test. - - - - - 9fe1259d by Henry Wilkes at 2023-04-13T19:07:40+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41608 - Remove unused TorMonitorService.bootstrapErrorOccurred - - - - - d6c9dd4f by Henry Wilkes at 2023-04-13T19:07:40+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Remove unused TorMonitorService.bootstrapErrorOccurred - - - - - 2a8e78df by Henry Wilkes at 2023-04-13T19:07:41+00:00 fixup! Bug 40597: Implement TorSettings module Bug 41608 - Add the canBeginBootstrap and canBeginAutoBootstrap properties to determine whether it is possible to enter the corresponding TorConnectState from the current state. Add options to openTorConnect to begin bootstrapping or auto-bootstrapping once opened. - - - - - 203f9488 by Henry Wilkes at 2023-04-13T19:07:41+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41608 - Use TorConnect.canBeginBootstrap and TorConnect.canBeginAutoBootstrap and use bootstrapping options in openAboutTor. Selecting a location in the preferences now also opens "about:torconnect". - - - - - e109bbd2 by Henry Wilkes at 2023-04-13T19:07:42+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41608 - Remove the FatalError state since it is not defined in TorConnect. - - - - - 5 changed files: - browser/components/torconnect/TorConnectParent.jsm - browser/components/torconnect/content/aboutTorConnect.js - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorConnect.jsm - toolkit/components/tor-launcher/TorMonitorService.jsm Changes: ===================================== browser/components/torconnect/TorConnectParent.jsm ===================================== @@ -38,7 +38,7 @@ class TorConnectParent extends JSWindowActorParent { InternetStatus: TorConnect.internetStatus, DetectedLocation: TorConnect.detectedLocation, ShowViewLog: TorConnect.logHasWarningOrError, - HasBootsrapEverFailed: TorConnect.hasBootstrapEverFailed, + HasEverFailed: TorConnect.hasEverFailed, QuickStartEnabled: TorSettings.quickstart.enabled, UIState: TorConnect.uiState, }; @@ -67,8 +67,7 @@ class TorConnectParent extends JSWindowActorParent { self.state.ErrorMessage = null; self.state.ErrorDetails = null; } - self.state.HasBootsrapEverFailed = - TorConnect.hasBootstrapEverFailed; + self.state.HasEverFailed = TorConnect.hasEverFailed; break; } case TorConnectTopics.BootstrapProgress: { @@ -89,10 +88,6 @@ class TorConnectParent extends JSWindowActorParent { self.state.ShowViewLog = true; break; } - case TorConnectTopics.FatalError: { - // TODO: handle - break; - } case TorSettingsTopics.SettingChanged: { if (aData === TorSettingsData.QuickStartEnabled) { self.state.QuickStartEnabled = obj.value; ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -142,7 +142,6 @@ class AboutTorConnect { uiState = { currentState: UIStates.ConnectToTor, - connectIsTryAgain: false, allowAutomaticLocation: true, selectedLocation: "automatic", bootstrapCause: UIStates.ConnectToTor, @@ -389,12 +388,6 @@ class AboutTorConnect { } update_Error(state) { - if (!this.uiState.connectIsTryAgain) { - // TorConnect.hasBootstrapEverFailed remains false in case of Internet - // offline - this.uiState.connectIsTryAgain = true; - this.saveUIState(); - } if (!state.StateChanged) { return; } @@ -457,7 +450,7 @@ class AboutTorConnect { if (state?.StateChanged) { this.elements.connectButton.focus(); } - if (this.uiState.connectIsTryAgain) { + if (state.HasEverFailed) { this.setBreadcrumbsStatus( BreadcrumbStatus.Active, BreadcrumbStatus.Default, @@ -481,7 +474,7 @@ class AboutTorConnect { switch (this.uiState.bootstrapCause) { case UIStates.ConnectToTor: breadcrumbs[0] = BreadcrumbStatus.Active; - title = this.uiState.connectIsTryAgain + title = state.HasEverFailed ? TorStrings.torConnect.tryAgain : TorStrings.torConnect.torConnecting; description = TorStrings.settings.torPreferencesDescription; @@ -505,7 +498,7 @@ class AboutTorConnect { this.setTitle(title, ""); this.showConfigureConnectionLink(description); this.setProgress("", showProgressbar, state.BootstrapProgress); - if (state.HasBootsrapEverFailed) { + if (state.HasEverFailed) { this.setBreadcrumbsStatus(...breadcrumbs); } else { this.hideBreadcrumbs(); ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -18,9 +18,6 @@ const { TorBridgeSource, } = ChromeUtils.import("resource:///modules/TorSettings.jsm"); -const { TorMonitorService } = ChromeUtils.import( - "resource://gre/modules/TorMonitorService.jsm" -); const { TorProtocolService } = ChromeUtils.import( "resource://gre/modules/TorProtocolService.jsm" ); @@ -197,17 +194,13 @@ const gConnectionPane = (function() { ); // wire up connect button messageBoxButton.addEventListener("click", () => { - TorConnect.beginBootstrap(); - TorConnect.openTorConnect(); + TorConnect.openTorConnect({ beginBootstrap: true }); }); this._populateMessagebox = () => { - if ( - TorConnect.shouldShowTorConnect && - TorConnect.state === TorConnectState.Configuring - ) { + if (TorConnect.canBeginBootstrap) { // set messagebox style and text - if (TorMonitorService.bootstrapErrorOccurred) { + if (TorConnect.hasEverFailed) { messageBox.parentNode.style.display = null; messageBox.className = "error"; messageBoxMessage.innerText = TorStrings.torConnect.tryAgainMessage; @@ -291,10 +284,11 @@ const gConnectionPane = (function() { TorStrings.settings.statusInternetOffline; break; } + // FIXME: What about the TorConnectState.Disabled state? if (TorConnect.state === TorConnectState.Bootstrapped) { torIcon.className = "connected"; torStatus.textContent = TorStrings.settings.statusTorConnected; - } else if (TorConnect.hasBootstrapEverFailed) { + } else if (TorConnect.potentiallyBlocked) { torIcon.className = "blocked"; torStatus.textContent = TorStrings.settings.statusTorBlocked; } else { @@ -358,7 +352,9 @@ const gConnectionPane = (function() { TorStrings.settings.bridgeChooseForMe ); chooseForMe.addEventListener("command", e => { - TorConnect.beginAutoBootstrap(location.value); + TorConnect.openTorConnect({ + beginAutoBootstrap: location.value, + }); }); this._populateLocations = () => { const currentValue = location.value; @@ -404,8 +400,8 @@ const gConnectionPane = (function() { }; this._showAutoconfiguration = () => { if ( - !TorConnect.shouldShowTorConnect || - !TorMonitorService.bootstrapErrorOccurred + !TorConnect.canBeginAutoBootstrap || + !TorConnect.potentiallyBlocked ) { locationGroup.setAttribute("hidden", "true"); return; @@ -969,7 +965,7 @@ const gConnectionPane = (function() { // whether the page should be present in about:preferences get enabled() { - return TorMonitorService.ownsTorDaemon; + return TorConnect.enabled; }, // ===================================== browser/modules/TorConnect.jsm ===================================== @@ -366,6 +366,7 @@ const TorConnect = (() => { _errorMessage: null, _errorDetails: null, _logHasWarningOrError: false, + _hasEverFailed: false, _hasBootstrapEverFailed: false, _transitionPromise: null, @@ -458,7 +459,6 @@ const TorConnect = (() => { "Error: Censorship simulation", true ); - TorMonitorService.setBootstrapError(); return; } @@ -581,7 +581,6 @@ const TorConnect = (() => { ); return; } - TorMonitorService.setBootstrapError(); } } @@ -793,6 +792,9 @@ const TorConnect = (() => { }, _changeState(newState, ...args) { + if (newState === TorConnectState.Error) { + this._hasEverFailed = true; + } const prevState = this._state; // ensure this is a valid state transition @@ -836,7 +838,7 @@ const TorConnect = (() => { console.log("TorConnect: init()"); this._callback(TorConnectState.Initial).begin(); - if (!TorMonitorService.ownsTorDaemon) { + if (!this.enabled) { // Disabled this._changeState(TorConnectState.Disabled); } else { @@ -881,15 +883,50 @@ const TorConnect = (() => { Various getters */ + /** + * Whether TorConnect is enabled. + * + * @type {boolean} + */ + get enabled() { + return TorMonitorService.ownsTorDaemon; + }, + get shouldShowTorConnect() { // TorBrowser must control the daemon return ( - TorMonitorService.ownsTorDaemon && + this.enabled && // if we have succesfully bootstraped, then no need to show TorConnect this.state !== TorConnectState.Bootstrapped ); }, + /** + * Whether bootstrapping can currently begin. + * + * The value may change with TorConnectTopics.StateChanged. + * + * @param {boolean} + */ + get canBeginBootstrap() { + return TorConnectStateTransitions.get(this.state).includes( + TorConnectState.Bootstrapping + ); + }, + + /** + * Whether auto-bootstrapping can currently begin. + * + * The value may change with TorConnectTopics.StateChanged. + * + * @param {boolean} + */ + get canBeginAutoBootstrap() { + return TorConnectStateTransitions.get(this.state).includes( + TorConnectState.AutoBootstrapping + ); + }, + get shouldQuickStart() { // quickstart must be enabled return ( @@ -939,7 +976,24 @@ const TorConnect = (() => { return this._logHasWarningOrError; }, - get hasBootstrapEverFailed() { + /** + * Whether we have ever entered the Error state. + * + * @type {boolean} + */ + get hasEverFailed() { + return this._hasEverFailed; + }, + + /** + * Whether the Bootstrapping process has ever failed, not including when it + * failed due to not being connected to the internet. + * + * This does not include a failure in AutoBootstrapping. + * + * @type {boolean} + */ + get potentiallyBlocked() { return this._hasBootstrapEverFailed; }, @@ -982,11 +1036,40 @@ const TorConnect = (() => { win.switchToTabHavingURI("about:preferences#connection", true); }, - openTorConnect() { + /** + * Open the "about:torconnect" tab. + * + * Bootstrapping or AutoBootstrapping can also be automatically triggered at + * the same time, if the current state allows for it. + * + * Bootstrapping will not be triggered if the connection is + * potentially blocked. + * + * @param {object} [options] - extra options. + * @property {boolean} [options.beginBootstrap=false] - Whether to try and + * begin Bootstrapping. + * @property {string} [options.beginAutoBootstrap] - The location to use to + * begin AutoBootstrapping, if possible. + */ + openTorConnect(options) { const win = BrowserWindowTracker.getTopWindow(); win.switchToTabHavingURI("about:torconnect", true, { ignoreQueryString: true, }); + if ( + options?.beginBootstrap && + this.canBeginBootstrap && + !this.potentiallyBlocked + ) { + this.beginBootstrap(); + } + // options.beginAutoBootstrap can be an empty string. + if ( + options?.beginAutoBootstrap !== undefined && + this.canBeginAutoBootstrap + ) { + this.beginAutoBootstrap(options.beginAutoBootstrap); + } }, viewTorLogs() { ===================================== toolkit/components/tor-launcher/TorMonitorService.jsm ===================================== @@ -74,7 +74,6 @@ const TorMonitorService = { _startTimeout: null, _isBootstrapDone: false, - _bootstrapErrorOccurred: false, _lastWarningPhase: null, _lastWarningReason: null, @@ -162,21 +161,11 @@ const TorMonitorService = { return this._isBootstrapDone; }, - get bootstrapErrorOccurred() { - return this._bootstrapErrorOccurred; - }, - clearBootstrapError() { - this._bootstrapErrorOccurred = false; this._lastWarningPhase = null; this._lastWarningReason = null; }, - // This should be used for debug only - setBootstrapError() { - this._bootstrapErrorOccurred = true; - }, - get isRunning() { return !!this._connection; }, @@ -211,7 +200,6 @@ const TorMonitorService = { } } catch (e) { // TorProcess already logs the error. - this._bootstrapErrorOccurred = true; this._lastWarningPhase = "startup"; this._lastWarningReason = e.toString(); } @@ -248,7 +236,6 @@ const TorMonitorService = { ControlConnTimings.timeoutMS ) { let s = TorLauncherUtil.getLocalizedString("tor_controlconn_failed"); - this._bootstrapErrorOccurred = true; this._lastWarningPhase = "startup"; this._lastWarningReason = s; logger.info(s); @@ -435,7 +422,6 @@ const TorMonitorService = { if (statusObj.PROGRESS === 100) { this._isBootstrapDone = true; - this._bootstrapErrorOccurred = false; try { Services.prefs.setBoolPref(Preferences.PromptAtStartup, false); } catch (e) { @@ -456,7 +442,6 @@ const TorMonitorService = { }, _notifyBootstrapError(statusObj) { - this._bootstrapErrorOccurred = true; try { Services.prefs.setBoolPref(Preferences.PromptAtStartup, true); } catch (e) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d585b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d585b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.10.0esr-12.5-1] fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch base-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 22054938 by hackademix at 2023-04-13T18:58:47+00:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -286,6 +286,8 @@ pref("security.remote_settings.intermediates.enabled", false); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// tor-browser#41695: how many warnings we show if user closes them without restoring the window size +pref("privacy.resistFingerprinting.resizeWarnings", 3); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -54,7 +54,7 @@ async function windowResizeHandler(aEvent) { if (RFPHelper.letterboxingEnabled) { return; } - if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2205493… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2205493… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.10.0esr-12.5-1] fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module
by Richard Pospesel (＠richard) 14 Apr '23

14 Apr '23

Richard Pospesel pushed to branch tor-browser-102.10.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 9d585beb by hackademix at 2023-04-13T18:55:46+00:00 fixup! Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - toolkit/components/resistfingerprinting/RFPHelper.jsm Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -286,6 +286,8 @@ pref("security.remote_settings.intermediates.enabled", false); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// tor-browser#41695: how many warnings we show if user closes them without restoring the window size +pref("privacy.resistFingerprinting.resizeWarnings", 3); // Enforce Network Information API as disabled pref("dom.netinfo.enabled", false); pref("network.http.referer.defaultPolicy", 2); // Bug 32948: Make referer behavior consistent regardless of private browing mode status ===================================== toolkit/components/resistfingerprinting/RFPHelper.jsm ===================================== @@ -54,7 +54,7 @@ async function windowResizeHandler(aEvent) { if (RFPHelper.letterboxingEnabled) { return; } - if (Services.prefs.getIntPref(kPrefResizeWarnings, 3) <= 0) { + if (Services.prefs.getIntPref(kPrefResizeWarnings) <= 0) { return; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d585be… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d585be… You're receiving this email because of your account on gitlab.torproject.org.

1 0