February 2019 - tor-commits - lists.torproject.org

[tor/release-0.3.5] hs-v3: add an option param to safe log functions
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit 238a9080c6e80856145210a374b35e613d4cb11e Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Tue Jan 15 12:16:23 2019 +0700 hs-v3: add an option param to safe log functions We add an option param to safe_str and safe_str_client because in some case we need to use those functions before global_options is set. --- src/app/config/config.c | 16 ++++++++++++---- src/app/config/config.h | 10 ++++++++++ src/feature/hs/hs_client.c | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index c71ed0184..7bd850edd 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1086,10 +1086,14 @@ config_free_all(void) * (We return "[scrubbed]" if SafeLogging is "1", and address otherwise.) */ const char * -safe_str_client(const char *address) +safe_str_client_opts(const or_options_t *options, const char *address) { tor_assert(address); - if (get_options()->SafeLogging_ == SAFELOG_SCRUB_ALL) + if (!options) { + options = get_options(); + } + + if (options->SafeLogging_ == SAFELOG_SCRUB_ALL) return "[scrubbed]"; else return address; @@ -1103,10 +1107,14 @@ safe_str_client(const char *address) * otherwise.) */ const char * -safe_str(const char *address) +safe_str_opts(const or_options_t *options, const char *address) { tor_assert(address); - if (get_options()->SafeLogging_ != SAFELOG_SCRUB_NONE) + if (!options) { + options = get_options(); + } + + if (options->SafeLogging_ != SAFELOG_SCRUB_NONE) return "[scrubbed]"; else return address; diff --git a/src/app/config/config.h b/src/app/config/config.h index a169cfd45..6b23b3934 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -143,6 +143,16 @@ MOCK_DECL(char *, #define get_cachedir_fname_suffix(sub1, suffix) \ options_get_cachedir_fname2_suffix(get_options(), (sub1), NULL, (suffix)) +#define safe_str_client(address) \ + safe_str_client_opts(NULL, address) +#define safe_str(address) \ + safe_str_opts(NULL, address) + +const char * safe_str_client_opts(const or_options_t *options, + const char *address); +const char * safe_str_opts(const or_options_t *options, + const char *address); + int using_default_dir_authorities(const or_options_t *options); int create_keys_directory(const or_options_t *options); diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index e04f0cc0c..1f026a20d 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -1646,7 +1646,7 @@ hs_config_client_authorization(const or_options_t *options, if (digest256map_get(auths, identity_pk.pubkey)) { log_warn(LD_REND, "Duplicate authorization for the same hidden " "service address %s.", - safe_str_client(auth->onion_address)); + safe_str_client_opts(options, auth->onion_address)); client_service_authorization_free(auth); goto end; }

1 0

[tor/release-0.3.5] Merge branch 'ticket29040_1_changes' into maint-0.3.5
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit ab6534781996404ca57e9f5b0cbdda998579c329 Merge: 4b36f9676 eca0f8780 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:37:43 2019 -0500 Merge branch 'ticket29040_1_changes' into maint-0.3.5 changes/bug29040 | 4 ++++ src/app/config/config.c | 16 ++++++++++++---- src/app/config/config.h | 10 ++++++++++ src/feature/hs/hs_client.c | 6 +++--- 4 files changed, 29 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit fc6e389a25d659f2d1383f5b42f498e231ef4885 Merge: 7a9fb4c08 ab6534781 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:37:46 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29040 | 4 ++++ src/app/config/config.c | 16 ++++++++++++---- src/app/config/config.h | 10 ++++++++++ src/feature/hs/hs_client.c | 6 +++--- 4 files changed, 29 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.5] Add changes file for bug 29040.
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit eca0f87801ea5062038544b6cfe2bdbba0998999 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:37:23 2019 -0500 Add changes file for bug 29040. --- changes/bug29040 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug29040 b/changes/bug29040 new file mode 100644 index 000000000..0662aaa8a --- /dev/null +++ b/changes/bug29040 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services): + - Avoid crashing if ClientOnionAuthDir (incorrectly) contains + more than one private key for a hidden service. Fixes bug 29040; + bugfix on 0.3.5.1-alpha.

1 0

[tor/maint-0.3.5] hs-v3: fix use after free in client auth config
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit 8de735f0681970ff688cb5e775dae812ed27aa62 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Tue Jan 15 12:12:31 2019 +0700 hs-v3: fix use after free in client auth config We accidentally use `auth` after freeing it in client_service_authorization_free. The way to solve it is to free after using it. --- src/feature/hs/hs_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index 5fded92fe..e04f0cc0c 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -1637,17 +1637,17 @@ hs_config_client_authorization(const or_options_t *options, * as a key of global map in the future. */ if (hs_parse_address(auth->onion_address, &identity_pk, NULL, NULL) < 0) { - client_service_authorization_free(auth); log_warn(LD_REND, "The onion address \"%s\" is invalid in " "file %s", filename, auth->onion_address); + client_service_authorization_free(auth); continue; } if (digest256map_get(auths, identity_pk.pubkey)) { - client_service_authorization_free(auth); log_warn(LD_REND, "Duplicate authorization for the same hidden " "service address %s.", safe_str_client(auth->onion_address)); + client_service_authorization_free(auth); goto end; }

1 0

[tor/maint-0.3.5] Add changes file for bug 29040.
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit eca0f87801ea5062038544b6cfe2bdbba0998999 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:37:23 2019 -0500 Add changes file for bug 29040. --- changes/bug29040 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug29040 b/changes/bug29040 new file mode 100644 index 000000000..0662aaa8a --- /dev/null +++ b/changes/bug29040 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services): + - Avoid crashing if ClientOnionAuthDir (incorrectly) contains + more than one private key for a hidden service. Fixes bug 29040; + bugfix on 0.3.5.1-alpha.

1 0

[tor/maint-0.3.5] hs-v3: add an option param to safe log functions
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit 238a9080c6e80856145210a374b35e613d4cb11e Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Tue Jan 15 12:16:23 2019 +0700 hs-v3: add an option param to safe log functions We add an option param to safe_str and safe_str_client because in some case we need to use those functions before global_options is set. --- src/app/config/config.c | 16 ++++++++++++---- src/app/config/config.h | 10 ++++++++++ src/feature/hs/hs_client.c | 2 +- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index c71ed0184..7bd850edd 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -1086,10 +1086,14 @@ config_free_all(void) * (We return "[scrubbed]" if SafeLogging is "1", and address otherwise.) */ const char * -safe_str_client(const char *address) +safe_str_client_opts(const or_options_t *options, const char *address) { tor_assert(address); - if (get_options()->SafeLogging_ == SAFELOG_SCRUB_ALL) + if (!options) { + options = get_options(); + } + + if (options->SafeLogging_ == SAFELOG_SCRUB_ALL) return "[scrubbed]"; else return address; @@ -1103,10 +1107,14 @@ safe_str_client(const char *address) * otherwise.) */ const char * -safe_str(const char *address) +safe_str_opts(const or_options_t *options, const char *address) { tor_assert(address); - if (get_options()->SafeLogging_ != SAFELOG_SCRUB_NONE) + if (!options) { + options = get_options(); + } + + if (options->SafeLogging_ != SAFELOG_SCRUB_NONE) return "[scrubbed]"; else return address; diff --git a/src/app/config/config.h b/src/app/config/config.h index a169cfd45..6b23b3934 100644 --- a/src/app/config/config.h +++ b/src/app/config/config.h @@ -143,6 +143,16 @@ MOCK_DECL(char *, #define get_cachedir_fname_suffix(sub1, suffix) \ options_get_cachedir_fname2_suffix(get_options(), (sub1), NULL, (suffix)) +#define safe_str_client(address) \ + safe_str_client_opts(NULL, address) +#define safe_str(address) \ + safe_str_opts(NULL, address) + +const char * safe_str_client_opts(const or_options_t *options, + const char *address); +const char * safe_str_opts(const or_options_t *options, + const char *address); + int using_default_dir_authorities(const or_options_t *options); int create_keys_directory(const or_options_t *options); diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index e04f0cc0c..1f026a20d 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -1646,7 +1646,7 @@ hs_config_client_authorization(const or_options_t *options, if (digest256map_get(auths, identity_pk.pubkey)) { log_warn(LD_REND, "Duplicate authorization for the same hidden " "service address %s.", - safe_str_client(auth->onion_address)); + safe_str_client_opts(options, auth->onion_address)); client_service_authorization_free(auth); goto end; }

1 0

[torspec/master] Merge branch 'ticket28181_05_squashed'
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit f20d5519bdd8e08f723b68e32d8e0cbea04ee928 Merge: 43e34fa d890052 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 08:30:35 2019 -0500 Merge branch 'ticket28181_05_squashed' pt-spec.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)

1 0

[torspec/master] pt-spec: Add the LOG and STATUS message
by nickm＠torproject.org 08 Feb '19

08 Feb '19

commit d890052d5525a09829c798ab0ad6dcdcede1a8ef Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 25 10:23:55 2018 -0400 pt-spec: Add the LOG and STATUS message Give the ability of a pluggable transport to send back logging and status messages to the parent process. Tor implementation in #28179. Closes #28181. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- pt-spec.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/pt-spec.txt b/pt-spec.txt index e94d480..9ec1e29 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -596,6 +596,59 @@ Table of Contents Upon sending the "SMETHODS DONE" message, the PT proxy initialization is complete. +3.3.4. Pluggable Transport Log Message + + This message is for a client or server PT to be able to signal back to the + parent process via stdout or stderr any log messages. + + A log message can be any kind of messages (human readable) that the PT + sends back so the parent process can gather information about what is going + on in the child process. It is not intended for the parent process to parse + and act accordingly but rather a message used for plain logging. + + For example, the tor daemon logs those messages at the Severity level and + sends them onto the control port using the PT_LOG (see control-spec.txt) + event so any third part can pick them up for debugging. + + The format of the message: + + LOG SEVERITY=Severity MESSAGE=Message + + The SEVERITY value indicate at which logging level the message applies. + The accepted values for <Severity> are: error, warning, notice, info, debug + + The MESSAGE value is a human readable string formatted by the PT. The + <Message> contains the log message which can be a String or CString (see + section 2 in control-spec.txt). + + Example: + + LOG SEVERITY=debug MESSAGE="Connected to bridge A" + +3.3.5 Pluggable Transport Status Message + + This message is for a client or server PT to be able to signal back to the + parent process via stdout or stderr any status messages. + + The format of the message: + + STATUS TRANSPORT=Transport <K_1>=<V_1> [<K_2>=<V_2>, ...] + + The TRANSPORT value indicate a hint on what the PT is such has the name or + the protocol used for instance. As an example, obfs4proxy would use + "obfs4". Thus, the Transport value can be anything the PT itself defines + and it can be a String or CString (see section 2 in control-spec.txt). + + The <K_n>=<V_n> values are specific to the PT and there has to be at least + one. They are messages that reflects the status that the PT wants to + report. <V_n> can be a String or CString. + + Examples (fictional): + + STATUS TRANSPORT=obfs4 ADDRESS=198.51.100.123:1234 CONNECT=Success + STATUS TRANSPORT=obfs4 ADDRESS=198.51.100.222:2222 CONNECT=Failed FINGERPRINT=<Fingerprint> ERRSTR="Connection refused" + STATUS TRANSPORT=trebuchet ADDRESS=198.51.100.15:443 PERCENT=42 + 3.4. Pluggable Transport Shutdown The recommended way for Pluggable Transport using applications and

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 08 Feb '19

08 Feb '19

commit a4ac81dbc709e2f19cd74aecda94df93fa1c55da Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 8 13:21:02 2019 +0000 Update translations for support-portal --- contents+de.po | 15 ++++++++++++--- contents+fr.po | 9 +++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/contents+de.po b/contents+de.po index 838c0727e..f1988644f 100644 --- a/contents+de.po +++ b/contents+de.po @@ -1429,7 +1429,7 @@ msgstr "" #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### onion address" -msgstr "" +msgstr "### onion adresse" #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description) @@ -1439,13 +1439,16 @@ msgid "" "A standardized internet domain name used by onion services that ends in " ".onion and is designed to be [self-authenticating](#self-authenticating)." msgstr "" +"Ein standardisierter Internet-Domainname, der von Onion-Diensten verwendet " +"wird und mit .onion endet und als " +"[selbstauthentifizierend](#selbstauthentifizierend) konzipiert ist." #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description) #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### OONI" -msgstr "" +msgstr "### OONI" #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description) @@ -1456,13 +1459,16 @@ msgid "" " observation network for detecting [censorship](#network-censorship), " "surveillance and [traffic](#traffic) manipulation on the internet." msgstr "" +"OONI steht für \"Open Observatory of Network Interference\", es ist ein " +"globales Beobachtungsnetzwerk zur Erkennung von [Zensur](#Netzwerk-Zensur), " +"Überwachung und [Verkehr](#Verkehr) Manipulation im Internet." #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description) #: https//support.torproject.org/misc/tor-glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### onion services" -msgstr "" +msgstr "### onion dienste" #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description) @@ -1473,6 +1479,9 @@ msgid "" " services (like websites) that are only accessible through the [Tor " "network](#tor-/-tor-network/-core-tor)." msgstr "" +"Onion Dienste (früher bekannt als \"[hidden services](#hidden-services)\") " +"sind Dienste (wie Webseiten), die nur über das [Tor-Netzwerk](#tor-/-tor-" +"network/-core-tor) zugänglich sind." #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description) diff --git a/contents+fr.po b/contents+fr.po index 2bb81c2dd..a97d23c0f 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -2,8 +2,8 @@ # erinm, 2018 # AO <ao(a)localizationlab.org>, 2019 # Emma Peel, 2019 -# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2019 +# Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-28 19:24+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2019\n" +"Last-Translator: Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1481,6 +1481,9 @@ msgid "" " services (like websites) that are only accessible through the [Tor " "network](#tor-/-tor-network/-core-tor)." msgstr "" +"Les services Onion (anciennement connus sous le nom de \"[hidden services" +"](#hidden-services)\") sont des services (comme les sites web) qui ne sont " +"accessibles que par le réseau [Tor](#tor-/-tor-network/-core-tor)." #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description) @@ -1490,6 +1493,8 @@ msgid "" "Onion services offer advantages over ordinary services on the non-private " "web, including:" msgstr "" +"Les services Onion offrent des avantages par rapport aux services ordinaires" +" sur le Web non privé, notamment :" #: https//support.torproject.org/glossary/ #: (content/glossary/contents+en.lrquestion.description)

1 0