February 2021 - tor-commits - lists.torproject.org

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 890a9e89bab8378a511470787253a4aee14fafd0 Merge: cc5d5a5d1e f322ea3fa8 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 09:11:14 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/address_set.c | 75 ----------------------------------------------- src/core/or/address_set.h | 15 ---------- 2 files changed, 90 deletions(-) diff --cc src/core/or/address_set.c index fcddc55e9f,7ada4446c4..9bd3cc0f2d --- a/src/core/or/address_set.c +++ b/src/core/… [View More]

1 0

[tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit cc5d5a5d1ebf8d42d77713eab11d200770d869e8 Merge: e50648582b a3cef41fc3 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 08:56:38 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/connection_edge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.4] Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit b2434d30d2c1071f01d9331752fc7d357169332f Merge: ea38016202 705fd37875 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jan 29 14:54:21 2021 -0500 Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01 changes/ticket2667 | 4 ++ src/core/or/address_set.c | 74 +++++++++++++++++++++++++++++++++++ src/core/or/address_set.h | 18 ++++++++- src/core/or/connection_edge.c | 25 ++++++++++++ src/feature/nodelist/dirlist.c | 11 ++++-- src/… [View More]

1 0

[tor/maint-0.4.4] Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 705fd37875c4acd61037da6a2680678ae128e4a4 Merge: 79cb47cfc2 9eba65bd8b Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jan 29 14:51:38 2021 -0500 Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01 changes/ticket2667 | 4 ++ src/core/or/address_set.c | 74 +++++++++++++++++++++++++++++++++++ src/core/or/address_set.h | 18 ++++++++- src/core/or/connection_edge.c | 25 ++++++++++++ src/feature/nodelist/dirlist.c | 11 ++++-- src/… [View More]feature/nodelist/nodelist.c | 87 +++++++++++++++++++++++++++++------------ src/feature/nodelist/nodelist.h | 6 ++- src/test/test_address_set.c | 80 +++++++++++++++++++++++++++++++++++++ 8 files changed, 274 insertions(+), 31 deletions(-) diff --cc src/feature/nodelist/nodelist.c index 6c7fd6d0f9,9d553ce1f5..5df8e63073 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@@ -633,14 -664,16 +665,17 @@@ nodelist_set_consensus(networkstatus_t SMARTLIST_FOREACH(the_nodelist->nodes, node_t *, node, node->rs = NULL); - /* Conservatively estimate that every node will have 2 addresses. */ + /* Conservatively estimate that every node will have 2 addresses (v4 and + * v6). Then we add the number of configured trusted authorities we have. */ int estimated_addresses = smartlist_len(ns->routerstatus_list) * get_estimated_address_per_node(); - estimated_addresses += (get_n_authorities(V3_DIRINFO & BRIDGE_DIRINFO) * + estimated_addresses += (get_n_authorities(V3_DIRINFO | BRIDGE_DIRINFO) * get_estimated_address_per_node()); address_set_free(the_nodelist->node_addrs); + addr_port_set_free(the_nodelist->reentry_set); the_nodelist->node_addrs = address_set_new(estimated_addresses); + /* Times two here is for both the ORPort and DirPort. */ + the_nodelist->reentry_set = addr_port_set_new(estimated_addresses * 2); SMARTLIST_FOREACH_BEGIN(ns->routerstatus_list, routerstatus_t *, rs) { node_t *node = node_get_or_create(rs->identity_digest); diff --cc src/test/test_address_set.c index 829ecd79e8,6d9fab67ab..4c99008ae3 --- a/src/test/test_address_set.c +++ b/src/test/test_address_set.c @@@ -179,9 -174,87 +179,88 @@@ test_nodelist(void *arg UNMOCK(networkstatus_get_latest_consensus); UNMOCK(networkstatus_get_latest_consensus_by_flavor); UNMOCK(get_estimated_address_per_node); + UNMOCK(dirlist_add_trusted_dir_addresses); } + /** Test that the no-reentry exit filter works as intended */ + static void + test_exit_no_reentry(void *arg) + { + routerstatus_t *rs = NULL; microdesc_t *md = NULL; routerinfo_t *ri = NULL; + (void) arg; + + MOCK(networkstatus_get_latest_consensus, + mock_networkstatus_get_latest_consensus); + MOCK(networkstatus_get_latest_consensus_by_flavor, + mock_networkstatus_get_latest_consensus_by_flavor); + MOCK(get_estimated_address_per_node, + mock_get_estimated_address_per_node); + MOCK(dirlist_add_trusted_dir_addresses, + mock_dirlist_add_trusted_dir_addresses); + + dummy_ns = tor_malloc_zero(sizeof(*dummy_ns)); + dummy_ns->flavor = FLAV_MICRODESC; + dummy_ns->routerstatus_list = smartlist_new(); + + tor_addr_t addr_v4, addr_v6, dummy_addr; + tor_addr_parse(&addr_v4, "42.42.42.42"); + tor_addr_parse(&addr_v6, "1:2:3:4::"); + memset(&dummy_addr, 'A', sizeof(dummy_addr)); + + /* This will make the nodelist bloom filter very large + * (the_nodelist->node_addrs) so we will fail the contain test rarely. */ + addr_per_node = 1024; + + /* After this point the nodelist is populated with the directory authorities + * address and ports */ + nodelist_set_consensus(dummy_ns); + + /* The address set is empty. Try it anyway */ + tt_assert(!nodelist_reentry_probably_contains(&addr_v4, 244)); + tt_assert(!nodelist_reentry_probably_contains(&addr_v6, 244)); + + /* Now let's populate the network */ + md = tor_malloc_zero(sizeof(*md)); + ri = tor_malloc_zero(sizeof(*ri)); + rs = tor_malloc_zero(sizeof(*rs)); + crypto_rand(rs->identity_digest, sizeof(rs->identity_digest)); + crypto_rand(md->digest, sizeof(md->digest)); + memcpy(rs->descriptor_digest, md->digest, DIGEST256_LEN); + + /* Setup the rs, ri and md addresses. */ + rs->addr = tor_addr_to_ipv4h(&addr_v4); + rs->or_port = 444; + tor_addr_parse(&rs->ipv6_addr, "1:2:3:4::"); + rs->ipv6_orport = 666; + ri->addr = tor_addr_to_ipv4h(&addr_v4); + tor_addr_parse(&ri->ipv6_addr, "1:2:3:4::"); + tor_addr_parse(&md->ipv6_addr, "1:2:3:4::"); + + /* Add the rs to the consensus becoming a node_t. */ + smartlist_add(dummy_ns->routerstatus_list, rs); + nodelist_set_consensus(dummy_ns); + + /* Now that the nodelist is populated let's do some retry attempts */ + + /* First let's try an address that is on the no-reentry list, but with a + different port */ + tt_assert(!nodelist_reentry_probably_contains(&addr_v4, 666)); + tt_assert(!nodelist_reentry_probably_contains(&addr_v6, 444)); + + /* OK now let's try with the right address and right port */ + tt_assert(nodelist_reentry_probably_contains(&addr_v4, 444)); + tt_assert(nodelist_reentry_probably_contains(&addr_v6, 666)); + + done: + routerstatus_free(rs); routerinfo_free(ri); microdesc_free(md); + smartlist_clear(dummy_ns->routerstatus_list); + networkstatus_vote_free(dummy_ns); + UNMOCK(networkstatus_get_latest_consensus); + UNMOCK(networkstatus_get_latest_consensus_by_flavor); + UNMOCK(get_estimated_address_per_node); + UNMOCK(dirlist_add_trusted_dir_addresses); + } + struct testcase_t address_set_tests[] = { { "contains", test_contains, TT_FORK, NULL, NULL }, [View Less]

1 0

[tor/maint-0.4.4] relay: Follow consensus parameter for network reentry
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit ce3af5dd5948cd9c24fc5b5f70814b38cbca46a9 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 1 08:56:27 2021 -0500 relay: Follow consensus parameter for network reentry Obey the "allow-network-reentry" consensus parameters in order to decide to allow it or not at the Exit. Closes #40268 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/or/connection_edge.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) … [View More]

1 0

[tor/maint-0.4.4] relay: Double the size of the relay reentry set
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 98590621bb49cbecd601085f7e03697f8783ff7b Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 1 09:04:50 2021 -0500 relay: Double the size of the relay reentry set This is to minimize false positive and thus deny reentry to Exit connections that were in reality not re-entering. Helps with overall UX. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/nodelist/nodelist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 … [View More]

1 0

[tor/maint-0.4.4] test: Add test for exits blocking reentry to the network
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 9eba65bd8b688497de139b57ac72e5b8a40bb728 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jan 29 18:21:30 2021 +0200 test: Add test for exits blocking reentry to the network Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/nodelist/dirlist.c | 4 +- src/feature/nodelist/dirlist.h | 2 +- src/test/test_address_set.c | 87 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 3 deletions(-) diff --… [View More]git a/src/feature/nodelist/dirlist.c b/src/feature/nodelist/dirlist.c index 25f769dd5a..b4abffad67 100644 --- a/src/feature/nodelist/dirlist.c +++ b/src/feature/nodelist/dirlist.c @@ -71,8 +71,8 @@ add_trusted_dir_to_nodelist_addr_set(const dir_server_t *dir) /** Go over the trusted directory server list and add their address(es) to the * nodelist address set. This is called every time a new consensus is set. */ -void -dirlist_add_trusted_dir_addresses(void) +MOCK_IMPL(void, +dirlist_add_trusted_dir_addresses, (void)) { if (!trusted_dir_servers) { return; diff --git a/src/feature/nodelist/dirlist.h b/src/feature/nodelist/dirlist.h index 9354769bcf..527af35427 100644 --- a/src/feature/nodelist/dirlist.h +++ b/src/feature/nodelist/dirlist.h @@ -44,6 +44,6 @@ void dir_server_add(dir_server_t *ent); void clear_dir_servers(void); void dirlist_free_all(void); -void dirlist_add_trusted_dir_addresses(void); +MOCK_DECL(void, dirlist_add_trusted_dir_addresses, (void)); #endif diff --git a/src/test/test_address_set.c b/src/test/test_address_set.c index fb8408b3c3..6d9fab67ab 100644 --- a/src/test/test_address_set.c +++ b/src/test/test_address_set.c @@ -4,6 +4,7 @@ #include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" #include "core/or/address_set.h" +#include "feature/nodelist/dirlist.h" #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" @@ -31,6 +32,12 @@ mock_networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f) return dummy_ns; } +static void +mock_dirlist_add_trusted_dir_addresses(void) +{ + return; +} + /* Number of address a single node_t can have. Default to the production * value. This is to control the size of the bloom filter. */ static int addr_per_node = 2; @@ -169,11 +176,91 @@ test_nodelist(void *arg) UNMOCK(get_estimated_address_per_node); } +/** Test that the no-reentry exit filter works as intended */ +static void +test_exit_no_reentry(void *arg) +{ + routerstatus_t *rs = NULL; microdesc_t *md = NULL; routerinfo_t *ri = NULL; + (void) arg; + + MOCK(networkstatus_get_latest_consensus, + mock_networkstatus_get_latest_consensus); + MOCK(networkstatus_get_latest_consensus_by_flavor, + mock_networkstatus_get_latest_consensus_by_flavor); + MOCK(get_estimated_address_per_node, + mock_get_estimated_address_per_node); + MOCK(dirlist_add_trusted_dir_addresses, + mock_dirlist_add_trusted_dir_addresses); + + dummy_ns = tor_malloc_zero(sizeof(*dummy_ns)); + dummy_ns->flavor = FLAV_MICRODESC; + dummy_ns->routerstatus_list = smartlist_new(); + + tor_addr_t addr_v4, addr_v6, dummy_addr; + tor_addr_parse(&addr_v4, "42.42.42.42"); + tor_addr_parse(&addr_v6, "1:2:3:4::"); + memset(&dummy_addr, 'A', sizeof(dummy_addr)); + + /* This will make the nodelist bloom filter very large + * (the_nodelist->node_addrs) so we will fail the contain test rarely. */ + addr_per_node = 1024; + + /* After this point the nodelist is populated with the directory authorities + * address and ports */ + nodelist_set_consensus(dummy_ns); + + /* The address set is empty. Try it anyway */ + tt_assert(!nodelist_reentry_probably_contains(&addr_v4, 244)); + tt_assert(!nodelist_reentry_probably_contains(&addr_v6, 244)); + + /* Now let's populate the network */ + md = tor_malloc_zero(sizeof(*md)); + ri = tor_malloc_zero(sizeof(*ri)); + rs = tor_malloc_zero(sizeof(*rs)); + crypto_rand(rs->identity_digest, sizeof(rs->identity_digest)); + crypto_rand(md->digest, sizeof(md->digest)); + memcpy(rs->descriptor_digest, md->digest, DIGEST256_LEN); + + /* Setup the rs, ri and md addresses. */ + rs->addr = tor_addr_to_ipv4h(&addr_v4); + rs->or_port = 444; + tor_addr_parse(&rs->ipv6_addr, "1:2:3:4::"); + rs->ipv6_orport = 666; + ri->addr = tor_addr_to_ipv4h(&addr_v4); + tor_addr_parse(&ri->ipv6_addr, "1:2:3:4::"); + tor_addr_parse(&md->ipv6_addr, "1:2:3:4::"); + + /* Add the rs to the consensus becoming a node_t. */ + smartlist_add(dummy_ns->routerstatus_list, rs); + nodelist_set_consensus(dummy_ns); + + /* Now that the nodelist is populated let's do some retry attempts */ + + /* First let's try an address that is on the no-reentry list, but with a + different port */ + tt_assert(!nodelist_reentry_probably_contains(&addr_v4, 666)); + tt_assert(!nodelist_reentry_probably_contains(&addr_v6, 444)); + + /* OK now let's try with the right address and right port */ + tt_assert(nodelist_reentry_probably_contains(&addr_v4, 444)); + tt_assert(nodelist_reentry_probably_contains(&addr_v6, 666)); + + done: + routerstatus_free(rs); routerinfo_free(ri); microdesc_free(md); + smartlist_clear(dummy_ns->routerstatus_list); + networkstatus_vote_free(dummy_ns); + UNMOCK(networkstatus_get_latest_consensus); + UNMOCK(networkstatus_get_latest_consensus_by_flavor); + UNMOCK(get_estimated_address_per_node); + UNMOCK(dirlist_add_trusted_dir_addresses); +} + struct testcase_t address_set_tests[] = { { "contains", test_contains, TT_FORK, NULL, NULL }, { "nodelist", test_nodelist, TT_FORK, NULL, NULL }, + { "exit_no_reentry", test_exit_no_reentry, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; [View Less]

1 0

[tor/maint-0.4.4] relay: Send back CONNECTION_REFUSED on reentry
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 59f1a41a7fdc03f5008e859e7e56e9c159b8a8d9 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 1 12:45:32 2021 -0500 relay: Send back CONNECTION_REFUSED on reentry The TORPROTOCOL reason causes the client to close the circuit which is not what we want because other valid streams might be on it. Instead, CONNECTION_REFUSED will leave it open but will not allow more streams to be attached to it. The client then open a new circuit to the … [View More]

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit 0f8195406e0a2a97a3167d4bb40484f4bd091289 Merge: 705fd37875 98590621bb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 08:51:36 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/connection_edge.c | 12 ++++++++++++ src/feature/nodelist/nodelist.c | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by dgoulet＠torproject.org 03 Feb '21

03 Feb '21

commit e50648582b6e0bc7bb37edc08e7a4d67b50f2c53 Merge: 0f8195406e c2cee6c780 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 3 08:54:40 2021 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 src/core/or/connection_edge.c | 2 +- src/feature/nodelist/nodelist.c | 63 ++++++++++++++++++++++++++++++++--------- src/feature/nodelist/nodelist.h | 3 +- src/test/test_address_set.c | 12 ++++---- 4 files changed, 57 insertions(+), 23 deletions(-)

1 0