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

[tor/master] relay: Remove router_pick_published_address()
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit 8178a34b800331cf2f7dc4cddcca6df3de0c829d Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 14 13:09:26 2020 -0400 relay: Remove router_pick_published_address() Unused at this commit. Closes #40025 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/relay/relay_find_addr.c | 53 ------------------------------------- src/feature/relay/relay_find_addr.h | 3 --- 2 files changed, 56 deletions(-) diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c index 840896f23b..f6cafe5315 100644 --- a/src/feature/relay/relay_find_addr.c +++ b/src/feature/relay/relay_find_addr.c @@ -24,20 +24,6 @@ * headers. */ static tor_addr_t last_guessed_ip = TOR_ADDR_NULL; -/** We failed to resolve our address locally, but we'd like to build - * a descriptor and publish / test reachability. If we have a guess - * about our address based on directory headers, answer it and return - * 0; else return -1. */ -static int -router_guess_address_from_dir_headers(uint32_t *guess) -{ - if (!tor_addr_is_null(&last_guessed_ip)) { - *guess = tor_addr_to_ipv4h(&last_guessed_ip); - return 0; - } - return -1; -} - /** Consider the address suggestion suggested_addr as a possible one to use as * our address. * @@ -216,45 +202,6 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, return true; } -/** Make a current best guess at our address, either because - * it's configured in torrc, or because we've learned it from - * dirserver headers. Place the answer in *addr and return - * 0 on success, else return -1 if we have no guess. - * - * If cache_only is true, just return any cached answers, and - * don't try to get any new answers. - */ -MOCK_IMPL(int, -router_pick_published_address, (const or_options_t *options, uint32_t *addr, - int cache_only)) -{ - tor_addr_t last_resolved_addr; - - /* First, check the cached output from find_my_address(). */ - resolved_addr_get_last(AF_INET, &last_resolved_addr); - if (!tor_addr_is_null(&last_resolved_addr)) { - *addr = tor_addr_to_ipv4h(&last_resolved_addr); - return 0; - } - - /* Second, consider doing a resolve attempt right here. */ - if (!cache_only) { - tor_addr_t my_addr; - if (find_my_address(options, AF_INET, LOG_INFO, &my_addr, NULL, NULL)) { - log_info(LD_CONFIG,"Success: chose address '%s'.", fmt_addr(&my_addr)); - *addr = tor_addr_to_ipv4h(&my_addr); - return 0; - } - } - - /* Third, check the cached output from router_new_address_suggestion(). */ - if (router_guess_address_from_dir_headers(addr) >= 0) - return 0; - - /* We have no useful cached answers. Return failure. */ - return -1; -} - /** Return true iff this relay has an address set for the given family. * * This only checks the caches so it will not trigger a full discovery of the diff --git a/src/feature/relay/relay_find_addr.h b/src/feature/relay/relay_find_addr.h index ad147686a5..5ad9f0deb7 100644 --- a/src/feature/relay/relay_find_addr.h +++ b/src/feature/relay/relay_find_addr.h @@ -9,9 +9,6 @@ #ifndef TOR_RELAY_FIND_ADDR_H #define TOR_RELAY_FIND_ADDR_H -MOCK_DECL(int, router_pick_published_address, - (const or_options_t *options, uint32_t *addr, int cache_only)); - void router_new_address_suggestion(const char *suggestion, const dir_connection_t *d_conn);

1 0

[tor/master] relay: Handle dir address suggestion with new interface
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit 433a1949e87190f1732ea426ed359c93f28cb578 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jul 17 10:34:30 2020 -0400 relay: Handle dir address suggestion with new interface We now use relay_address_new_suggestion() when a suggested address is received from a directory. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/dirclient/dirclient.c | 8 +++- src/feature/relay/relay_find_addr.c | 84 ++++--------------------------------- src/feature/relay/relay_find_addr.h | 3 -- 3 files changed, 14 insertions(+), 81 deletions(-) diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c index bc4162cf52..7a026d3c52 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -2106,7 +2106,13 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if (conn->dirconn_direct) { char *guess = http_get_header(headers, X_ADDRESS_HEADER); if (guess) { - router_new_address_suggestion(guess, conn); + tor_addr_t addr; + if (tor_addr_parse(&addr, guess) < 0) { + log_debug(LD_DIR, "Malformed X-Your-Address-Is header %s. Ignoring.", + escaped(guess)); + } else { + relay_address_new_suggestion(&addr, &TO_CONN(conn)->addr, NULL); + } tor_free(guess); } } diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c index f6cafe5315..9a279d2277 100644 --- a/src/feature/relay/relay_find_addr.c +++ b/src/feature/relay/relay_find_addr.c @@ -20,15 +20,12 @@ #include "feature/relay/router.h" #include "feature/relay/routermode.h" -/** The most recently guessed value of our IP address, based on directory - * headers. */ -static tor_addr_t last_guessed_ip = TOR_ADDR_NULL; - /** Consider the address suggestion suggested_addr as a possible one to use as * our address. * - * This is called when a valid NETINFO cell is recevied containing a candidate - * for our address. + * This is called when a valid NETINFO cell is received containing a candidate + * for our address or when a directory sends us back the X-Your-Address-Is + * header. * * The suggested address is ignored if it does NOT come from a trusted source. * At the moment, we only look a trusted directory authorities. @@ -37,6 +34,9 @@ static tor_addr_t last_guessed_ip = TOR_ADDR_NULL; * given peer_addr which is the address from the endpoint that sent the * NETINFO cell. * + * The identity_digest is NULL if this is an address suggested by a directory + * since this is a plaintext connection. + * * The suggested address is set in our suggested address cache if everything * passes. */ void @@ -48,7 +48,6 @@ relay_address_new_suggestion(const tor_addr_t *suggested_addr, tor_assert(suggested_addr); tor_assert(peer_addr); - tor_assert(identity_digest); /* Non server should just ignore this suggestion. Clients don't need to * learn their address let alone cache it. */ @@ -59,7 +58,7 @@ relay_address_new_suggestion(const tor_addr_t *suggested_addr, /* Is the peer a trusted source? Ignore anything coming from non trusted * source. In this case, we only look at trusted directory authorities. */ if (!router_addr_is_trusted_dir(peer_addr) || - !router_digest_is_trusted_dir(identity_digest)) { + (identity_digest && !router_digest_is_trusted_dir(identity_digest))) { return; } @@ -81,75 +80,6 @@ relay_address_new_suggestion(const tor_addr_t *suggested_addr, resolved_addr_set_suggested(suggested_addr); } -/** A directory server d_conn told us our IP address is - * suggestion. - * If this address is different from the one we think we are now, and - * if our computer doesn't actually know its IP address, then switch. */ -void -router_new_address_suggestion(const char *suggestion, - const dir_connection_t *d_conn) -{ - tor_addr_t addr, my_addr, last_resolved_addr; - const or_options_t *options = get_options(); - - /* first, learn what the IP address actually is */ - if (tor_addr_parse(&addr, suggestion) == -1) { - log_debug(LD_DIR, "Malformed X-Your-Address-Is header %s. Ignoring.", - escaped(suggestion)); - return; - } - - log_debug(LD_DIR, "Got X-Your-Address-Is: %s.", suggestion); - - if (!server_mode(options)) { - tor_addr_copy(&last_guessed_ip, &addr); - return; - } - - /* XXXX ipv6 */ - resolved_addr_get_last(AF_INET, &last_resolved_addr); - if (!tor_addr_is_null(&last_resolved_addr)) { - /* Lets use this one. */ - tor_addr_copy(&last_guessed_ip, &last_resolved_addr); - return; - } - - /* Attempt to find our address. */ - if (find_my_address(options, AF_INET, LOG_INFO, &my_addr, NULL, NULL)) { - /* We're all set -- we already know our address. Great. */ - tor_addr_copy(&last_guessed_ip, &my_addr); /* store it in case we - need it later */ - return; - } - - /* Consider the suggestion from the directory. */ - if (tor_addr_is_internal(&addr, 0)) { - /* Don't believe anybody who says our IP is, say, 127.0.0.1. */ - return; - } - if (tor_addr_eq(&d_conn->base_.addr, &addr)) { - /* Don't believe anybody who says our IP is their IP. */ - log_debug(LD_DIR, "A directory server told us our IP address is %s, " - "but they are just reporting their own IP address. Ignoring.", - suggestion); - return; - } - - /* Okay. We can't resolve our own address, and X-Your-Address-Is is giving - * us an answer different from what we had the last time we managed to - * resolve it. */ - if (!tor_addr_eq(&last_guessed_ip, &addr)) { - control_event_server_status(LOG_NOTICE, - "EXTERNAL_ADDRESS ADDRESS=%s METHOD=DIRSERV", - suggestion); - log_addr_has_changed(LOG_NOTICE, &last_guessed_ip, &addr, - d_conn->base_.address); - ip_address_changed(0); - tor_addr_copy(&last_guessed_ip, &addr); /* router_rebuild_descriptor() - will fetch it */ - } -} - /** Find our address to be published in our descriptor. Three places are * looked at: * diff --git a/src/feature/relay/relay_find_addr.h b/src/feature/relay/relay_find_addr.h index 5ad9f0deb7..294ae4db57 100644 --- a/src/feature/relay/relay_find_addr.h +++ b/src/feature/relay/relay_find_addr.h @@ -9,9 +9,6 @@ #ifndef TOR_RELAY_FIND_ADDR_H #define TOR_RELAY_FIND_ADDR_H -void router_new_address_suggestion(const char *suggestion, - const dir_connection_t *d_conn); - void relay_address_new_suggestion(const tor_addr_t *suggested_addr, const tor_addr_t *peer_addr, const char *identity_digest);

1 0

[tor/master] relay: Use flags in relay_find_addr_to_publish()
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit 75434a1df18e3007c286ce48a1e981a4e96e3f82 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jul 17 11:10:56 2020 -0400 relay: Use flags in relay_find_addr_to_publish() Instead of a boolean saying "cache_only" add the concept of flags so we add semantic through out the code and allow ourselves to have more options in the future. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/client/transports.c | 7 ++++--- src/feature/control/control_getinfo.c | 3 ++- src/feature/relay/relay_find_addr.c | 14 ++++++++------ src/feature/relay/relay_find_addr.h | 7 ++++++- src/feature/relay/router.c | 6 ++++-- src/test/test_config.c | 4 ++-- src/test/test_relay.c | 18 ++++++++++++------ 7 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 8a0694449a..2eb05d6a67 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1652,11 +1652,12 @@ pt_get_extra_info_descriptor_string(void) tor_addr_t addr; /* Attempt to find the IPv4 and then attempt to find the IPv6 if we * can't find it. */ - bool found = relay_find_addr_to_publish(get_options(), AF_INET, false, + bool found = relay_find_addr_to_publish(get_options(), AF_INET, + RELAY_FIND_ADDR_NO_FLAG, &addr); if (!found) { - found = relay_find_addr_to_publish(get_options(), AF_INET6, false, - &addr); + found = relay_find_addr_to_publish(get_options(), AF_INET6, + RELAY_FIND_ADDR_NO_FLAG, &addr); } if (!found) { log_err(LD_PT, "Unable to find address for transport %s", t->name); diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index 4ac4f48a86..3e4feadded 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -133,7 +133,8 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) { tor_addr_t addr; - if (!relay_find_addr_to_publish(get_options(), AF_INET, true, &addr)) { + if (!relay_find_addr_to_publish(get_options(), AF_INET, + RELAY_FIND_ADDR_CACHE_ONLY, &addr)) { *errmsg = "Address unknown"; return -1; } diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c index 9a279d2277..48f28b182a 100644 --- a/src/feature/relay/relay_find_addr.c +++ b/src/feature/relay/relay_find_addr.c @@ -86,18 +86,19 @@ relay_address_new_suggestion(const tor_addr_t *suggested_addr, * 1. Resolved cache. Populated by find_my_address() during the relay * periodic event that attempts to learn if our address has changed. * - * 2. If cache_only is false, attempt to find the address using the - * relay_find_addr.h interface. + * 2. If flags is set with RELAY_FIND_ADDR_CACHE_ONLY, only the resolved + * and suggested cache are looked at. No address discovery will be done. * * 3. Finally, if all fails, use the suggested address cache which is - * populated by the NETINFO cell values. + * populated by the NETINFO cell content or HTTP header from a + * directory. * * Return true on success and addr_out contains the address to use for the * given family. On failure to find the address, false is returned and * addr_out is set to an AF_UNSPEC address. */ MOCK_IMPL(bool, relay_find_addr_to_publish, (const or_options_t *options, int family, - bool cache_only, tor_addr_t *addr_out)) + int flags, tor_addr_t *addr_out)) { tor_assert(options); tor_assert(addr_out); @@ -113,7 +114,7 @@ relay_find_addr_to_publish, (const or_options_t *options, int family, /* Second, attempt to find our address. The following can do a DNS resolve * thus only do it when the no cache only flag is flipped. */ - if (!cache_only) { + if (!(flags & RELAY_FIND_ADDR_CACHE_ONLY)) { if (find_my_address(options, family, LOG_INFO, addr_out, NULL, NULL)) { goto found; } @@ -140,5 +141,6 @@ bool relay_has_address_set(int family) { tor_addr_t addr; - return relay_find_addr_to_publish(get_options(), family, 1, &addr); + return relay_find_addr_to_publish(get_options(), family, + RELAY_FIND_ADDR_CACHE_ONLY, &addr); } diff --git a/src/feature/relay/relay_find_addr.h b/src/feature/relay/relay_find_addr.h index 294ae4db57..3d30946b05 100644 --- a/src/feature/relay/relay_find_addr.h +++ b/src/feature/relay/relay_find_addr.h @@ -9,12 +9,17 @@ #ifndef TOR_RELAY_FIND_ADDR_H #define TOR_RELAY_FIND_ADDR_H +typedef enum { + RELAY_FIND_ADDR_NO_FLAG = (1U << 0), + RELAY_FIND_ADDR_CACHE_ONLY = (1U << 1), +} relay_find_addr_flags_t; + void relay_address_new_suggestion(const tor_addr_t *suggested_addr, const tor_addr_t *peer_addr, const char *identity_digest); MOCK_DECL(bool, relay_find_addr_to_publish, - (const or_options_t *options, int family, bool cache_only, + (const or_options_t *options, int family, int flags, tor_addr_t *addr_out)); bool relay_has_address_set(int family); diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 039aeb7343..b75241160f 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2040,9 +2040,11 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)) /* Find our resolved address both IPv4 and IPv6. In case the address is not * found, the object is set to an UNSPEC address. */ - bool have_v4 = relay_find_addr_to_publish(options, AF_INET, false, + bool have_v4 = relay_find_addr_to_publish(options, AF_INET, + RELAY_FIND_ADDR_NO_FLAG, &ipv4_addr); - bool have_v6 = relay_find_addr_to_publish(options, AF_INET6, false, + bool have_v6 = relay_find_addr_to_publish(options, AF_INET6, + RELAY_FIND_ADDR_NO_FLAG, &ipv6_addr); /* Tor requires a relay to have an IPv4 so bail if we can't find it. */ diff --git a/src/test/test_config.c b/src/test/test_config.c index 7496c7c57c..71b2cdf2f4 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3846,11 +3846,11 @@ static bool mock_relay_find_addr_to_publish_result = true; static bool mock_relay_find_addr_to_publish(const or_options_t *options, int family, - bool cache_only, tor_addr_t *addr_out) + int flags, tor_addr_t *addr_out) { (void) options; (void) family; - (void) cache_only; + (void) flags; (void) addr_out; return mock_relay_find_addr_to_publish_result; } diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 5ea35b6ad0..60db98aec3 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -316,11 +316,13 @@ test_find_addr_to_publish(void *arg) tt_assert(tor_addr_eq(&ipv6_addr, &cache_addr)); /* 1. Address located in the resolved cache. */ - ret = relay_find_addr_to_publish(&options, AF_INET, true, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET, + RELAY_FIND_ADDR_CACHE_ONLY, &cache_addr); tt_assert(ret); tt_assert(tor_addr_eq(&ipv4_addr, &cache_addr)); - ret = relay_find_addr_to_publish(&options, AF_INET6, true, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET6, + RELAY_FIND_ADDR_CACHE_ONLY, &cache_addr); tt_assert(ret); tt_assert(tor_addr_eq(&ipv6_addr, &cache_addr)); resolved_addr_reset_last(AF_INET); @@ -330,21 +332,25 @@ test_find_addr_to_publish(void *arg) * the find_my_address() code path because that is extensively tested in * another unit tests. */ resolved_addr_set_suggested(&ipv4_addr); - ret = relay_find_addr_to_publish(&options, AF_INET, true, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET, + RELAY_FIND_ADDR_CACHE_ONLY, &cache_addr); tt_assert(ret); tt_assert(tor_addr_eq(&ipv4_addr, &cache_addr)); resolved_addr_set_suggested(&ipv6_addr); - ret = relay_find_addr_to_publish(&options, AF_INET6, true, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET6, + RELAY_FIND_ADDR_CACHE_ONLY, &cache_addr); tt_assert(ret); tt_assert(tor_addr_eq(&ipv6_addr, &cache_addr)); resolve_addr_reset_suggested(AF_INET); resolve_addr_reset_suggested(AF_INET6); /* 3. No IP anywhere. */ - ret = relay_find_addr_to_publish(&options, AF_INET, true, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET, + RELAY_FIND_ADDR_CACHE_ONLY, &cache_addr); tt_assert(!ret); - ret = relay_find_addr_to_publish(&options, AF_INET6, true, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET6, + RELAY_FIND_ADDR_CACHE_ONLY, &cache_addr); tt_assert(!ret); done:

1 0

[tor/master] control: With GETINFO, don't trigger an address resolve
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit 230293c169f73923b290598a1df4872acf1dee68 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Jul 17 10:56:22 2020 -0400 control: With GETINFO, don't trigger an address resolve Tell the relay find address interface to only use the cache so we don't trigger an address resolve everytime the "GETINFO address" is called. Related #40025 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/control/control_getinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index c489dfa865..4ac4f48a86 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -133,7 +133,7 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, *answer = tor_strdup("VERBOSE_NAMES EXTENDED_EVENTS"); } else if (!strcmp(question, "address")) { tor_addr_t addr; - if (!relay_find_addr_to_publish(get_options(), AF_INET, false, &addr)) { + if (!relay_find_addr_to_publish(get_options(), AF_INET, true, &addr)) { *errmsg = "Address unknown"; return -1; }

1 0

[tor/master] test: Unit test for relay_address_new_suggestion()
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit c98cffbc07d65a1324ec2e2dcf84e1101b7a9b0c Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jul 14 13:58:03 2020 -0400 test: Unit test for relay_address_new_suggestion() Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/resolve_addr.c | 10 ++++ src/app/config/resolve_addr.h | 6 +++ src/test/test_relay.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 7368b019d6..df9af231bf 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -733,3 +733,13 @@ is_local_to_resolve_addr, (const tor_addr_t *addr)) return false; } } + +#ifdef TOR_UNIT_TESTS + +void +resolve_addr_reset_suggested(int family) +{ + tor_addr_make_unspec(&last_suggested_addrs[af_to_idx(family)]); +} + +#endif /* TOR_UNIT_TESTS */ diff --git a/src/app/config/resolve_addr.h b/src/app/config/resolve_addr.h index d9a3e28924..369f621fa9 100644 --- a/src/app/config/resolve_addr.h +++ b/src/app/config/resolve_addr.h @@ -33,6 +33,12 @@ MOCK_DECL(bool, is_local_to_resolve_addr, (const tor_addr_t *addr)); #ifdef RESOLVE_ADDR_PRIVATE +#ifdef TOR_UNIT_TESTS + +void resolve_addr_reset_suggested(int family); + +#endif /* TOR_UNIT_TESTS */ + #endif /* RESOLVE_ADDR_PRIVATE */ #endif /* TOR_CONFIG_RESOLVE_ADDR_H */ diff --git a/src/test/test_relay.c b/src/test/test_relay.c index 060ca1b75d..98b407feb3 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -17,6 +17,14 @@ #include "core/or/cell_st.h" #include "core/or/or_circuit_st.h" +#define RESOLVE_ADDR_PRIVATE +#include "feature/nodelist/dirlist.h" +#include "feature/relay/relay_find_addr.h" +#include "feature/relay/routermode.h" +#include "feature/dirclient/dir_server_st.h" + +#include "app/config/resolve_addr.h" + /* Test suite stuff */ #include "test/test.h" #include "test/fakechans.h" @@ -24,6 +32,13 @@ static void test_relay_append_cell_to_circuit_queue(void *arg); +static int +mock_server_mode_true(const or_options_t *options) +{ + (void) options; + return 1; +} + static void assert_circuit_ok_mock(const circuit_t *c) { @@ -192,10 +207,98 @@ test_relay_append_cell_to_circuit_queue(void *arg) return; } +static void +test_suggested_address(void *arg) +{ + int ret; + const char *untrusted_id = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; + dir_server_t *ds = NULL; + tor_addr_t ipv4_addr, ipv6_addr, cache_addr; + tor_addr_t trusted_addr, untrusted_addr; + tor_addr_port_t trusted_ap_v6 = { .port = 443 }; + + (void) arg; + + MOCK(server_mode, mock_server_mode_true); + + /* Unstrusted relay source. */ + ret = tor_addr_parse(&untrusted_addr, "8.8.8.8"); + tt_int_op(ret, OP_EQ, AF_INET); + + /* Add gabelmoo as a trusted directory authority. */ + ret = tor_addr_parse(&trusted_addr, "[2001:638:a000:4140::ffff:189]"); + tt_int_op(ret, OP_EQ, AF_INET6); + tor_addr_copy(&trusted_ap_v6.addr, &trusted_addr); + + ds = trusted_dir_server_new("gabelmoo", "131.188.40.189", 80, 443, + &trusted_ap_v6, + "F2044413DAC2E02E3D6BCF4735A19BCA1DE97281", + "ED03BB616EB2F60BEC80151114BB25CEF515B226", + V3_DIRINFO, 1.0); + tt_assert(ds); + dir_server_add(ds); + + /* 1. Valid IPv4 from a trusted authority (gabelmoo). */ + ret = tor_addr_parse(&ipv4_addr, "1.2.3.4"); + relay_address_new_suggestion(&ipv4_addr, &ds->ipv4_addr, ds->digest); + resolved_addr_get_suggested(AF_INET, &cache_addr); + tt_assert(tor_addr_eq(&cache_addr, &ipv4_addr)); + resolve_addr_reset_suggested(AF_INET); + + /* 2. Valid IPv6 from a trusted authority (gabelmoo). */ + ret = tor_addr_parse(&ipv6_addr, "[4242::4242]"); + relay_address_new_suggestion(&ipv6_addr, &ds->ipv6_addr, ds->digest); + resolved_addr_get_suggested(AF_INET6, &cache_addr); + tt_assert(tor_addr_eq(&cache_addr, &ipv6_addr)); + resolve_addr_reset_suggested(AF_INET6); + + /* 3. Valid IPv4 but untrusted source. */ + ret = tor_addr_parse(&ipv4_addr, "1.2.3.4"); + relay_address_new_suggestion(&ipv4_addr, &untrusted_addr, untrusted_id); + resolved_addr_get_suggested(AF_INET, &cache_addr); + tt_assert(tor_addr_is_unspec(&cache_addr)); + + /* 4. Valid IPv6 but untrusted source. */ + ret = tor_addr_parse(&ipv6_addr, "[4242::4242]"); + relay_address_new_suggestion(&ipv6_addr, &untrusted_addr, untrusted_id); + resolved_addr_get_suggested(AF_INET6, &cache_addr); + tt_assert(tor_addr_is_unspec(&cache_addr)); + + /* 5. Internal IPv4 from a trusted authority (gabelmoo). */ + ret = tor_addr_parse(&ipv4_addr, "127.0.0.1"); + relay_address_new_suggestion(&ipv4_addr, &ds->ipv4_addr, ds->digest); + resolved_addr_get_suggested(AF_INET, &cache_addr); + tt_assert(tor_addr_is_unspec(&cache_addr)); + + /* 6. Internal IPv6 from a trusted authority (gabelmoo). */ + ret = tor_addr_parse(&ipv6_addr, "[::1]"); + relay_address_new_suggestion(&ipv6_addr, &ds->ipv6_addr, ds->digest); + resolved_addr_get_suggested(AF_INET6, &cache_addr); + tt_assert(tor_addr_is_unspec(&cache_addr)); + + /* 7. IPv4 from a trusted authority (gabelmoo). */ + relay_address_new_suggestion(&ds->ipv4_addr, &ds->ipv4_addr, ds->digest); + resolved_addr_get_suggested(AF_INET, &cache_addr); + tt_assert(tor_addr_is_unspec(&cache_addr)); + + /* 8. IPv6 from a trusted authority (gabelmoo). */ + relay_address_new_suggestion(&ds->ipv6_addr, &ds->ipv6_addr, ds->digest); + resolved_addr_get_suggested(AF_INET6, &cache_addr); + tt_assert(tor_addr_is_unspec(&cache_addr)); + + done: + dirlist_free_all(); + + UNMOCK(server_mode); +} + struct testcase_t relay_tests[] = { { "append_cell_to_circuit_queue", test_relay_append_cell_to_circuit_queue, TT_FORK, NULL, NULL }, { "close_circ_rephist", test_relay_close_circuit, TT_FORK, NULL, NULL }, + { "suggested_address", test_suggested_address, + TT_FORK, NULL, NULL }, + END_OF_TESTCASES };

1 0

[tor/master] addr: Use false/true with relay_find_addr_to_publish()
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit 0b89eba7d55839c4b746bbe5efd8fe1531592bf7 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 16 09:26:58 2020 -0400 addr: Use false/true with relay_find_addr_to_publish() Previous development introduced the error of using 0/1 for a boolean parameter. Fix that everywhere Related #40025 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/client/transports.c | 4 ++-- src/feature/relay/router.c | 6 ++++-- src/test/test_relay.c | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index ecc952e2ac..8a0694449a 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -1652,10 +1652,10 @@ pt_get_extra_info_descriptor_string(void) tor_addr_t addr; /* Attempt to find the IPv4 and then attempt to find the IPv6 if we * can't find it. */ - bool found = relay_find_addr_to_publish(get_options(), AF_INET, 0, + bool found = relay_find_addr_to_publish(get_options(), AF_INET, false, &addr); if (!found) { - found = relay_find_addr_to_publish(get_options(), AF_INET6, 0, + found = relay_find_addr_to_publish(get_options(), AF_INET6, false, &addr); } if (!found) { diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 2d79a9ba4d..039aeb7343 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2040,8 +2040,10 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)) /* Find our resolved address both IPv4 and IPv6. In case the address is not * found, the object is set to an UNSPEC address. */ - bool have_v4 = relay_find_addr_to_publish(options, AF_INET, 0, &ipv4_addr); - bool have_v6 = relay_find_addr_to_publish(options, AF_INET6, 0, &ipv6_addr); + bool have_v4 = relay_find_addr_to_publish(options, AF_INET, false, + &ipv4_addr); + bool have_v6 = relay_find_addr_to_publish(options, AF_INET6, false, + &ipv6_addr); /* Tor requires a relay to have an IPv4 so bail if we can't find it. */ if (!have_v4) { diff --git a/src/test/test_relay.c b/src/test/test_relay.c index af48eb5a44..5ea35b6ad0 100644 --- a/src/test/test_relay.c +++ b/src/test/test_relay.c @@ -316,11 +316,11 @@ test_find_addr_to_publish(void *arg) tt_assert(tor_addr_eq(&ipv6_addr, &cache_addr)); /* 1. Address located in the resolved cache. */ - ret = relay_find_addr_to_publish(&options, AF_INET, 1, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET, true, &cache_addr); tt_assert(ret); tt_assert(tor_addr_eq(&ipv4_addr, &cache_addr)); - ret = relay_find_addr_to_publish(&options, AF_INET6, 1, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET6, true, &cache_addr); tt_assert(ret); tt_assert(tor_addr_eq(&ipv6_addr, &cache_addr)); resolved_addr_reset_last(AF_INET); @@ -330,21 +330,21 @@ test_find_addr_to_publish(void *arg) * the find_my_address() code path because that is extensively tested in * another unit tests. */ resolved_addr_set_suggested(&ipv4_addr); - ret = relay_find_addr_to_publish(&options, AF_INET, 1, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET, true, &cache_addr); tt_assert(ret); tt_assert(tor_addr_eq(&ipv4_addr, &cache_addr)); resolved_addr_set_suggested(&ipv6_addr); - ret = relay_find_addr_to_publish(&options, AF_INET6, 1, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET6, true, &cache_addr); tt_assert(ret); tt_assert(tor_addr_eq(&ipv6_addr, &cache_addr)); resolve_addr_reset_suggested(AF_INET); resolve_addr_reset_suggested(AF_INET6); /* 3. No IP anywhere. */ - ret = relay_find_addr_to_publish(&options, AF_INET, 1, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET, true, &cache_addr); tt_assert(!ret); - ret = relay_find_addr_to_publish(&options, AF_INET6, 1, &cache_addr); + ret = relay_find_addr_to_publish(&options, AF_INET6, true, &cache_addr); tt_assert(!ret); done:

1 0

[tor/master] relay: Don't log at warn level when we find an address
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit a576f37cfeff9f6b0a13a9475b5eed424ee44db9 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Jul 20 10:58:54 2020 -0400 relay: Don't log at warn level when we find an address Dirauth code use the warn log severity when calling find_my_address() which made it that every time we would find an address, it would log a warning. These are not needed below info level and thus set them to info level. An IP change is set to notice by default. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/config/resolve_addr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index df9af231bf..ba1c854d77 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -287,8 +287,8 @@ get_address_from_config(const or_options_t *options, int warn_severity, } /* Address can be used. We are done. */ - log_fn(warn_severity, LD_CONFIG, "Address found in configuration: %s", - fmt_addr(addr_out)); + log_info(LD_CONFIG, "Address found in configuration: %s", + fmt_addr(addr_out)); return FN_RET_OK; } @@ -350,8 +350,8 @@ get_address_from_hostname(const or_options_t *options, int warn_severity, *hostname_out = tor_strdup(hostname); /* Found it! */ - log_fn(warn_severity, LD_CONFIG, "Address found from local hostname: %s", - fmt_addr(addr_out)); + log_info(LD_CONFIG, "Address found from local hostname: %s", + fmt_addr(addr_out)); return FN_RET_OK; } @@ -402,8 +402,7 @@ get_address_from_interface(const or_options_t *options, int warn_severity, *method_out = "INTERFACE"; /* Found it! */ - log_fn(warn_severity, LD_CONFIG, "Address found from interface: %s", - fmt_addr(addr_out)); + log_info(LD_CONFIG, "Address found from interface: %s", fmt_addr(addr_out)); return FN_RET_OK; }

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/51'
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit f5d773c600e9902f053d03f47b7812bd1f4796b7 Merge: d6570eaf5d a576f37cfe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 20 16:50:32 2020 -0400 Merge remote-tracking branch 'tor-gitlab/mr/51' src/app/config/resolve_addr.c | 41 +++++--- src/app/config/resolve_addr.h | 6 ++ src/feature/client/transports.c | 21 ++-- src/feature/control/control_getinfo.c | 7 +- src/feature/dirclient/dirclient.c | 8 +- src/feature/dirclient/dirclient_modes.c | 12 ++- src/feature/relay/relay_find_addr.c | 170 +++++++++++--------------------- src/feature/relay/relay_find_addr.h | 15 ++- src/feature/relay/router.c | 161 +++++++++++++++--------------- src/test/test_config.c | 80 ++++----------- src/test/test_relay.c | 170 ++++++++++++++++++++++++++++++++ 11 files changed, 399 insertions(+), 292 deletions(-)

1 0

[chutney/master] Restore test for bridge presence in networkstatus.
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit 0767932c890b167088d6697f245cdaad58571c3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 20 11:58:59 2020 -0400 Restore test for bridge presence in networkstatus. Without this check, bridges+hs-v23 seems to be failing. If this works with all our supported versions, I'll figure out what to do with the mentioned issues (chutney#33851 and tor#33852, and also see tor#33407). --- lib/chutney/TorNet.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index c832b9f..e3aca65 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -1415,13 +1415,9 @@ class LocalNodeController(NodeController): # bridge descs are stored with relay descs paths = { 'desc': desc, 'desc_new': desc_new } - # Temporarily disabled due to bug #33582. We will reactivate these - # checks in #33581. There's a race condition between bridges - # bootstrapping, and trying to publish their descriptors too early if to_bridge_auth: - paths = None - # br_status = Path(datadir, "networkstatus-bridges") - # paths['br_status'] = br_status + br_status = Path(datadir, "networkstatus-bridges") + paths['br_status'] = br_status else: # We're looking for bridges, but other nodes don't use bridges paths = None

1 0

[chutney/master] Try the same multi-phase fix on two more bridges networks
by nickm＠torproject.org 20 Jul '20

20 Jul '20

commit e055b6478a7f7187a87e256fe57e093fb61c3355 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 20 14:03:13 2020 -0400 Try the same multi-phase fix on two more bridges networks --- networks/bridges+ipv6-min | 6 ++++-- networks/bridges-min | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/networks/bridges+ipv6-min b/networks/bridges+ipv6-min index cdf6dc7..a305b89 100644 --- a/networks/bridges+ipv6-min +++ b/networks/bridges+ipv6-min @@ -6,8 +6,10 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", - torrc="bridge-v6.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") + torrc="bridge-v6.tmpl", launch_phase=2) +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, + torrc="bridgeclient.tmpl", + launch_phase=3) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks diff --git a/networks/bridges-min b/networks/bridges-min index f8ec732..1904392 100644 --- a/networks/bridges-min +++ b/networks/bridges-min @@ -4,8 +4,13 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, relay=1, torrc="bridgeauthority.tmpl") -Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl") -BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl") + +Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl", + launch_phase=2) + +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, + torrc="bridgeclient.tmpl", + launch_phase=3) # Since only 25% of relays get the guard flag, # TestingDirAuthVoteGuard * may need to be used in small networks

1 0