April 2020 - tor-commits - lists.torproject.org

[translation/tails-greeter-2] https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 06dcff625b5465bb2d3037f4ff2f6a5087145345 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 15:19:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-greeter-2 --- sv/sv.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 88097fcefd..7bdcc9a3c6 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -9,11 +9,11 @@ # runasand <inactive+runasand(a)transifex.com>, 2016 # Anders Nilsson <anders(a)devode.se>, 2016 # Daniel Sjöberg <sjbrg(a)protonmail.com>, 2016 -# Nikolai Stenfors <nikolai.stenfors(a)bahnhof.se>, 2016 +# 031baa191491efb7c91072837490d5ba, 2016 # Bo Serrander <bserrander(a)gmail.com>, 2017 # Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2018 # erinm, 2019 -# Jonatan Nyberg, 2019 +# Jonatan Nyberg, 2020 # #, fuzzy msgid "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-05-11 00:25+0200\n" "PO-Revision-Date: 2016-11-18 21:29+0000\n" -"Last-Translator: Jonatan Nyberg, 2019\n" +"Last-Translator: Jonatan Nyberg, 2020\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -110,7 +110,7 @@ msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." msgstr "" -"Du konfigurerar Tor bron och lokala proxyn senare efter anslutning till ett " +"Du konfigurerar Tor-bron och lokal proxy senare efter anslutning till ett " "nätverk." #: ../data/greeter.ui.h:19 @@ -349,8 +349,8 @@ msgstr "" #: ../tailsgreeter/utils.py:48 msgid "On" -msgstr "" +msgstr "På" #: ../tailsgreeter/utils.py:50 msgid "Off" -msgstr "" +msgstr "Av"

1 0

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 9c0ec324666f9eccc3faa78be0ddb5f4d11eb5b8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 15:19:00 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index e8bbd221dc..26131eaded 100644 --- a/sv.po +++ b/sv.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2020-03-25 21:28+0000\n" +"PO-Revision-Date: 2020-04-08 15:02+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -168,7 +168,7 @@ msgstr "Fel vid hämtning av uppgradering" msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "Utdata filen '%{output_file}s' existerar inte, men tails-iuk-get-target-file klagade inte. Anmäl detta som ett fel." +msgstr "Utdatafilen \"%{output_file}s\" finns inte, men tails-iuk-get-target-file klagade inte. Vänligen anmäl detta som ett fel." #: ../lib/Tails/IUK/Frontend.pm:560 msgid "Error while creating temporary downloading directory" @@ -196,7 +196,7 @@ msgid "" "The network connection will now be disabled.\n" "\n" "Please save your work and close all other applications." -msgstr "Uppgraderingen hämtades.\n\nNätverksanslutningen kommer nu att inaktiveras.\n\nSpara ditt arbete och stäng alla andra program." +msgstr "Uppgraderingen hämtades.\n\nNätverksanslutningen kommer nu att inaktiveras.\n\nVänligen spara ditt arbete och stäng alla andra program." #: ../lib/Tails/IUK/Frontend.pm:612 msgid "Upgrade successfully downloaded" @@ -261,7 +261,7 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "Ett fel inträffade vid installation av uppgraderingen.\\n\\nDin Tails enhet måste repareras och kanske inte kan startas längre.\\n\\nFölj instruktionerna på file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" +msgstr "Ett fel inträffade vid installation av uppgraderingen.\\n\\nDin Tails enhet måste repareras och kanske inte kan startas längre.\\n\\nVänligen följ instruktionerna på file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: ../lib/Tails/IUK/Frontend.pm:715 msgid "Error while installing the upgrade"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit ac44cd7ced8c2e52ab6c4179294c294e1d39559d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 15:18:55 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sv.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sv.po b/sv.po index 3aabf631a3..f712974c80 100644 --- a/sv.po +++ b/sv.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 21:31+0000\n" +"PO-Revision-Date: 2020-04-08 15:17+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -892,13 +892,13 @@ msgstr "ej tillgängligt" msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." -msgstr "{details} Kontrollera din lista över extra program eller läs systemloggen för att förstå problemet." +msgstr "{details} Vänligen kontrollera din lista över ytterligare programvara eller läs systemloggen för att förstå problemet." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." -msgstr "Kontrollera din lista över extra program eller läs systemloggen för att förstå problemet." +msgstr "Vänligen kontrollera din lista över ytterligare programvara eller läs systemloggen för att förstå problemet." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 msgid "Show Log" @@ -1093,7 +1093,7 @@ msgstr "Synkroniserar systemklockan" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "Klockan måste gå rätt för att Tor ska fungera bra, speciellt för Hidden Services. Var god vänta..." +msgstr "Tor behöver en korrekt klocka för att fungera korrekt, särskilt för Hidden Services. Vänligen vänta..." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" @@ -1383,7 +1383,7 @@ msgstr "Startar den osäkra webbläsaren..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49 msgid "This may take a while, so please be patient." -msgstr "Detta kan ta en liten stund, så ha tålamod." +msgstr "Detta kan ta en liten stund, vänligen ha tålamod." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 msgid "Shutting down the Unsafe Browser..." @@ -1408,7 +1408,7 @@ msgstr "Osäker webbläsare" msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." -msgstr "En annan osäker webbläsare är för närvarande igång, eller på väg att stängas av. Försök igen om en stund." +msgstr "En annan osäker webbläsare är för närvarande igång eller på väg att stängas av. Vänligen försök igen om en stund." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96 msgid "Failed to setup chroot."

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 07c1d69b9555fa163867cd8dc7598883b001f8e0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 15:17:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sv.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sv.po b/sv.po index 66bc89e0c0..7a042080dc 100644 --- a/sv.po +++ b/sv.po @@ -25,7 +25,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-03-21 09:59+0100\n" -"PO-Revision-Date: 2020-03-25 21:31+0000\n" +"PO-Revision-Date: 2020-04-08 15:17+0000\n" "Last-Translator: Jonatan Nyberg\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -274,7 +274,7 @@ msgstr "Fel vid hämtning av uppgradering" msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." -msgstr "Utdata filen '%{output_file}s' existerar inte, men tails-iuk-get-target-file klagade inte. Anmäl detta som ett fel." +msgstr "Utdatafilen \"%{output_file}s\" finns inte, men tails-iuk-get-target-file klagade inte. Vänligen anmäl detta som ett fel." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:647 msgid "Error while creating temporary downloading directory" @@ -302,7 +302,7 @@ msgid "" "The network connection will now be disabled.\n" "\n" "Please save your work and close all other applications." -msgstr "Uppgraderingen hämtades.\n\nNätverksanslutningen kommer nu att inaktiveras.\n\nSpara ditt arbete och stäng alla andra program." +msgstr "Uppgraderingen hämtades.\n\nNätverksanslutningen kommer nu att inaktiveras.\n\nVänligen spara ditt arbete och stäng alla andra program." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:699 msgid "Upgrade successfully downloaded" @@ -367,7 +367,7 @@ msgid "" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" " instructions at " "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" -msgstr "Ett fel inträffade vid installation av uppgraderingen.\\n\\nDin Tails enhet måste repareras och kanske inte kan startas längre.\\n\\nFölj instruktionerna på file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" +msgstr "Ett fel inträffade vid installation av uppgraderingen.\\n\\nDin Tails enhet måste repareras och kanske inte kan startas längre.\\n\\nVänligen följ instruktionerna på file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:799 msgid "Error while installing the upgrade" @@ -830,7 +830,7 @@ msgstr "Ändringar kommer inte att gälla förrän du har startat om Tails.\n\nD #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21 msgid "su is disabled. Please use sudo instead." -msgstr "su är inaktiverad. Använd sudo istället." +msgstr "su är inaktiverad. Vänligen använd sudo istället." #: config/chroot_local-includes/usr/src/perl5lib/lib/Tails/RunningSystem.pm:225 msgid "" @@ -892,13 +892,13 @@ msgstr "ej tillgängligt" msgid "" "{details} Please check your list of additional software or read the system " "log to understand the problem." -msgstr "{details} Kontrollera din lista över extra program eller läs systemloggen för att förstå problemet." +msgstr "{details} Vänligen kontrollera din lista över ytterligare programvara eller läs systemloggen för att förstå problemet." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:153 msgid "" "Please check your list of additional software or read the system log to " "understand the problem." -msgstr "Kontrollera din lista över extra program eller läs systemloggen för att förstå problemet." +msgstr "Vänligen kontrollera din lista över ytterligare programvara eller läs systemloggen för att förstå problemet." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:157 msgid "Show Log" @@ -1093,7 +1093,7 @@ msgstr "Synkroniserar systemklockan" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "Klockan måste gå rätt för att Tor ska fungera bra, speciellt för Hidden Services. Var god vänta..." +msgstr "Tor behöver en korrekt klocka för att fungera korrekt, särskilt för Hidden Services. Vänligen vänta..." #: config/chroot_local-includes/usr/local/lib/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" @@ -1360,7 +1360,7 @@ msgstr "Det gick inte att lägga till behållare" msgid "" "Could not add file container %s: Timeout while waiting for loop setup.\n" "Please try using the Disks application instead." -msgstr "Det gick inte att lägga till filbehållaren %s: Tiden löpte ut i väntan på loop-inställning.\nFörsök använda programmet Disks istället." +msgstr "Det gick inte att lägga till filbehållaren %s: Tiden löpte ut i väntan på loop-inställning.\nVänligen försök att använda programmet Disks istället." #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_manager.py:209 msgid "Choose File Container" @@ -1383,7 +1383,7 @@ msgstr "Startar den osäkra webbläsaren..." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:49 msgid "This may take a while, so please be patient." -msgstr "Detta kan ta en liten stund, så ha tålamod." +msgstr "Detta kan ta en liten stund, vänligen ha tålamod." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:54 msgid "Shutting down the Unsafe Browser..." @@ -1408,7 +1408,7 @@ msgstr "Osäker webbläsare" msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." -msgstr "En annan osäker webbläsare är för närvarande igång, eller på väg att stängas av. Försök igen om en stund." +msgstr "En annan osäker webbläsare är för närvarande igång eller på väg att stängas av. Vänligen försök igen om en stund." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:96 msgid "Failed to setup chroot." @@ -1571,7 +1571,7 @@ msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" " disable all networking." -msgstr "Om din Internet-anslutning censureras, filtreras eller går via proxy kan du konfigurera en Tor-brygga eller en lokal proxy. För att arbeta helt nedkopplad kan du inaktivera alla nätverk." +msgstr "Om din Internet-anslutning censureras, filtreras eller går via proxy kan du konfigurera en Tor-bron eller en lokal proxy. För att arbeta helt nedkopplad kan du inaktivera alla nätverk." #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367 msgid "Connect directly to the Tor network (default)" @@ -1589,7 +1589,7 @@ msgstr "Inaktivera alla nätverk" msgid "" "You will configure the Tor bridge and local proxy later on after connecting " "to a network." -msgstr "Du konfigurerar Tor-bryggan och lokala proxyn senare efter anslutning till ett nätverk." +msgstr "Du konfigurerar Tor-bron och den lokala proxyn senare efter anslutning till ett nätverk." #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152 msgid "Welcome to Tails!"

1 0

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit 6a5fb914c9a73ead84b8158acf4df48fd1a23c64 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 15:17:20 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- sv_SE/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv_SE/messages.json b/sv_SE/messages.json index b7003f04e2..0719859afc 100644 --- a/sv_SE/messages.json +++ b/sv_SE/messages.json @@ -57,7 +57,7 @@ "message": "Rapportera fel" }, "fileBug": { - "message": "Om du stöter på problem med Snowflake som klient eller proxy, överväg att lämna in en felrapport. För att göra det måste du," + "message": "Om du stöter på problem med Snowflake som klient eller proxy, vänligen överväg att skicka in en felrapport. För att göra det måste du," }, "sharedAccount": { "message": "Antingen <a href=\"https://trac.torproject.org/projects/tor/register\">skapa ett konto</a> eller <a href=\"https://trac.torproject.org/projects/tor/login\">logga in</a> med det delade cypherpunks-kontot med lösenordet writecode."

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 08 Apr '20

08 Apr '20

commit c9d05394146b07b544e7774c13d30a7d3f76da4d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 8 15:17:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code_of_conduct+sv.po b/code_of_conduct+sv.po index 4c89bdc0af..041322a945 100644 --- a/code_of_conduct+sv.po +++ b/code_of_conduct+sv.po @@ -543,9 +543,9 @@ msgid "" "expected to comply immediately. Please don't step in on someone else's " "behalf without their consent." msgstr "" -"Alla som ombeds av en annan diskussionsgruppmedlem att sluta oacceptabelt " -"beteende förväntas följa omedelbart. Stig inte in för någon annans räkning " -"utan deras medgivande." +"Alla som uppmanas av en annan gemenskapsmedlem att stoppa oacceptabelt " +"beteende förväntas följa omedelbart. Vänligen gå inte in på någon annans " +"vägnar utan deras samtycke." #. type: Plain text #: ../code_of_conduct.txt:195

1 0

[tor/master] hs-v3: Report introduction failure SOCKS ExtendedErrors
by asn＠torproject.org 08 Apr '20

08 Apr '20

commit fdd6352506ccf3d085238d970bef962b592da35d Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Dec 11 09:50:43 2019 -0500 hs-v3: Report introduction failure SOCKS ExtendedErrors Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/hs/hs_client.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index cc1b01d2e..4b9c9cb18 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -961,6 +961,20 @@ client_get_random_intro(const ed25519_public_key_t *service_pk) return ei; } +/** Called when introduction has failed meaning there is no more usable + * introduction points to be used (either NACKed or failed) for the given + * entry connection. + * + * This function only reports back the SOCKS5_HS_INTRO_FAILED (0xF2) code. The + * caller has to make sure to close the entry connections. */ +static void +socks_report_introduction_failed(entry_connection_t *conn) +{ + tor_assert(conn); + tor_assert(conn->socks_request); + conn->socks_request->socks_extended_error_code = SOCKS5_HS_INTRO_FAILED; +} + /** For this introduction circuit, we'll look at if we have any usable * introduction point left for this service. If so, we'll use the circuit to * re-extend to a new intro point. Else, we'll close the circuit and its @@ -1313,6 +1327,10 @@ client_desc_has_arrived(const smartlist_t *entry_conns) if (!hs_client_any_intro_points_usable(identity_pk, desc)) { log_info(LD_REND, "Hidden service descriptor is unusable. " "Closing streams."); + /* Report the extended socks error code that we were unable to introduce + * to the service. */ + socks_report_introduction_failed(entry_conn); + connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_RESOLVEFAILED); /* We are unable to use the descriptor so remove the directory request

1 0

[tor/master] hs-v3: Report rendezvous circuit failure SOCKS ExtendedErrors
by asn＠torproject.org 08 Apr '20

08 Apr '20

commit cf39276f7810c58a1a53bdccf3c3d15001808625 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Dec 11 10:15:02 2019 -0500 hs-v3: Report rendezvous circuit failure SOCKS ExtendedErrors Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/hs/hs_circuit.c | 18 ++++++++++++++++ src/feature/hs/hs_client.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ src/feature/hs/hs_client.h | 1 + 3 files changed, 71 insertions(+) diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c index dc13c7045..53f574c14 100644 --- a/src/feature/hs/hs_circuit.c +++ b/src/feature/hs/hs_circuit.c @@ -622,6 +622,20 @@ setup_introduce1_data(const hs_desc_intro_point_t *ip, } /** Helper: cleanup function for client circuit. This is for every HS version. + * It is called from hs_circ_cleanup_on_close() entry point. */ +static void +cleanup_on_close_client_circ(circuit_t *circ) +{ + tor_assert(circ); + + if (circuit_is_hs_v3(circ)) { + hs_client_circuit_cleanup_on_close(circ); + } + /* It is possible the circuit has an HS purpose but no identifier (rend_data + * or hs_ident). Thus possible that this passess through. */ +} + +/** Helper: cleanup function for client circuit. This is for every HS version. * It is called from hs_circ_cleanup_on_free() entry point. */ static void cleanup_on_free_client_circ(circuit_t *circ) @@ -1293,6 +1307,10 @@ hs_circ_cleanup_on_close(circuit_t *circ) { tor_assert(circ); + if (circuit_purpose_is_hs_client(circ->purpose)) { + cleanup_on_close_client_circ(circ); + } + /* On close, we simply remove it from the circuit map. It can not be used * anymore. We keep this code path fast and lean. */ diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 4b9c9cb18..ceaba08ff 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -961,6 +961,27 @@ client_get_random_intro(const ed25519_public_key_t *service_pk) return ei; } +/** Called when a rendezvous circuit has timed out. Every streams attached to + * the circuit will get set with the SOCKS5_HS_REND_FAILED (0xF3) extended + * error code so if the connection to the rendezvous point ends up not + * working, this code could be sent back as a reason. */ +static void +socks_report_rend_circuit_timed_out(const origin_circuit_t *rend_circ) +{ + tor_assert(rend_circ); + + /* For each entry connections attached to this rendezvous circuit, report + * the error. */ + for (edge_connection_t *edge = rend_circ->p_streams; edge; + edge = edge->next_stream) { + entry_connection_t *entry = EDGE_TO_ENTRY_CONN(edge); + if (entry->socks_request) { + entry->socks_request->socks_extended_error_code = + SOCKS5_HS_REND_FAILED; + } + } +} + /** Called when introduction has failed meaning there is no more usable * introduction points to be used (either NACKed or failed) for the given * entry connection. @@ -1780,6 +1801,37 @@ get_hs_client_auths_map(void) /* ========== */ /** Called when a circuit was just cleaned up. This is done right before the + * circuit is marked for close. */ +void +hs_client_circuit_cleanup_on_close(const circuit_t *circ) +{ + bool has_timed_out; + + tor_assert(circ); + tor_assert(CIRCUIT_IS_ORIGIN(circ)); + + has_timed_out = + (circ->marked_for_close_orig_reason == END_CIRC_REASON_TIMEOUT); + + switch (circ->purpose) { + case CIRCUIT_PURPOSE_C_ESTABLISH_REND: + case CIRCUIT_PURPOSE_C_REND_READY: + case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: + case CIRCUIT_PURPOSE_C_REND_JOINED: + /* Report extended SOCKS error code when a rendezvous circuit timeouts. + * This MUST be done on_close() because it is possible the entry + * connection would get closed before the circuit is freed and thus + * failing to report the error code. */ + if (has_timed_out) { + socks_report_rend_circuit_timed_out(CONST_TO_ORIGIN_CIRCUIT(circ)); + } + break; + default: + break; + } +} + +/** Called when a circuit was just cleaned up. This is done right before the * circuit is freed. */ void hs_client_circuit_cleanup_on_free(const circuit_t *circ) diff --git a/src/feature/hs/hs_client.h b/src/feature/hs/hs_client.h index 3660bfa96..685b10f95 100644 --- a/src/feature/hs/hs_client.h +++ b/src/feature/hs/hs_client.h @@ -110,6 +110,7 @@ int hs_client_send_introduce1(origin_circuit_t *intro_circ, origin_circuit_t *rend_circ); void hs_client_circuit_has_opened(origin_circuit_t *circ); +void hs_client_circuit_cleanup_on_close(const circuit_t *circ); void hs_client_circuit_cleanup_on_free(const circuit_t *circ); int hs_client_receive_rendezvous_acked(origin_circuit_t *circ,

1 0

[tor/master] hs-v3: Report SOCKS ExtendedErrors when all intro timed out
by asn＠torproject.org 08 Apr '20

08 Apr '20

commit 6ab11bbf30e66ab4d63079657b689e09e127c939 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Dec 11 10:30:31 2019 -0500 hs-v3: Report SOCKS ExtendedErrors when all intro timed out Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/hs/hs_client.c | 50 ++++++++++++++++++++++++++++++++++++++++----- src/lib/net/socks5_status.h | 1 + 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index ceaba08ff..40647ac25 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -961,6 +961,37 @@ client_get_random_intro(const ed25519_public_key_t *service_pk) return ei; } +/** Return true iff all intro points for the given service have timed out. */ +static bool +intro_points_all_timed_out(const ed25519_public_key_t *service_pk) +{ + bool ret = false; + + tor_assert(service_pk); + + const hs_descriptor_t *desc = hs_cache_lookup_as_client(service_pk); + + SMARTLIST_FOREACH_BEGIN(desc->encrypted_data.intro_points, + const hs_desc_intro_point_t *, ip) { + const hs_cache_intro_state_t *state = + hs_cache_client_intro_state_find(service_pk, + &ip->auth_key_cert->signed_key); + if (!state || !state->timed_out) { + /* No state or if this intro point has not timed out, we are done since + * clearly not all of them have timed out. */ + goto end; + } + } SMARTLIST_FOREACH_END(ip); + + /* Exiting the loop here means that all intro points we've looked at have + * timed out. Note that we can _not_ have a descriptor without intro points + * in the client cache. */ + ret = true; + + end: + return ret; +} + /** Called when a rendezvous circuit has timed out. Every streams attached to * the circuit will get set with the SOCKS5_HS_REND_FAILED (0xF3) extended * error code so if the connection to the rendezvous point ends up not @@ -986,14 +1017,23 @@ socks_report_rend_circuit_timed_out(const origin_circuit_t *rend_circ) * introduction points to be used (either NACKed or failed) for the given * entry connection. * - * This function only reports back the SOCKS5_HS_INTRO_FAILED (0xF2) code. The - * caller has to make sure to close the entry connections. */ + * This function only reports back the SOCKS5_HS_INTRO_FAILED (0xF2) code or + * SOCKS5_HS_INTRO_TIMEDOUT (0xF7) if all intros have timed out. The caller + * has to make sure to close the entry connections. */ static void -socks_report_introduction_failed(entry_connection_t *conn) +socks_report_introduction_failed(entry_connection_t *conn, + const ed25519_public_key_t *identity_pk) { + socks5_reply_status_t code = SOCKS5_HS_INTRO_FAILED; + tor_assert(conn); tor_assert(conn->socks_request); - conn->socks_request->socks_extended_error_code = SOCKS5_HS_INTRO_FAILED; + tor_assert(identity_pk); + + if (intro_points_all_timed_out(identity_pk)) { + code = SOCKS5_HS_INTRO_TIMEDOUT; + } + conn->socks_request->socks_extended_error_code = code; } /** For this introduction circuit, we'll look at if we have any usable @@ -1350,7 +1390,7 @@ client_desc_has_arrived(const smartlist_t *entry_conns) "Closing streams."); /* Report the extended socks error code that we were unable to introduce * to the service. */ - socks_report_introduction_failed(entry_conn); + socks_report_introduction_failed(entry_conn, identity_pk); connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_RESOLVEFAILED); diff --git a/src/lib/net/socks5_status.h b/src/lib/net/socks5_status.h index 2b663e00c..90c4305d2 100644 --- a/src/lib/net/socks5_status.h +++ b/src/lib/net/socks5_status.h @@ -37,6 +37,7 @@ typedef enum { SOCKS5_HS_MISSING_CLIENT_AUTH = 0xF4, SOCKS5_HS_BAD_CLIENT_AUTH = 0xF5, SOCKS5_HS_BAD_ADDRESS = 0xF6, + SOCKS5_HS_INTRO_TIMEDOUT = 0xF7, } socks5_reply_status_t; #endif /* !defined(TOR_SOCKS5_STATUS_H) */

1 0

[tor/master] man: Update tor.1 ExtendedErrors section with latest
by asn＠torproject.org 08 Apr '20

08 Apr '20

commit dd25805152342385c3fee1c1f2bee6cad452c5cf Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Dec 11 10:34:35 2019 -0500 man: Update tor.1 ExtendedErrors section with latest Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/tor.1.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f2acf15f1..3cd9a2403 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1563,15 +1563,13 @@ The following options are useful only for clients (that is, if X'F2' Onion Service Introduction Failed - Client failed to introduce to the service meaning the descriptor - was found but the service is not connected anymore to the - introduction point. The service has likely changed its descriptor - or is not running. (v3 only) + All introduction attempts failed either due to a combination of + NACK by the intro point or time out. (v3 only) X'F3' Onion Service Rendezvous Failed - Client failed to rendezvous with the service which means that the - client is unable to finalize the connection. (v3 only) + Every rendezvous circuit has timed out and thus the client is + unable to rendezvous with the service. (v3 only) X'F4' Onion Service Missing Client Authorization @@ -1592,6 +1590,11 @@ The following options are useful only for clients (that is, if error is returned: address checksum doesn't match, ed25519 public key is invalid or the encoding is invalid. (v3 only) + X'F7' Onion Service Introduction Timed Out + + Similar to X'F2' code but in this case, all introduction attemps + have failed due to a time out. (v3 only) + // Anchor only for formatting, not visible in the man page. [[SocksPortFlagsMisc]]:: Flags are processed left to right. If flags conflict, the last flag on the

1 0