November 2016 - tor-commits - lists.torproject.org

[tor/master] hs: Document arguments of rend_data_*_create()
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit 4ff534495ff430e0de3ca96a7a5a7a552853dc42 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 7 14:03:32 2016 -0500 hs: Document arguments of rend_data_*_create() Fixes #20567 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_common.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index b7ee888..7dd97e7 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -135,7 +135,9 @@ compute_desc_id(rend_data_t *rend_data) /* Allocate and initialize a rend_data_t object for a service using the * provided arguments. All arguments are optional (can be NULL), except from - * onion_address which MUST be set. + * onion_address which MUST be set. The pk_digest is the hash of + * the service private key. The cookie is the rendezvous cookie and + * auth_type is which authentiation this service is configured with. * * Return a valid rend_data_t pointer. This only returns a version 2 object of * rend_data_t. */ @@ -163,10 +165,11 @@ rend_data_service_create(const char *onion_address, const char *pk_digest, return rend_data; } -/* Allocate and initialize a rend_data_t object for a client request using - * the given arguments. Either an onion address or a descriptor ID is - * needed. Both can be given but only the onion address will be used to make - * the descriptor fetch. +/* Allocate and initialize a rend_data_t object for a client request using the + * given arguments. Either an onion address or a descriptor ID is needed. Both + * can be given but in this case only the onion address will be used to make + * the descriptor fetch. The cookie is the rendezvous cookie and + * auth_type is which authentiation the service is configured with. * * Return a valid rend_data_t pointer or NULL on error meaning the * descriptor IDs couldn't be computed from the given data. */

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug20567_030_01'
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit 5e16c3f5fabbf9d2595157b1e7788a0e942a6e5e Merge: b6164e1 4ff5344 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 10 09:27:45 2016 -0500 Merge remote-tracking branch 'dgoulet/bug20567_030_01' src/or/hs_common.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'public/feature20552'
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit b6164e1604be7f6692156d2103f2de0fba4ca8b5 Merge: f82f0c3 b7a1e79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 10 09:25:11 2016 -0500 Merge remote-tracking branch 'public/feature20552' changes/feature20552 | 4 ++++ src/or/or.h | 4 ++++ src/or/protover.c | 2 +- src/or/routerparse.c | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/master] Declare a LINKAUTH subprotocol version for #15055 (ed link handshake)
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit b7a1e793e69e540e0377fa4418810ff1c02d50f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 10:01:40 2016 -0400 Declare a LINKAUTH subprotocol version for #15055 (ed link handshake) Closes ticket 20552. --- changes/feature20552 | 4 ++++ src/or/or.h | 4 ++++ src/or/protover.c | 2 +- src/or/routerparse.c | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/changes/feature20552 b/changes/feature20552 new file mode 100644 index 0000000..1195480 --- /dev/null +++ b/changes/feature20552 @@ -0,0 +1,4 @@ + o Minor features (ed25519 link handshake): + - Advertise support for the ed25519 link handshake using the + subprotocol-versions mechanism, so that clients can tell which + relays can identity themselves by Ed25519 ID. diff --git a/src/or/or.h b/src/or/or.h index d305eac..a8664bb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2247,6 +2247,10 @@ typedef struct routerstatus_t { * accept EXTEND2 cells */ unsigned int supports_extend2_cells:1; + /** True iff this router has a protocol list that allows it to negotiate + * ed25519 identity keys on a link handshake. */ + unsigned int supports_ed25519_link_handshake:1; + unsigned int has_bandwidth:1; /**< The vote/consensus had bw info */ unsigned int has_exitsummary:1; /**< The vote/consensus had exit summaries */ unsigned int bw_is_unmeasured:1; /**< This is a consensus entry, with diff --git a/src/or/protover.c b/src/or/protover.c index 335be29..ff8948b 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -292,7 +292,7 @@ protover_get_supported_protocols(void) "HSIntro=3 " "HSRend=1-2 " "Link=1-4 " - "LinkAuth=1 " + "LinkAuth=1,3 " "Microdesc=1-2 " "Relay=1-2"; } diff --git a/src/or/routerparse.c b/src/or/routerparse.c index cb2bc72..95bc683 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2962,6 +2962,8 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->protocols_known = 1; rs->supports_extend2_cells = protocol_list_supports_protocol(tok->args[0], PRT_RELAY, 2); + rs->supports_ed25519_link_handshake = + protocol_list_supports_protocol(tok->args[0], PRT_LINKAUTH, 3); } if ((tok = find_opt_by_keyword(tokens, K_V))) { tor_assert(tok->n_args == 1);

1 0

[tor/master] hs: Add changes file for HSDir v3 protocol feature
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit b0ea8b535fd438632ca4bfe5f207adad7932bca1 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Nov 7 13:49:27 2016 -0500 hs: Add changes file for HSDir v3 protocol feature Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/feature17238 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/feature17238 b/changes/feature17238 new file mode 100644 index 0000000..eba9fb7 --- /dev/null +++ b/changes/feature17238 @@ -0,0 +1,6 @@ + o Major features (onion service) + - Tor relays now support the HSDir version 3 protocol meaning they can + store and serve v3 descriptors. This is part of the next generation + onion service work detailled in proposal 224. The tor daemon also + contains all the necessary code to encode and decode a v3 descriptor but + it's currently only used by the directory subsystem. Closes #17238.

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug20574_030_01'
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit f82f0c3eb1fcee6278769c2262779a0a295b184d Merge: 217b895 b0ea8b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 10 09:22:34 2016 -0500 Merge remote-tracking branch 'dgoulet/bug20574_030_01' changes/feature17238 | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[torspec/master] prop224: Add the single onion service line to descriptor
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit 56136e530fc8008847641005fa420d6b3a719487 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 18 09:59:38 2016 -0400 prop224: Add the single onion service line to descriptor Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 9c4527e..c1ee9af 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1000,6 +1000,13 @@ Table of contents: able to contact the host. Recognized types are: 'password' and 'ed25519'. See [INTRO-AUTH] below. + "single-onion-service" + + [None or at most once] + + If present, this line indicates that the service is a Single Onion + Service (see prop260 for more details about that type of service). + Followed by zero or more introduction points as follows (see section [NUM_INTRO_POINT] below for accepted values):

1 0

[torspec/master] fixup! prop224: Add the single onion service line to descriptor
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit 11db4e4e62c43049190f89646d05871aee79778d Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 8 11:54:09 2016 -0500 fixup! prop224: Add the single onion service line to descriptor --- proposals/224-rend-spec-ng.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index c1ee9af..680e5bc 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1005,7 +1005,9 @@ Table of contents: [None or at most once] If present, this line indicates that the service is a Single Onion - Service (see prop260 for more details about that type of service). + Service (see prop260 for more details about that type of service). This + field has been introduced in 0.3.0 meaning 0.2.9 service don't include + this. Followed by zero or more introduction points as follows (see section [NUM_INTRO_POINT] below for accepted values):

1 0

[torspec/master] Merge remote-tracking branch 'dgoulet/ticket19642_01'
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit bb39e5ddc6deadf5a8445c869647323eaf18536c Merge: 4307310 11db4e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 10 09:18:22 2016 -0500 Merge remote-tracking branch 'dgoulet/ticket19642_01' proposals/224-rend-spec-ng.txt | 9 +++++++++ 1 file changed, 9 insertions(+)

1 0

[tor/master] hs: Add single-onion-service line to v3 descriptor
by nickm＠torproject.org 10 Nov '16

10 Nov '16

commit 34f14a35b60522e2482fade24ab455956370eee4 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 8 13:22:42 2016 -0500 hs: Add single-onion-service line to v3 descriptor This field indicates if the service is a Single Onion Service if present in the descriptor. Closes #19642 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_descriptor.c | 13 +++++++++++++ src/or/hs_descriptor.h | 3 +++ src/or/parsecommon.h | 1 + src/test/test_hs_descriptor.c | 1 + 4 files changed, 18 insertions(+) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 96db936..1517ccb 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -26,6 +26,7 @@ /* Constant string value for the encrypted part of the descriptor. */ #define str_create2_formats "create2-formats" #define str_auth_required "authentication-required" +#define str_single_onion "single-onion-service" #define str_intro_point "introduction-point" #define str_ip_auth_key "auth-key" #define str_ip_enc_key "enc-key" @@ -63,6 +64,7 @@ static token_rule_t hs_desc_v3_token_table[] = { static token_rule_t hs_desc_encrypted_v3_token_table[] = { T1_START(str_create2_formats, R3_CREATE2_FORMATS, CONCAT_ARGS, NO_OBJ), T01(str_auth_required, R3_AUTHENTICATION_REQUIRED, ARGS, NO_OBJ), + T01(str_single_onion, R3_SINGLE_ONION_SERVICE, ARGS, NO_OBJ), END_OF_TABLE }; @@ -692,6 +694,10 @@ encode_encrypted_data(const hs_descriptor_t *desc, smartlist_add_asprintf(lines, "%s %s\n", str_auth_required, buf); tor_free(buf); } + + if (desc->encrypted_data.single_onion_service) { + smartlist_add_asprintf(lines, "%s\n", str_single_onion); + } } /* Build the introduction point(s) section. */ @@ -1613,6 +1619,13 @@ desc_decode_encrypted_v3(const hs_descriptor_t *desc, goto err; } } + + /* Is this service a single onion service? */ + tok = find_opt_by_keyword(tokens, R3_SINGLE_ONION_SERVICE); + if (tok) { + desc_encrypted_out->single_onion_service = 1; + } + /* Initialize the descriptor's introduction point list before we start * decoding. Having 0 intro point is valid. Then decode them all. */ desc_encrypted_out->intro_points = smartlist_new(); diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h index 8bc7256..895bed2 100644 --- a/src/or/hs_descriptor.h +++ b/src/or/hs_descriptor.h @@ -128,6 +128,9 @@ typedef struct hs_desc_encrypted_data_t { * in order to contact the service. Contains NULL terminated strings. */ smartlist_t *auth_types; + /* Is this descriptor a single onion service? */ + unsigned int single_onion_service : 1; + /* A list of intro points. Contains hs_desc_intro_point_t objects. */ smartlist_t *intro_points; } hs_desc_encrypted_data_t; diff --git a/src/or/parsecommon.h b/src/or/parsecommon.h index 3a86c52..3019df6 100644 --- a/src/or/parsecommon.h +++ b/src/or/parsecommon.h @@ -158,6 +158,7 @@ typedef enum { R3_SIGNATURE, R3_CREATE2_FORMATS, R3_AUTHENTICATION_REQUIRED, + R3_SINGLE_ONION_SERVICE, R3_INTRODUCTION_POINT, R3_INTRO_AUTH_KEY, R3_INTRO_ENC_KEY, diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 6c88cc1..66ed3ce 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -102,6 +102,7 @@ helper_build_hs_desc(unsigned int no_ip) /* Setup encrypted data section. */ desc->encrypted_data.create2_ntor = 1; desc->encrypted_data.auth_types = smartlist_new(); + desc->encrypted_data.single_onion_service = 1; smartlist_add(desc->encrypted_data.auth_types, tor_strdup("ed25519")); desc->encrypted_data.intro_points = smartlist_new(); if (!no_ip) {

1 0