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

[tor/release-0.3.3] hs-v3: Close all SOCKS request on descriptor failure
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit fa6d5dd2686d9fedfbbea9bdf0d7dab1a7afc7c4 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 19 10:56:15 2018 -0400 hs-v3: Close all SOCKS request on descriptor failure Client side, when a descriptor is finally fetched and stored in the cache, we then go over all pending SOCKS request for that descriptor. If it turns out that the intro points are unusable, we close the first SOCKS request but not the others for the same .onion. This commit makes it that we'll close all SOCKS requests so we don't let hanging the other ones. It also fixes another bug which is having a SOCKS connection in RENDDESC_WAIT state but with a descriptor in the cache. At some point, tor will expire the intro failure cache which will make that descriptor usable again. When retrying all SOCKS connection (retry_all_socks_conn_waiting_for_desc()), we won't end up in the code path where we have already the descriptor for a pending request causing a BUG(). Bottom line is that we should never have pending requests (waiting for a descriptor) with that descriptor in the cache (even if unusable). Fixees #27410. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket27410 | 5 +++++ src/or/hs_client.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/ticket27410 b/changes/ticket27410 new file mode 100644 index 000000000..a21fdde58 --- /dev/null +++ b/changes/ticket27410 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden service v3): + - Close all SOCKS request (for the same .onion) if the newly fetched + descriptor is unusable. Before that, we would close only the first one + leaving the other hanging and let to time out by themselves. Fixes bug + 27410; bugfix on 0.3.2.1-alpha. diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 4e2824c13..fb21e6f20 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -1423,7 +1423,7 @@ hs_client_desc_has_arrived(const hs_ident_dir_conn_t *ident) /* We are unable to use the descriptor so remove the directory request * from the cache so the next connection can try again. */ note_connection_attempt_succeeded(edge_conn->hs_ident); - goto end; + continue; } log_info(LD_REND, "Descriptor has arrived. Launching circuits.");

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit e0f4e6a2eb0c36b47aa4540926bdf441ecc9873b Merge: 73eebf4c8 e847909b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:04:25 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket27410 | 5 +++++ src/or/hs_client.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit d1a6043bfb0a3869439565d563a93aeb0fa30923 Merge: 9c83cd199 0971b3ce4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 20 10:59:23 2018 -0400 Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2 changes/bug27335 | 4 ++++ changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- src/or/hs_service.c | 6 +++--- 4 files changed, 23 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 12258bbb9056ae400a58de4eb57c3de079b21782 Merge: 2968c716d b205714ba Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 3 13:31:06 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26535.029 | 5 +++++ src/test/ntor_ref.py | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.4] fixup! Check for duplicate-close in connection_dir_finished_flusing()
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 21a9d034455a9c302055524a9d4dccbfddb220f2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 11:15:07 2018 -0400 fixup! Check for duplicate-close in connection_dir_finished_flusing() --- src/or/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 32ec876f7..ca53756cb 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -5179,7 +5179,7 @@ connection_dir_finished_flushing(dir_connection_t *conn) tor_assert(conn); tor_assert(conn->base_.type == CONN_TYPE_DIR); - if (conn->marked_for_close) + if (conn->base_.marked_for_close) return 0; /* Note that we have finished writing the directory response. For direct

1 0

[tor/release-0.3.4] Check for duplicate-close in connection_dir_finished_flusing()
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 18183de0609a45a92b69d00e37ab569921e63413 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 09:50:48 2018 -0400 Check for duplicate-close in connection_dir_finished_flusing() Fix for 26896. --- changes/bug26896 | 3 +++ src/or/directory.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug26896 b/changes/bug26896 new file mode 100644 index 000000000..9762dc7fa --- /dev/null +++ b/changes/bug26896 @@ -0,0 +1,3 @@ + o Minor bugfixes (directory connection shutdown): + - Avoid a double-close when shutting down a stalled directory connection. + Fixes bug 26896; bugfix on 0.3.4.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index e763de268..32ec876f7 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -5179,6 +5179,9 @@ connection_dir_finished_flushing(dir_connection_t *conn) tor_assert(conn); tor_assert(conn->base_.type == CONN_TYPE_DIR); + if (conn->marked_for_close) + return 0; + /* Note that we have finished writing the directory response. For direct * connections this means we're done; for tunneled connections it's only * an intermediate step. */ @@ -5912,4 +5915,3 @@ dir_split_resource_into_spoolable(const char *resource, smartlist_free(fingerprints); return r; } -

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit d1a6043bfb0a3869439565d563a93aeb0fa30923 Merge: 9c83cd199 0971b3ce4 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 20 10:59:23 2018 -0400 Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2 changes/bug27335 | 4 ++++ changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- src/or/hs_service.c | 6 +++--- 4 files changed, 23 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 12258bbb9056ae400a58de4eb57c3de079b21782 Merge: 2968c716d b205714ba Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 3 13:31:06 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug26535.029 | 5 +++++ src/test/ntor_ref.py | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit e847909b71333690d3fb9a31a738ea3c1ab6d1e1 Merge: bcc1a7180 fa6d5dd26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 2 09:04:20 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3 changes/ticket27410 | 5 +++++ src/or/hs_client.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 02 Nov '18

02 Nov '18

commit 6fed66d268fa84bff7c68eb549907546b66ca6f8 Merge: a4e8f9450 12258bbb9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 3 13:31:08 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0