January 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.2] Merge branch 'bug25105_032' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 56857291b08b65be6bc6d89e4b98e84862b559a2 Merge: 1c39d969b 31f2a8771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:33:12 2018 -0500 Merge branch 'bug25105_032' into maint-0.3.2 changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Extract code to summarize protocol versions into new function
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 7792be2d446a35ad71d0c67fb762f868ae07b99c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 13:38:01 2018 -0500 Extract code to summarize protocol versions into new function This will let us put this summary into routerinfo_t too. No behavior change. --- src/or/routerparse.c | 93 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 36 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index b8f7e166a..1cbbb1728 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2530,6 +2530,50 @@ routerstatus_parse_guardfraction(const char *guardfraction_str, return 0; } +/** Summarize the protocols listed in protocols into out, + * falling back or correcting them based on version as appropriate. + */ +static void +summarize_protover_flags(protover_summary_flags_t *out, + const char *protocols, + const char *version) +{ + tor_assert(out); + memset(out, 0, sizeof(*out)); + if (protocols) { + out->protocols_known = 1; + out->supports_extend2_cells = + protocol_list_supports_protocol(protocols, PRT_RELAY, 2); + out->supports_ed25519_link_handshake_compat = + protocol_list_supports_protocol(protocols, PRT_LINKAUTH, 3); + out->supports_ed25519_link_handshake_any = + protocol_list_supports_protocol_or_later(protocols, PRT_LINKAUTH, 3); + out->supports_ed25519_hs_intro = + protocol_list_supports_protocol(protocols, PRT_HSINTRO, 4); + out->supports_v3_hsdir = + protocol_list_supports_protocol(protocols, PRT_HSDIR, + PROTOVER_HSDIR_V3); + out->supports_v3_rendezvous_point = + protocol_list_supports_protocol(protocols, PRT_HSDIR, + PROTOVER_HS_RENDEZVOUS_POINT_V3); + } + if (version && !strcmpstart(version, "Tor ")) { + if (!out->protocols_known) { + /* The version is a "Tor" version, and where there is no + * list of protocol versions that we should be looking at instead. */ + + out->supports_extend2_cells = + tor_version_as_new_as(version, "0.2.4.8-alpha"); + out->protocols_known = 1; + } else { + /* Bug #22447 forces us to filter on this version. */ + if (!tor_version_as_new_as(version, "0.3.0.8")) { + out->supports_v3_hsdir = 0; + } + } + } +} + /** Given a string at *s, containing a routerstatus object, and an * empty smartlist at tokens, parse and return the first router status * object in the string, and advance *s to just after the end of the @@ -2695,44 +2739,21 @@ routerstatus_parse_entry_from_string(memarea_t *area, if (consensus_method >= MIN_METHOD_FOR_EXCLUDING_INVALID_NODES) rs->is_valid = 1; } - int found_protocol_list = 0; - if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { - found_protocol_list = 1; - rs->pv.protocols_known = 1; - rs->pv.supports_extend2_cells = - protocol_list_supports_protocol(tok->args[0], PRT_RELAY, 2); - rs->pv.supports_ed25519_link_handshake_compat = - protocol_list_supports_protocol(tok->args[0], PRT_LINKAUTH, 3); - rs->pv.supports_ed25519_link_handshake_any = - protocol_list_supports_protocol_or_later(tok->args[0], PRT_LINKAUTH, 3); - rs->pv.supports_ed25519_hs_intro = - protocol_list_supports_protocol(tok->args[0], PRT_HSINTRO, 4); - rs->pv.supports_v3_hsdir = - protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, - PROTOVER_HSDIR_V3); - rs->pv.supports_v3_rendezvous_point = - protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, - PROTOVER_HS_RENDEZVOUS_POINT_V3); - } - if ((tok = find_opt_by_keyword(tokens, K_V))) { - tor_assert(tok->n_args == 1); - if (!strcmpstart(tok->args[0], "Tor ") && !found_protocol_list) { - /* We only do version checks like this in the case where - * the version is a "Tor" version, and where there is no - * list of protocol versions that we should be looking at instead. */ - rs->pv.supports_extend2_cells = - tor_version_as_new_as(tok->args[0], "0.2.4.8-alpha"); - rs->pv.protocols_known = 1; - } - if (!strcmpstart(tok->args[0], "Tor ") && found_protocol_list) { - /* Bug #22447 forces us to filter on this version. */ - if (!tor_version_as_new_as(tok->args[0], "0.3.0.8")) { - rs->pv.supports_v3_hsdir = 0; + { + const char *protocols = NULL, *version = NULL; + if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { + tor_assert(tok->n_args == 1); + protocols = tok->args[0]; + } + if ((tok = find_opt_by_keyword(tokens, K_V))) { + tor_assert(tok->n_args == 1); + version = tok->args[0]; + if (vote_rs) { + vote_rs->version = tor_strdup(tok->args[0]); } } - if (vote_rs) { - vote_rs->version = tor_strdup(tok->args[0]); - } + + summarize_protover_flags(&rs->pv, protocols, version); } /* handle weighting/bandwidth info */

1 0

[tor/master] Also cache the protover summary in the routerinfo_t, if we're using that
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 92496a739aac44a537ee9062a4f0d71fba023156 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 24 13:49:15 2018 -0500 Also cache the protover summary in the routerinfo_t, if we're using that --- src/or/or.h | 3 +++ src/or/routerparse.c | 21 ++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 0be19fdbd..2ef27a99a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2299,6 +2299,9 @@ typedef struct { * this routerinfo. Used only during voting. */ unsigned int omit_from_vote:1; + /** Flags to summarize the protocol versions for this routerinfo_t. */ + protover_summary_flags_t pv; + /** Tor can use this router for general positions in circuits; we got it * from a directory server as usual, or we're an authority and a server * uploaded it. */ diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 1cbbb1728..54759c9a7 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -379,6 +379,10 @@ static int check_signature_token(const char *digest, int flags, const char *doctype); +static void summarize_protover_flags(protover_summary_flags_t *out, + const char *protocols, + const char *version); + #undef DEBUG_AREA_ALLOC #ifdef DEBUG_AREA_ALLOC @@ -1895,12 +1899,19 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_PLATFORM))) { - router->platform = tor_strdup(tok->args[0]); - } + { + const char *version = NULL, *protocols = NULL; + if ((tok = find_opt_by_keyword(tokens, K_PLATFORM))) { + router->platform = tor_strdup(tok->args[0]); + version = tok->args[0]; + } + + if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { + router->protocol_list = tor_strdup(tok->args[0]); + protocols = tok->args[0]; + } - if ((tok = find_opt_by_keyword(tokens, K_PROTO))) { - router->protocol_list = tor_strdup(tok->args[0]); + summarize_protover_flags(&router->pv, protocols, version); } if ((tok = find_opt_by_keyword(tokens, K_CONTACT))) {

1 0

[tor/master] Document remaining cases for protocol support
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 144bf015f83ba22ee2210282d574ec8572d66834 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 13:50:04 2018 -0500 Document remaining cases for protocol support For each support flag, document which subprotocol version it requires. --- src/or/or.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 2ef27a99a..5b062349e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2204,15 +2204,17 @@ typedef struct protover_summary_flags_t { unsigned int protocols_known:1; /** True iff this router has a version or protocol list that allows it to - * accept EXTEND2 cells */ + * accept EXTEND2 cells. This requires Relay=2. */ 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 with us. */ + * ed25519 identity keys on a link handshake with us. This + * requires LinkAuth=3. */ unsigned int supports_ed25519_link_handshake_compat:1; /** True iff this router has a protocol list that allows it to negotiate - * ed25519 identity keys on a link handshake, at all. */ + * ed25519 identity keys on a link handshake, at all. This requires some + * LinkAuth=X for X >= 3. */ unsigned int supports_ed25519_link_handshake_any:1; /** True iff this router has a protocol list that allows it to be an

1 0

[tor/master] Look at the correct protocol for supports_v3_rendezvous_point
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit bbf2d9cf6bb97c3e15ada5803681f856b844c2ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:01:49 2018 -0500 Look at the correct protocol for supports_v3_rendezvous_point Fixes bug 25105; bugfix on 0.3.2.1-alpha. --- changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug25105 b/changes/bug25105 new file mode 100644 index 000000000..36d1a5f16 --- /dev/null +++ b/changes/bug25105 @@ -0,0 +1,5 @@ + o Minor bugfixes (v3 onion services): + - Look at the "HSRend" protocol version, not the "HSDir" protocol + version, when deciding whether a consensus entry can support + the v3 onion service protocol as a rendezvous point. + Fixes bug 25105; bugfix on 0.3.2.1-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 54759c9a7..fc071b11d 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2565,7 +2565,7 @@ summarize_protover_flags(protover_summary_flags_t *out, protocol_list_supports_protocol(protocols, PRT_HSDIR, PROTOVER_HSDIR_V3); out->supports_v3_rendezvous_point = - protocol_list_supports_protocol(protocols, PRT_HSDIR, + protocol_list_supports_protocol(protocols, PRT_HSREND, PROTOVER_HS_RENDEZVOUS_POINT_V3); } if (version && !strcmpstart(version, "Tor ")) {

1 0

[tor/master] Merge branch 'bug25008'
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 98dd3757bfa2111707f6fe9cde7e1ece88825821 Merge: 0dc1595d0 3d937043c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:32:24 2018 -0500 Merge branch 'bug25008' changes/bug25008 | 9 ++++ changes/bug25105 | 5 +++ src/or/nodelist.c | 103 +++++++++++++++--------------------------- src/or/or.h | 73 +++++++++++++++++------------- src/or/routerlist.c | 4 +- src/or/routerparse.c | 110 ++++++++++++++++++++++++++++----------------- src/or/routerparse.h | 4 ++ src/test/test_hs_common.c | 2 +- src/test/test_hs_service.c | 3 ++ 9 files changed, 173 insertions(+), 140 deletions(-)

1 0

[tor/master] Look at the correct protocol for supports_v3_rendezvous_point
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 31f2a8771cf0075f4a0ef5625d3947a683305ff9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:01:49 2018 -0500 Look at the correct protocol for supports_v3_rendezvous_point Fixes bug 25105; bugfix on 0.3.2.1-alpha. (This is a backport of bbf2d9cf6bb97c3e15ada58 for 0.3.2.) --- changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug25105 b/changes/bug25105 new file mode 100644 index 000000000..36d1a5f16 --- /dev/null +++ b/changes/bug25105 @@ -0,0 +1,5 @@ + o Minor bugfixes (v3 onion services): + - Look at the "HSRend" protocol version, not the "HSDir" protocol + version, when deciding whether a consensus entry can support + the v3 onion service protocol as a rendezvous point. + Fixes bug 25105; bugfix on 0.3.2.1-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 15cdb0bbd..3eda024f0 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2709,7 +2709,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, PROTOVER_HSDIR_V3); rs->supports_v3_rendezvous_point = - protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, + protocol_list_supports_protocol(tok->args[0], PRT_HSREND, PROTOVER_HS_RENDEZVOUS_POINT_V3); } if ((tok = find_opt_by_keyword(tokens, K_V))) {

1 0

[tor/master] Fix a failing unit test.
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 3d937043c2961923f9c28152615dc591997328f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:06:37 2018 -0500 Fix a failing unit test. When we stopped looking at the "protocols" variable directly, we broke the hs_service/build_update_descriptors test, since it didn't actually update any of the flags. The fix here is to call summarize_protover_flags() from that test, and to expose summarize_protover_flags() as "STATIC" from routerparse.c. --- src/or/routerparse.c | 6 +----- src/or/routerparse.h | 4 ++++ src/test/test_hs_service.c | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index fc071b11d..1b79a6fe2 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -379,10 +379,6 @@ static int check_signature_token(const char *digest, int flags, const char *doctype); -static void summarize_protover_flags(protover_summary_flags_t *out, - const char *protocols, - const char *version); - #undef DEBUG_AREA_ALLOC #ifdef DEBUG_AREA_ALLOC @@ -2544,7 +2540,7 @@ routerstatus_parse_guardfraction(const char *guardfraction_str, /** Summarize the protocols listed in protocols into out, * falling back or correcting them based on version as appropriate. */ -static void +STATIC void summarize_protover_flags(protover_summary_flags_t *out, const char *protocols, const char *version) diff --git a/src/or/routerparse.h b/src/or/routerparse.h index c4c8635f4..418fd3acd 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -133,6 +133,10 @@ MOCK_DECL(STATIC int, router_compute_hash_final,(char *digest, digest_algorithm_t alg)); MOCK_DECL(STATIC int, signed_digest_equals, (const uint8_t *d1, const uint8_t *d2, size_t len)); + +STATIC void summarize_protover_flags(protover_summary_flags_t *out, + const char *protocols, + const char *version); #endif /* defined(ROUTERPARSE_PRIVATE) */ #define ED_DESC_SIGNATURE_PREFIX "Tor router descriptor signature v1" diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 3e3a7d8e0..fad65e61f 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -20,6 +20,7 @@ #define STATEFILE_PRIVATE #define TOR_CHANNEL_INTERNAL_ #define HS_CLIENT_PRIVATE +#define ROUTERPARSE_PRIVATE #include "test.h" #include "test_helpers.h" @@ -37,6 +38,7 @@ #include "networkstatus.h" #include "nodelist.h" #include "relay.h" +#include "routerparse.h" #include "hs_common.h" #include "hs_config.h" @@ -1210,6 +1212,7 @@ test_build_update_descriptors(void *arg) /* Ugly yes but we never free the "ri" object so this just makes things * easier. */ ri.protocol_list = (char *) "HSDir=1-2 LinkAuth=3"; + summarize_protover_flags(&ri.pv, ri.protocol_list, NULL); ret = curve25519_secret_key_generate(&curve25519_secret_key, 0); tt_int_op(ret, OP_EQ, 0); ri.onion_curve25519_pkey =

1 0

[tor/master] Merge branch 'bug25105_032' into maint-0.3.2
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 56857291b08b65be6bc6d89e4b98e84862b559a2 Merge: 1c39d969b 31f2a8771 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:33:12 2018 -0500 Merge branch 'bug25105_032' into maint-0.3.2 changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Look at the correct protocol for supports_v3_rendezvous_point
by nickm＠torproject.org 31 Jan '18

31 Jan '18

commit 31f2a8771cf0075f4a0ef5625d3947a683305ff9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 31 14:01:49 2018 -0500 Look at the correct protocol for supports_v3_rendezvous_point Fixes bug 25105; bugfix on 0.3.2.1-alpha. (This is a backport of bbf2d9cf6bb97c3e15ada58 for 0.3.2.) --- changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug25105 b/changes/bug25105 new file mode 100644 index 000000000..36d1a5f16 --- /dev/null +++ b/changes/bug25105 @@ -0,0 +1,5 @@ + o Minor bugfixes (v3 onion services): + - Look at the "HSRend" protocol version, not the "HSDir" protocol + version, when deciding whether a consensus entry can support + the v3 onion service protocol as a rendezvous point. + Fixes bug 25105; bugfix on 0.3.2.1-alpha. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 15cdb0bbd..3eda024f0 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2709,7 +2709,7 @@ routerstatus_parse_entry_from_string(memarea_t *area, protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, PROTOVER_HSDIR_V3); rs->supports_v3_rendezvous_point = - protocol_list_supports_protocol(tok->args[0], PRT_HSDIR, + protocol_list_supports_protocol(tok->args[0], PRT_HSREND, PROTOVER_HS_RENDEZVOUS_POINT_V3); } if ((tok = find_opt_by_keyword(tokens, K_V))) {

1 0