October 2018 - tor-commits - lists.torproject.org

[tor/master] Add test for HiddenServiceAuthorizeClient and v3 onion services
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit cd9914d9f91a2fd1f56e1c0f89bee57b9a49bbc6 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:20:10 2018 -0400 Add test for HiddenServiceAuthorizeClient and v3 onion services --- src/test/test_hs_config.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/test_hs_config.c b/src/test/test_hs_config.c index 553b96758..b6ab0c21f 100644 --- a/src/test/test_hs_config.c +++ b/src/test/test_hs_config.c @@ -366,6 +366,22 @@ test_invalid_service_v3(void *arg) teardown_capture_of_logs(); } + /* v2-specific HiddenServiceAuthorizeClient set. */ + { + const char *conf = + "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n" + "HiddenServiceVersion 3\n" + "HiddenServiceAuthorizeClient stealth client1\n"; + setup_full_capture_of_logs(LOG_WARN); + ret = helper_config_service(conf, validate_only); + tt_int_op(ret, OP_EQ, -1); + expect_log_msg_containing("Hidden service option " + "HiddenServiceAuthorizeClient is incompatible " + "with version 3 of service in " + "/tmp/tor-test-hs-RANDOM/hs1"); + teardown_capture_of_logs(); + } + done: ; }

1 0

[tor/maint-0.3.5] Add changes file for Bug #28127
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 9b72dca953d56636f0434bd67be2ca80422e7c1e Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:20:28 2018 -0400 Add changes file for Bug #28127 --- changes/bug28127 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug28127 b/changes/bug28127 new file mode 100644 index 000000000..541128c88 --- /dev/null +++ b/changes/bug28127 @@ -0,0 +1,7 @@ + o Minor bugfixes (onion services): + - Unless we have explicitly set HiddenServiceVersion, detect the onion + service version and then look for invalid options. Previously, we + did the reverse, but that broke existing configs which were pointed + to a v2 hidden service and had options like HiddenServiceAuthorizeClient + set Fixes bug 28127; bugfix on 0.3.5.1-alpha. Patch by Neel Chauhan. +

1 0

[tor/master] Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 82b3a023024755971003f53950d9b6dfbe90f969 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:19:42 2018 -0400 Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion --- src/feature/hs/hs_config.c | 30 +++++++++++++++++++----------- src/feature/hs/hs_service.h | 3 +++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 93d7403df..497e31fbb 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -419,7 +419,7 @@ config_generic_service(const config_line_t *line_, dup_opt_seen = line->key; goto err; } - have_version = 1; + have_version = service->config.hs_version_explicitly_set = 1; continue; } /* Virtual port. */ @@ -534,18 +534,15 @@ config_service(const config_line_t *line, const or_options_t *options, /* We have a new hidden service. */ service = hs_service_new(options); + /* We'll configure that service as a generic one and then pass it to a * specific function according to the configured version number. */ if (config_generic_service(line, options, service) < 0) { goto err; } + tor_assert(service->config.version <= HS_VERSION_MAX); - /* Before we configure the service on a per-version basis, we'll make - * sure that this set of options for a service are valid that is for - * instance an option only for v2 is not used for v3. */ - if (config_has_invalid_options(line->next, service)) { - goto err; - } + /* Check permission on service directory that was just parsed. And this must * be done regardless of the service version. Do not ask for the directory * to be created, this is done when the keys are loaded because we could be @@ -556,11 +553,19 @@ config_service(const config_line_t *line, const or_options_t *options, 0) < 0) { goto err; } + /* We'll try to learn the service version here by loading the key(s) if - * present. Depending on the key format, we can figure out the service - * version. If we can't find a key, the configuration version will be used - * which has been set previously. */ - service->config.version = config_learn_service_version(service); + * present and we did not set HiddenServiceVersion. Depending on the key + * format, we can figure out the service version. */ + if (!service->config.hs_version_explicitly_set) { + service->config.version = config_learn_service_version(service); + } + + /* We make sure that this set of options for a service are valid that is for + * instance an option only for v2 is not used for v3. */ + if (config_has_invalid_options(line->next, service)) { + goto err; + } /* Different functions are in charge of specific options for a version. We * start just after the service directory line so once we hit another @@ -580,13 +585,16 @@ config_service(const config_line_t *line, const or_options_t *options, if (ret < 0) { goto err; } + /* We'll check if this service can be kept depending on the others * configured previously. */ if (service_is_duplicate_in_list(service_list, service)) { goto err; } + /* Passes, add it to the given list. */ smartlist_add(service_list, service); + return 0; err: diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index 6fb15b9d3..cc0006f1d 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -178,6 +178,9 @@ typedef struct hs_service_config_t { * option. */ uint32_t version; + /* Have we explicitly set HiddenServiceVersion? */ + unsigned int hs_version_explicitly_set : 1; + /* List of rend_service_port_config_t */ smartlist_t *ports;

1 0

[tor/release-0.3.5] Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 82b3a023024755971003f53950d9b6dfbe90f969 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:19:42 2018 -0400 Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion --- src/feature/hs/hs_config.c | 30 +++++++++++++++++++----------- src/feature/hs/hs_service.h | 3 +++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 93d7403df..497e31fbb 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -419,7 +419,7 @@ config_generic_service(const config_line_t *line_, dup_opt_seen = line->key; goto err; } - have_version = 1; + have_version = service->config.hs_version_explicitly_set = 1; continue; } /* Virtual port. */ @@ -534,18 +534,15 @@ config_service(const config_line_t *line, const or_options_t *options, /* We have a new hidden service. */ service = hs_service_new(options); + /* We'll configure that service as a generic one and then pass it to a * specific function according to the configured version number. */ if (config_generic_service(line, options, service) < 0) { goto err; } + tor_assert(service->config.version <= HS_VERSION_MAX); - /* Before we configure the service on a per-version basis, we'll make - * sure that this set of options for a service are valid that is for - * instance an option only for v2 is not used for v3. */ - if (config_has_invalid_options(line->next, service)) { - goto err; - } + /* Check permission on service directory that was just parsed. And this must * be done regardless of the service version. Do not ask for the directory * to be created, this is done when the keys are loaded because we could be @@ -556,11 +553,19 @@ config_service(const config_line_t *line, const or_options_t *options, 0) < 0) { goto err; } + /* We'll try to learn the service version here by loading the key(s) if - * present. Depending on the key format, we can figure out the service - * version. If we can't find a key, the configuration version will be used - * which has been set previously. */ - service->config.version = config_learn_service_version(service); + * present and we did not set HiddenServiceVersion. Depending on the key + * format, we can figure out the service version. */ + if (!service->config.hs_version_explicitly_set) { + service->config.version = config_learn_service_version(service); + } + + /* We make sure that this set of options for a service are valid that is for + * instance an option only for v2 is not used for v3. */ + if (config_has_invalid_options(line->next, service)) { + goto err; + } /* Different functions are in charge of specific options for a version. We * start just after the service directory line so once we hit another @@ -580,13 +585,16 @@ config_service(const config_line_t *line, const or_options_t *options, if (ret < 0) { goto err; } + /* We'll check if this service can be kept depending on the others * configured previously. */ if (service_is_duplicate_in_list(service_list, service)) { goto err; } + /* Passes, add it to the given list. */ smartlist_add(service_list, service); + return 0; err: diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index 6fb15b9d3..cc0006f1d 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -178,6 +178,9 @@ typedef struct hs_service_config_t { * option. */ uint32_t version; + /* Have we explicitly set HiddenServiceVersion? */ + unsigned int hs_version_explicitly_set : 1; + /* List of rend_service_port_config_t */ smartlist_t *ports;

1 0

[tor/master] Merge branch 'maint-0.3.5'
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit cdb065d6b211298efb0be9320fce32d307b79d2c Merge: 6ba7f9f0a 9b72dca95 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 30 10:55:10 2018 -0400 Merge branch 'maint-0.3.5' changes/bug28127 | 7 +++++++ src/feature/hs/hs_config.c | 30 +++++++++++++++++++----------- src/feature/hs/hs_service.h | 3 +++ src/test/test_hs_config.c | 16 ++++++++++++++++ 4 files changed, 45 insertions(+), 11 deletions(-)

1 0

[tor/master] Add changes file for Bug #28127
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 9b72dca953d56636f0434bd67be2ca80422e7c1e Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:20:28 2018 -0400 Add changes file for Bug #28127 --- changes/bug28127 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug28127 b/changes/bug28127 new file mode 100644 index 000000000..541128c88 --- /dev/null +++ b/changes/bug28127 @@ -0,0 +1,7 @@ + o Minor bugfixes (onion services): + - Unless we have explicitly set HiddenServiceVersion, detect the onion + service version and then look for invalid options. Previously, we + did the reverse, but that broke existing configs which were pointed + to a v2 hidden service and had options like HiddenServiceAuthorizeClient + set Fixes bug 28127; bugfix on 0.3.5.1-alpha. Patch by Neel Chauhan. +

1 0

[tor/release-0.3.5] Add test for HiddenServiceAuthorizeClient and v3 onion services
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit cd9914d9f91a2fd1f56e1c0f89bee57b9a49bbc6 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:20:10 2018 -0400 Add test for HiddenServiceAuthorizeClient and v3 onion services --- src/test/test_hs_config.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/test_hs_config.c b/src/test/test_hs_config.c index 553b96758..b6ab0c21f 100644 --- a/src/test/test_hs_config.c +++ b/src/test/test_hs_config.c @@ -366,6 +366,22 @@ test_invalid_service_v3(void *arg) teardown_capture_of_logs(); } + /* v2-specific HiddenServiceAuthorizeClient set. */ + { + const char *conf = + "HiddenServiceDir /tmp/tor-test-hs-RANDOM/hs1\n" + "HiddenServiceVersion 3\n" + "HiddenServiceAuthorizeClient stealth client1\n"; + setup_full_capture_of_logs(LOG_WARN); + ret = helper_config_service(conf, validate_only); + tt_int_op(ret, OP_EQ, -1); + expect_log_msg_containing("Hidden service option " + "HiddenServiceAuthorizeClient is incompatible " + "with version 3 of service in " + "/tmp/tor-test-hs-RANDOM/hs1"); + teardown_capture_of_logs(); + } + done: ; }

1 0

[tor/release-0.3.5] Add changes file for Bug #28127
by dgoulet＠torproject.org 30 Oct '18

30 Oct '18

commit 9b72dca953d56636f0434bd67be2ca80422e7c1e Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Oct 24 12:20:28 2018 -0400 Add changes file for Bug #28127 --- changes/bug28127 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug28127 b/changes/bug28127 new file mode 100644 index 000000000..541128c88 --- /dev/null +++ b/changes/bug28127 @@ -0,0 +1,7 @@ + o Minor bugfixes (onion services): + - Unless we have explicitly set HiddenServiceVersion, detect the onion + service version and then look for invalid options. Previously, we + did the reverse, but that broke existing configs which were pointed + to a v2 hidden service and had options like HiddenServiceAuthorizeClient + set Fixes bug 28127; bugfix on 0.3.5.1-alpha. Patch by Neel Chauhan. +

1 0

[translation/donatepages-messagespot_completed] Update translations for donatepages-messagespot_completed
by translation＠torproject.org 30 Oct '18

30 Oct '18

commit 4c902e017c11253922418f3a2cf306c036449a88 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 14:15:28 2018 +0000 Update translations for donatepages-messagespot_completed --- locale/es_AR/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 50c08cbc2..890f7e1a1 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -513,7 +513,7 @@ msgstr "Remera" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:449 msgid "Choose your size and fit for each shirt." -msgstr "Elegí tu talle y estilo por cada remera." +msgstr "Elegí tu talle y estilo para cada remera." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:453 msgid "" @@ -541,7 +541,7 @@ msgid "" "again." msgstr "" "Falta completar en el formulario un campo requerido. Por favor recargá la " -"página y tratá de nuevo." +"página e intenta de nuevo." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:473 msgid "There was a problem submitting your request to the server:<br>"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 30 Oct '18

30 Oct '18

commit 16efa1eddfeffac81a2a455cefadb0bbf237a519 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 30 14:15:20 2018 +0000 Update translations for donatepages-messagespot --- locale/es_AR/LC_MESSAGES/messages.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es_AR/LC_MESSAGES/messages.po b/locale/es_AR/LC_MESSAGES/messages.po index 50c08cbc2..890f7e1a1 100644 --- a/locale/es_AR/LC_MESSAGES/messages.po +++ b/locale/es_AR/LC_MESSAGES/messages.po @@ -513,7 +513,7 @@ msgstr "Remera" #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:449 msgid "Choose your size and fit for each shirt." -msgstr "Elegí tu talle y estilo por cada remera." +msgstr "Elegí tu talle y estilo para cada remera." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:453 msgid "" @@ -541,7 +541,7 @@ msgid "" "again." msgstr "" "Falta completar en el formulario un campo requerido. Por favor recargá la " -"página y tratá de nuevo." +"página e intenta de nuevo." #: tmp/cache_locale/c7/c763c19bb6abb9330294c550c8241bb3874e3b4e17fb6e7b15db26c60df8d5fe.php:473 msgid "There was a problem submitting your request to the server:<br>"

1 0