August 2019 - tor-commits - lists.torproject.org

[tor/master] Check for private IPv6 addresses in dirserv_router_has_valid_address()
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit d9a7d4779887dbd2cba082c2a5daa535fe0d36ce Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Jul 19 12:56:02 2019 -0400 Check for private IPv6 addresses in dirserv_router_has_valid_address() --- src/feature/dirauth/process_descs.c | 16 +++++++++++++--- src/feature/dirauth/process_descs.h | 4 ++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index a68d15565..e1a02179b 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -428,7 +428,7 @@ dirserv_free_fingerprint_list(void) /** Return -1 if <b>ri</b> has a private or otherwise bad address, * unless we're configured to not care. Return 0 if all ok. */ -static int +STATIC int dirserv_router_has_valid_address(routerinfo_t *ri) { tor_addr_t addr; @@ -436,12 +436,22 @@ dirserv_router_has_valid_address(routerinfo_t *ri) return 0; /* whatever it is, we're fine with it */ tor_addr_from_ipv4h(&addr, ri->addr); - if (tor_addr_is_internal(&addr, 0)) { + if (tor_addr_is_internal(&addr, 0) || tor_addr_is_null(&addr)) { + log_info(LD_DIRSERV, + "Router %s published internal IPv4 address. Refusing.", + router_describe(ri)); + return -1; /* it's a private IP, we should reject it */ + } + /* We only check internal v6 on non-null addresses because we do not require + * IPv6 and null IPv6 is normal. */ + if (tor_addr_is_internal(&ri->ipv6_addr, 0) && + !tor_addr_is_null(&ri->ipv6_addr)) { log_info(LD_DIRSERV, - "Router %s published internal IP address. Refusing.", + "Router %s published internal IPv6 address. Refusing.", router_describe(ri)); return -1; /* it's a private IP, we should reject it */ } + return 0; } diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 001c866eb..1d4085b09 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -36,4 +36,8 @@ void dirserv_set_node_flags_from_authoritative_status(node_t *node, int dirserv_would_reject_router(const routerstatus_t *rs); +#ifdef TOR_UNIT_TESTS +STATIC int dirserv_router_has_valid_address(routerinfo_t *ri); +#endif /* defined(TOR_UNIT_TESTS) */ + #endif /* !defined(TOR_RECV_UPLOADS_H) */

1 0

[tor/master] Add changes file for Bug #31088
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit cc5af6dbd5d27cc80fba9df65eea1fff5833a08d Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Jul 19 13:11:45 2019 -0400 Add changes file for Bug #31088 --- changes/bug31088 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug31088 b/changes/bug31088 new file mode 100644 index 000000000..c258d1bad --- /dev/null +++ b/changes/bug31088 @@ -0,0 +1,5 @@ + o Minor bugfixes (ipv6): + - We check for private IPv6 address alongside their IPv4 equivalents when + authorities check descriptors. Previously, we only checked for private + IPv4 addresses. Fixes bug 31088; bugfix on 0.2.3.21-rc. Patch by Neel + Chauhan.

1 0

[tor/master] Add test for dirserv_router_has_valid_address()
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit c8e69e63f9d39776bd926f1a07628c03c7582280 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Aug 13 20:36:05 2019 -0400 Add test for dirserv_router_has_valid_address() --- src/test/test_address.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/test/test_address.c b/src/test/test_address.c index bf9ca047d..eb0500be8 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -24,6 +24,7 @@ #endif /* defined(HAVE_IFCONF_TO_SMARTLIST) */ #include "core/or/or.h" +#include "feature/dirauth/process_descs.h" #include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/node_st.h" #include "feature/nodelist/nodelist.h" @@ -1244,6 +1245,38 @@ test_address_tor_node_in_same_network_family(void *ignored) helper_free_mock_node(node_b); } +#define CHECK_RI_ADDR(addr_str, rv) STMT_BEGIN \ + routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); \ + tor_addr_t addr; \ + tor_addr_parse(&addr, addr_str); \ + ri->addr = tor_addr_to_ipv4h(&addr); \ + tor_addr_make_null(&ri->ipv6_addr, AF_INET6); \ + tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, rv); \ + tor_free(ri); \ + STMT_END + +/* XXX: Here, we use a non-internal IPv4 as dirserv_router_has_valid_address() + * will check internal/null IPv4 first. */ +#define CHECK_RI_ADDR6(addr_str, rv) STMT_BEGIN \ + routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); \ + ri->addr = 16777217; /* 1.0.0.1 */ \ + tor_addr_parse(&ri->ipv6_addr, addr_str); \ + tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, rv); \ + tor_free(ri); \ + STMT_END + +static void +test_address_dirserv_router_addr_private(void *ignored) +{ + (void)ignored; + CHECK_RI_ADDR("1.0.0.1", 0); + CHECK_RI_ADDR("10.0.0.1", -1); + CHECK_RI_ADDR6("2600::1", 0); + CHECK_RI_ADDR6("fe80::1", -1); + done: + ; +} + #define ADDRESS_TEST(name, flags) \ { #name, test_address_ ## name, flags, NULL, NULL } @@ -1277,5 +1310,6 @@ struct testcase_t address_tests[] = { ADDRESS_TEST(tor_addr_eq_ipv4h, 0), ADDRESS_TEST(tor_addr_in_same_network_family, 0), ADDRESS_TEST(tor_node_in_same_network_family, 0), + ADDRESS_TEST(dirserv_router_addr_private, 0), END_OF_TESTCASES };

1 0

[tor/master] In tests, make sure that "ri" is freed on all paths.
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 5eca338107a4d578e1cd0204e21fd7556c0aa926 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 26 18:27:55 2019 -0400 In tests, make sure that "ri" is freed on all paths. In Tor's tests, the tt_*() macros can call "goto done" on failure. When that happens, we need to make sure that all of our allocated memory still gets freed, or else Coverity will complain. --- src/test/test_address.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index eb0500be8..164cc3150 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1246,7 +1246,7 @@ test_address_tor_node_in_same_network_family(void *ignored) } #define CHECK_RI_ADDR(addr_str, rv) STMT_BEGIN \ - routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); \ + ri = tor_malloc_zero(sizeof(routerinfo_t)); \ tor_addr_t addr; \ tor_addr_parse(&addr, addr_str); \ ri->addr = tor_addr_to_ipv4h(&addr); \ @@ -1258,7 +1258,7 @@ test_address_tor_node_in_same_network_family(void *ignored) /* XXX: Here, we use a non-internal IPv4 as dirserv_router_has_valid_address() * will check internal/null IPv4 first. */ #define CHECK_RI_ADDR6(addr_str, rv) STMT_BEGIN \ - routerinfo_t *ri = tor_malloc_zero(sizeof(routerinfo_t)); \ + ri = tor_malloc_zero(sizeof(routerinfo_t)); \ ri->addr = 16777217; /* 1.0.0.1 */ \ tor_addr_parse(&ri->ipv6_addr, addr_str); \ tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, rv); \ @@ -1269,12 +1269,14 @@ static void test_address_dirserv_router_addr_private(void *ignored) { (void)ignored; + /* A stub routerinfo structure, with only its address fields set. */ + routerinfo_t *ri = NULL; CHECK_RI_ADDR("1.0.0.1", 0); CHECK_RI_ADDR("10.0.0.1", -1); CHECK_RI_ADDR6("2600::1", 0); CHECK_RI_ADDR6("fe80::1", -1); done: - ; + tor_free(ri); } #define ADDRESS_TEST(name, flags) \

1 0

[tor/master] test_address: parenthesize macro arguments.
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 8af92b6577595181eddc1dea25cf44d20bedb8a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 26 18:30:02 2019 -0400 test_address: parenthesize macro arguments. It's good style to always add parentheses when using macro arguments, in case somebody someday provides an argument that contains an operator you don't expect, or causes the expression to parse differently. --- src/test/test_address.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 164cc3150..ef6daa06b 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -1248,10 +1248,10 @@ test_address_tor_node_in_same_network_family(void *ignored) #define CHECK_RI_ADDR(addr_str, rv) STMT_BEGIN \ ri = tor_malloc_zero(sizeof(routerinfo_t)); \ tor_addr_t addr; \ - tor_addr_parse(&addr, addr_str); \ + tor_addr_parse(&addr, (addr_str)); \ ri->addr = tor_addr_to_ipv4h(&addr); \ tor_addr_make_null(&ri->ipv6_addr, AF_INET6); \ - tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, rv); \ + tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, (rv)); \ tor_free(ri); \ STMT_END @@ -1260,8 +1260,8 @@ test_address_tor_node_in_same_network_family(void *ignored) #define CHECK_RI_ADDR6(addr_str, rv) STMT_BEGIN \ ri = tor_malloc_zero(sizeof(routerinfo_t)); \ ri->addr = 16777217; /* 1.0.0.1 */ \ - tor_addr_parse(&ri->ipv6_addr, addr_str); \ - tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, rv); \ + tor_addr_parse(&ri->ipv6_addr, (addr_str)); \ + tt_int_op(dirserv_router_has_valid_address(ri), OP_EQ, (rv)); \ tor_free(ri); \ STMT_END

1 0

[tor/master] Merge branch 'tor-github/pr/1267'
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 78e084a12e55cf7f26f8663dfe738c2a49468e86 Merge: 761a0ec3d 8af92b657 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:47:46 2019 +0300 Merge branch 'tor-github/pr/1267' changes/bug31088 | 5 +++++ src/feature/dirauth/process_descs.c | 16 +++++++++++++--- src/feature/dirauth/process_descs.h | 4 ++++ src/test/test_address.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 3 deletions(-)

1 0

[tor/master] clarify that tor's license is free software
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 272265efbd89c4c2589316a20cf27064def21911 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Aug 23 21:52:33 2019 -0400 clarify that tor's license is free software no actual changes to the license. this way folks who don't immediately recognize the text of the 3-clause bsd can be reassured that we're using a standard license. closes ticket #31498 --- LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index cc2766842..438208426 100644 --- a/LICENSE +++ b/LICENSE @@ -9,7 +9,8 @@ there may be other license terms that you should be aware of. =============================================================================== -Tor is distributed under this license: +Tor is distributed under the "3-clause BSD" license, a commonly used +software license that means Tor is both free software and open source: Copyright (c) 2001-2004, Roger Dingledine Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson

1 0

[tor/master] Merge remote-tracking branch 'arma/ticket31498'
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 761a0ec3d1d3b79f5476789621d1f9c9efd07051 Merge: 92a8573d2 272265efb Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:46:52 2019 +0300 Merge remote-tracking branch 'arma/ticket31498' LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor/master] Remove the unused circuit_type field from hs_ident_circuit_t and hs_ident_circuit_new()
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 14654d5c97663d5f2552b9f27620c8d829dd8d52 Author: Neel Chauhan <neel(a)neelc.org> Date: Fri Aug 23 14:04:05 2019 -0400 Remove the unused circuit_type field from hs_ident_circuit_t and hs_ident_circuit_new() --- changes/bug31490 | 6 ++++++ src/core/or/circuituse.c | 3 +-- src/feature/hs/hs_circuit.c | 6 ++---- src/feature/hs/hs_ident.c | 6 +----- src/feature/hs/hs_ident.h | 10 +--------- src/test/test_hs_client.c | 9 +++------ src/test/test_hs_service.c | 9 +++------ 7 files changed, 17 insertions(+), 32 deletions(-) diff --git a/changes/bug31490 b/changes/bug31490 new file mode 100644 index 000000000..24782be3e --- /dev/null +++ b/changes/bug31490 @@ -0,0 +1,6 @@ + o Minor bugfixes (onion services): + - In the hs_ident_circuit_t data structure, remove the unused field + circuit_type and the respective argument in hs_ident_circuit_new(). + This field is set by clients (for introduction) and services (for + introduction and rendezvous) but is never used afterwards. Fixes + bug 31490; bugfix on 0.3.2.1-alpha. Patch by Neel Chauhan. diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 18b419e99..606c5e2dd 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2533,8 +2533,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, circ->rend_data = rend_data_dup(edge_conn->rend_data); } else if (edge_conn->hs_ident) { circ->hs_ident = - hs_ident_circuit_new(&edge_conn->hs_ident->identity_pk, - HS_IDENT_CIRCUIT_INTRO); + hs_ident_circuit_new(&edge_conn->hs_ident->identity_pk); } if (circ->base_.purpose == CIRCUIT_PURPOSE_C_ESTABLISH_REND && circ->base_.state == CIRCUIT_STATE_OPEN) diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c index a6e86c5ab..259ffb144 100644 --- a/src/feature/hs/hs_circuit.c +++ b/src/feature/hs/hs_circuit.c @@ -259,8 +259,7 @@ create_rp_circuit_identifier(const hs_service_t *service, tor_assert(server_pk); tor_assert(keys); - ident = hs_ident_circuit_new(&service->keys.identity_pk, - HS_IDENT_CIRCUIT_RENDEZVOUS); + ident = hs_ident_circuit_new(&service->keys.identity_pk); /* Copy the RENDEZVOUS_COOKIE which is the unique identifier. */ memcpy(ident->rendezvous_cookie, rendezvous_cookie, sizeof(ident->rendezvous_cookie)); @@ -294,8 +293,7 @@ create_intro_circuit_identifier(const hs_service_t *service, tor_assert(service); tor_assert(ip); - ident = hs_ident_circuit_new(&service->keys.identity_pk, - HS_IDENT_CIRCUIT_INTRO); + ident = hs_ident_circuit_new(&service->keys.identity_pk); ed25519_pubkey_copy(&ident->intro_auth_pk, &ip->auth_key_kp.pubkey); return ident; diff --git a/src/feature/hs/hs_ident.c b/src/feature/hs/hs_ident.c index 8fd001394..a00e55ec2 100644 --- a/src/feature/hs/hs_ident.c +++ b/src/feature/hs/hs_ident.c @@ -13,14 +13,10 @@ /* Return a newly allocated circuit identifier. The given public key is copied * identity_pk into the identifier. */ hs_ident_circuit_t * -hs_ident_circuit_new(const ed25519_public_key_t *identity_pk, - hs_ident_circuit_type_t circuit_type) +hs_ident_circuit_new(const ed25519_public_key_t *identity_pk) { - tor_assert(circuit_type == HS_IDENT_CIRCUIT_INTRO || - circuit_type == HS_IDENT_CIRCUIT_RENDEZVOUS); hs_ident_circuit_t *ident = tor_malloc_zero(sizeof(*ident)); ed25519_pubkey_copy(&ident->identity_pk, identity_pk); - ident->circuit_type = circuit_type; return ident; } diff --git a/src/feature/hs/hs_ident.h b/src/feature/hs/hs_ident.h index 8c46936a1..82ca50f6b 100644 --- a/src/feature/hs/hs_ident.h +++ b/src/feature/hs/hs_ident.h @@ -44,13 +44,6 @@ typedef struct hs_ident_circuit_t { * the one found in the onion address. */ ed25519_public_key_t identity_pk; - /* (All circuit) The type of circuit this identifier is attached to. - * Accessors of the fields in this object assert non fatal on this circuit - * type. In other words, if a rendezvous field is being accessed, the - * circuit type MUST BE of type HS_IDENT_CIRCUIT_RENDEZVOUS. This value is - * set when an object is initialized in its constructor. */ - hs_ident_circuit_type_t circuit_type; - /* (All circuit) Introduction point authentication key. It's also needed on * the rendezvous circuit for the ntor handshake. It's used as the unique key * of the introduction point so it should not be shared between multiple @@ -120,8 +113,7 @@ typedef struct hs_ident_edge_conn_t { /* Circuit identifier API. */ hs_ident_circuit_t *hs_ident_circuit_new( - const ed25519_public_key_t *identity_pk, - hs_ident_circuit_type_t circuit_type); + const ed25519_public_key_t *identity_pk); void hs_ident_circuit_free_(hs_ident_circuit_t *ident); #define hs_ident_circuit_free(id) \ FREE_AND_NULL(hs_ident_circuit_t, hs_ident_circuit_free_, (id)) diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index fb497d52a..b777dafdf 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -160,8 +160,7 @@ helper_get_circ_and_stream_for_test(origin_circuit_t **circ_out, or_circ->rend_data = rend_data_dup(conn_rend_data); } else { /* prop224: Setup hs ident on the circuit */ - or_circ->hs_ident = hs_ident_circuit_new(&service_pk, - HS_IDENT_CIRCUIT_RENDEZVOUS); + or_circ->hs_ident = hs_ident_circuit_new(&service_pk); } TO_CIRCUIT(or_circ)->state = CIRCUIT_STATE_OPEN; @@ -964,8 +963,7 @@ test_close_intro_circuits_new_desc(void *arg) const hs_desc_intro_point_t *ip = smartlist_get(desc1->encrypted_data.intro_points, 0); tt_assert(ip); - ocirc->hs_ident = hs_ident_circuit_new(&service_kp.pubkey, - HS_IDENT_CIRCUIT_INTRO); + ocirc->hs_ident = hs_ident_circuit_new(&service_kp.pubkey); ed25519_pubkey_copy(&ocirc->hs_ident->intro_auth_pk, &ip->auth_key_cert->signed_key); } @@ -1066,8 +1064,7 @@ test_close_intro_circuits_cache_clean(void *arg) const hs_desc_intro_point_t *ip = smartlist_get(desc1->encrypted_data.intro_points, 0); tt_assert(ip); - ocirc->hs_ident = hs_ident_circuit_new(&service_kp.pubkey, - HS_IDENT_CIRCUIT_INTRO); + ocirc->hs_ident = hs_ident_circuit_new(&service_kp.pubkey); ed25519_pubkey_copy(&ocirc->hs_ident->intro_auth_pk, &ip->auth_key_cert->signed_key); } diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 2e4be4e29..c0803a5a5 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -171,8 +171,7 @@ test_e2e_rend_circuit_setup(void *arg) tt_int_op(0, OP_EQ, ed25519_secret_key_generate(&sk, 0)); tt_int_op(0, OP_EQ, ed25519_public_key_generate(&service_pk, &sk)); - or_circ->hs_ident = hs_ident_circuit_new(&service_pk, - HS_IDENT_CIRCUIT_RENDEZVOUS); + or_circ->hs_ident = hs_ident_circuit_new(&service_pk); TO_CIRCUIT(or_circ)->state = CIRCUIT_STATE_OPEN; } @@ -1105,8 +1104,7 @@ test_closing_intro_circs(void *arg) /* Initialize intro circuit */ intro_circ = origin_circuit_init(CIRCUIT_PURPOSE_S_ESTABLISH_INTRO, flags); - intro_circ->hs_ident = hs_ident_circuit_new(&service->keys.identity_pk, - HS_IDENT_CIRCUIT_INTRO); + intro_circ->hs_ident = hs_ident_circuit_new(&service->keys.identity_pk); /* Register circuit in the circuitmap . */ hs_circuitmap_register_intro_circ_v3_service_side(intro_circ, &ip->auth_key_kp.pubkey); @@ -1132,8 +1130,7 @@ test_closing_intro_circs(void *arg) /* Now pretend that a new intro point circ was launched and opened. Check * that the intro point will be established correctly. */ intro_circ = origin_circuit_init(CIRCUIT_PURPOSE_S_ESTABLISH_INTRO, flags); - intro_circ->hs_ident = hs_ident_circuit_new(&service->keys.identity_pk, - HS_IDENT_CIRCUIT_INTRO); + intro_circ->hs_ident = hs_ident_circuit_new(&service->keys.identity_pk); ed25519_pubkey_copy(&intro_circ->hs_ident->intro_auth_pk, &ip->auth_key_kp.pubkey); /* Register circuit in the circuitmap . */

1 0

[tor/master] Merge branch 'tor-github/pr/1258'
by asn＠torproject.org 27 Aug '19

27 Aug '19

commit 92a8573d22ce05636f9f1ad96cd1df7b8d809981 Merge: 0d7f76d7c 14654d5c9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Aug 27 11:45:18 2019 +0300 Merge branch 'tor-github/pr/1258' changes/bug31490 | 6 ++++++ src/core/or/circuituse.c | 3 +-- src/feature/hs/hs_circuit.c | 6 ++---- src/feature/hs/hs_ident.c | 6 +----- src/feature/hs/hs_ident.h | 10 +--------- src/test/test_hs_client.c | 9 +++------ src/test/test_hs_service.c | 9 +++------ 7 files changed, 17 insertions(+), 32 deletions(-)

1 0