- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.9.0esr-9.5-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by gk＠torproject.org 12 Jun '20

12 Jun '20

commit aace250e0ac5bb4b36004aadd0cab2d05c23d5d5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 9 13:58:12 2020 -0400 fixup! Bug 30237: Add v3 onion services client authentication prompt Fixes bug 34362. --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 8f3a9ce838b8..e8a8d37ae373 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -381,7 +381,7 @@ var TorStrings = { }, authPrompt: { description: - getString("authPrompt.description", "%S is requesting your private key."), + getString("authPrompt.description2", "%S is requesting that you authenticate."), keyPlaceholder: getString("authPrompt.keyPlaceholder", "Enter your key"), done: getString("authPrompt.done", "Done"), doneAccessKey: getString("authPrompt.doneAccessKey", "d"),

1 0

[torbutton/master] Bug 34362: Improve onion service authentication prompt
by gk＠torproject.org 12 Jun '20

12 Jun '20

commit 605e9d398ab026ce53ec8ad106848bfe5ae5e627 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 9 13:59:12 2020 -0400 Bug 34362: Improve onion service authentication prompt To avoid misleading users about private key usage, change: example.onion is requesting your private key. to: example.onion is requesting that you authenticate. --- chrome/locale/en-US/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 7b6c2d65..53651280 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Done onionServices.authPrompt.doneAccessKey=d

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by gk＠torproject.org 12 Jun '20

12 Jun '20

commit 58ac4b710c63854d6285b437e241e0284b43dbee Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 8 11:11:28 2020 -0400 fixup! Bug 30237: Add v3 onion services client authentication prompt Fixes bug 34369. --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 05bbfd63ef60..8f3a9ce838b8 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -333,7 +333,7 @@ var TorStrings = { let retval = { learnMore: getString("learnMore", "Learn more"), - learnMoreURL: `https://2019.www.torproject.org/docs/tor-manual-dev.html.${getLocale()}#_client_authorization`, + learnMoreURL: `https://support.torproject.org/${getLocale()}/onionservices/client-auth/`, errorPage: { browser: getString("errorPage.browser", "Browser"), network: getString("errorPage.network", "Network"),

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 30237: Add v3 onion services client authentication prompt
by gk＠torproject.org 12 Jun '20

12 Jun '20

commit 632beb89a79f17bdb0db266196c39b67fc11561f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 8 11:11:28 2020 -0400 fixup! Bug 30237: Add v3 onion services client authentication prompt Fixes bug 34369. --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 05bbfd63ef60..8f3a9ce838b8 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -333,7 +333,7 @@ var TorStrings = { let retval = { learnMore: getString("learnMore", "Learn more"), - learnMoreURL: `https://2019.www.torproject.org/docs/tor-manual-dev.html.${getLocale()}#_client_authorization`, + learnMoreURL: `https://support.torproject.org/${getLocale()}/onionservices/client-auth/`, errorPage: { browser: getString("errorPage.browser", "Browser"), network: getString("errorPage.network", "Network"),

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 21952: Implement Onion-Location
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit 8c3168ab58f038cc1e72d2f408bee1e5f715c455 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 9 14:59:00 2020 -0400 fixup! Bug 21952: Implement Onion-Location Fixes bug 34379. --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 66c44257c163..05bbfd63ef60 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -434,7 +434,7 @@ var TorStrings = { tryThis: getString("tryThis", "Try this: Onionsite"), onionAvailable: getString("onionAvailable", "Onionsite available"), learnMore: getString("learnMore", "Learn more"), - learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}`, // TODO: replace when manual page is available. + learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}/onion-services/`, always: getString("always", "Always"), askEverytime: getString("askEverytime", "Ask you every time"), prioritizeOnionsDescription: getString(

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] fixup! Bug 21952: Implement Onion-Location
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit e2d86fb3d25e5044c0b514c096b1af1a632829ab Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 9 14:59:00 2020 -0400 fixup! Bug 21952: Implement Onion-Location Fixes bug 34379. --- browser/modules/TorStrings.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 66c44257c163..05bbfd63ef60 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -434,7 +434,7 @@ var TorStrings = { tryThis: getString("tryThis", "Try this: Onionsite"), onionAvailable: getString("onionAvailable", "Onionsite available"), learnMore: getString("learnMore", "Learn more"), - learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}`, // TODO: replace when manual page is available. + learnMoreURL: `https://tb-manual.torproject.org/${getLocale()}/onion-services/`, always: getString("always", "Always"), askEverytime: getString("askEverytime", "Ask you every time"), prioritizeOnionsDescription: getString(

1 0

[tor-launcher/master] Bug 33890: Rename xul files to xhtml
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit de405aee1a4e5c848905b9f52bccc2764cdbb8c7 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Apr 9 12:53:27 2020 +0200 Bug 33890: Rename xul files to xhtml --- src/chrome/content/{localePicker.xul => localePicker.xhtml} | 0 .../{network-settings-wizard.xul => network-settings-wizard.xhtml} | 0 src/chrome/content/{network-settings.xul => network-settings.xhtml} | 0 src/components/tl-process.js | 6 +++--- src/install.rdf | 3 --- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/localePicker.xul b/src/chrome/content/localePicker.xhtml similarity index 100% rename from src/chrome/content/localePicker.xul rename to src/chrome/content/localePicker.xhtml diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xhtml similarity index 100% rename from src/chrome/content/network-settings-wizard.xul rename to src/chrome/content/network-settings-wizard.xhtml diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xhtml similarity index 100% rename from src/chrome/content/network-settings.xul rename to src/chrome/content/network-settings.xhtml diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 1cad103..31f6801 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -722,7 +722,7 @@ TorProcessService.prototype = _openLocalePicker: function() { - const kLocalePickerURL = "chrome://torlauncher/content/localePicker.xul"; + const kLocalePickerURL = "chrome://torlauncher/content/localePicker.xhtml"; var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); @@ -743,8 +743,8 @@ TorProcessService.prototype = return; } - const kSettingsURL = "chrome://torlauncher/content/network-settings.xul"; - const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xul"; + const kSettingsURL = "chrome://torlauncher/content/network-settings.xhtml"; + const kWizardURL = "chrome://torlauncher/content/network-settings-wizard.xhtml"; var wwSvc = Cc["@mozilla.org/embedcomp/window-watcher;1"] .getService(Ci.nsIWindowWatcher); diff --git a/src/install.rdf b/src/install.rdf index 919d5e8..571b8c5 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -12,9 +12,6 @@ <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey> -  <em:targetApplication> <Description>

1 0

[tor-launcher/master] Bug 32174: replace XUL <textbox> with <html:input>
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit 32603f686e3d006d60633a52d0cf9f6cd6cdc2ef Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Apr 9 13:23:40 2020 +0200 Bug 32174: replace XUL <textbox> with <html:input> --- src/chrome/content/network-settings-shared.js | 10 +++++----- src/chrome/content/network-settings.js | 4 ++-- src/chrome/content/network-settings.xhtml | 2 +- src/chrome/skin/network-settings.css | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/network-settings-shared.js b/src/chrome/content/network-settings-shared.js index 1575f3d..b125d24 100644 --- a/src/chrome/content/network-settings-shared.js +++ b/src/chrome/content/network-settings-shared.js @@ -40,11 +40,11 @@ var proxySettings = ` <label value="&torsettings.useProxy.address;" control="proxyAddr" class="rightAlign"/> <hbox align="center"> - <textbox id="proxyAddr" size="20" flex="1" + <html:input id="proxyAddr" size="20" style="-moz-box-flex: 1;" placeholder="&torsettings.useProxy.address.placeholder;"/> <separator orient="vertical"/> <label value="&torsettings.useProxy.port;" control="proxyPort"/> - <textbox id="proxyPort" size="4"/> + <html:input id="proxyPort" size="4"/> </hbox> </row> <row align="center"> @@ -52,13 +52,13 @@ var proxySettings = ` value="&torsettings.useProxy.username;" control="proxyUsername" class="rightAlign"/> <hbox align="center"> - <textbox id="proxyUsername" size="14" flex="1" + <html:input id="proxyUsername" size="14" style="-moz-box-flex: 1;" placeholder="&torsettings.optional;"/> <separator orient="vertical"/> <label id="proxyPasswordLabel" value="&torsettings.useProxy.password;" control="proxyPassword"/> - <textbox id="proxyPassword" size="14" type="password" + <html:input id="proxyPassword" size="14" type="password" placeholder="&torsettings.optional;"/> </hbox> </row> @@ -175,7 +175,7 @@ var bridgeDBRequestOverlayContent = ` <hbox> <spacer id="bridgeDBReloadSpacer"/> <spacer flex="1"/> - <textbox id="bridgeDBCaptchaSolution" size="35" + <html:input id="bridgeDBCaptchaSolution" size="35" placeholder="&torsettings.useBridges.captchaSolution.placeholder;" oninput="onCaptchaSolutionChange()"/> <spacer flex="1"/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 4b5a9af..9692b40 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2489,7 +2489,7 @@ function setElemValue(aID, aValue) toggleElemUI(elem); break; case "html:textarea": - case "textbox": + case "html:input": if (Array.isArray(aValue)) { val = ""; @@ -2555,7 +2555,7 @@ function getElemValue(aID, aDefaultValue) rv = elem.selected; break; case "html:textarea": - case "textbox": + case "html:input": case "menulist": case "richlistbox": rv = elem.value; diff --git a/src/chrome/content/network-settings.xhtml b/src/chrome/content/network-settings.xhtml index 1d3423e..faf2dc9 100644 --- a/src/chrome/content/network-settings.xhtml +++ b/src/chrome/content/network-settings.xhtml @@ -41,7 +41,7 @@ <hbox align="center"> <label value="&torsettings.firewall.allowedPorts;" control="firewallAllowedPorts"/> - <textbox id="firewallAllowedPorts" value="80,443"/> + <html:input id="firewallAllowedPorts" value="80,443"/> </hbox> </groupbox> </vbox> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index aae7c0b..c9452d8 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -307,7 +307,7 @@ html|textarea { .os-windows label, .os-windows description, .os-windows html|textarea, -.os-windows textbox +.os-windows html|input { font-size: 120% !important; }

1 0

[tor-launcher/master] Bug 33862: Fix usages of createTransport API
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit c7b35efb2a753d1a9e2cb119c780b5679bab7ca6 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Apr 9 13:05:27 2020 +0200 Bug 33862: Fix usages of createTransport API There was a nsISocketTransportService breaking change in https://bugzilla.mozilla.org/show_bug.cgi?id=1558726. --- src/components/tl-protocol.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index d6df319..0e8075a 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -765,7 +765,7 @@ TorProtocolService.prototype = { TorLauncherLogger.log(2, "Opening control connection to " + this.mControlHost + ":" + this.mControlPort); - socket = sts.createTransport(null, 0, this.mControlHost, + socket = sts.createTransport([], this.mControlHost, this.mControlPort, null); }

1 0

[tor-launcher/master] Bug 34206: Tor Launcher button labels are missing (Firefox 76)
by gk＠torproject.org 11 Jun '20

11 Jun '20

commit ee6c43379b23aca1efe581d9cb12642167e6a326 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 13 10:30:15 2020 -0400 Bug 34206: Tor Launcher button labels are missing (Firefox 76) Mozilla's wizard has a bug where localized labels are not loaded because Fluent is not initialized early enough. Apply the same workaround as Mozilla applied in https://bugzilla.mozilla.org/show_bug.cgi?id=1625938 --- src/chrome/content/localePicker.xhtml | 6 ++++++ src/chrome/content/network-settings-wizard.xhtml | 5 +++++ src/chrome/content/network-settings.js | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/localePicker.xhtml b/src/chrome/content/localePicker.xhtml index 38762a0..e31f1b2 100644 --- a/src/chrome/content/localePicker.xhtml +++ b/src/chrome/content/localePicker.xhtml @@ -12,12 +12,18 @@ <!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml" torwizard="true" title="&torlauncher.localePicker.title;" windowtype="TorLauncher:LocalePicker" persist="screenX screenY" onload="initLocaleDialog();"> + +<linkset> + <html:link rel="localization" href="toolkit/global/wizard.ftl"/> +</linkset> + <wizard id="TorLauncherLocalePicker"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> diff --git a/src/chrome/content/network-settings-wizard.xhtml b/src/chrome/content/network-settings-wizard.xhtml index 7386067..6e26468 100644 --- a/src/chrome/content/network-settings-wizard.xhtml +++ b/src/chrome/content/network-settings-wizard.xhtml @@ -18,6 +18,11 @@ onload="initDialog();" onunload="deinitDialog();"> + +<linkset> + <html:link rel="localization" href="toolkit/global/wizard.ftl"/> +</linkset> + <wizard id="TorNetworkSettings" defaulttitle="&torsettings.wizard.title.default;" buttonlabelextra2="&torsettings.copyLog;"> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 2f89632..81d7138 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -2583,7 +2583,7 @@ function getElemValue(aID, aDefaultValue) function getButton(aButtonName) { - let dialogOrWizard = document.documentElement.firstChild; + let dialogOrWizard = document.querySelector("wizard"); return dialogOrWizard.getButton(aButtonName); }

1 0