tor-commits October 2020

tor-commits@lists.torproject.org

17 participants
2274 discussions

[tor/release-0.4.4] Split required/recommended protocol lists into multiple lines
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit 4298d87756e5bdb83276de1f361860c198b3c0c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 18 16:18:42 2020 -0400 Split required/recommended protocol lists into multiple lines This should make diffs easier to read. --- src/feature/dirauth/dirvote.h | 49 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 1b1c9f2cc7..7cfa72ead5 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -239,31 +239,62 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_RELAY_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ - "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" + "Cons=2 " \ + "Desc=2 " \ + "DirCache=1-2 " \ + "HSDir=1 " \ + "HSIntro=3 " \ + "HSRend=1 " \ + "Link=4 " \ + "Microdesc=2 " \ + "Relay=2" + /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ - "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" + "Cons=1-2 " \ + "Desc=1-2 " \ + "DirCache=2 " \ + "HSDir=2 " \ + "HSIntro=4 " \ + "HSRend=2 " \ + "Link=5 " \ + "LinkAuth=3 " \ + "Microdesc=1-2 " \ + "Relay=2" /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. * Requiring the wrong protocols can break the tor network. * See Proposal 303: When and how to remove support for protocol versions. */ -#define DIRVOTE_REQUIRE_RELAY_PROTO \ - "Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=3-4 Microdesc=1 Relay=1-2" +#define DIRVOTE_REQUIRE_RELAY_PROTO \ + "Cons=1 " \ + "Desc=1 " \ + "DirCache=1 " \ + "HSDir=1 " \ + "HSIntro=3 " \ + "HSRend=1 " \ + "Link=3-4 " \ + "Microdesc=1 " \ + "Relay=1-2" \ + /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. * Requiring the wrong protocols can break the tor network. * See Proposal 303: When and how to remove support for protocol versions. */ #define DIRVOTE_REQUIRE_CLIENT_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" + "Cons=1-2 " \ + "Desc=1-2 " \ + "DirCache=1 " \ + "HSDir=1 " \ + "HSIntro=3 " \ + "HSRend=1 " \ + "Link=4 " \ + "Microdesc=1-2 " \ + "Relay=2" #endif /* defined(DIRVOTE_PRIVATE) */

1 0

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

27 Oct '20

commit 35ae8d4e8f497cfff40334c8c5fbc19746a15fb7 Merge: fd2f79cacf 26cfac1880 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 27 10:20:05 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40162 | 7 ++++++ src/feature/dirauth/dirvote.h | 52 +++++++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 12 deletions(-)

1 0

[tor/release-0.4.4] Update required/recommended protocol lists more systematically
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit fd58e74ddcb012892bd7e59ef1587fc4faa2ab35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 23 11:23:08 2020 -0400 Update required/recommended protocol lists more systematically First I began with a set of candidates: The client's _required_ list starts with all the protocols supported by every release in 0.2.9-stable through current master. The client's _required_ list starts with all the protocols supported by every release in 0.3.5-stable through current master. Everybody's _recommended_ list starts with all the protocols supported by every release in 0.3.5-stable through current master. Then I removed the protocol versions that we do not actually want to require or recommend: DirCache=1 (deprecated) HSDir=1, HSIntro=1-3, HSRend=1 (deprecated) (All HS* protocol requirements for clients) Link=1-3 (deprecated) LinkAuth=1 (obsolete) Relay=1 (obsolete) --- changes/ticket40162 | 10 +++---- src/feature/dirauth/dirvote.h | 65 +++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/changes/ticket40162 b/changes/ticket40162 index 5a8a76bfd8..093042f9af 100644 --- a/changes/ticket40162 +++ b/changes/ticket40162 @@ -1,7 +1,7 @@ o Minor features (authorities): - - Authorities now list the directory formats used by currently supported - Tor releases as required. Previously, they listed only the formats - supported by older Tor releases as required. This change makes - the subprotocols "Cons=2 Desc=2 Microdesc=2" required, and makes - "Cons=1 Desc=1 Microdesc=1" no longer required or recommended. + - Authorities now list a different set of protocols as required and + recommended. These lists are chosen so that only truly recommended + and/or required protocols are included, and so that clients using 0.2.9 + or later will continue to work (even though they are not supported), + whereas only relays running 0.3.5 or later will meet the requirements. Closes ticket 40162. diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 69c8a025c4..a9b356b387 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -238,30 +238,30 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, /** The recommended relay protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECOMMEND_RELAY_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=1-2 " \ - "HSDir=1 " \ - "HSIntro=3 " \ - "HSRend=1 " \ - "Link=4 " \ - "Microdesc=2 " \ +#define DIRVOTE_RECOMMEND_RELAY_PROTO \ + "Cons=2 " \ + "Desc=2 " \ + "DirCache=2 " \ + "HSDir=2 " \ + "HSIntro=4 " \ + "HSRend=2 " \ + "Link=4-5 " \ + "LinkAuth=3 " \ + "Microdesc=2 " \ "Relay=2" /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=2 " \ - "HSDir=2 " \ - "HSIntro=4 " \ - "HSRend=2 " \ - "Link=5 " \ - "LinkAuth=3 " \ - "Microdesc=1-2 " \ +#define DIRVOTE_RECOMMEND_CLIENT_PROTO \ + "Cons=2 " \ + "Desc=2 " \ + "DirCache=2 " \ + "HSDir=2 " \ + "HSIntro=4 " \ + "HSRend=2 " \ + "Link=4-5 " \ + "Microdesc=2 " \ "Relay=2" /** The required relay protocols for this authority's votes. @@ -272,28 +272,25 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, #define DIRVOTE_REQUIRE_RELAY_PROTO \ "Cons=2 " \ "Desc=2 " \ - "DirCache=1 " \ - "HSDir=1 " \ - "HSIntro=3 " \ - "HSRend=1 " \ - "Link=3-4 " \ + "DirCache=2 " \ + "HSDir=2 " \ + "HSIntro=4 " \ + "HSRend=2 " \ + "Link=4-5 " \ + "LinkAuth=3 " \ "Microdesc=2 " \ - "Relay=1-2" \ + "Relay=2" /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. * Requiring the wrong protocols can break the tor network. * See Proposal 303: When and how to remove support for protocol versions. */ -#define DIRVOTE_REQUIRE_CLIENT_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=1 " \ - "HSDir=1 " \ - "HSIntro=3 " \ - "HSRend=1 " \ - "Link=4 " \ - "Microdesc=2 " \ +#define DIRVOTE_REQUIRE_CLIENT_PROTO \ + "Cons=2 " \ + "Desc=2 " \ + "Link=4 " \ + "Microdesc=2 " \ "Relay=2" #endif /* defined(DIRVOTE_PRIVATE) */

1 0

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

27 Oct '20

commit bd582583f610d568bb61d1a108d1ff4f38ef08b5 Merge: 6338fc2afa 26cfac1880 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 27 10:20:05 2020 -0400 Merge branch 'maint-0.4.4'

1 0

[tor/release-0.4.4] Update required/recommended protocol versions.
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit d872c6925516a571b0ce624e913b620ba9324740 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 18 16:09:25 2020 -0400 Update required/recommended protocol versions. Cons=1 is the old format of consensuses, without ed25519 keys. It is no longer required or recommended. Cons=2 is the new format of consensuses, with ed25519 keys. It is now required. (Similarly for Desc=1,2 and Microdesc=1,2) No supported client or relay versions should be affected by this change, since these versions are supported by clients and relays running 0.2.9 and later. It will only take effect once enough authorities vote for it. Closes ticket 40162. --- changes/ticket40162 | 7 +++++++ src/feature/dirauth/dirvote.h | 16 ++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/ticket40162 b/changes/ticket40162 new file mode 100644 index 0000000000..5a8a76bfd8 --- /dev/null +++ b/changes/ticket40162 @@ -0,0 +1,7 @@ + o Minor features (authorities): + - Authorities now list the directory formats used by currently supported + Tor releases as required. Previously, they listed only the formats + supported by older Tor releases as required. This change makes + the subprotocols "Cons=2 Desc=2 Microdesc=2" required, and makes + "Cons=1 Desc=1 Microdesc=1" no longer required or recommended. + Closes ticket 40162. diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 7cfa72ead5..69c8a025c4 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -253,8 +253,8 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=1-2 " \ - "Desc=1-2 " \ + "Cons=2 " \ + "Desc=2 " \ "DirCache=2 " \ "HSDir=2 " \ "HSIntro=4 " \ @@ -270,14 +270,14 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * See Proposal 303: When and how to remove support for protocol versions. */ #define DIRVOTE_REQUIRE_RELAY_PROTO \ - "Cons=1 " \ - "Desc=1 " \ + "Cons=2 " \ + "Desc=2 " \ "DirCache=1 " \ "HSDir=1 " \ "HSIntro=3 " \ "HSRend=1 " \ "Link=3-4 " \ - "Microdesc=1 " \ + "Microdesc=2 " \ "Relay=1-2" \ /** The required relay protocols for this authority's votes. @@ -286,14 +286,14 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * See Proposal 303: When and how to remove support for protocol versions. */ #define DIRVOTE_REQUIRE_CLIENT_PROTO \ - "Cons=1-2 " \ - "Desc=1-2 " \ + "Cons=2 " \ + "Desc=2 " \ "DirCache=1 " \ "HSDir=1 " \ "HSIntro=3 " \ "HSRend=1 " \ "Link=4 " \ - "Microdesc=1-2 " \ + "Microdesc=2 " \ "Relay=2" #endif /* defined(DIRVOTE_PRIVATE) */

1 0

[tor/release-0.4.4] Merge branch 'tor-gitlab/mr/176' into maint-0.4.4
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit 26cfac18803ae1eb9f449d563842347f4d9340f9 Merge: c1bcc1da03 fd58e74ddc Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 27 10:18:16 2020 -0400 Merge branch 'tor-gitlab/mr/176' into maint-0.4.4 changes/ticket40162 | 7 ++++++ src/feature/dirauth/dirvote.h | 52 +++++++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 12 deletions(-)

1 0

[torsocks/master] Fixes an issue when calling recvmsg on a domain socket non-blocking
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit d4b0a84bdf2a1895c8ec3091dc2767fd9f8c2d66 Author: Ola Bini <ola(a)autonomia.digital> Date: Thu Jul 9 18:31:41 2020 +0000 Fixes an issue when calling recvmsg on a domain socket non-blocking Since the original flags are not taken into account when peeking, the peek recvmsg call will hang forever in certain circumstances, including in all QT applications running Wayland. This fix simply adds the original flags, so that the peeking recvmsg call might be nonblocking, if the original call was nonblocking. Closes #40001 --- src/lib/recv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/recv.c b/src/lib/recv.c index d1bbaea..abdd1fa 100644 --- a/src/lib/recv.c +++ b/src/lib/recv.c @@ -92,7 +92,7 @@ LIBC_RECVMSG_RET_TYPE tsocks_recvmsg(LIBC_RECVMSG_SIG) do { /* Just peek the data to inspect the payload for fd. */ - ret = tsocks_libc_recvmsg(sockfd, &msg_hdr, MSG_PEEK); + ret = tsocks_libc_recvmsg(sockfd, &msg_hdr, MSG_PEEK | flags); } while (ret < 0 && errno == EINTR); if (ret < 0) { /* Use the current errno set by the call above. */

1 0

[torsocks/master] Fixed out-of-bounds write in onion pool.
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit fb7db9ecd0be04385ad5ae40e6e802cd80bb3455 Author: anonhelper <torcontrib(a)airmail.cc> Date: Wed Oct 21 02:07:26 2020 +0000 Fixed out-of-bounds write in onion pool. --- src/common/onion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/onion.c b/src/common/onion.c index 6a61d83..d99bf5c 100644 --- a/src/common/onion.c +++ b/src/common/onion.c @@ -62,7 +62,7 @@ static int insert_onion_entry(struct onion_entry *entry, assert(entry); assert(pool); - if (pool->count > pool->size) { + if (pool->count >= pool->size) { /* Double the size of the pool. */ ret = resize_onion_pool(pool, pool->size * 2); if (ret < 0) {

1 0

[tor/master] Add ed25519 identities to relay descriptions.
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit 5718f38c85a4c1e44465488d458980cac6226a1d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:22:49 2020 -0400 Add ed25519 identities to relay descriptions. (Or at least, to all those relay descriptions that derive from format_node_description()). Closes #22668. --- changes/ticket22668 | 3 +++ src/feature/nodelist/describe.c | 33 ++++++++++++++++++++++++++++++--- src/feature/nodelist/describe.h | 18 ++++++++++++------ src/test/test_nodelist.c | 27 +++++++++++++++++++++++++-- 4 files changed, 70 insertions(+), 11 deletions(-) diff --git a/changes/ticket22668 b/changes/ticket22668 new file mode 100644 index 0000000000..49e05e4d8c --- /dev/null +++ b/changes/ticket22668 @@ -0,0 +1,3 @@ + o Minor features (logging): + - When describing a relay in th elogs, we now include its ed25519 identity. + Closes ticket 22668. diff --git a/src/feature/nodelist/describe.c b/src/feature/nodelist/describe.c index 96604800e9..b6a0fe74f7 100644 --- a/src/feature/nodelist/describe.c +++ b/src/feature/nodelist/describe.c @@ -14,6 +14,10 @@ #include "core/or/or.h" #include "core/or/extendinfo.h" #include "feature/nodelist/describe.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerinfo.h" +#include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/crypt_ops/crypto_format.h" #include "core/or/extend_info_st.h" #include "feature/nodelist/node_st.h" @@ -34,7 +38,8 @@ */ STATIC const char * format_node_description(char *buf, - const char *id_digest, + const char *rsa_id_digest, + const ed25519_public_key_t *ed25519_id, const char *nickname, const tor_addr_t *ipv4_addr, const tor_addr_t *ipv6_addr) @@ -48,7 +53,7 @@ format_node_description(char *buf, memset(buf, 0, NODE_DESC_BUF_LEN); - if (!id_digest) { + if (!rsa_id_digest) { /* strlcpy() returns the length of the source string it attempted to copy, * ignoring any required truncation due to the buffer length. */ rv = strlcpy(buf, "<NULL ID DIGEST>", NODE_DESC_BUF_LEN); @@ -66,7 +71,7 @@ format_node_description(char *buf, memset(hex_digest, 0, sizeof(hex_digest)); base16_encode(hex_digest, sizeof(hex_digest), - id_digest, DIGEST_LEN); + rsa_id_digest, DIGEST_LEN); rv = strlcat(buf, hex_digest, NODE_DESC_BUF_LEN); tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); } @@ -77,6 +82,16 @@ format_node_description(char *buf, rv = strlcat(buf, nickname, NODE_DESC_BUF_LEN); tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); } + if (ed25519_id) { + char ed_base64[ED25519_BASE64_LEN+1]; + ed25519_public_to_base64(ed_base64, ed25519_id); + rv = strlcat(buf, " [", NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); + rv = strlcat(buf, ed_base64, NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); + rv = strlcat(buf, "]", NODE_DESC_BUF_LEN); + tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); + } if (ipv4_addr || has_ipv6) { rv = strlcat(buf, " at ", NODE_DESC_BUF_LEN); tor_assert_nonfatal(rv < NODE_DESC_BUF_LEN); @@ -126,8 +141,11 @@ router_describe(const routerinfo_t *ri) if (!ri) return "<null>"; + const ed25519_public_key_t *ed25519_id = routerinfo_get_ed25519_id(ri); + return format_node_description(buf, ri->cache_info.identity_digest, + ed25519_id, ri->nickname, &ri->ipv4_addr, &ri->ipv6_addr); @@ -166,8 +184,11 @@ node_describe(const node_t *node) return "<null rs and ri>"; } + const ed25519_public_key_t *ed25519_id = node_get_ed25519_id(node); + return format_node_description(buf, node->identity, + ed25519_id, nickname, ipv4_addr, ipv6_addr); @@ -188,6 +209,7 @@ routerstatus_describe(const routerstatus_t *rs) return format_node_description(buf, rs->identity_digest, + NULL, rs->nickname, &rs->ipv4_addr, &rs->ipv6_addr); @@ -211,8 +233,13 @@ extend_info_describe(const extend_info_t *ei) const tor_addr_t *addr4 = ap4 ? &ap4->addr : NULL; const tor_addr_t *addr6 = ap6 ? &ap6->addr : NULL; + const ed25519_public_key_t *ed25519_id = &ei->ed_identity; + if (ed25519_public_key_is_zero(ed25519_id)) + ed25519_id = NULL; + return format_node_description(buf, ei->identity_digest, + ed25519_id, ei->nickname, addr4, addr6); diff --git a/src/feature/nodelist/describe.h b/src/feature/nodelist/describe.h index 62f6c693e2..898b5c943b 100644 --- a/src/feature/nodelist/describe.h +++ b/src/feature/nodelist/describe.h @@ -35,22 +35,28 @@ void router_get_verbose_nickname(char *buf, const routerinfo_t *router); /** * Longest allowed output of format_node_description, plus 1 character for * NUL. This allows space for: - * "$FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF~xxxxxxxxxxxxxxxxxxx at" + * "$FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF~xxxxxxxxxxxxxxxxxxx " + * "[+++++++++++++++++++++++++++++++++++++++++++] at" * " 255.255.255.255 and [ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255]" * plus a terminating NUL. */ #define NODE_DESC_BUF_LEN \ - (MAX_VERBOSE_NICKNAME_LEN+4+IPV4_BUF_LEN_NO_NUL+5+TOR_ADDR_BUF_LEN) + (MAX_VERBOSE_NICKNAME_LEN+4 \ + + ED25519_BASE64_LEN+3 \ + + IPV4_BUF_LEN_NO_NUL+5 \ + + TOR_ADDR_BUF_LEN) #endif /* defined(DESCRIBE_PRIVATE) || defined(TOR_UNIT_TESTS) */ #ifdef TOR_UNIT_TESTS +struct ed25519_public_key_t; STATIC const char *format_node_description(char *buf, - const char *id_digest, - const char *nickname, - const tor_addr_t *ipv4_addr, - const tor_addr_t *ipv6_addr); + const char *rsa_id_digest, + const struct ed25519_public_key_t *ed25519_id, + const char *nickname, + const tor_addr_t *ipv4_addr, + const tor_addr_t *ipv6_addr); #endif /* defined(TOR_UNIT_TESTS) */ diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index c165eebb63..96fb5a65ad 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -11,6 +11,7 @@ #include "core/or/or.h" #include "lib/crypt_ops/crypto_rand.h" +#include "lib/crypt_ops/crypto_format.h" #include "feature/nodelist/describe.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodefamily.h" @@ -657,6 +658,7 @@ test_nodelist_format_node_description(void *arg) tor_addr_t mock_null_ip; tor_addr_t mock_ipv4; tor_addr_t mock_ipv6; + ed25519_public_key_t ed_id; char ndesc[NODE_DESC_BUF_LEN]; const char *rv = NULL; @@ -685,6 +687,7 @@ test_nodelist_format_node_description(void *arg) mock_digest, NULL, NULL, + NULL, NULL); tt_ptr_op(rv, OP_EQ, ndesc); tt_str_op(ndesc, OP_EQ, "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); @@ -692,6 +695,7 @@ test_nodelist_format_node_description(void *arg) /* format node description should use ~ because named is deprecated */ rv = format_node_description(ndesc, mock_digest, + NULL, mock_nickname, NULL, NULL); @@ -702,6 +706,7 @@ test_nodelist_format_node_description(void *arg) /* Try a null IP address, rather than NULL */ rv = format_node_description(ndesc, mock_digest, + NULL, mock_nickname, NULL, &mock_null_ip); @@ -713,6 +718,7 @@ test_nodelist_format_node_description(void *arg) rv = format_node_description(ndesc, mock_digest, NULL, + NULL, &mock_ipv4, NULL); tt_ptr_op(rv, OP_EQ, ndesc); @@ -721,6 +727,7 @@ test_nodelist_format_node_description(void *arg) rv = format_node_description(ndesc, mock_digest, + NULL, mock_nickname, NULL, &mock_ipv6); @@ -731,6 +738,7 @@ test_nodelist_format_node_description(void *arg) rv = format_node_description(ndesc, mock_digest, + NULL, mock_nickname, &mock_ipv4, &mock_ipv6); @@ -739,11 +747,26 @@ test_nodelist_format_node_description(void *arg) "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~TestOR7890123456789 at " "111.222.233.244 and [1111:2222:3333:4444:5555:6666:7777:8888]"); + /* Try some ed25519 keys. */ + int n = ed25519_public_from_base64(&ed_id, + "+wBP6WVZzqKK+eTdwU7Hhb80xEm40FSZDBMNozTJpDE"); + tt_int_op(n,OP_EQ,0); + rv = format_node_description(ndesc, + mock_digest, + &ed_id, + mock_nickname, + &mock_ipv4, + &mock_ipv6); + tt_str_op(ndesc, OP_EQ, + "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA~TestOR7890123456789 " + "[+wBP6WVZzqKK+eTdwU7Hhb80xEm40FSZDBMNozTJpDE] at " + "111.222.233.244 and [1111:2222:3333:4444:5555:6666:7777:8888]"); + /* test NULL handling */ - rv = format_node_description(NULL, NULL, NULL, NULL, NULL); + rv = format_node_description(NULL, NULL, NULL, NULL, NULL, NULL); tt_str_op(rv, OP_EQ, "<NULL BUFFER>"); - rv = format_node_description(ndesc, NULL, NULL, NULL, NULL); + rv = format_node_description(ndesc, NULL, NULL, NULL, NULL, NULL); tt_ptr_op(rv, OP_EQ, ndesc); tt_str_op(rv, OP_EQ, "<NULL ID DIGEST>");

1 0

[tor/master] Also, include ed25519 identities in connection_describe().
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit 47d6eef1901c82823362e097156693685c4eb4a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 15 10:53:45 2020 -0400 Also, include ed25519 identities in connection_describe(). Related to #22668. --- src/core/mainloop/connection.c | 15 ++++++++++++--- src/core/or/connection_or.c | 20 ++++++++++++++++++++ src/core/or/connection_or.h | 2 ++ src/test/test_connection.c | 6 +++--- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index c043b1ccec..7a17d7ff9d 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -110,6 +110,7 @@ #include "feature/stats/rephist.h" #include "feature/stats/bwhist.h" #include "lib/crypt_ops/crypto_util.h" +#include "lib/crypt_ops/crypto_format.h" #include "lib/geoip/geoip.h" #include "lib/cc/ctassert.h" @@ -440,11 +441,19 @@ connection_describe_peer_internal(const connection_t *conn, // This could be a client, so scrub it. No identity to report. scrub = true; } else { - char id_buf[HEX_DIGEST_LEN+1]; - base16_encode(id_buf, sizeof(id_buf), + const ed25519_public_key_t *ed_id = + connection_or_get_alleged_ed25519_id(or_conn); + char ed_id_buf[ED25519_BASE64_LEN+1]; + char rsa_id_buf[HEX_DIGEST_LEN+1]; + if (ed_id) { + ed25519_public_to_base64(ed_id_buf, ed_id); + } else { + strlcpy(ed_id_buf, "<none>", sizeof(ed_id_buf)); + } + base16_encode(rsa_id_buf, sizeof(rsa_id_buf), or_conn->identity_digest, DIGEST_LEN); tor_snprintf(extra_buf, sizeof(extra_buf), - " ID=%s", id_buf); + " ID=%s RSA_ID=%s", ed_id_buf, rsa_id_buf); } if (! scrub && (! tor_addr_eq(addr, &or_conn->canonical_orport.addr) || conn->port != or_conn->canonical_orport.port)) { diff --git a/src/core/or/connection_or.c b/src/core/or/connection_or.c index 0795521be0..bf29cd2c3a 100644 --- a/src/core/or/connection_or.c +++ b/src/core/or/connection_or.c @@ -207,6 +207,26 @@ connection_or_set_identity_digest(or_connection_t *conn, channel_set_identity_digest(chan, rsa_digest, ed_id); } +/** + * Return the Ed25519 identity of the peer for this connection (if any). + * + * Note that this ID may not be the _actual_ identity for the peer if + * authentication is not complete. + **/ +const struct ed25519_public_key_t * +connection_or_get_alleged_ed25519_id(const or_connection_t *conn) +{ + if (conn && conn->chan) { + const channel_t *chan = NULL; + chan = TLS_CHAN_TO_BASE(conn->chan); + if (!ed25519_public_key_is_zero(&chan->ed25519_identity)) { + return &chan->ed25519_identity; + } + } + + return NULL; +} + /**************************************************************/ /** Map from a string describing what a non-open OR connection was doing when diff --git a/src/core/or/connection_or.h b/src/core/or/connection_or.h index fe81b5c5e1..b6aaa44df2 100644 --- a/src/core/or/connection_or.h +++ b/src/core/or/connection_or.h @@ -73,6 +73,8 @@ void connection_or_init_conn_from_address(or_connection_t *conn, int connection_or_client_learned_peer_id(or_connection_t *conn, const uint8_t *rsa_peer_id, const struct ed25519_public_key_t *ed_peer_id); +const struct ed25519_public_key_t *connection_or_get_alleged_ed25519_id( + const or_connection_t *conn); time_t connection_or_client_used(or_connection_t *conn); MOCK_DECL(int, connection_or_get_num_circuits, (or_connection_t *conn)); void or_handshake_state_free_(or_handshake_state_t *state); diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 178a37adf6..cf5626ead7 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -1049,20 +1049,20 @@ test_conn_describe(void *arg) options->SafeLogging_ = SAFELOG_SCRUB_RELAY; // back to safelogging. tt_str_op(connection_describe(conn), OP_EQ, "OR connection (open) with [ffff:3333:1111::2]:8080 " - "ID=0000000700000000000000000000000000000000"); + "ID=<none> RSA_ID=0000000700000000000000000000000000000000"); // Add a 'canonical address' that is the same as the one we have. tor_addr_parse(&TO_OR_CONN(conn)->canonical_orport.addr, "[ffff:3333:1111::2]"); TO_OR_CONN(conn)->canonical_orport.port = 8080; tt_str_op(connection_describe(conn), OP_EQ, "OR connection (open) with [ffff:3333:1111::2]:8080 " - "ID=0000000700000000000000000000000000000000"); + "ID=<none> RSA_ID=0000000700000000000000000000000000000000"); // Add a different 'canonical address' tor_addr_parse(&TO_OR_CONN(conn)->canonical_orport.addr, "[ffff:3333:1111::8]"); tt_str_op(connection_describe(conn), OP_EQ, "OR connection (open) with [ffff:3333:1111::2]:8080 " - "ID=0000000700000000000000000000000000000000 " + "ID=<none> RSA_ID=0000000700000000000000000000000000000000 " "canonical_addr=[ffff:3333:1111::8]:8080"); // Clear identity_digest so that free_minimal won't complain.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2020