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

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

12 Feb '21

commit 90c4702ff03336ea513397b537ea77df5260b9ec Merge: 4a7fcc7361 5887c1f1f3 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 12 13:13:57 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40289 | 6 ++++ src/app/config/config.c | 1 + src/feature/relay/relay_config.c | 69 ++++++++++++++++++++++++++++++++++++---- src/test/test_config.c | 4 ++- 4 files changed, 73 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.5] config: Do not compare for duplicate ORPorts with different addresses
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit dfcb050bbf424b6e72acb1bccd2dd99e8c96cb8c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 11 16:14:56 2021 -0500 config: Do not compare for duplicate ORPorts with different addresses We were just looking at the family which is not correct because it is possible to have two explicit ORPort for the same family but different addresses. One example is: ORPort 127.0.0.1:9001 NoAdvertise ORPort 1.2.3.4:9001 NoListen Thus, this patch now ignores ports that have different addresses iff they are both explicits. That is, if we have this example, also two different addresses: ORPort 9001 ORPort 127.0.0.1:9001 NoAdvertise The first one is implicit and second one is explicit and thus we have to consider them for removal which in this case would remove the "ORPort 9001" in favor of the second port. Fixes #40289 Signe-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40289 | 6 ++++ src/feature/relay/relay_config.c | 69 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 69 insertions(+), 6 deletions(-) diff --git a/changes/ticket40289 b/changes/ticket40289 new file mode 100644 index 0000000000..cdb36825b0 --- /dev/null +++ b/changes/ticket40289 @@ -0,0 +1,6 @@ + o Minor bugfixes (relay, config): + - Fix a problem in the removal of duplicate ORPort from the internal port + list when loading config file. We were removing wrong ports breaking valid + torrc uses cases for multiple ORPorts of the same address family. Fixes + bug 40289; bugfix on 0.4.5.1-alpha. + diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index e007a3bd0d..c4a5d7f572 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -188,6 +188,41 @@ describe_relay_port(const port_cfg_t *port) return buf; } +/** Return true iff port p1 is equal to p2. + * + * This does a field by field comparaison. */ +static bool +port_cfg_eq(const port_cfg_t *p1, const port_cfg_t *p2) +{ + bool ret = true; + + tor_assert(p1); + tor_assert(p2); + + /* Address, port and type. */ + ret &= tor_addr_eq(&p1->addr, &p2->addr); + ret &= (p1->port == p2->port); + ret &= (p1->type == p2->type); + + /* Mode. */ + ret &= (p1->is_unix_addr == p2->is_unix_addr); + ret &= (p1->is_group_writable == p2->is_group_writable); + ret &= (p1->is_world_writable == p2->is_world_writable); + ret &= (p1->relax_dirmode_check == p2->relax_dirmode_check); + ret &= (p1->explicit_addr == p2->explicit_addr); + + /* Entry config flags. */ + ret &= tor_memeq(&p1->entry_cfg, &p2->entry_cfg, + sizeof(entry_port_cfg_t)); + /* Server config flags. */ + ret &= tor_memeq(&p1->server_cfg, &p2->server_cfg, + sizeof(server_port_cfg_t)); + /* Unix address path if any. */ + ret &= !strcmp(p1->unix_addr, p2->unix_addr); + + return ret; +} + /** Attempt to find duplicate ORPort that would be superseded by another and * remove them from the given ports list. This is possible if we have for * instance: @@ -241,20 +276,42 @@ remove_duplicate_orports(smartlist_t *ports) if (next->type != CONN_TYPE_OR_LISTENER) { continue; } + /* Remove duplicates. */ + if (port_cfg_eq(current, next)) { + removing[j] = true; + continue; + } /* Don't compare addresses of different family. */ if (tor_addr_family(&current->addr) != tor_addr_family(&next->addr)) { continue; } + /* At this point, we have a port of the same type and same address + * family. Now, we want to avoid comparing addresses that are different + * but are both explicit. As an example, these are not duplicates: + * + * ORPort 127.0.0.:9001 NoAdvertise + * ORPort 1.2.3.4:9001 NoListen + * + * Any implicit address must be considered for removal since an explicit + * one will always supersedes it. */ + if (!tor_addr_eq(&current->addr, &next->addr) && + current->explicit_addr && next->explicit_addr) { + continue; + } - /* Same port, we keep the explicit one. */ + /* Port value is the same so we either have a duplicate or a port that + * supersedes another. */ if (current->port == next->port) { - removing[j] = true; + /* Do not remove the explicit address. As stated before above, we keep + * explicit addresses which supersedes implicit ones. */ if (!current->explicit_addr && next->explicit_addr) { - char *next_str = tor_strdup(describe_relay_port(next)); - log_warn(LD_CONFIG, "Configuration port %s superseded by %s", - describe_relay_port(current), next_str); - tor_free(next_str); + continue; } + removing[j] = true; + char *next_str = tor_strdup(describe_relay_port(next)); + log_warn(LD_CONFIG, "Configuration port %s superseded by %s", + next_str, describe_relay_port(current)); + tor_free(next_str); } } }

1 0

[tor/maint-0.4.5] relay: Allow RFC1918 addresses for non public relays
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit ae5800cd9faccd8c1319601cac7f6c76c4beb288 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 10 11:46:32 2021 -0500 relay: Allow RFC1918 addresses for non public relays In other words, if PublishServerDescriptor is set to 0 and AssumeReachable to 1, then allow a relay to hold a RFC1918 address. Reasons for this are documented in #40208 Fixes #40208 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40208 | 6 ++++++ src/app/config/resolve_addr.c | 14 +++++++++++++- src/test/test_config.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/changes/ticket40208 b/changes/ticket40208 new file mode 100644 index 0000000000..5a3a1aa55e --- /dev/null +++ b/changes/ticket40208 @@ -0,0 +1,6 @@ + o Minor bugfixes (relay): + - Allow relays to have a RFC1918 address if PublishServerDescriptor is set + to 0 and AssumeReachable is set to 1. This is to support the use case of a + bridge on a local network that can be used by restricted users on that + network to reach the Tor network. Fixes bug 40208; bugfix on + 0.4.5.1-alpha. diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 080cb967bc..86db6ba680 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -193,7 +193,19 @@ address_can_be_used(const tor_addr_t *addr, const or_options_t *options, goto allow; } - /* We have a private IP address. It is allowed only if we set custom + /* We allow internal addresses to be used if the PublishServerDescriptor is + * unset and AssumeReachable (or for IPv6) is set. + * + * This is to cover the case where a relay/bridge might be run behind a + * firewall on a local network to users can reach the network through it + * using Tor Browser for instance. */ + if (options->PublishServerDescriptor_ == NO_DIRINFO && + (options->AssumeReachable || + (tor_addr_family(addr) == AF_INET6 && options->AssumeReachableIPv6))) { + goto allow; + } + + /* We have a private IP address. This is also allowed if we set custom * directory authorities. */ if (using_default_dir_authorities(options)) { log_fn(warn_severity, LD_CONFIG, diff --git a/src/test/test_config.c b/src/test/test_config.c index 4eb4ac9cf5..eacf12a25f 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1460,6 +1460,7 @@ test_config_find_my_address(void *arg) options = options_new(); options_init(options); + options->PublishServerDescriptor_ = V3_DIRINFO; /* * Case 0: @@ -1782,6 +1783,22 @@ test_config_find_my_address(void *arg) VALIDATE_FOUND_ADDRESS(true, RESOLVED_ADDR_INTERFACE, NULL); CLEANUP_FOUND_ADDRESS; + /* + * Case 15: Address is a local address (internal) but we unset + * PublishServerDescriptor_ so we are allowed to hold it. + */ + options->PublishServerDescriptor_ = NO_DIRINFO; + if (p->family == AF_INET) { + options->AssumeReachable = 1; + } + config_line_append(&options->Address, "Address", p->internal_ip); + + tor_addr_parse(&test_addr, p->internal_ip); + retval = find_my_address(options, p->family, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, RESOLVED_ADDR_CONFIGURED, NULL); + CLEANUP_FOUND_ADDRESS; + UNMOCK(get_interface_address6); UNMOCK(tor_gethostname); UNMOCK(tor_addr_lookup);

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/302' into maint-0.4.5
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit bdca475518ca3036f1df7e78fef93bfa988cb01f Merge: 73bedcaf4d 5138a9c3c2 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 12 12:56:15 2021 -0500 Merge branch 'tor-gitlab/mr/302' into maint-0.4.5 src/feature/relay/router.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/master] relay: Don't look at omit flag when building descriptor
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit 5138a9c3c22fb00b3f6e04058d80f0e6d56aea91 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 10 11:06:52 2021 -0500 relay: Don't look at omit flag when building descriptor That comes from 685c4866acf8489c58aca41ec01aa5a53e39220a which added that check correctly except for when we build a descriptor. We already omit the IPv6 address, if we need to, when we encode the descriptor but we need to keep the actual discovered address in the descriptor so we can notice future IP changes and be able to assess that we are not publishable as long as we don't specifically set the omit flag. This lead to also having tor noticing that our IP changed from <nothing> (no IPv6 in the descriptor) to a discovered one which would trigger every minute. Fixes #40279, #40288 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/relay/router.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 0be3eec1dd..9ef609c72d 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2101,8 +2101,7 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)) ri->ipv4_dirport = routerconf_find_dir_port(options, 0); /* Optionally check for an IPv6. We still publish without one. */ - if (!omit_ipv6_on_publish && - relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, + if (relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, &ri->ipv6_addr)) { ri->ipv6_orport = routerconf_find_or_port(options, AF_INET6); router_check_descriptor_address_consistency(&ri->ipv6_addr);

1 0

[tor/maint-0.4.5] relay: Don't look at omit flag when building descriptor
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit 5138a9c3c22fb00b3f6e04058d80f0e6d56aea91 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 10 11:06:52 2021 -0500 relay: Don't look at omit flag when building descriptor That comes from 685c4866acf8489c58aca41ec01aa5a53e39220a which added that check correctly except for when we build a descriptor. We already omit the IPv6 address, if we need to, when we encode the descriptor but we need to keep the actual discovered address in the descriptor so we can notice future IP changes and be able to assess that we are not publishable as long as we don't specifically set the omit flag. This lead to also having tor noticing that our IP changed from <nothing> (no IPv6 in the descriptor) to a discovered one which would trigger every minute. Fixes #40279, #40288 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/relay/router.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 0be3eec1dd..9ef609c72d 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2101,8 +2101,7 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)) ri->ipv4_dirport = routerconf_find_dir_port(options, 0); /* Optionally check for an IPv6. We still publish without one. */ - if (!omit_ipv6_on_publish && - relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, + if (relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, &ri->ipv6_addr)) { ri->ipv6_orport = routerconf_find_or_port(options, AF_INET6); router_check_descriptor_address_consistency(&ri->ipv6_addr);

1 0

[tor/maint-0.4.5] Merge branch 'tor-gitlab/mr/303' into maint-0.4.5
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit 73bedcaf4db3688c5720fb078e584d5b2a73f052 Merge: d24a6b2f75 ae5800cd9f Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 12 12:54:52 2021 -0500 Merge branch 'tor-gitlab/mr/303' into maint-0.4.5 changes/ticket40208 | 6 ++++++ src/app/config/resolve_addr.c | 14 +++++++++++++- src/test/test_config.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-)

1 0

[tor/master] relay: Allow RFC1918 addresses for non public relays
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit ae5800cd9faccd8c1319601cac7f6c76c4beb288 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 10 11:46:32 2021 -0500 relay: Allow RFC1918 addresses for non public relays In other words, if PublishServerDescriptor is set to 0 and AssumeReachable to 1, then allow a relay to hold a RFC1918 address. Reasons for this are documented in #40208 Fixes #40208 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40208 | 6 ++++++ src/app/config/resolve_addr.c | 14 +++++++++++++- src/test/test_config.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/changes/ticket40208 b/changes/ticket40208 new file mode 100644 index 0000000000..5a3a1aa55e --- /dev/null +++ b/changes/ticket40208 @@ -0,0 +1,6 @@ + o Minor bugfixes (relay): + - Allow relays to have a RFC1918 address if PublishServerDescriptor is set + to 0 and AssumeReachable is set to 1. This is to support the use case of a + bridge on a local network that can be used by restricted users on that + network to reach the Tor network. Fixes bug 40208; bugfix on + 0.4.5.1-alpha. diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c index 080cb967bc..86db6ba680 100644 --- a/src/app/config/resolve_addr.c +++ b/src/app/config/resolve_addr.c @@ -193,7 +193,19 @@ address_can_be_used(const tor_addr_t *addr, const or_options_t *options, goto allow; } - /* We have a private IP address. It is allowed only if we set custom + /* We allow internal addresses to be used if the PublishServerDescriptor is + * unset and AssumeReachable (or for IPv6) is set. + * + * This is to cover the case where a relay/bridge might be run behind a + * firewall on a local network to users can reach the network through it + * using Tor Browser for instance. */ + if (options->PublishServerDescriptor_ == NO_DIRINFO && + (options->AssumeReachable || + (tor_addr_family(addr) == AF_INET6 && options->AssumeReachableIPv6))) { + goto allow; + } + + /* We have a private IP address. This is also allowed if we set custom * directory authorities. */ if (using_default_dir_authorities(options)) { log_fn(warn_severity, LD_CONFIG, diff --git a/src/test/test_config.c b/src/test/test_config.c index 4eb4ac9cf5..eacf12a25f 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1460,6 +1460,7 @@ test_config_find_my_address(void *arg) options = options_new(); options_init(options); + options->PublishServerDescriptor_ = V3_DIRINFO; /* * Case 0: @@ -1782,6 +1783,22 @@ test_config_find_my_address(void *arg) VALIDATE_FOUND_ADDRESS(true, RESOLVED_ADDR_INTERFACE, NULL); CLEANUP_FOUND_ADDRESS; + /* + * Case 15: Address is a local address (internal) but we unset + * PublishServerDescriptor_ so we are allowed to hold it. + */ + options->PublishServerDescriptor_ = NO_DIRINFO; + if (p->family == AF_INET) { + options->AssumeReachable = 1; + } + config_line_append(&options->Address, "Address", p->internal_ip); + + tor_addr_parse(&test_addr, p->internal_ip); + retval = find_my_address(options, p->family, LOG_NOTICE, &resolved_addr, + &method_used, &hostname_out); + VALIDATE_FOUND_ADDRESS(true, RESOLVED_ADDR_CONFIGURED, NULL); + CLEANUP_FOUND_ADDRESS; + UNMOCK(get_interface_address6); UNMOCK(tor_gethostname); UNMOCK(tor_addr_lookup);

1 0

[tor/master] Merge branch 'tor-gitlab/mr/303' into maint-0.4.5
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit 73bedcaf4db3688c5720fb078e584d5b2a73f052 Merge: d24a6b2f75 ae5800cd9f Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 12 12:54:52 2021 -0500 Merge branch 'tor-gitlab/mr/303' into maint-0.4.5 changes/ticket40208 | 6 ++++++ src/app/config/resolve_addr.c | 14 +++++++++++++- src/test/test_config.c | 17 +++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 12 Feb '21

12 Feb '21

commit c1b5e7fa1bfb7a64c148f098c86b08f4f3167213 Merge: e6caf7d8c7 bdca475518 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 12 12:57:18 2021 -0500 Merge branch 'maint-0.4.5' changes/ticket40208 | 6 ++++++ src/app/config/resolve_addr.c | 14 +++++++++++++- src/feature/relay/router.c | 3 +-- src/test/test_config.c | 17 +++++++++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-)

1 0