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

[tor/master] Vote on 'proto' lines and include them after 'v' lines.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 90a6fe318cfae4d64fff034574153b8c96895a6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 12:33:23 2016 -0400 Vote on 'proto' lines and include them after 'v' lines. (Despite the increased size of the consensus, this should have approximately zero effect on the compressed consensus size, since the "proto" line should be completely implied by the "v" line.) --- src/or/dirvote.c | 22 ++++++++++++++++++++++ src/or/dirvote.h | 2 -- src/or/routerparse.c | 5 +++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 67f0ba8..f606b07 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1563,6 +1563,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_t *matching_descs = smartlist_new(); smartlist_t *chosen_flags = smartlist_new(); smartlist_t *versions = smartlist_new(); + smartlist_t *protocols = smartlist_new(); smartlist_t *exitsummaries = smartlist_new(); uint32_t *bandwidths_kb = tor_calloc(smartlist_len(votes), sizeof(uint32_t)); @@ -1705,6 +1706,7 @@ networkstatus_compute_consensus(smartlist_t *votes, routerstatus_t rs_out; const char *current_rsa_id = NULL; const char *chosen_version; + const char *chosen_protocol_list; const char *chosen_name = NULL; int exitsummary_disagreement = 0; int is_named = 0, is_unnamed = 0, is_running = 0; @@ -1718,6 +1720,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_clear(matching_descs); smartlist_clear(chosen_flags); smartlist_clear(versions); + smartlist_clear(protocols); num_bandwidths = 0; num_mbws = 0; num_guardfraction_inputs = 0; @@ -1737,6 +1740,12 @@ networkstatus_compute_consensus(smartlist_t *votes, if (rs->version && rs->version[0]) smartlist_add(versions, rs->version); + if (rs->protocols) { + /* We include this one even if it's empty: voting for an + * empty protocol list actually is meaningful. */ + smartlist_add(protocols, rs->protocols); + } + /* Tally up all the flags. */ for (int flag = 0; flag < n_voter_flags[voter_idx]; ++flag) { if (rs->flags & (U64_LITERAL(1) << flag)) @@ -1875,6 +1884,14 @@ networkstatus_compute_consensus(smartlist_t *votes, chosen_version = NULL; } + /* Pick the protocol list */ + if (smartlist_len(protocols)) { + smartlist_sort_strings(protocols); + chosen_protocol_list = get_most_frequent_member(protocols); + } else { + chosen_protocol_list = NULL; + } + /* If it's a guard and we have enough guardfraction votes, calculate its consensus guardfraction value. */ if (is_guard && num_guardfraction_inputs > 2 && @@ -2028,6 +2045,10 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_add(chunks, tor_strdup(chosen_version)); } smartlist_add(chunks, tor_strdup("\n")); + if (chosen_protocol_list && + consensus_method >= MIN_METHOD_FOR_RS_PROTOCOLS) { + smartlist_add_asprintf(chunks, "proto %s\n", chosen_protocol_list); + } /* Now the weight line. */ if (rs_out.has_bandwidth) { char *guardfraction_str = NULL; @@ -2068,6 +2089,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_free(matching_descs); smartlist_free(chosen_flags); smartlist_free(versions); + smartlist_free(protocols); smartlist_free(exitsummaries); tor_free(bandwidths_kb); tor_free(measured_bws_kb); diff --git a/src/or/dirvote.h b/src/or/dirvote.h index f29fe97..a6c847e 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -103,11 +103,9 @@ * protocols. */ #define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 24 -#if 0 /** Lowest consensus method where authorities add protocols to routerstatus * entries. */ #define MIN_METHOD_FOR_RS_PROTOCOLS 24 -#endif /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 46209ab..9428e45 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -388,6 +388,7 @@ static token_rule_t rtrstatus_token_table[] = { T01("w", K_W, ARGS, NO_OBJ ), T0N("m", K_M, CONCAT_ARGS, NO_OBJ ), T0N("id", K_ID, GE(2), NO_OBJ ), + T01("proto", K_PROTO, CONCAT_ARGS, NO_OBJ ), T0N("opt", K_OPT, CONCAT_ARGS, OBJ_OK ), END_OF_TABLE }; @@ -2992,6 +2993,10 @@ routerstatus_parse_entry_from_string(memarea_t *area, } } } + if (t->tp == K_PROTO) { + tor_assert(t->n_args == 1); + vote_rs->protocols = tor_strdup(t->args[0]); + } } SMARTLIST_FOREACH_END(t); } else if (flav == FLAV_MICRODESC) { tok = find_opt_by_keyword(tokens, K_M);

1 0

[tor/master] Unit tests for protover_all_supported
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 0697e413efa32b71d080353e5151beee117fca04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 13:47:14 2016 -0400 Unit tests for protover_all_supported --- src/test/test_protover.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 2c72282..651d2fd 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -110,6 +110,44 @@ test_protover_vote(void *arg) smartlist_free(lst); } +static void +test_protover_all_supported(void *arg) +{ + (void)arg; + char *msg = NULL; + + tt_assert(protover_all_supported(NULL, &msg)); + tt_assert(msg == NULL); + + tt_assert(protover_all_supported("", &msg)); + tt_assert(msg == NULL); + + // Some things that we do support + tt_assert(protover_all_supported("Link=3-4", &msg)); + tt_assert(msg == NULL); + tt_assert(protover_all_supported("Link=3-4 Desc=2", &msg)); + tt_assert(msg == NULL); + + // Some things we don't support + tt_assert(! protover_all_supported("Wombat=9", &msg)); + tt_str_op(msg, OP_EQ, "Wombat=9"); + tor_free(msg); + tt_assert(! protover_all_supported("Link=999", &msg)); + tt_str_op(msg, OP_EQ, "Link=999"); + tor_free(msg); + + // Mix of things we support and things we don't + tt_assert(! protover_all_supported("Link=3-4 Wombat=9", &msg)); + tt_str_op(msg, OP_EQ, "Wombat=9"); + tor_free(msg); + tt_assert(! protover_all_supported("Link=3-999", &msg)); + tt_str_op(msg, OP_EQ, "Link=3-999"); + tor_free(msg); + + done: + tor_free(msg); +} + #define PV_TEST(name, flags) \ { #name, test_protover_ ##name, (flags), NULL, NULL } @@ -117,6 +155,7 @@ test_protover_vote(void *arg) struct testcase_t protover_tests[] = { PV_TEST(parse, 0), PV_TEST(vote, 0), + PV_TEST(all_supported, 0), END_OF_TESTCASES };

1 0

[tor/master] Include protocol versions in votes.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit f33b90324abe11724f59389e1aeaf8b3e021c3af Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 14:55:41 2016 -0400 Include protocol versions in votes. --- src/or/dirserv.c | 11 +++++++++++ src/or/dirserv.h | 4 +++- src/or/dirvote.c | 5 +++-- src/or/networkstatus.c | 3 ++- src/or/or.h | 2 ++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index a4eb738..03b05ac 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -24,6 +24,7 @@ #include "networkstatus.h" #include "nodelist.h" #include "policies.h" +#include "protover.h" #include "rephist.h" #include "router.h" #include "routerlist.h" @@ -1795,6 +1796,7 @@ version_from_platform(const char *platform) */ char * routerstatus_format_entry(const routerstatus_t *rs, const char *version, + const char *protocols, routerstatus_format_type_t format, const vote_routerstatus_t *vrs) { @@ -1858,6 +1860,9 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, if (version && strlen(version) < MAX_V_LINE_LEN - V_LINE_OVERHEAD) { smartlist_add_asprintf(chunks, "v %s\n", version); } + if (protocols) { + smartlist_add_asprintf(chunks, "proto %s\n", protocols); + } if (format != NS_V2) { const routerinfo_t* desc = router_get_by_id_digest(rs->identity_digest); @@ -2836,6 +2841,12 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, rs->is_flagged_running = 0; vrs->version = version_from_platform(ri->platform); + if (ri->protocol_list) { + vrs->protocols = tor_strdup(ri->protocol_list); + } else { + vrs->protocols = tor_strdup( + protover_compute_for_old_tor(vrs->version)); + } vrs->microdesc = dirvote_format_all_microdesc_vote_lines(ri, now, microdescriptors); diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 3c914e9..1e4f27e 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -96,7 +96,9 @@ size_t dirserv_estimate_data_size(smartlist_t *fps, int is_serverdescs, size_t dirserv_estimate_microdesc_size(const smartlist_t *fps, int compressed); char *routerstatus_format_entry( - const routerstatus_t *rs, const char *platform, + const routerstatus_t *rs, + const char *version, + const char *protocols, routerstatus_format_type_t format, const vote_routerstatus_t *vrs); void dirserv_free_all(void); diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 2d840a5..67f0ba8 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -244,7 +244,8 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, char *rsf; vote_microdesc_hash_t *h; rsf = routerstatus_format_entry(&vrs->status, - vrs->version, NS_V3_VOTE, vrs); + vrs->version, vrs->protocols, + NS_V3_VOTE, vrs); if (rsf) smartlist_add(chunks, rsf); @@ -2007,7 +2008,7 @@ networkstatus_compute_consensus(smartlist_t *votes, char *buf; /* Okay!! Now we can write the descriptor... */ /* First line goes into "buf". */ - buf = routerstatus_format_entry(&rs_out, NULL, rs_format, NULL); + buf = routerstatus_format_entry(&rs_out, NULL, NULL, rs_format, NULL); if (buf) smartlist_add(chunks, buf); } diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 6c92773..0fc22c9 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -230,6 +230,7 @@ vote_routerstatus_free(vote_routerstatus_t *rs) if (!rs) return; tor_free(rs->version); + tor_free(rs->protocols); tor_free(rs->status.exitsummary); for (h = rs->microdesc; h; h = next) { tor_free(h->microdesc_hash_line); @@ -2095,7 +2096,7 @@ signed_descs_update_status_from_consensus_networkstatus(smartlist_t *descs) char * networkstatus_getinfo_helper_single(const routerstatus_t *rs) { - return routerstatus_format_entry(rs, NULL, NS_CONTROL_PORT, NULL); + return routerstatus_format_entry(rs, NULL, NULL, NS_CONTROL_PORT, NULL); } /** Alloc and return a string describing routerstatuses for the most diff --git a/src/or/or.h b/src/or/or.h index e9d41ee..5085139 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2408,6 +2408,8 @@ typedef struct vote_routerstatus_t { * networkstatus_t.known_flags. */ char *version; /**< The version that the authority says this router is * running. */ + char *protocols; /**< The protocols that this authority says this router + * provides. */ unsigned int has_measured_bw:1; /**< The vote had a measured bw */ /** True iff the vote included an entry for ed25519 ID, or included * "id ed25519 none" to indicate that there was no ed25519 ID. */

1 0

[tor/master] Add code to infer protocol versions for old Tor versions.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit c6a2204e23db9ba462b1e8601897b3cadf6a0a03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 11:18:05 2016 -0400 Add code to infer protocol versions for old Tor versions. --- src/or/protover.c | 33 +++++++++++++++++++++++++++++++-- src/or/protover.h | 5 +++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/or/protover.c b/src/or/protover.c index 2bde02c..7314d61 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -1,9 +1,9 @@ #define PROTOVER_PRIVATE +#include "or.h" #include "protover.h" -#include "compat.h" -#include "torlog.h" +#include "routerparse.h" static const smartlist_t *get_supported_protocol_list(void); static int protocol_list_contains(const smartlist_t *protos, @@ -617,6 +617,35 @@ protocol_list_contains(const smartlist_t *protos, return 0; } +/** Return a string describing the protocols supported by tor version + * version, or an empty string if we cannot tell. + * + * Note that this is only used to infer protocols for Tor versions that + * can't declare their own. + **/ +const char * +protover_compute_for_old_tor(const char *version) +{ + if (tor_version_as_new_as(version, + FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS)) { + return ""; + } else if (tor_version_as_new_as(version, "0.2.7.5")) { + /* 0.2.7-stable added Desc=2, Microdesc=2, Cons=2, which indicate + * ed25519 support. We'll call them present only in "stable" 027, + * though. */ + return "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=1-4 LinkAuth=1 " + "Microdesc=1-2 Relay=1-2"; + } else if (tor_version_as_new_as(version, "0.2.4.19")) { + /* No currently supported Tor server versions are older than this, or + * lack these protocols. */ + return "Cons=1 Desc=1 DirCache=1 HSDir=1 HSMid=1 Link=1-4 LinkAuth=1 " + "Microdesc=1 Relay=1-2"; + } else { + /* Cannot infer protocols. */ + return ""; + } +} + void protover_free_all(void) { diff --git a/src/or/protover.h b/src/or/protover.h index f809a8d..d378627 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -4,6 +4,9 @@ #include "container.h" +/* This is a guess. */ +#define FIRST_TOR_VERSION_TO_ADVERTISE_PROTOCOLS "0.2.9.3-alpha" + typedef enum protocol_type_t { PRT_LINK, PRT_LINKAUTH, @@ -29,6 +32,8 @@ const char *get_supported_protocols(void); char * compute_protover_vote(const smartlist_t *list_of_proto_strings, int threshold); +const char *protover_compute_for_old_tor(const char *version); + void protover_free_all(void);

1 0

[tor/master] Changes file for prop264 / ticket 19958.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 78c07eeee1184feba25a554d9902fe22d9da64fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 13:56:31 2016 -0400 Changes file for prop264 / ticket 19958. --- changes/prop264 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/changes/prop264 b/changes/prop264 new file mode 100644 index 0000000..bab8a40 --- /dev/null +++ b/changes/prop264 @@ -0,0 +1,18 @@ + o Major features (subprotocol versions): + + - Tor now uses "subprotocol versions" to indicate + compatibility. Previously, versions of Tor looked at the declared Tor + version of a relay to tell whether they could use a given feature. + Now, they should be able to rely on its declared subprotocol versions. + This change allows compatible implementations of the Tor protocol(s) to + exist without declaring compatibility with pretending to be particular + releases of Tor itself. Closes ticket 19958; implements part of + proposal 264. + + - Tor directory authorities now vote on a set of recommended subprotocol + versions, and on a set of required subprotocol versions. Clients and + relays that lack support for a _required_ suprotocol version will not + start; those that lack support for a _recommended_ subprotocol version + will warn the user to upgrade. Closes ticket 19958; implements part of + proposal 264. +

1 0

[tor/master] prop264: sometimes check client _and_ server versions.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 0a3da5ce79768c15da3897097f0cc7ba727a7d35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 13 11:02:44 2016 -0400 prop264: sometimes check client _and_ server versions. As before, we check server protocols whenever server_mode(options) is true and we check client protocols whenever server_mode(options) is false. Additionally, we now _also_ check client protocols whenever any client port is set. --- src/or/networkstatus.c | 52 +++++++++++++++++++++++++++++++++++++++++++------- src/or/networkstatus.h | 3 --- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 0fc22c9..3299a2c 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -125,6 +125,9 @@ static void routerstatus_list_update_named_server_map(void); static void update_consensus_bootstrap_multiple_downloads( time_t now, const or_options_t *options); +static int networkstatus_check_required_protocols(const networkstatus_t *ns, + int client_mode, + char **warning_out); /** Forget that we've warned about anything networkstatus-related, so we will * give fresh warnings if the same behavior happens again. */ @@ -1553,17 +1556,35 @@ networkstatus_set_current_consensus_from_ns(networkstatus_t *c, } #endif //TOR_UNIT_TESTS -/** Called when we have received a networkstatus c. If there are - * any _required_ protocols we are missing, log an error and exit - * immediately. If there are any _recommended_ protocols we are missing, - * warn. */ +/** + * Return true if any option is set in options to make us behave + * as a client. + * + * XXXX If we need this elsewhere at any point, we should make it nonstatic + * XXXX and move it into another file. + */ +static int +any_client_port_set(const or_options_t *options) +{ + return (options->SocksPort_set || + options->TransPort_set || + options->NATDPort_set || + options->ControlPort_set || + options->DNSPort_set); +} + +/** + * Helper for handle_missing_protocol_warning: handles either the + * client case (if is_client is set) or the server case otherwise. + */ static void -handle_missing_protocol_warning(const networkstatus_t *c, - const or_options_t *options) +handle_missing_protocol_warning_impl(const networkstatus_t *c, + int is_client) { char *protocol_warning = NULL; + int should_exit = networkstatus_check_required_protocols(c, - !server_mode(options), + is_client, &protocol_warning); if (protocol_warning) { tor_log(should_exit ? LOG_ERR : LOG_WARN, @@ -1578,6 +1599,23 @@ handle_missing_protocol_warning(const networkstatus_t *c, exit(1); } +/** Called when we have received a networkstatus c. If there are + * any _required_ protocols we are missing, log an error and exit + * immediately. If there are any _recommended_ protocols we are missing, + * warn. */ +static void +handle_missing_protocol_warning(const networkstatus_t *c, + const or_options_t *options) +{ + const int is_server = server_mode(options); + const int is_client = any_client_port_set(options) || !is_server; + + if (is_server) + handle_missing_protocol_warning_impl(c, 0); + if (is_client) + handle_missing_protocol_warning_impl(c, 1); +} + /** Try to replace the current cached v3 networkstatus with the one in * consensus. If we don't have enough certificates to validate it, * store it in consensus_waiting_for_certs and launch a certificate fetch. diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index da175ec..71f36b6 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -122,9 +122,6 @@ void document_signature_free(document_signature_t *sig); document_signature_t *document_signature_dup(const document_signature_t *sig); void networkstatus_free_all(void); int networkstatus_get_weight_scale_param(networkstatus_t *ns); -int networkstatus_check_required_protocols(const networkstatus_t *ns, - int client_mode, - char **warning_out); #ifdef NETWORKSTATUS_PRIVATE STATIC void vote_routerstatus_free(vote_routerstatus_t *rs);

1 0

[tor/master] Cover the error cases of parsing protocol versions
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit a232161f7beeecebf31b2259a571e8b26cb0b541 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 14:02:48 2016 -0400 Cover the error cases of parsing protocol versions Also, detect an additional failure type. Thanks, tests! (How distinctly I recall thee) --- src/or/protover.c | 12 +++++++++--- src/test/test_protover.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/src/or/protover.c b/src/or/protover.c index 3a2d401..2bde02c 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -39,8 +39,10 @@ protocol_type_to_str(protocol_type_t pr) if (PROTOCOL_NAMES[i].protover_type == pr) return PROTOCOL_NAMES[i].name; } + /* LCOV_EXCL_START */ tor_assert_nonfatal_unreached_once(); return "UNKNOWN"; + /* LCOV_EXCL_STOP */ } /** @@ -150,6 +152,10 @@ parse_single_entry(const char *s, const char *end_of_entry) if (!equals) goto error; + /* The name must be nonempty */ + if (equals == s) + goto error; + out->name = tor_strndup(s, equals-s); tor_assert(equals < end_of_entry); @@ -388,7 +394,7 @@ contract_protocol_list(const smartlist_t *proto_strings) SMARTLIST_FOREACH_BEGIN(proto_strings, const char *, s) { proto_entry_t *ent = parse_single_entry(s, s+strlen(s)); if (BUG(!ent)) - continue; + continue; // LCOV_EXCL_LINE smartlist_t *lst = strmap_get(entry_lists_by_name, ent->name); if (!lst) { smartlist_add(all_names, ent->name); @@ -591,11 +597,11 @@ protocol_list_contains(const smartlist_t *protos, protocol_type_t pr, uint32_t ver) { if (BUG(protos == NULL)) { - return 0; + return 0; // LCOV_EXCL_LINE } const char *pr_name = protocol_type_to_str(pr); if (BUG(pr_name == NULL)) { - return 0; + return 0; // LCOV_EXCL_LINE } SMARTLIST_FOREACH_BEGIN(protos, const proto_entry_t *, ent) { diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 651d2fd..c86c3b2 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -81,6 +81,41 @@ test_protover_parse(void *arg) } static void +test_protover_parse_fail(void *arg) +{ + (void)arg; + smartlist_t *elts; + + /* random junk */ + elts = parse_protocol_list("!!3@*"); + tt_assert(elts == NULL); + + /* Missing equals sign in an entry */ + elts = parse_protocol_list("Link=4 Haprauxymatyve Desc=9"); + tt_assert(elts == NULL); + + /* Missing word. */ + elts = parse_protocol_list("Link=4 =3 Desc=9"); + tt_assert(elts == NULL); + + /* Broken numbers */ + elts = parse_protocol_list("Link=fred"); + tt_assert(elts == NULL); + elts = parse_protocol_list("Link=1,fred"); + tt_assert(elts == NULL); + elts = parse_protocol_list("Link=1,fred,3"); + tt_assert(elts == NULL); + + /* Broken range */ + elts = parse_protocol_list("Link=1,9-8,3"); + tt_assert(elts == NULL); + + done: + ; +} + + +static void test_protover_vote(void *arg) { (void) arg; @@ -154,6 +189,7 @@ test_protover_all_supported(void *arg) struct testcase_t protover_tests[] = { PV_TEST(parse, 0), + PV_TEST(parse_fail, 0), PV_TEST(vote, 0), PV_TEST(all_supported, 0), END_OF_TESTCASES

1 0

[tor/master] Update authority votes to match updated proposal.
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 4f57d5871e2b8cc54639d05208233947d4d43f56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 26 13:19:26 2016 -0400 Update authority votes to match updated proposal. --- src/or/dirserv.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 03b05ac..99b2e8a 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2920,19 +2920,19 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, v3_out->client_versions = client_versions; v3_out->server_versions = server_versions; - /* These are hardwired to avoid disaster. */ + /* These are hardwired, to avoid disaster. */ v3_out->recommended_relay_protocols = - tor_strdup("DirCache=1 HSDir=1 Desc=1-2 Cons=1-2 Microdesc=1-2 " - "HSMid=1 Link=3-4 LinkAuth=1 Relay=1-2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " + "LinkAuth=1 Microdesc=1-2 Relay=2"); v3_out->recommended_client_protocols = - tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " - "HSMid=1 Link=4 LinkAuth=1 Relay=2"); - v3_out->required_relay_protocols = - tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " - "HSMid=1 Link=3-4 LinkAuth=1 Relay=1-2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " + "LinkAuth=1 Microdesc=1-2 Relay=2"); v3_out->required_client_protocols = - tor_strdup("DirCache=1 HSDir=1 Desc=1 Cons=1 Microdesc=1 " - "HSMid=1 Link=1 LinkAuth=1 Relay=2"); + tor_strdup("Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4 " + "LinkAuth=1 Microdesc=1-2 Relay=2"); + v3_out->required_relay_protocols = + tor_strdup("Cons=1 Desc=1 DirCache=1 HSDir=1 HSMid=1 Link=3-4 " + "LinkAuth=1 Microdesc=1 Relay=1-2"); v3_out->package_lines = smartlist_new(); {

1 0

[tor/master] Implement voting on the protocol-version options
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit a3e82563df3b549a36a49a4efdb2f1aeef0e0b07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 14:24:34 2016 -0400 Implement voting on the protocol-version options --- src/or/dirvote.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/dirvote.h | 12 ++++++++- 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index e1d0d84..2d840a5 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -13,6 +13,7 @@ #include "microdesc.h" #include "networkstatus.h" #include "policies.h" +#include "protover.h" #include "rephist.h" #include "router.h" #include "routerkeys.h" @@ -1198,6 +1199,72 @@ update_total_bandwidth_weights(const routerstatus_t *rs, } } +/** Considering the different recommended/required protocols sets as a + * 4-element array, return the element from vote for that protocol + * set. + */ +static const char * +get_nth_protocol_set_vote(int n, const networkstatus_t *vote) +{ + switch (n) { + case 0: return vote->recommended_client_protocols; + case 1: return vote->recommended_relay_protocols; + case 2: return vote->required_client_protocols; + case 3: return vote->required_relay_protocols; + default: + tor_assert_unreached(); + return NULL; + } +} + +/** Considering the different recommended/required protocols sets as a + * 4-element array, return a newly allocated string for the consensus value + * for the n'th set. + */ +static char * +compute_nth_protocol_set(int n, int n_voters, const smartlist_t *votes) +{ + const char *keyword; + smartlist_t *proto_votes = smartlist_new(); + int threshold; + switch (n) { + case 0: + keyword = "recommended-client-protocols"; + threshold = CEIL_DIV(n_voters, 2); + break; + case 1: + keyword = "recommended-relay-protocols"; + threshold = CEIL_DIV(n_voters, 2); + break; + case 2: + keyword = "required-client-protocols"; + threshold = CEIL_DIV(n_voters * 2, 3); + break; + case 3: + keyword = "required-relay-protocols"; + threshold = CEIL_DIV(n_voters * 2, 3); + break; + default: + tor_assert_unreached(); + return NULL; + } + + SMARTLIST_FOREACH_BEGIN(votes, const networkstatus_t *, ns) { + const char *v = get_nth_protocol_set_vote(n, ns); + if (v) + smartlist_add(proto_votes, (void*)v); + } SMARTLIST_FOREACH_END(ns); + + char *protocols = compute_protover_vote(proto_votes, threshold); + smartlist_free(proto_votes); + + char *result = NULL; + tor_asprintf(&result, "%s %s\n", keyword, protocols); + tor_free(protocols); + + return result; +} + /** Given a list of vote networkstatus_t in votes, our public * authority identity_key, our private authority signing_key, * and the number of total_authorities that we believe exist in our @@ -1377,6 +1444,17 @@ networkstatus_compute_consensus(smartlist_t *votes, tor_free(flaglist); } + if (consensus_method >= MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS) { + int num_dirauth = get_n_authorities(V3_DIRINFO); + int idx; + for (idx = 0; idx < 4; ++idx) { + char *proto_line = compute_nth_protocol_set(idx, num_dirauth, votes); + if (BUG(!proto_line)) + continue; + smartlist_add(chunks, proto_line); + } + } + param_list = dirvote_compute_params(votes, consensus_method, total_authorities); if (smartlist_len(param_list)) { diff --git a/src/or/dirvote.h b/src/or/dirvote.h index a1f71ce..f29fe97 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -55,7 +55,7 @@ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 23 +#define MAX_SUPPORTED_CONSENSUS_METHOD 24 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@ -99,6 +99,16 @@ * value(s). */ #define MIN_METHOD_FOR_SHARED_RANDOM 23 +/** Lowest consensus method where authorities vote on required/recommended + * protocols. */ +#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 24 + +#if 0 +/** Lowest consensus method where authorities add protocols to routerstatus + * entries. */ +#define MIN_METHOD_FOR_RS_PROTOCOLS 24 +#endif + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */

1 0

[tor/master] Remove a little duplicated code before it becomes a lot
by nickm＠torproject.org 26 Sep '16

26 Sep '16

commit 07a9b795203fdf670832b2b9f9f9f5da5929c82e Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 11:30:32 2016 -0400 Remove a little duplicated code before it becomes a lot --- src/or/dirvote.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9748f4a..aec13a9 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -61,6 +61,20 @@ static int dirvote_publish_consensus(void); * Voting * =====*/ +/* If opt_value is non-NULL, return "keyword opt_value\n" in a new + * string. Otherwise return a new empty string. */ +static char * +format_line_if_present(const char *keyword, const char *opt_value) +{ + if (opt_value) { + char *result = NULL; + tor_asprintf(&result, "%s %s\n", keyword, opt_value); + return result; + } else { + return tor_strdup(""); + } +} + /** Return a new string containing the string representation of the vote in * v3_ns, signed with our v3 signing key private_signing_key. * For v3 authorities. */ @@ -69,7 +83,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, networkstatus_t *v3_ns) { smartlist_t *chunks = smartlist_new(); - const char *client_versions = NULL, *server_versions = NULL; char *packages = NULL; char fingerprint[FINGERPRINT_LEN+1]; char digest[DIGEST_LEN]; @@ -88,21 +101,11 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, base16_encode(fingerprint, sizeof(fingerprint), v3_ns->cert->cache_info.identity_digest, DIGEST_LEN); - client_versions = v3_ns->client_versions; - server_versions = v3_ns->server_versions; - if (client_versions) { - tor_asprintf(&client_versions_line, "client-versions %s\n", - client_versions); - } else { - client_versions_line = tor_strdup(""); - } - if (server_versions) { - tor_asprintf(&server_versions_line, "server-versions %s\n", - server_versions); - } else { - server_versions_line = tor_strdup(""); - } + client_versions_line = format_line_if_present("client-versions", + v3_ns->client_versions); + server_versions_line = format_line_if_present("server-versions", + v3_ns->server_versions); if (v3_ns->package_lines) { smartlist_t *tmp = smartlist_new();

1 0