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

[tor/master] Clarify comment about IPv6Exit in policies_parse_exit_policy_from_options()
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit ada673291402d1e015e79cadca67c0bdd31b4019 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Apr 16 08:22:17 2019 -0400 Clarify comment about IPv6Exit in policies_parse_exit_policy_from_options() --- src/core/or/policies.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/policies.c b/src/core/or/policies.c index 41d221b19..f59894ea8 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -2149,7 +2149,7 @@ policies_parse_exit_policy_from_options(const or_options_t *or_options, int rv = 0; /* Short-circuit for non-exit relays, or for relays where we didn't specify - * ExitPolicy or ReducedExitPolicy and ExitRelay is auto. */ + * ExitPolicy or ReducedExitPolicy or IPv6Exit and ExitRelay is auto. */ if (or_options->ExitRelay == 0 || policy_using_default_exit_options(or_options)) { append_exit_policy_string(result, "reject *4:*");

1 0

[tor/master] Update practracker exceptions.txt for policies.c
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit f643020e64a3730f262f810ed68ed7910da2a9f4 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Apr 16 09:16:52 2019 -0400 Update practracker exceptions.txt for policies.c --- scripts/maint/practracker/exceptions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 8601c5803..c99cdc016 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -117,7 +117,7 @@ problem include-count /src/core/or/connection_or.c 51 problem function-size /src/core/or/connection_or.c:connection_or_group_set_badness_() 105 problem function-size /src/core/or/connection_or.c:connection_or_client_learned_peer_id() 144 problem function-size /src/core/or/connection_or.c:connection_or_compute_authenticate_cell_body() 235 -problem file-size /src/core/or/policies.c 3164 +problem file-size /src/core/or/policies.c 3171 problem function-size /src/core/or/policies.c:policy_summarize() 107 problem function-size /src/core/or/protover.c:protover_all_supported() 116 problem file-size /src/core/or/relay.c 3173

1 0

[tor/master] Grammar fixes for IPv6Exit in tor.1.txt
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit caa55a6d37426073dc264d2adec7201ec65aec19 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Apr 17 21:41:31 2019 -0400 Grammar fixes for IPv6Exit in tor.1.txt --- doc/tor.1.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 23b7e7b60..cbbc3515b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1939,9 +1939,10 @@ is non-zero): ExitPolicy, ReducedExitPolicy, and IPv6Exit options are ignored. + + If ExitRelay is set to "auto", then Tor checks the ExitPolicy, - ReducedExitPolicy, and IPv6Exit options. If either is set, Tor behaves - as if ExitRelay were set to 1. If neither exit policy option is set, Tor - behaves as if ExitRelay were set to 0. (Default: auto) + ReducedExitPolicy, and IPv6Exit options. If at least one of these options + is set, Tor behaves as if ExitRelay were set to 1. If none of these exit + policy options are set, Tor behaves as if ExitRelay were set to 0. + (Default: auto) [[ExitPolicy]] **ExitPolicy** __policy__,__policy__,__...__:: Set an exit policy for this server. Each policy is of the form

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/944'
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit 15d42383833341c9e0c859ba3998ea70eccd74af Merge: 8bea0c2fa caa55a6d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 23 15:39:23 2019 -0400 Merge remote-tracking branch 'tor-github/pr/944' changes/bug29613 | 5 +++++ doc/tor.1.txt | 18 ++++++++++-------- scripts/maint/practracker/exceptions.txt | 2 +- src/config/torrc.sample.in | 6 ++---- src/core/or/policies.c | 20 ++++++++++++++------ 5 files changed, 32 insertions(+), 19 deletions(-)

1 0

[torspec/master] Merge remote-tracking branch 'tor-github/pr/79'
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit d443c0ce01ce8942c89f693b06720ce2ff4dfeff Merge: abe7ffd a26f28c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 23 15:05:47 2019 -0400 Merge remote-tracking branch 'tor-github/pr/79' cert-spec.txt | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[torspec/master] Mention that we're using NBO in cert-spec.txt
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit a26f28c01b5a5027311288bd660b3ee366ca7e43 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Apr 21 11:18:24 2019 +0300 Mention that we're using NBO in cert-spec.txt --- cert-spec.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cert-spec.txt b/cert-spec.txt index 95c303f..d4dab2e 100644 --- a/cert-spec.txt +++ b/cert-spec.txt @@ -22,6 +22,11 @@ signed document is prefixed with a personalization string, which will be different in each case. +1.2 Integer encoding + + Network byte order (big-endian) is used to encode all integer values + in Ed25519 certificates unless explicitly specified otherwise. + 2. Document formats 2.1. Ed25519 Certificates

1 0

[torspec/master] Add HSFETCH controller response QUERY_RATE_LIMITED
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit bd80679c770772a34ce98f4a0d76afea088a61fc Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 15:19:41 2019 -0400 Add HSFETCH controller response QUERY_RATE_LIMITED --- control-spec.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 78a842f..44a5a76 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -3186,7 +3186,7 @@ HsDir = LongName / Fingerprint / "UNKNOWN" DescriptorID = 32*Base32Character / 43*Base64Character Reason = "BAD_DESC" / "QUERY_REJECTED" / "UPLOAD_REJECTED" / "NOT_FOUND" / - "UNEXPECTED" / "QUERY_NO_HSDIR" + "UNEXPECTED" / "QUERY_NO_HSDIR" / "QUERY_RATE_LIMITED" Replica = 1*DIGIT HSDirIndex = 64*HEXDIG @@ -3213,9 +3213,10 @@ - "NOT_FOUND" - HS descriptor with given identifier was not found. - "UNEXPECTED" - nature of failure is unknown. - "QUERY_NO_HSDIR" - No suitable HSDir were found for the query. + - "QUERY_RATE_LIMITED" - query for this service is rate-limited - For "QUERY_NO_HSDIR", the HsDir will be set to "UNKNOWN" which was - introduced in tor 0.3.1.0-alpha. + For "QUERY_NO_HSDIR" or "QUERY_RATE_LIMITED", the HsDir will be set to + "UNKNOWN" which was introduced in tor 0.3.1.0-alpha. If Action is "CREATED", Tor SHOULD send Replica field as well. The Replica field contains the replica number of the generated descriptor. The Replica @@ -3261,8 +3262,9 @@ to "UNKNOWN". The HS_DESC event should be used to get more information on the failed request. - If the fetch fails for the QUERY_NO_HSDIR reason from the HS_DESC event, the - HsDir is set to "UNKNOWN". This was introduced in 0.3.1.0-alpha. + If the fetch fails for the QUERY_NO_HSDIR or QUERY_RATE_LIMITED reason from + the HS_DESC event, the HsDir is set to "UNKNOWN". This was introduced in + 0.3.1.0-alpha. It's expected to receive a reply relatively fast as in it's the time it takes to fetch something over the Tor network. This can be between a

1 0

[torspec/master] Clarify about versions for QUERY_RATE_LIMITED
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit abe7ffd1b498b0b39afe403bd615dd44e6d0a2bb Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 18:15:40 2019 -0400 Clarify about versions for QUERY_RATE_LIMITED --- control-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 44a5a76..ed473f0 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -3216,7 +3216,8 @@ - "QUERY_RATE_LIMITED" - query for this service is rate-limited For "QUERY_NO_HSDIR" or "QUERY_RATE_LIMITED", the HsDir will be set to - "UNKNOWN" which was introduced in tor 0.3.1.0-alpha. + "UNKNOWN" which was introduced in tor 0.3.1.0-alpha and 0.4.1.0-alpha + respectively. If Action is "CREATED", Tor SHOULD send Replica field as well. The Replica field contains the replica number of the generated descriptor. The Replica @@ -3264,7 +3265,7 @@ If the fetch fails for the QUERY_NO_HSDIR or QUERY_RATE_LIMITED reason from the HS_DESC event, the HsDir is set to "UNKNOWN". This was introduced in - 0.3.1.0-alpha. + 0.3.1.0-alpha and 0.4.1.0-alpha respectively. It's expected to receive a reply relatively fast as in it's the time it takes to fetch something over the Tor network. This can be between a

1 0

[tor/master] Make rate_limited and is_rate_limited a bool
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit 943559b18066e126652450df4402dca74ba1baa0 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Apr 19 08:33:00 2019 -0400 Make rate_limited and is_rate_limited a bool --- src/feature/hs/hs_common.c | 4 ++-- src/feature/hs/hs_common.h | 2 +- src/feature/rend/rendclient.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index cffec2b87..a14ff6a64 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -1598,14 +1598,14 @@ hs_purge_last_hid_serv_requests(void) * NULL if no HSDirs are worth trying right now. */ routerstatus_t * hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str, - int *is_rate_limited) + bool *is_rate_limited) { smartlist_t *usable_responsible_dirs = smartlist_new(); const or_options_t *options = get_options(); routerstatus_t *hs_dir; time_t now = time(NULL); int excluded_some; - int rate_limited; + bool rate_limited; int rate_limited_count = 0; int responsible_dirs_count = smartlist_len(responsible_dirs); diff --git a/src/feature/hs/hs_common.h b/src/feature/hs/hs_common.h index f96fc8beb..fc0c39f94 100644 --- a/src/feature/hs/hs_common.h +++ b/src/feature/hs/hs_common.h @@ -241,7 +241,7 @@ void hs_get_responsible_hsdirs(const struct ed25519_public_key_t *blinded_pk, int use_second_hsdir_index, int for_fetching, smartlist_t *responsible_dirs); routerstatus_t *hs_pick_hsdir(smartlist_t *responsible_dirs, - const char *req_key_str, int *is_rate_limited); + const char *req_key_str, bool *is_rate_limited); time_t hs_hsdir_requery_period(const or_options_t *options); time_t hs_lookup_last_hid_serv_request(routerstatus_t *hs_dir, diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 9863fc1c1..090722a4c 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -469,7 +469,7 @@ directory_get_from_hs_dir(const char *desc_id, /* Automatically pick an hs dir if none given. */ if (!rs_hsdir) { - int rate_limited; + bool rate_limited; /* Determine responsible dirs. Even if we can't get all we want, work with * the ones we have. If it's empty, we'll notice in hs_pick_hsdir(). */

1 0

[tor/master] Make repeated/rate limited HSFETCH queries fail with QUERY_RATE_LIMITED
by nickm＠torproject.org 24 Apr '19

24 Apr '19

commit 011307dd5fa608739456b98d259b013286320b91 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Apr 11 15:20:31 2019 -0400 Make repeated/rate limited HSFETCH queries fail with QUERY_RATE_LIMITED --- changes/bug28269 | 7 +++++++ src/feature/hs/hs_client.c | 2 +- src/feature/hs/hs_common.c | 20 ++++++++++++++++---- src/feature/hs/hs_common.h | 2 +- src/feature/rend/rendclient.c | 9 ++++++--- src/test/test_hs.c | 10 ++++++++++ 6 files changed, 41 insertions(+), 9 deletions(-) diff --git a/changes/bug28269 b/changes/bug28269 new file mode 100644 index 000000000..bdfe9e1aa --- /dev/null +++ b/changes/bug28269 @@ -0,0 +1,7 @@ + o Minor bugfixes (onion services): + - If we are launching repeated HSFETCH queries and are rate-limited, + we introduce a new controller response QUERY_RATE_LIMITED instead + of QUERY_NO_HSDIR, while keeping the latter for when onion service + directories are missing a descriptor. Previously, we returned + QUERY_NO_HSDIR for both cases. Fixes bug 28269; bugfix on + 0.3.1.1-alpha. Patch by Neel Chauhan diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index c34271efc..b4b9f0a94 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -434,7 +434,7 @@ pick_hsdir_v3(const ed25519_public_key_t *onion_identity_pk) /* Pick an HSDir from the responsible ones. The ownership of * responsible_hsdirs is given to this function so no need to free it. */ - hsdir_rs = hs_pick_hsdir(responsible_hsdirs, base64_blinded_pubkey); + hsdir_rs = hs_pick_hsdir(responsible_hsdirs, base64_blinded_pubkey, NULL); return hsdir_rs; } diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index b2227432d..cffec2b87 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -1589,20 +1589,25 @@ hs_purge_last_hid_serv_requests(void) /** Given the list of responsible HSDirs in responsible_dirs, pick the * one that we should use to fetch a descriptor right now. Take into account * previous failed attempts at fetching this descriptor from HSDirs using the - * string identifier req_key_str. + * string identifier req_key_str. We return whether we are rate limited + * into *is_rate_limited if it is not NULL. * * Steals ownership of responsible_dirs. * * Return the routerstatus of the chosen HSDir if successful, otherwise return * NULL if no HSDirs are worth trying right now. */ routerstatus_t * -hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str) +hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str, + int *is_rate_limited) { smartlist_t *usable_responsible_dirs = smartlist_new(); const or_options_t *options = get_options(); routerstatus_t *hs_dir; time_t now = time(NULL); int excluded_some; + int rate_limited; + int rate_limited_count = 0; + int responsible_dirs_count = smartlist_len(responsible_dirs); tor_assert(req_key_str); @@ -1622,6 +1627,7 @@ hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str) if (last + hs_hsdir_requery_period(options) >= now || !node || !node_has_preferred_descriptor(node, 0)) { SMARTLIST_DEL_CURRENT(responsible_dirs, dir); + rate_limited_count++; continue; } if (!routerset_contains_node(options->ExcludeNodes, node)) { @@ -1629,6 +1635,7 @@ hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str) } } SMARTLIST_FOREACH_END(dir); + rate_limited = rate_limited_count == responsible_dirs_count; excluded_some = smartlist_len(usable_responsible_dirs) < smartlist_len(responsible_dirs); @@ -1640,9 +1647,10 @@ hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str) smartlist_free(responsible_dirs); smartlist_free(usable_responsible_dirs); if (!hs_dir) { + const char *warn_str = (rate_limited) ? "we are rate limited." : + "we requested them all recently without success"; log_info(LD_REND, "Could not pick one of the responsible hidden " - "service directories, because we requested them all " - "recently without success."); + "service directories, because %s.", warn_str); if (options->StrictNodes && excluded_some) { log_warn(LD_REND, "Could not pick a hidden service directory for the " "requested hidden service: they are all either down or " @@ -1654,6 +1662,10 @@ hs_pick_hsdir(smartlist_t *responsible_dirs, const char *req_key_str) hs_lookup_last_hid_serv_request(hs_dir, req_key_str, now, 1); } + if (is_rate_limited != NULL) { + *is_rate_limited = rate_limited; + } + return hs_dir; } diff --git a/src/feature/hs/hs_common.h b/src/feature/hs/hs_common.h index abf39fa43..f96fc8beb 100644 --- a/src/feature/hs/hs_common.h +++ b/src/feature/hs/hs_common.h @@ -241,7 +241,7 @@ void hs_get_responsible_hsdirs(const struct ed25519_public_key_t *blinded_pk, int use_second_hsdir_index, int for_fetching, smartlist_t *responsible_dirs); routerstatus_t *hs_pick_hsdir(smartlist_t *responsible_dirs, - const char *req_key_str); + const char *req_key_str, int *is_rate_limited); time_t hs_hsdir_requery_period(const or_options_t *options); time_t hs_lookup_last_hid_serv_request(routerstatus_t *hs_dir, diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 5a8b23454..9863fc1c1 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -469,16 +469,19 @@ directory_get_from_hs_dir(const char *desc_id, /* Automatically pick an hs dir if none given. */ if (!rs_hsdir) { + int rate_limited; + /* Determine responsible dirs. Even if we can't get all we want, work with * the ones we have. If it's empty, we'll notice in hs_pick_hsdir(). */ smartlist_t *responsible_dirs = smartlist_new(); hid_serv_get_responsible_directories(responsible_dirs, desc_id); - hs_dir = hs_pick_hsdir(responsible_dirs, desc_id_base32); + hs_dir = hs_pick_hsdir(responsible_dirs, desc_id_base32, &rate_limited); if (!hs_dir) { /* No suitable hs dir can be found, stop right now. */ - control_event_hsv2_descriptor_failed(rend_query, NULL, - "QUERY_NO_HSDIR"); + const char *query_response = (rate_limited) ? "QUERY_RATE_LIMITED" : + "QUERY_NO_HSDIR"; + control_event_hsv2_descriptor_failed(rend_query, NULL, query_response); control_event_hs_descriptor_content(rend_data_get_address(rend_query), desc_id_base32, NULL, NULL); return 0; diff --git a/src/test/test_hs.c b/src/test/test_hs.c index aeb338747..5d3327c77 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -323,6 +323,16 @@ test_hs_desc_event(void *arg) tt_str_op(received_msg,OP_EQ, expected_msg); tor_free(received_msg); + /* test HSDir rate limited */ + rend_query.auth_type = REND_NO_AUTH; + control_event_hsv2_descriptor_failed(&rend_query.base_, NULL, + "QUERY_RATE_LIMITED"); + expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" NO_AUTH " \ + "UNKNOWN REASON=QUERY_RATE_LIMITED\r\n"; + tt_assert(received_msg); + tt_str_op(received_msg,OP_EQ, expected_msg); + tor_free(received_msg); + /* Test invalid content with no HSDir fingerprint. */ char *exp_msg; control_event_hs_descriptor_content(rend_query.onion_address,

1 0