- tor-commits - lists.torproject.org

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/393' into maint-0.4.5
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit 065ebd10c2baee20f2963ac7116701d9593027a8 Merge: a53c949dcf 9348b1b440 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:41:12 2021 -0400 Merge branch 'tor-gitlab/mr/393' into maint-0.4.5 changes/bug40175 | 5 +++++ src/feature/dirclient/dirclient.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] Merge branch 'tor-gitlab/mr/393' into maint-0.4.5
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit 065ebd10c2baee20f2963ac7116701d9593027a8 Merge: a53c949dcf 9348b1b440 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:41:12 2021 -0400 Merge branch 'tor-gitlab/mr/393' into maint-0.4.5 changes/bug40175 | 5 +++++ src/feature/dirclient/dirclient.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit 6e83db69a9d7e6c3d940b1eb7584587045961e52 Merge: 53b08a1158 a160a9ec30 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:41:17 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit a160a9ec30e11fe99ec60a072416b8bf74d39018 Merge: 474c85a98d 065ebd10c2 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:41:17 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0

[tor/release-0.4.5] dir: Do not flag non-running failing HSDir
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit cac612af42798bc76d8933837a9da97ddc039c9b Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 17 12:43:58 2021 -0400 dir: Do not flag non-running failing HSDir When a directory request fails, we flag the relay as non Running so we don't use it anymore. This can be problematic with onion services because there are cases where a tor instance could have a lot of services, ephemeral ones, and keeps failing to upload descriptors, let say due to a bad network, and thus flag a lot of nodes as non Running which then in turn can not be used for circuit building. This commit makes it that we never flag nodes as non Running on a onion service directory request (upload or fetch) failure as to keep the hashring intact and not affect other parts of tor. Fortunately, the onion service hashring is _not_ selected by looking at the Running flag but since we do a 3-hop circuit to the HSDir, other services on the same instance can influence each other by removing nodes from the consensus for path selection. This was made apparent with a small network that ran out of nodes to used due to rapid succession of onion services uploading and failing. See #40434 for details. Fixes #40434 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40434 | 6 ++++++ src/feature/dirclient/dirclient.c | 17 ++++++++++++++++- src/feature/dircommon/directory.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/changes/ticket40434 b/changes/ticket40434 new file mode 100644 index 0000000000..988bb416be --- /dev/null +++ b/changes/ticket40434 @@ -0,0 +1,6 @@ + o Minor bugfix (onion service): + - Do not flag an HSDir as non-running in case the descriptor upload or + fetch fails. An onion service closes pending directory connections + before uploading a new descriptor which can thus lead to wrongly + flagging many relays and thus affecting circuit building path selection. + Fixes bug 40434; bugfix on 0.2.0.13-alpha. diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c index a5dd856729..f2e1e5b5ff 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -738,7 +738,22 @@ connection_dir_client_request_failed(dir_connection_t *conn) return; /* this was a test fetch. don't retry. */ } if (!entry_list_is_constrained(get_options())) - router_set_status(conn->identity_digest, 0); /* don't try this one again */ + /* We must not set a directory to non-running for HS purposes else we end + * up flagging nodes from the hashring has unusable. It doesn't have direct + * effect on the HS subsystem because the nodes are selected regardless of + * their status but still, we shouldn't flag them as non running. + * + * One example where this can go bad is if a tor instance gets added a lot + * of ephemeral services and with a network with problem then many nodes in + * the consenus ends up unusable. + * + * Furthermore, a service does close any pending directory connections + * before uploading a descriptor and thus we can end up here in a natural + * way since closing a pending directory connection leads to this code + * path. */ + if (!DIR_PURPOSE_IS_HS(TO_CONN(conn)->purpose)) { + router_set_status(conn->identity_digest, 0); + } if (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) { log_info(LD_DIR, "Giving up on serverdesc/extrainfo fetch from " diff --git a/src/feature/dircommon/directory.h b/src/feature/dircommon/directory.h index 0aa2ff53ef..2cd9c176c8 100644 --- a/src/feature/dircommon/directory.h +++ b/src/feature/dircommon/directory.h @@ -87,6 +87,12 @@ const dir_connection_t *CONST_TO_DIR_CONN(const connection_t *c); (p)==DIR_PURPOSE_UPLOAD_RENDDESC_V2 || \ (p)==DIR_PURPOSE_UPLOAD_HSDESC) +/** True iff p is a purpose corresponding to onion service that is either + * uploading or fetching actions. */ +#define DIR_PURPOSE_IS_HS(p) \ + ((p) == DIR_PURPOSE_FETCH_HSDESC || \ + (p) == DIR_PURPOSE_UPLOAD_HSDESC) + enum compress_method_t; int parse_http_response(const char *headers, int *code, time_t *date, enum compress_method_t *compression, char **response);

1 0

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/420' into maint-0.4.5
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit a53c949dcf2816f6878209788c8768b7ca35dc35 Merge: f0d1240a07 cac612af42 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:35:30 2021 -0400 Merge branch 'tor-gitlab/mr/420' into maint-0.4.5 changes/ticket40434 | 6 ++++++ src/feature/dirclient/dirclient.c | 17 ++++++++++++++++- src/feature/dircommon/directory.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] Merge branch 'tor-gitlab/mr/420' into maint-0.4.5
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit a53c949dcf2816f6878209788c8768b7ca35dc35 Merge: f0d1240a07 cac612af42 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:35:30 2021 -0400 Merge branch 'tor-gitlab/mr/420' into maint-0.4.5 changes/ticket40434 | 6 ++++++ src/feature/dirclient/dirclient.c | 17 ++++++++++++++++- src/feature/dircommon/directory.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit a6c848ff6ff67a27ca6b59d2884e63cd74df63fd Merge: ac623fa2ac a53c949dcf Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:35:43 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40434 | 6 ++++++ src/feature/dirclient/dirclient.c | 17 ++++++++++++++++- src/feature/dircommon/directory.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit 53b08a1158b2f4a9c69c2ea908c7c2b73afb737c Merge: fd640bbeae 474c85a98d Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:35:43 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40434 | 6 ++++++ src/feature/dirclient/dirclient.c | 17 ++++++++++++++++- src/feature/dircommon/directory.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 06 Oct '21

06 Oct '21

commit 474c85a98d56ebf8cef11cea59728fdf3e5f39d3 Merge: 82b7939d19 a53c949dcf Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 6 15:35:43 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 changes/ticket40434 | 6 ++++++ src/feature/dirclient/dirclient.c | 17 ++++++++++++++++- src/feature/dircommon/directory.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --cc src/feature/dirclient/dirclient.c index fd677d33fe,f2e1e5b5ff..0b6a8101a5 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@@ -708,8 -734,26 +708,23 @@@ connection_dir_client_request_failed(di * failed. */ entry_guard_failed(&conn->guard_state); } - if (directory_conn_is_self_reachability_test(conn)) { - return; /* this was a test fetch. don't retry. */ - } if (!entry_list_is_constrained(get_options())) - router_set_status(conn->identity_digest, 0); /* don't try this one again */ + /* We must not set a directory to non-running for HS purposes else we end + * up flagging nodes from the hashring has unusable. It doesn't have direct + * effect on the HS subsystem because the nodes are selected regardless of + * their status but still, we shouldn't flag them as non running. + * + * One example where this can go bad is if a tor instance gets added a lot + * of ephemeral services and with a network with problem then many nodes in + * the consenus ends up unusable. + * + * Furthermore, a service does close any pending directory connections + * before uploading a descriptor and thus we can end up here in a natural + * way since closing a pending directory connection leads to this code + * path. */ + if (!DIR_PURPOSE_IS_HS(TO_CONN(conn)->purpose)) { + router_set_status(conn->identity_digest, 0); + } if (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) { log_info(LD_DIR, "Giving up on serverdesc/extrainfo fetch from " diff --cc src/feature/dircommon/directory.h index f233e8b244,2cd9c176c8..7d861682bb --- a/src/feature/dircommon/directory.h +++ b/src/feature/dircommon/directory.h @@@ -78,8 -84,15 +78,14 @@@ const dir_connection_t *CONST_TO_DIR_CO ((p)==DIR_PURPOSE_UPLOAD_DIR || \ (p)==DIR_PURPOSE_UPLOAD_VOTE || \ (p)==DIR_PURPOSE_UPLOAD_SIGNATURES || \ - (p)==DIR_PURPOSE_UPLOAD_RENDDESC_V2 || \ (p)==DIR_PURPOSE_UPLOAD_HSDESC) + /** True iff p is a purpose corresponding to onion service that is either + * uploading or fetching actions. */ + #define DIR_PURPOSE_IS_HS(p) \ + ((p) == DIR_PURPOSE_FETCH_HSDESC || \ + (p) == DIR_PURPOSE_UPLOAD_HSDESC) + enum compress_method_t; int parse_http_response(const char *headers, int *code, time_t *date, enum compress_method_t *compression, char **response);

1 0