July 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Refactor setup_intro_circ_auth_key() to make it simpler.
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit c1598be1e01cdadda56f9fd41909ee8e9b7b4ecf Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 16:08:34 2020 +0300 Refactor setup_intro_circ_auth_key() to make it simpler. It now uses the 'goto err' pattern, instead of the fatal_unreached() pattern. The latter pattern is usually used when there is a loop, but there is no loop in this function so it can be simplified easily. --- src/feature/hs/hs_client.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index a49999d7d..7f4d5385e 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -722,29 +722,28 @@ setup_intro_circ_auth_key(origin_circuit_t *circ) * and the client descriptor cache that gets purged (NEWNYM) or the * cleaned up because it expired. Mark the circuit for close so a new * descriptor fetch can occur. */ - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - goto end; + goto err; } /* We will go over every intro point and try to find which one is linked to * that circuit. Those lists are small so it's not that expensive. */ ip = find_desc_intro_point_by_legacy_id( circ->build_state->chosen_exit->identity_digest, desc); - if (ip) { - /* We got it, copy its authentication key to the identifier. */ - ed25519_pubkey_copy(&circ->hs_ident->intro_auth_pk, - &ip->auth_key_cert->signed_key); - goto end; + if (!ip) { + /* Reaching this point means we didn't find any intro point for this + * circuit which is not supposed to happen. */ + log_info(LD_REND,"Could not match opened intro circuit with intro point."); + goto err; } - /* Reaching this point means we didn't find any intro point for this circuit - * which is not supposed to happen. */ + /* We got it, copy its authentication key to the identifier. */ + ed25519_pubkey_copy(&circ->hs_ident->intro_auth_pk, + &ip->auth_key_cert->signed_key); + return 0; + + err: circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - log_info(LD_REND, "Could not match opened intro circuit with intro point."); return -1; - - end: - return 0; } /** Called when an introduction circuit has opened. */

1 0

[tor/maint-0.4.4] Handle a failure edge-case when a client-side intro circ opens.
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit e0da64fd27a8c1a34668dfa337877c0aeb398022 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 16:06:17 2020 +0300 Handle a failure edge-case when a client-side intro circ opens. --- changes/bug34084 | 3 +++ src/feature/hs/hs_client.c | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/changes/bug34084 b/changes/bug34084 new file mode 100644 index 000000000..524c4cf68 --- /dev/null +++ b/changes/bug34084 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services v3): + - Avoid a non-fatal assert log in an edge-case of opening an intro circuit + as a client. Fixes bug 34084; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index c3697d0c1..a49999d7d 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -704,8 +704,11 @@ send_introduce1(origin_circuit_t *intro_circ, } /** Using the introduction circuit circ, setup the authentication key of the - * intro point this circuit has extended to. */ -static void + * intro point this circuit has extended to. + * + * Return 0 if everything went well, otherwise return -1 in the case of errors. + */ +static int setup_intro_circ_auth_key(origin_circuit_t *circ) { const hs_descriptor_t *desc; @@ -736,10 +739,12 @@ setup_intro_circ_auth_key(origin_circuit_t *circ) /* Reaching this point means we didn't find any intro point for this circuit * which is not supposed to happen. */ - tor_assert_nonfatal_unreached(); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); + log_info(LD_REND, "Could not match opened intro circuit with intro point."); + return -1; end: - return; + return 0; } /** Called when an introduction circuit has opened. */ @@ -754,7 +759,9 @@ client_intro_circ_has_opened(origin_circuit_t *circ) /* This is an introduction circuit so we'll attach the correct * authentication key to the circuit identifier so it can be identified * properly later on. */ - setup_intro_circ_auth_key(circ); + if (setup_intro_circ_auth_key(circ) < 0) { + return; + } connection_ap_attach_pending(1); }

1 0

[tor/master] Refactor setup_intro_circ_auth_key() to make it simpler.
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit c1598be1e01cdadda56f9fd41909ee8e9b7b4ecf Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 16:08:34 2020 +0300 Refactor setup_intro_circ_auth_key() to make it simpler. It now uses the 'goto err' pattern, instead of the fatal_unreached() pattern. The latter pattern is usually used when there is a loop, but there is no loop in this function so it can be simplified easily. --- src/feature/hs/hs_client.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index a49999d7d..7f4d5385e 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -722,29 +722,28 @@ setup_intro_circ_auth_key(origin_circuit_t *circ) * and the client descriptor cache that gets purged (NEWNYM) or the * cleaned up because it expired. Mark the circuit for close so a new * descriptor fetch can occur. */ - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - goto end; + goto err; } /* We will go over every intro point and try to find which one is linked to * that circuit. Those lists are small so it's not that expensive. */ ip = find_desc_intro_point_by_legacy_id( circ->build_state->chosen_exit->identity_digest, desc); - if (ip) { - /* We got it, copy its authentication key to the identifier. */ - ed25519_pubkey_copy(&circ->hs_ident->intro_auth_pk, - &ip->auth_key_cert->signed_key); - goto end; + if (!ip) { + /* Reaching this point means we didn't find any intro point for this + * circuit which is not supposed to happen. */ + log_info(LD_REND,"Could not match opened intro circuit with intro point."); + goto err; } - /* Reaching this point means we didn't find any intro point for this circuit - * which is not supposed to happen. */ + /* We got it, copy its authentication key to the identifier. */ + ed25519_pubkey_copy(&circ->hs_ident->intro_auth_pk, + &ip->auth_key_cert->signed_key); + return 0; + + err: circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - log_info(LD_REND, "Could not match opened intro circuit with intro point."); return -1; - - end: - return 0; } /** Called when an introduction circuit has opened. */

1 0

[tor/master] Handle a failure edge-case when a client-side intro circ opens.
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit e0da64fd27a8c1a34668dfa337877c0aeb398022 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 16:06:17 2020 +0300 Handle a failure edge-case when a client-side intro circ opens. --- changes/bug34084 | 3 +++ src/feature/hs/hs_client.c | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/changes/bug34084 b/changes/bug34084 new file mode 100644 index 000000000..524c4cf68 --- /dev/null +++ b/changes/bug34084 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services v3): + - Avoid a non-fatal assert log in an edge-case of opening an intro circuit + as a client. Fixes bug 34084; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index c3697d0c1..a49999d7d 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -704,8 +704,11 @@ send_introduce1(origin_circuit_t *intro_circ, } /** Using the introduction circuit circ, setup the authentication key of the - * intro point this circuit has extended to. */ -static void + * intro point this circuit has extended to. + * + * Return 0 if everything went well, otherwise return -1 in the case of errors. + */ +static int setup_intro_circ_auth_key(origin_circuit_t *circ) { const hs_descriptor_t *desc; @@ -736,10 +739,12 @@ setup_intro_circ_auth_key(origin_circuit_t *circ) /* Reaching this point means we didn't find any intro point for this circuit * which is not supposed to happen. */ - tor_assert_nonfatal_unreached(); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); + log_info(LD_REND, "Could not match opened intro circuit with intro point."); + return -1; end: - return; + return 0; } /** Called when an introduction circuit has opened. */ @@ -754,7 +759,9 @@ client_intro_circ_has_opened(origin_circuit_t *circ) /* This is an introduction circuit so we'll attach the correct * authentication key to the circuit identifier so it can be identified * properly later on. */ - setup_intro_circ_auth_key(circ); + if (setup_intro_circ_auth_key(circ) < 0) { + return; + } connection_ap_attach_pending(1); }

1 0

[tor/master] Merge branch 'maint-0.4.4'
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit 32a0bc2a84b0e73ab94e9428f9f8864bdc458444 Merge: d7f3d1196 1af7f40da Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 9 07:27:25 2020 -0400 Merge branch 'maint-0.4.4' changes/bug34084 | 3 +++ src/feature/hs/hs_client.c | 36 +++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'tor-github/pr/1988' into maint-0.4.4
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit 1af7f40dad505c506f2237262bc7c03fe7681820 Merge: 562957e0d c1598be1e Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 9 07:27:13 2020 -0400 Merge branch 'tor-github/pr/1988' into maint-0.4.4 changes/bug34084 | 3 +++ src/feature/hs/hs_client.c | 36 +++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-)

1 0

[tor/release-0.4.4] Handle a failure edge-case when a client-side intro circ opens.
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit e0da64fd27a8c1a34668dfa337877c0aeb398022 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 16:06:17 2020 +0300 Handle a failure edge-case when a client-side intro circ opens. --- changes/bug34084 | 3 +++ src/feature/hs/hs_client.c | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/changes/bug34084 b/changes/bug34084 new file mode 100644 index 000000000..524c4cf68 --- /dev/null +++ b/changes/bug34084 @@ -0,0 +1,3 @@ + o Minor bugfixes (onion services v3): + - Avoid a non-fatal assert log in an edge-case of opening an intro circuit + as a client. Fixes bug 34084; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index c3697d0c1..a49999d7d 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -704,8 +704,11 @@ send_introduce1(origin_circuit_t *intro_circ, } /** Using the introduction circuit circ, setup the authentication key of the - * intro point this circuit has extended to. */ -static void + * intro point this circuit has extended to. + * + * Return 0 if everything went well, otherwise return -1 in the case of errors. + */ +static int setup_intro_circ_auth_key(origin_circuit_t *circ) { const hs_descriptor_t *desc; @@ -736,10 +739,12 @@ setup_intro_circ_auth_key(origin_circuit_t *circ) /* Reaching this point means we didn't find any intro point for this circuit * which is not supposed to happen. */ - tor_assert_nonfatal_unreached(); + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); + log_info(LD_REND, "Could not match opened intro circuit with intro point."); + return -1; end: - return; + return 0; } /** Called when an introduction circuit has opened. */ @@ -754,7 +759,9 @@ client_intro_circ_has_opened(origin_circuit_t *circ) /* This is an introduction circuit so we'll attach the correct * authentication key to the circuit identifier so it can be identified * properly later on. */ - setup_intro_circ_auth_key(circ); + if (setup_intro_circ_auth_key(circ) < 0) { + return; + } connection_ap_attach_pending(1); }

1 0

[tor/master] Merge branch 'tor-github/pr/1988' into maint-0.4.4
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit 1af7f40dad505c506f2237262bc7c03fe7681820 Merge: 562957e0d c1598be1e Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 9 07:27:13 2020 -0400 Merge branch 'tor-github/pr/1988' into maint-0.4.4 changes/bug34084 | 3 +++ src/feature/hs/hs_client.c | 36 +++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit d4fde97de26ef65d22d84ec2fb3c83a1e0dc29df Merge: 990ae1b02 1af7f40da Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 9 07:27:25 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug34084 | 3 +++ src/feature/hs/hs_client.c | 36 +++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-)

1 0

[tor/release-0.4.4] Refactor setup_intro_circ_auth_key() to make it simpler.
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit c1598be1e01cdadda56f9fd41909ee8e9b7b4ecf Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 16:08:34 2020 +0300 Refactor setup_intro_circ_auth_key() to make it simpler. It now uses the 'goto err' pattern, instead of the fatal_unreached() pattern. The latter pattern is usually used when there is a loop, but there is no loop in this function so it can be simplified easily. --- src/feature/hs/hs_client.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c index a49999d7d..7f4d5385e 100644 --- a/src/feature/hs/hs_client.c +++ b/src/feature/hs/hs_client.c @@ -722,29 +722,28 @@ setup_intro_circ_auth_key(origin_circuit_t *circ) * and the client descriptor cache that gets purged (NEWNYM) or the * cleaned up because it expired. Mark the circuit for close so a new * descriptor fetch can occur. */ - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - goto end; + goto err; } /* We will go over every intro point and try to find which one is linked to * that circuit. Those lists are small so it's not that expensive. */ ip = find_desc_intro_point_by_legacy_id( circ->build_state->chosen_exit->identity_digest, desc); - if (ip) { - /* We got it, copy its authentication key to the identifier. */ - ed25519_pubkey_copy(&circ->hs_ident->intro_auth_pk, - &ip->auth_key_cert->signed_key); - goto end; + if (!ip) { + /* Reaching this point means we didn't find any intro point for this + * circuit which is not supposed to happen. */ + log_info(LD_REND,"Could not match opened intro circuit with intro point."); + goto err; } - /* Reaching this point means we didn't find any intro point for this circuit - * which is not supposed to happen. */ + /* We got it, copy its authentication key to the identifier. */ + ed25519_pubkey_copy(&circ->hs_ident->intro_auth_pk, + &ip->auth_key_cert->signed_key); + return 0; + + err: circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); - log_info(LD_REND, "Could not match opened intro circuit with intro point."); return -1; - - end: - return 0; } /** Called when an introduction circuit has opened. */

1 0