tor-commits June 2020

tor-commits@lists.torproject.org

17 participants
1326 discussions

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

10 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

[tor-launcher/master] Bug 33906: Fix Tor-Launcher issues for Firefox 75
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit df0350fcaedf1bf859872edfead31814ef23b507 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 22 15:46:23 2020 -0400 Bug 33906: Fix Tor-Launcher issues for Firefox 75 The <wizard> and <dialog> elements can no longer be used as root elements. Adapt to the use of shadow DOM within the <wizard> implemention. Migrate the locale picker from the general.useragent.locale preference to intl.locale.requested. --- src/chrome/content/localePicker.xhtml | 10 +-- src/chrome/content/network-settings-wizard.xhtml | 14 ++-- src/chrome/content/network-settings.js | 88 ++++++++++++++---------- src/chrome/content/network-settings.xhtml | 13 ++-- src/chrome/skin/network-settings.css | 25 ++----- 5 files changed, 80 insertions(+), 70 deletions(-) diff --git a/src/chrome/content/localePicker.xhtml b/src/chrome/content/localePicker.xhtml index 152b54c..38762a0 100644 --- a/src/chrome/content/localePicker.xhtml +++ b/src/chrome/content/localePicker.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -9,15 +9,16 @@ <?xml-stylesheet href="chrome://torlauncher/skin/network-settings.css" type="text/css"?> -<!DOCTYPE wizard SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> +<!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> -<wizard id="TorLauncherLocalePicker" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" +<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + torwizard="true" title="&torlauncher.localePicker.title;" windowtype="TorLauncher:LocalePicker" persist="screenX screenY" onload="initLocaleDialog();"> +<wizard id="TorLauncherLocalePicker"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> @@ -37,3 +38,4 @@ <label id="forAssistance"/> </hbox> </wizard> +</window> diff --git a/src/chrome/content/network-settings-wizard.xhtml b/src/chrome/content/network-settings-wizard.xhtml index 98dbdd8..7386067 100644 --- a/src/chrome/content/network-settings-wizard.xhtml +++ b/src/chrome/content/network-settings-wizard.xhtml @@ -1,5 +1,5 @@  @@ -8,18 +8,19 @@ <?xml-stylesheet href="chrome://torlauncher/skin/network-settings.css" type="text/css"?> -<!DOCTYPE wizard SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> +<!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> -<wizard id="TorNetworkSettings" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" +<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" - defaulttitle="&torsettings.wizard.title.default;" + torwizard="true" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttonlabelextra2="&torsettings.copyLog;" onload="initDialog();" onunload="deinitDialog();"> +<wizard id="TorNetworkSettings" + defaulttitle="&torsettings.wizard.title.default;" + buttonlabelextra2="&torsettings.copyLog;"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> @@ -129,3 +130,4 @@ </hbox> <panel id="copyLogFeedbackPanel"/> </wizard> +</window> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 9692b40..2f89632 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2019, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -20,7 +20,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherBridgeDB", "resource://torlauncher/modules/tl-bridgedb.jsm"); const kPrefPromptForLocale = "extensions.torlauncher.prompt_for_locale"; -const kPrefLocale = "general.useragent.locale"; +const kPrefLocale = "intl.locale.requested"; const kPrefMatchOSLocale = "intl.locale.matchOS"; // The recommended type is listed first in the dropdown menu. @@ -138,7 +138,7 @@ function initDialogCommon() let wizardElem = getWizard(); let haveWizard = (wizardElem != null); - let cancelBtn = document.documentElement.getButton("cancel"); + let cancelBtn = getButton("cancel"); if (cancelBtn) { gCancelLabelStr = cancelBtn.label; @@ -151,6 +151,18 @@ function initDialogCommon() if (haveWizard) { + // Apply styles to elements within the wizard element's shadow DOM. + let wizardPageBox = wizardElem.shadowRoot.querySelector(".wizard-page-box"); + if (wizardPageBox) + { + wizardPageBox.style.padding = "0px"; + wizardPageBox.style.margin = "14px 20px 18px 20px"; + } + + let wizardHeader = wizardElem.shadowRoot.querySelector(".wizard-header"); + if (wizardHeader) + wizardHeader.style.display = "none"; + // Hide the Tor Browser logo and associated separator element if the // TOR_HIDE_BROWSER_LOGO environment variable is set. let env = Cc["@mozilla.org/process/environment;1"] @@ -291,16 +303,16 @@ function initDialog() }); // Relabel the accept button to be "Connect" - let okBtn = document.documentElement.getButton("accept"); + let okBtn = getButton("accept"); if (okBtn) okBtn.label = TorLauncherUtil.getLocalizedString("connect"); // Set "Copy Tor Log" label and move it after the Quit (cancel) button. - let copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = getButton("extra2"); if (copyLogBtn) { copyLogBtn.label = wizardElem.getAttribute("buttonlabelextra2"); - let cancelBtn = document.documentElement.getButton("cancel"); + let cancelBtn = getButton("cancel"); if (cancelBtn && TorLauncherUtil.isMac) cancelBtn.parentNode.insertBefore(copyLogBtn, cancelBtn.nextSibling); } @@ -312,7 +324,7 @@ function initDialog() } // Use "Connect" as the finish button label (on the last wizard page). - let finishBtn = document.documentElement.getButton("finish"); + let finishBtn = getButton("finish"); if (finishBtn) { finishBtn.label = TorLauncherUtil.getLocalizedString("connect"); @@ -320,7 +332,7 @@ function initDialog() } // Set Discard Settings back button label to match the wizard Back button. - let wizardBackBtn = document.documentElement.getButton("back"); + let wizardBackBtn = getButton("back"); let backBtn = document.getElementById("discardSettingsGoBack"); if (wizardBackBtn && backBtn) backBtn.label = wizardBackBtn.label; @@ -374,11 +386,18 @@ function initLocaleDialog() // Replace the finish button's label ("Done") with the next button's // label ("Next" or "Continue"). - let nextBtn = document.documentElement.getButton("next"); - let doneBtn = document.documentElement.getButton("finish"); + let nextBtn = getButton("next"); + let doneBtn = getButton("finish"); if (nextBtn && doneBtn) doneBtn.label = nextBtn.label; + // The locale picker does not use the "Back" and "Next" buttons; hide them. + let backBtn = getButton("back"); + if (backBtn) + backBtn.style.display = "none"; + if (nextBtn) + nextBtn.style.display = "none"; + let { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm"); let addonsPromise = AddonManager.getAddonsByTypes(["locale"]); addonsPromise.then(aLangPackAddons => @@ -432,13 +451,9 @@ function populateLocaleList(aLangPackAddons) }; // Retrieve the current locale so we can select it within the list by default. - let curLocale; - try - { - let chromeRegSvc = Cc["@mozilla.org/chrome/chrome-registry;1"] - .getService(Ci.nsIXULChromeRegistry); - curLocale = chromeRegSvc.getSelectedLocale("global").toLowerCase(); - } catch (e) {} + let curLocale = Services.locale.requestedLocale; + if (curLocale) + curLocale = curLocale.toLowerCase(); // Build a list of language info objects (language code plus friendly name). let foundCurLocale = false; @@ -485,9 +500,9 @@ function populateLocaleList(aLangPackAddons) let localeList = document.getElementById(kLocaleList); for (let infoObj of langInfo) { - let listItem = document.createElement("richlistitem"); + let listItem = document.createXULElement("richlistitem"); listItem.setAttribute("value", infoObj.langCode); - let label = document.createElement("label"); + let label = document.createXULElement("label"); label.value = infoObj.langName; listItem.appendChild(label); localeList.appendChild(listItem); @@ -517,7 +532,7 @@ function maxWidthOfContent() for (let i = 0; i < buttons.length; ++i) showOrHideButton(buttons[i], true, false); - let btn = document.documentElement.getButton("cancel"); + let btn = getButton("cancel"); let btnContainer = btn.parentElement; const kWarningIconWidth = 20; // skin/warning.png is 16 plus some margin @@ -991,7 +1006,7 @@ function updateBootstrapProgress(aStatusObj) // visibility=hidden instead of XUL hidden=true so that the "For // Assistance" text does not move. let btnID = getWizard() ? "finish" : "cancel"; - let btn = document.documentElement.getButton(btnID); + let btn = getButton(btnID); if (btn) btn.style.visibility = "hidden"; window.setTimeout(function() { close(); }, 250); @@ -1248,7 +1263,7 @@ function isShowingErrorOverlay() function showCopyLogButton(aHaveErrorOrWarning) { - let copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = getButton("extra2"); if (copyLogBtn) { let haveWizard = (getWizard() != null); @@ -1272,7 +1287,7 @@ function showCopyLogButton(aHaveErrorOrWarning) function restoreCopyLogVisibility() { - let copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = getButton("extra2"); if (!copyLogBtn) return; @@ -1288,14 +1303,10 @@ function restoreCopyLogVisibility() // Network Settings window. function showOrHideDialogButtons(aShow) { - let buttonContainer = document.getAnonymousElementByAttribute( - document.documentElement, "anonid", "buttons"); - if (!buttonContainer) - { - // The wizard uses "Buttons" (capital 'B'). - buttonContainer = document.getAnonymousElementByAttribute( - document.documentElement, "anonid", "Buttons"); - } + let wizard = getWizard(); + let buttonContainer = wizard + ? wizard.shadowRoot.querySelector(".wizard-buttons") + : document.querySelector(".dialog-button-box"); if (buttonContainer) { @@ -1328,7 +1339,7 @@ function setButtonAttr(aID, aAttr, aValue) if (!aID || !aAttr) return null; - let btn = document.documentElement.getButton(aID); // dialog buttons + let btn = getButton(aID); // dialog buttons if (!btn) btn = document.getElementById(aID); // other buttons if (btn) @@ -1428,7 +1439,7 @@ function showMenuListPlaceholderText(aElemID) function overrideButtonLabel(aID, aLabel) { - let btn = document.documentElement.getButton(aID); + let btn = getButton(aID); if (btn) { btn.setAttribute("origLabel", btn.label); @@ -1446,7 +1457,7 @@ function overrideButtonLabelWithKey(aID, aLabelKey) function restoreButtonLabel(aID) { - var btn = document.documentElement.getButton(aID); + var btn = getButton(aID); if (btn) { var oldLabel = btn.getAttribute("origLabel"); @@ -1641,7 +1652,7 @@ function onCopyLog() chSvc.copyString(gProtocolSvc.TorGetLog(countObj)); // Display a feedback popup that fades away after a few seconds. - let copyLogBtn = document.documentElement.getButton("extra2"); + let copyLogBtn = getButton("extra2"); let panel = document.getElementById(kCopyLogFeedbackPanel); if (copyLogBtn && panel) { @@ -2570,6 +2581,13 @@ function getElemValue(aID, aDefaultValue) } +function getButton(aButtonName) +{ + let dialogOrWizard = document.documentElement.firstChild; + return dialogOrWizard.getButton(aButtonName); +} + + // Hide and show groupbox based on aElem's checked state. aElem may be a // checkbox or radio element. function toggleElemUI(aElem) diff --git a/src/chrome/content/network-settings.xhtml b/src/chrome/content/network-settings.xhtml index faf2dc9..9d2f6b6 100644 --- a/src/chrome/content/network-settings.xhtml +++ b/src/chrome/content/network-settings.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0"?>  @@ -9,19 +9,19 @@ <?xml-stylesheet href="chrome://torlauncher/skin/network-settings.css" type="text/css"?> -<!DOCTYPE dialog SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> +<!DOCTYPE window SYSTEM "chrome://torlauncher/locale/network-settings.dtd"> -<dialog id="TorNetworkSettings" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" +<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" title="&torsettings.dialog.title;" windowtype="TorLauncher:NetworkSettings" persist="screenX screenY" - buttons="accept,cancel,extra2" - buttonlabelextra2="&torsettings.copyLog;" onload="initDialog();" onunload="deinitDialog();"> +<dialog id="TorNetworkSettings" + buttons="accept,cancel,extra2" + buttonlabelextra2="&torsettings.copyLog;"> <script type="application/x-javascript" src="chrome://torlauncher/content/network-settings.js"/> @@ -86,3 +86,4 @@ </vbox> </stack> </dialog> +</window> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index c9452d8..f60c5c6 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, The Tor Project, Inc. + * Copyright (c) 2020, The Tor Project, Inc. * See LICENSE for licensing information. * * vim: set sw=2 sts=2 ts=8 et syntax=css: @@ -7,36 +7,29 @@ @namespace html "http://www.w3.org/1999/xhtml"; -dialog { +window { width: 45em; height: 41em; font: -moz-dialog; } -dialog.os-windows { +window.os-windows { width: 49em; height: 42em; } -wizard { +window[torwizard="true"] { width: 45em; height: 38em; font: -moz-dialog; padding-top: 0px; } -wizard.os-windows { +window[torwizard="true"].os-windows { width: 49em; height: 44em; } -.wizard-page-box { - padding: 0px; - margin: 14px 20px 18px 20px; -} - -wizard .wizard-header { display: none; } - #forAssistance { margin-left: 12px; margin-bottom: 6px; @@ -104,11 +97,6 @@ wizard[tor_hide_browser_logo="true"] .tbb-logo { display: none; } -wizard#TorLauncherLocalePicker button[dlgtype="back"], -wizard#TorLauncherLocalePicker button[dlgtype="next"] { - display: none; -} - /* Show menulist placeholder text in gray. */ #defaultBridgeType:not([value]) .menulist-label, #defaultBridgeType[value=""] .menulist-label, @@ -124,8 +112,7 @@ wizard#TorLauncherLocalePicker button[dlgtype="next"] { margin-left: 1.8em; } -dialog.os-mac #bridgeList, -wizard.os-mac #bridgeList { +window.os-mac #bridgeList { font-size: 90%; }

1 0

[tor-launcher/master] Bug 34164: Tor Launcher deadlocks during startup (Firefox 77)
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit 98f3df12d48daf277f2e3f056600c64294c628c1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 13 10:45:01 2020 -0400 Bug 34164: Tor Launcher deadlocks during startup (Firefox 77) Initialize the DNS service as early as possible to avoid a problem where DNS service initialization is dispatched to the main thread while that thread is blocked. --- src/components/tl-process.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 31f6801..e9d7cde 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -100,6 +100,22 @@ TorProcessService.prototype = if ("profile-after-change" == aTopic) { + // Initialize the DNS service here (as early as possible). This + // avoids a deadlock that can occur inside TorProtocolService's + // _openAuthenticatedConnection() function. What happens in the + // deadlock case is that a Necko socket thread tries to dispatch + // initialization of the DNS service to the main thread while the + // main thread is blocked in a writeBytes() call inside the + // _sendCommand() function. The ultimate solution is to change + // our control port socket to use asynchronous I/O. + // References: + // netwerk/dns/nsDNSService2.cpp nsDNSService::GetSingleton() + // https://bugzilla.mozilla.org/show_bug.cgi?id=1625151 (the + // fix for this bug introduced the deadlock because it changed + // DNS service initialization to occur on the main thread). + const dns = Cc["@mozilla.org/network/dns-service;1"] + .getService(Ci.nsIDNSService); + this.mObsSvc.addObserver(this, "quit-application-granted", false); this.mObsSvc.addObserver(this, kOpenNetworkSettingsTopic, false); this.mObsSvc.addObserver(this, kUserQuitTopic, false);

1 0

[tor-launcher/master] Merge remote-tracking branch 'pc/bug34164-01'
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit 1807842bcbb1bf2d9a72e79d5da07ee401363b68 Merge: b4838d3 98f3df1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 10 18:43:18 2020 +0000 Merge remote-tracking branch 'pc/bug34164-01' .../{localePicker.xul => localePicker.xhtml} | 16 +++- src/chrome/content/network-settings-shared.js | 10 +-- ...gs-wizard.xul => network-settings-wizard.xhtml} | 19 +++-- src/chrome/content/network-settings.js | 92 +++++++++++++--------- ...network-settings.xul => network-settings.xhtml} | 15 ++-- src/chrome/skin/network-settings.css | 27 ++----- src/components/tl-process.js | 22 +++++- src/components/tl-protocol.js | 2 +- src/install.rdf | 3 - 9 files changed, 120 insertions(+), 86 deletions(-)

1 0

[tor-browser-build/master] Hardcode Tor Launcher commit for ESR 78 transition
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit 95c2aff01a4522f5673b4048c1a29201a8a24004 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 10 18:39:31 2020 +0000 Hardcode Tor Launcher commit for ESR 78 transition In order to start landing ESR 78 related patches without breaking our nightly builds (which are still ESR 68-based) we hardcode a known good commit for now. --- projects/tor-launcher/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 9aaca27..f8a974a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -22,5 +22,7 @@ steps: targets: nightly: version: '[% c("abbrev") %]' - git_hash: master + # Hardcode the commit for now so we can start landing ESR 78 patches without + # breaking nightly builds. + git_hash: b4838d339a84c5ebebd91a0ba6b22d44ecda97b1 tag_gpg_id: 0

1 0

[tor-launcher/master] Translations update
by gk＠torproject.org 10 Jun '20

10 Jun '20

commit b4838d339a84c5ebebd91a0ba6b22d44ecda97b1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 10 18:35:20 2020 +0000 Translations update --- src/chrome/locale/cs/torlauncher.properties | 2 +- src/chrome/locale/el/network-settings.dtd | 28 ++++++++++++++-------------- src/chrome/locale/el/torlauncher.properties | 10 +++++----- src/chrome/locale/ja/torlauncher.properties | 10 +++++----- src/chrome/locale/mr/network-settings.dtd | 4 ++-- src/chrome/locale/ta/network-settings.dtd | 8 ++++---- src/chrome/locale/ta/torlauncher.properties | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/chrome/locale/cs/torlauncher.properties b/src/chrome/locale/cs/torlauncher.properties index 0fb961d..27e5743 100644 --- a/src/chrome/locale/cs/torlauncher.properties +++ b/src/chrome/locale/cs/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Tor není možné zapnout\n\n%S torlauncher.tor_missing=Spustitelný soubor Toru chybí. torlauncher.torrc_missing=Chybí soubor torrc a nemohl být vytvořen. torlauncher.datadir_missing=Složka s daty Toru neexistuje a nemohla být vytvořena. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Onion ověřovací složka Toru neexistuje a nemohla být vytvořena. torlauncher.password_hash_missing=Nepovedlo se získat hashované heslo. torlauncher.failed_to_get_settings=Nelze načíst nastavení Toru.\n\n%S diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 9af2805..e094209 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -26,7 +26,7 @@ <!ENTITY torsettings.optional "Προεραιτικα"> <!ENTITY torsettings.useProxy.checkbox "Χρησιμοποιώ διακομιστή μεσολάβησης για να συνδεθώ στο ίντερνετ."> -<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.type "Τύπος διακομιστή μεσολάβησης"> <!ENTITY torsettings.useProxy.type.placeholder "Επιλέξτε τύπο διακομιστή μεσολάβησης."> <!ENTITY torsettings.useProxy.address "Διεύθυνση"> <!ENTITY torsettings.useProxy.address.placeholder "Διεύθυνση ΙΡ η όνομα υπολογιστή "> @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> +<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες"> <!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου"> <!ENTITY torsettings.useBridges.default "Επιλέξτε ένα ενταγμένο bridge"> <!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε ένα bridge"> @@ -63,21 +63,21 @@  <!ENTITY torPreferences.categoryTitle "Tor"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > +<!ENTITY torPreferences.torSettings "Ρυθμίσεις Tor"> +<!ENTITY torPreferences.torSettingsDescription "Ο Tor Browser δρομολογεί την κίνηση δικτύου σας μέσα από το δίκτυο Tor, που λειτουργεί χάρη σε χιλιάδες εθελοντές σε όλο τον κόσμο." > <!ENTITY torPreferences.learnMore "Μάθετε περισσότερα"> <!ENTITY torPreferences.bridges "Γέφυρες"> -<!ENTITY torPreferences.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."> -<!ENTITY torPreferences.useBridge "Use a bridge"> +<!ENTITY torPreferences.bridgesDescription "Οι γέφυρες σας βοηθούν στην πρόσβαση στο δίκτυο Tor σε τοποθεσίες που δεν επιτρέπεται. Εξαρτάται που βρίσκεστε, κάποια γέφυρα μπορεί να λειτουργεί από άλλες."> +<!ENTITY torPreferences.useBridge "Χρήση γέφυρας"> <!ENTITY torPreferences.requestNewBridge "Ζητήστε μία καινούρια γέφυρα..."> -<!ENTITY torPreferences.provideBridge "Provide a bridge"> +<!ENTITY torPreferences.provideBridge "Παραχωρήστε μια γέφυρα"> <!ENTITY torPreferences.advanced "Ρυθμίσεις για προχωρημένους"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> +<!ENTITY torPreferences.advancedDescription "Ρυθμίστε τον τρόπο που συνδέεται ο Tor Browser στο διαδίκτυο."> +<!ENTITY torPreferences.firewallPortsPlaceholder "Τιμές διαχωρισμένες με κόμμα"> +<!ENTITY torPreferences.requestBridgeDialogTitle "Αίτηση γέφυρας..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Επικοινωνία με την BridgeDB. Παρακαλώ, περιμένετε."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Λύστε το CAPTCHA για να ζητήσετε γέφυρα."> <!ENTITY torPreferences.requestBridgeErrorBadSolution "Η λύση δεν είναι σωστή. Παρακαλώ προσπαθήστε ξανά."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.viewTorLogs "Προβολή αρχείων καταγραφής του Tor."> +<!ENTITY torPreferences.viewLogs "Προβολή αρχείων καταγραφής..."> +<!ENTITY torPreferences.torLogsDialogTitle "Αρχεία καταγραφών Tor"> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index 980ac56..dc250a4 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Αδυναμία εκκίνησης του Tor. torlauncher.tor_missing=Το Tor εκτελέσιμο λείπει. torlauncher.torrc_missing=Το αρχείο torrc λείπει και δεν μπορεί να δημιουργηθεί. torlauncher.datadir_missing=Ο κατάλογος δεδομένων Tor δεν υπάρχει και δεν μπορεί να δημιουργηθεί. -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Ο κατάλογος αυθεντικοποίησης Tor onion δεν υπάρχει και δεν μπορεί να δημιουργηθεί. torlauncher.password_hash_missing=Απέτυχε να πάρει διαγραμμισμένο κωδικό πρόσβασης. torlauncher.failed_to_get_settings=Αποτυχία διαγραφής των Tor ρυθμισεων.⏎\n⏎\n%S @@ -60,8 +60,8 @@ torlauncher.bootstrapStatus.conn_proxy=Συνδέεται στο διαμεσο torlauncher.bootstrapStatus.conn_done_proxy=Συνδέθηκε στο διαμεσολαβητή torlauncher.bootstrapStatus.conn=Συνδέεται σε αναμεταδότη Tor torlauncher.bootstrapStatus.conn_done=Συνδέθηκε σε αναμεταδότη Tor -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.handshake=Διαπραγμάτευση με αναμεταδότη Tor +torlauncher.bootstrapStatus.handshake_done=Ολοκλήρωση διαπραγμάτευσης με αναμεταδότη Tor torlauncher.bootstrapStatus.onehop_create=Πραγματοποιήθηκε σύνδεση σε κρυπτογραφημένο κατάλογο torlauncher.bootstrapStatus.requesting_status=Ανάκτηση της κατάστασης του δικτύου torlauncher.bootstrapStatus.loading_status=Φόρτωση της κατάστασης του δικτύου @@ -75,8 +75,8 @@ torlauncher.bootstrapStatus.ap_conn_proxy=Κτίσιμο κυκλωμάτων: torlauncher.bootstrapStatus.ap_conn_done_proxy=Κτίσιμο κυκλωμάτων: Συνδέθηκε με τον διαμεσολαβητή torlauncher.bootstrapStatus.ap_conn=Κτίσιμο κυκλωμάτων: Συνδέεται με έναν ενδιάμεσο κόμβο Tor torlauncher.bootstrapStatus.ap_conn_done=Κτίσιμο κυκλωμάτων: Συνδέθηκε με έναν ενδιάμεσο κόμβο Tor -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.ap_handshake=Δημιουργία κυκλώματος: Διαπραγμάτευση με αναμεταδότη Tor +torlauncher.bootstrapStatus.ap_handshake_done=Δημιουργία κυκλώματος: Ολοκλήρωση διαπραγμάτευσης με αναμεταδότη Tor torlauncher.bootstrapStatus.circuit_create=Κτίσιμο κυκλωμάτων: Δημιουργία ενός κυκλώματος Tor torlauncher.bootstrapStatus.done=Συνδεθήκατε στο δίκτυο Tor! diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties index f233fc2..3be4b94 100644 --- a/src/chrome/locale/ja/torlauncher.properties +++ b/src/chrome/locale/ja/torlauncher.properties @@ -16,7 +16,7 @@ torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。 torlauncher.torrc_missing=torrcファイルが見つからず、作成もできませんでした。 torlauncher.datadir_missing=Torのデータディレクトリが存在せず、作成もできませんでした。 -torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. +torlauncher.onionauthdir_missing=Tor Onion 認証ディレクトリが存在せず、また作成することもできませんでした。 torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました torlauncher.failed_to_get_settings=Torの設定を回復出来ません。\n\n%S @@ -73,10 +73,10 @@ torlauncher.bootstrapStatus.ap_conn_pt=サーキットを確立中：ブリッ torlauncher.bootstrapStatus.ap_conn_done_pt=サーキットを確立中：ブリッジと接続しました torlauncher.bootstrapStatus.ap_conn_proxy=サーキットを確立中：プロキシと接続中 torlauncher.bootstrapStatus.ap_conn_done_proxy=サーキットを確立中：プロキシと接続しました -torlauncher.bootstrapStatus.ap_conn=サーキットを確立中：Torリレーと接続中 -torlauncher.bootstrapStatus.ap_conn_done=サーキットを確立中：Torリレーと接続しました -torlauncher.bootstrapStatus.ap_handshake=サーキットを確立中：Torリレーとネゴシエート中 -torlauncher.bootstrapStatus.ap_handshake_done=サーキットを確立中：Torリレーとネゴシエート完了しました +torlauncher.bootstrapStatus.ap_conn=サーキットを確立中：Tor リレーと接続中 +torlauncher.bootstrapStatus.ap_conn_done=サーキットを確立中：Tor リレーと接続しました +torlauncher.bootstrapStatus.ap_handshake=サーキットを確立中：Tor リレーとネゴシエート中 +torlauncher.bootstrapStatus.ap_handshake_done=サーキットを確立中：Tor リレーとネゴシエート完了しました torlauncher.bootstrapStatus.circuit_create=サーキットを確立中：Tor サーキットを設置しています torlauncher.bootstrapStatus.done=Tor ネットワークに接続しました! diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index b7ffd2d..03f09a6 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -32,7 +32,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "पोर्ट"> <!ENTITY torsettings.useProxy.username "Username"> -<!ENTITY torsettings.useProxy.password "Password"> +<!ENTITY torsettings.useProxy.password "पासवर्ड "> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> @@ -66,7 +66,7 @@ <!ENTITY torPreferences.torSettings "Tor Settings"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > <!ENTITY torPreferences.learnMore "Learn More"> -<!ENTITY torPreferences.bridges "Bridges"> +<!ENTITY torPreferences.bridges "पूल "> <!ENTITY torPreferences.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."> <!ENTITY torPreferences.useBridge "Use a bridge"> <!ENTITY torPreferences.requestNewBridge "नवीन ब्रिजची विनंती करा ..."> diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index 529f134..671734a 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -78,7 +78,7 @@ <!ENTITY torPreferences.requestBridgeDialogTitle "Bridge ஐ வேண்டுக"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs."> -<!ENTITY torPreferences.viewLogs "View Logs…"> -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "உள்ளிட்ட தீர்வு சரியானதல்ல. தயவு செய்து மீண்டும் முயல்க"> +<!ENTITY torPreferences.viewTorLogs "Tor பதிகைகளைக் காண்க"> +<!ENTITY torPreferences.viewLogs "பதிகைகளைக் காண்க..."> +<!ENTITY torPreferences.torLogsDialogTitle "Tor பதிகைகள்"> diff --git a/src/chrome/locale/ta/torlauncher.properties b/src/chrome/locale/ta/torlauncher.properties index b9a7c29..6c5bdaa 100644 --- a/src/chrome/locale/ta/torlauncher.properties +++ b/src/chrome/locale/ta/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.request_a_bridge=Request a Bridge… torlauncher.request_a_new_bridge=புதிய Bridge ஐ வேண்டுக... torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. +torlauncher.bad_captcha_solution=உள்ளிட்ட தீர்வு சரியானதல்ல. தயவு செய்து மீண்டும் முயல்க torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry.

1 0

[tor/master] Bug 30992: Changes file
by asn＠torproject.org 10 Jun '20

10 Jun '20

commit 963c3591c8993ef258520db0f845392bdcd8c1e3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jun 8 19:30:13 2020 -0500 Bug 30992: Changes file --- changes/bug30992 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug30992 b/changes/bug30992 new file mode 100644 index 000000000..f31831901 --- /dev/null +++ b/changes/bug30992 @@ -0,0 +1,4 @@ + o Minor bugfixes (circuitpadding): + - Add a per-circuit padding machine instance counter, so we can + differentiate between shutdown requests for old machines on a circuit; + Fixes bug 30992; bugfix on 0.4.1.1-alpha.

1 0

[tor/master] Update Trunnel for new machine_ctr field.
by asn＠torproject.org 10 Jun '20

10 Jun '20

commit 9eb0eeb68e524b03924ea9b1f11e9b75fcdcf37b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jun 8 18:05:34 2020 -0500 Update Trunnel for new machine_ctr field. This field area was memset to 0 in old versions, which the code treats as "match any machine instance", for backward compatibility without a protover bump. --- src/trunnel/circpad_negotiation.c | 52 +++++++++++++++++++++++++++++++++ src/trunnel/circpad_negotiation.h | 27 +++++++++++++++++ src/trunnel/circpad_negotiation.trunnel | 17 +++++++++++ 3 files changed, 96 insertions(+) diff --git a/src/trunnel/circpad_negotiation.c b/src/trunnel/circpad_negotiation.c index 547818f2e..4e3ee3d5b 100644 --- a/src/trunnel/circpad_negotiation.c +++ b/src/trunnel/circpad_negotiation.c @@ -112,6 +112,17 @@ circpad_negotiate_set_echo_request(circpad_negotiate_t *inp, uint8_t val) inp->echo_request = val; return 0; } +uint32_t +circpad_negotiate_get_machine_ctr(const circpad_negotiate_t *inp) +{ + return inp->machine_ctr; +} +int +circpad_negotiate_set_machine_ctr(circpad_negotiate_t *inp, uint32_t val) +{ + inp->machine_ctr = val; + return 0; +} const char * circpad_negotiate_check(const circpad_negotiate_t *obj) { @@ -148,6 +159,9 @@ circpad_negotiate_encoded_len(const circpad_negotiate_t *obj) /* Length of u8 echo_request IN [0, 1] */ result += 1; + + /* Length of u32 machine_ctr */ + result += 4; return result; } int @@ -203,6 +217,13 @@ circpad_negotiate_encode(uint8_t *output, const size_t avail, const circpad_nego trunnel_set_uint8(ptr, (obj->echo_request)); written += 1; ptr += 1; + /* Encode u32 machine_ctr */ + trunnel_assert(written <= avail); + if (avail - written < 4) + goto truncated; + trunnel_set_uint32(ptr, trunnel_htonl(obj->machine_ctr)); + written += 4; ptr += 4; + trunnel_assert(ptr == output + written); #ifdef TRUNNEL_CHECK_ENCODED_LEN @@ -263,6 +284,11 @@ circpad_negotiate_parse_into(circpad_negotiate_t *obj, const uint8_t *input, con remaining -= 1; ptr += 1; if (! (obj->echo_request == 0 || obj->echo_request == 1)) goto fail; + + /* Parse u32 machine_ctr */ + CHECK_REMAINING(4, truncated); + obj->machine_ctr = trunnel_ntohl(trunnel_get_uint32(ptr)); + remaining -= 4; ptr += 4; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining; @@ -372,6 +398,17 @@ circpad_negotiated_set_machine_type(circpad_negotiated_t *inp, uint8_t val) inp->machine_type = val; return 0; } +uint32_t +circpad_negotiated_get_machine_ctr(const circpad_negotiated_t *inp) +{ + return inp->machine_ctr; +} +int +circpad_negotiated_set_machine_ctr(circpad_negotiated_t *inp, uint32_t val) +{ + inp->machine_ctr = val; + return 0; +} const char * circpad_negotiated_check(const circpad_negotiated_t *obj) { @@ -408,6 +445,9 @@ circpad_negotiated_encoded_len(const circpad_negotiated_t *obj) /* Length of u8 machine_type */ result += 1; + + /* Length of u32 machine_ctr */ + result += 4; return result; } int @@ -463,6 +503,13 @@ circpad_negotiated_encode(uint8_t *output, const size_t avail, const circpad_neg trunnel_set_uint8(ptr, (obj->machine_type)); written += 1; ptr += 1; + /* Encode u32 machine_ctr */ + trunnel_assert(written <= avail); + if (avail - written < 4) + goto truncated; + trunnel_set_uint32(ptr, trunnel_htonl(obj->machine_ctr)); + written += 4; ptr += 4; + trunnel_assert(ptr == output + written); #ifdef TRUNNEL_CHECK_ENCODED_LEN @@ -523,6 +570,11 @@ circpad_negotiated_parse_into(circpad_negotiated_t *obj, const uint8_t *input, c CHECK_REMAINING(1, truncated); obj->machine_type = (trunnel_get_uint8(ptr)); remaining -= 1; ptr += 1; + + /* Parse u32 machine_ctr */ + CHECK_REMAINING(4, truncated); + obj->machine_ctr = trunnel_ntohl(trunnel_get_uint32(ptr)); + remaining -= 4; ptr += 4; trunnel_assert(ptr + remaining == input + len_in); return len_in - remaining; diff --git a/src/trunnel/circpad_negotiation.h b/src/trunnel/circpad_negotiation.h index ba9155019..9004540d4 100644 --- a/src/trunnel/circpad_negotiation.h +++ b/src/trunnel/circpad_negotiation.h @@ -26,6 +26,7 @@ struct circpad_negotiate_st { uint8_t machine_type; /** If true, send a relay_drop reply.. */ uint8_t echo_request; + uint32_t machine_ctr; uint8_t trunnel_error_code_; }; #endif @@ -42,6 +43,14 @@ struct circpad_negotiated_st { /** Machine type is left unbounded because we can specify * new machines in the consensus */ uint8_t machine_type; + /** + * This field is used for shutdown synchronization. It is OK if + * it wraps, because all we need to do is make sure the STOP + * command is actually for the currently active machine. + * For backward-compatibility, though, 0 has special meaning + * (it means match any machine). + */ + uint32_t machine_ctr; uint8_t trunnel_error_code_; }; #endif @@ -118,6 +127,15 @@ uint8_t circpad_negotiate_get_echo_request(const circpad_negotiate_t *inp); * code on 'inp' on failure. */ int circpad_negotiate_set_echo_request(circpad_negotiate_t *inp, uint8_t val); +/** Return the value of the machine_ctr field of the + * circpad_negotiate_t in 'inp' + */ +uint32_t circpad_negotiate_get_machine_ctr(const circpad_negotiate_t *inp); +/** Set the value of the machine_ctr field of the circpad_negotiate_t + * in 'inp' to 'val'. Return 0 on success; return -1 and set the error + * code on 'inp' on failure. + */ +int circpad_negotiate_set_machine_ctr(circpad_negotiate_t *inp, uint32_t val); /** Return a newly allocated circpad_negotiated with all elements set * to zero. */ @@ -190,6 +208,15 @@ uint8_t circpad_negotiated_get_machine_type(const circpad_negotiated_t *inp); * -1 and set the error code on 'inp' on failure. */ int circpad_negotiated_set_machine_type(circpad_negotiated_t *inp, uint8_t val); +/** Return the value of the machine_ctr field of the + * circpad_negotiated_t in 'inp' + */ +uint32_t circpad_negotiated_get_machine_ctr(const circpad_negotiated_t *inp); +/** Set the value of the machine_ctr field of the circpad_negotiated_t + * in 'inp' to 'val'. Return 0 on success; return -1 and set the error + * code on 'inp' on failure. + */ +int circpad_negotiated_set_machine_ctr(circpad_negotiated_t *inp, uint32_t val); #endif diff --git a/src/trunnel/circpad_negotiation.trunnel b/src/trunnel/circpad_negotiation.trunnel index abbc929cc..68fed6a01 100644 --- a/src/trunnel/circpad_negotiation.trunnel +++ b/src/trunnel/circpad_negotiation.trunnel @@ -27,6 +27,13 @@ struct circpad_negotiate { // FIXME-MP-AP: Maybe we just say to transition to the first state // here instead.. Also what about delay before responding? u8 echo_request IN [0,1]; + + // This field is used for shutdown synchronization. It is OK if + // it wraps, because all we need to do is make sure the STOP + // command is actually for the currently active machine. + // For backward-compatibility, though, 0 has special meaning + // (it means match any machine). + u32 machine_ctr; }; /** @@ -41,4 +48,14 @@ struct circpad_negotiated { /** Machine type is left unbounded because we can specify * new machines in the consensus */ u8 machine_type; + + /** + * This field is used for shutdown synchronization. It is OK if + * it wraps, because all we need to do is make sure the STOP + * command is actually for the currently active machine. + * For backward-compatibility, though, 0 has special meaning + * (it means match any machine). + */ + u32 machine_ctr; + };

1 0

[tor/master] Bug 30992: Track a padding machine ctr to reduce race issues.
by asn＠torproject.org 10 Jun '20

10 Jun '20

commit 0a4bc8fe90c110798948d5e05d436d5e3c1fdae6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jun 8 19:18:51 2020 -0500 Bug 30992: Track a padding machine ctr to reduce race issues. This tracking of the instantiation count should eliminate race conditions due to starting and stopping machines rapidly. Now, we should no longer obey STOP commands for previous machines. --- src/core/or/circuit_st.h | 6 +++ src/core/or/circuitpadding.c | 113 ++++++++++++++++++++++++++++++++----------- src/core/or/circuitpadding.h | 13 ++++- 3 files changed, 102 insertions(+), 30 deletions(-) diff --git a/src/core/or/circuit_st.h b/src/core/or/circuit_st.h index 4baafb184..35d214ce0 100644 --- a/src/core/or/circuit_st.h +++ b/src/core/or/circuit_st.h @@ -238,6 +238,12 @@ struct circuit_t { * Each element of this array corresponds to a different padding machine, * and we can have up to CIRCPAD_MAX_MACHINES such machines. */ struct circpad_machine_runtime_t *padding_info[CIRCPAD_MAX_MACHINES]; + + /** padding_machine_ctr increments each time a new padding machine + * is negotiated. It is used for shutdown conditions, to ensure + * that STOP commands actually correspond to the current machine, + * and not a previous one. */ + uint32_t padding_machine_ctr; }; #endif /* !defined(CIRCUIT_ST_H) */ diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 43f4a3162..b958fec4f 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -266,18 +266,31 @@ circpad_marked_circuit_for_padding(circuit_t *circ, int reason) /** * Free all the machineinfos in <b>circ</b> that match <b>machine_num</b>. * + * If machine_ctr is non-zero, also make sure it matches the padding_info's + * machine counter before freeing. + * * Returns true if any machineinfos with that number were freed. * False otherwise. */ static int -free_circ_machineinfos_with_machine_num(circuit_t *circ, int machine_num) +free_circ_machineinfos_with_machine_num(circuit_t *circ, int machine_num, + uint32_t machine_ctr) { int found = 0; FOR_EACH_CIRCUIT_MACHINE_BEGIN(i) { if (circ->padding_machine[i] && circ->padding_machine[i]->machine_num == machine_num) { - circpad_circuit_machineinfo_free_idx(circ, i); - circ->padding_machine[i] = NULL; - found = 1; + /* If machine_ctr is non-zero, make sure it matches too. This + * is to ensure that old STOP messages don't shutdown newer machines. */ + if (machine_ctr && circ->padding_info[i] && + circ->padding_info[i]->machine_ctr != machine_ctr) { + log_info(LD_CIRC, + "Padding shutdown for wrong (old?) machine ctr: %u vs %u", + machine_ctr, circ->padding_info[i]->machine_ctr); + } else { + circpad_circuit_machineinfo_free_idx(circ, i); + circ->padding_machine[i] = NULL; + found = 1; + } } } FOR_EACH_CIRCUIT_MACHINE_END; @@ -306,6 +319,7 @@ circpad_circuit_machineinfo_new(circuit_t *on_circ, int machine_index) mi->machine_index = machine_index; mi->on_circ = on_circ; mi->last_cell_time_sec = approx_time(); + mi->machine_ctr = on_circ->padding_machine_ctr; return mi; } @@ -1556,19 +1570,23 @@ circpad_machine_spec_transitioned_to_end(circpad_machine_runtime_t *mi) /* We free the machine info here so that we can be replaced * by a different machine. But we must leave the padding_machine * in place to wait for the negotiated response */ + uint32_t machine_ctr = mi->machine_ctr; circpad_circuit_machineinfo_free_idx(on_circ, machine->machine_index); circpad_negotiate_padding(TO_ORIGIN_CIRCUIT(on_circ), machine->machine_num, machine->target_hopnum, - CIRCPAD_COMMAND_STOP); + CIRCPAD_COMMAND_STOP, + machine_ctr); } else { + uint32_t machine_ctr = mi->machine_ctr; circpad_circuit_machineinfo_free_idx(on_circ, machine->machine_index); circpad_padding_negotiated(on_circ, machine->machine_num, CIRCPAD_COMMAND_STOP, - CIRCPAD_RESPONSE_OK); + CIRCPAD_RESPONSE_OK, + machine_ctr); on_circ->padding_machine[machine->machine_index] = NULL; } } @@ -2099,13 +2117,15 @@ circpad_shutdown_old_machines(origin_circuit_t *on_circ) FOR_EACH_ACTIVE_CIRCUIT_MACHINE_BEGIN(i, circ) { if (!circpad_machine_conditions_met(on_circ, circ->padding_machine[i])) { + uint32_t machine_ctr = circ->padding_info[i]->machine_ctr; // Clear machineinfo (frees timers) circpad_circuit_machineinfo_free_idx(circ, i); // Send padding negotiate stop circpad_negotiate_padding(on_circ, circ->padding_machine[i]->machine_num, circ->padding_machine[i]->target_hopnum, - CIRCPAD_COMMAND_STOP); + CIRCPAD_COMMAND_STOP, + machine_ctr); } } FOR_EACH_ACTIVE_CIRCUIT_MACHINE_END; } @@ -2172,7 +2192,8 @@ circpad_add_matching_machines(origin_circuit_t *on_circ, circpad_setup_machine_on_circ(circ, machine); if (circpad_negotiate_padding(on_circ, machine->machine_num, machine->target_hopnum, - CIRCPAD_COMMAND_START) < 0) { + CIRCPAD_COMMAND_START, + circ->padding_machine_ctr) < 0) { log_info(LD_CIRC, "Padding not negotiated. Cleaning machine from circuit %u", CIRCUIT_IS_ORIGIN(circ) ? @@ -2463,6 +2484,17 @@ circpad_setup_machine_on_circ(circuit_t *on_circ, machine->name, on_circ->purpose); } + /* Padding machine ctr starts at 1, so we increment this ctr first. + * (machine ctr of 0 means "any machine"). + * + * See https://bugs.tororject.org/30992. */ + on_circ->padding_machine_ctr++; + + /* uint32 wraparound check: 0 is special, just wrap to 1 */ + if (on_circ->padding_machine_ctr == 0) { + on_circ->padding_machine_ctr = 1; + } + on_circ->padding_info[machine->machine_index] = circpad_circuit_machineinfo_new(on_circ, machine->machine_index); on_circ->padding_machine[machine->machine_index] = machine; @@ -2816,7 +2848,8 @@ signed_error_t circpad_negotiate_padding(origin_circuit_t *circ, circpad_machine_num_t machine, uint8_t target_hopnum, - uint8_t command) + uint8_t command, + uint32_t machine_ctr) { circpad_negotiate_t type; cell_t cell; @@ -2838,14 +2871,16 @@ circpad_negotiate_padding(origin_circuit_t *circ, circpad_negotiate_set_command(&type, command); circpad_negotiate_set_version(&type, 0); circpad_negotiate_set_machine_type(&type, machine); + circpad_negotiate_set_machine_ctr(&type, machine_ctr); if ((len = circpad_negotiate_encode(cell.payload, CELL_PAYLOAD_SIZE, &type)) < 0) return -1; log_fn(LOG_INFO,LD_CIRC, - "Negotiating padding on circuit %u (%d), command %d", - circ->global_identifier, TO_CIRCUIT(circ)->purpose, command); + "Negotiating padding on circuit %u (%d), command %d, for ctr %u", + circ->global_identifier, TO_CIRCUIT(circ)->purpose, command, + machine_ctr); return circpad_send_command_to_hop(circ, target_hopnum, RELAY_COMMAND_PADDING_NEGOTIATE, @@ -2861,7 +2896,8 @@ bool circpad_padding_negotiated(circuit_t *circ, circpad_machine_num_t machine, uint8_t command, - uint8_t response) + uint8_t response, + uint32_t machine_ctr) { circpad_negotiated_t type; cell_t cell; @@ -2878,6 +2914,7 @@ circpad_padding_negotiated(circuit_t *circ, circpad_negotiated_set_response(&type, response); circpad_negotiated_set_version(&type, 0); circpad_negotiated_set_machine_type(&type, machine); + circpad_negotiated_set_machine_ctr(&type, machine_ctr); if ((len = circpad_negotiated_encode(cell.payload, CELL_PAYLOAD_SIZE, &type)) < 0) @@ -2923,19 +2960,33 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) if (negotiate->command == CIRCPAD_COMMAND_STOP) { /* Free the machine corresponding to this machine type */ if (free_circ_machineinfos_with_machine_num(circ, - negotiate->machine_type)) { - log_info(LD_CIRC, "Received STOP command for machine %u", - negotiate->machine_type); + negotiate->machine_type, + negotiate->machine_ctr)) { + log_info(LD_CIRC, "Received STOP command for machine %u, ctr %u", + negotiate->machine_type, negotiate->machine_ctr); goto done; } - log_fn(LOG_PROTOCOL_WARN, LD_CIRC, - "Received circuit padding stop command for unknown machine."); - goto err; - } else if (negotiate->command == CIRCPAD_COMMAND_START) { + if (negotiate->machine_ctr <= circ->padding_machine_ctr) { + log_info(LD_CIRC, "Received STOP command for old machine %u, ctr %u", + negotiate->machine_type, negotiate->machine_ctr); + goto done; + + } else { + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, + "Received circuit padding stop command for unknown machine."); + goto err; + } + } else if (negotiate->command == CIRCPAD_COMMAND_START) { SMARTLIST_FOREACH_BEGIN(relay_padding_machines, const circpad_machine_spec_t *, m) { if (m->machine_num == negotiate->machine_type) { circpad_setup_machine_on_circ(circ, m); + if (negotiate->machine_ctr && + circ->padding_machine_ctr != negotiate->machine_ctr) { + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, + "Client and relay have different counts for padding machines: " + "%u vs %u", circ->padding_machine_ctr, negotiate->machine_ctr); + } circpad_cell_event_nonpadding_received(circ); goto done; } @@ -2948,7 +2999,8 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell) done: circpad_padding_negotiated(circ, negotiate->machine_type, negotiate->command, - (retval == 0) ? CIRCPAD_RESPONSE_OK : CIRCPAD_RESPONSE_ERR); + (retval == 0) ? CIRCPAD_RESPONSE_OK : CIRCPAD_RESPONSE_ERR, + negotiate->machine_ctr); circpad_negotiate_free(negotiate); return retval; @@ -2999,17 +3051,22 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell, * circpad_add_matching_matchines() added a new machine, * there may be a padding_machine for a different machine num * than this response. */ - free_circ_machineinfos_with_machine_num(circ, negotiated->machine_type); + free_circ_machineinfos_with_machine_num(circ, negotiated->machine_type, + negotiated->machine_ctr); } else if (negotiated->command == CIRCPAD_COMMAND_START && negotiated->response == CIRCPAD_RESPONSE_ERR) { - // This can happen due to consensus drift.. free the machines + // This can still happen due to consensus drift.. free the machines // and be sad - free_circ_machineinfos_with_machine_num(circ, negotiated->machine_type); - TO_ORIGIN_CIRCUIT(circ)->padding_negotiation_failed = 1; - log_fn(LOG_PROTOCOL_WARN, LD_CIRC, - "Middle node did not accept our padding request on circuit %u (%d)", - TO_ORIGIN_CIRCUIT(circ)->global_identifier, - circ->purpose); + if (free_circ_machineinfos_with_machine_num(circ, negotiated->machine_type, + negotiated->machine_ctr)) { + // Only fail if a machine was there and matched the error cell + TO_ORIGIN_CIRCUIT(circ)->padding_negotiation_failed = 1; + log_fn(LOG_PROTOCOL_WARN, LD_CIRC, + "Middle node did not accept our padding request on circuit " + "%u (%d)", + TO_ORIGIN_CIRCUIT(circ)->global_identifier, + circ->purpose); + } } circpad_negotiated_free(negotiated); diff --git a/src/core/or/circuitpadding.h b/src/core/or/circuitpadding.h index 74b69a1c7..4fadcb742 100644 --- a/src/core/or/circuitpadding.h +++ b/src/core/or/circuitpadding.h @@ -565,6 +565,13 @@ typedef struct circpad_machine_runtime_t { /** What state is this machine in? */ circpad_statenum_t current_state; + /** Machine counter, for shutdown sync. + * + * Set from circuit_t.padding_machine_ctr, which is incremented each + * padding machine instantiation. + */ + uint32_t machine_ctr; + /** * True if we have scheduled a timer for padding. * @@ -726,11 +733,13 @@ signed_error_t circpad_handle_padding_negotiated(struct circuit_t *circ, signed_error_t circpad_negotiate_padding(struct origin_circuit_t *circ, circpad_machine_num_t machine, uint8_t target_hopnum, - uint8_t command); + uint8_t command, + uint32_t machine_ctr); bool circpad_padding_negotiated(struct circuit_t *circ, circpad_machine_num_t machine, uint8_t command, - uint8_t response); + uint8_t response, + uint32_t machine_ctr); circpad_purpose_mask_t circpad_circ_purpose_to_mask(uint8_t circ_purpose);

1 0

[tor/master] Merge branch 'tor-github/pr/1925'
by asn＠torproject.org 10 Jun '20

10 Jun '20

commit 1797d0516597c4554f19154870fd7455c9884fcf Merge: 1e230bd48 963c3591c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 10 15:37:59 2020 +0300 Merge branch 'tor-github/pr/1925' changes/bug30992 | 4 ++ src/core/or/circuit_st.h | 6 ++ src/core/or/circuitpadding.c | 113 ++++++++++++++++++++++++-------- src/core/or/circuitpadding.h | 13 +++- src/test/test_circuitpadding.c | 8 +-- src/trunnel/circpad_negotiation.c | 52 +++++++++++++++ src/trunnel/circpad_negotiation.h | 27 ++++++++ src/trunnel/circpad_negotiation.trunnel | 17 +++++ 8 files changed, 206 insertions(+), 34 deletions(-)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2020