February 2013 - tor-commits - lists.torproject.org

[tor/master] Speed up the curve25519 unit test by doing fewer iterations
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit ffd6e557cbd0754dc26808dadf721227c8047788 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 13:55:42 2013 -0500 Speed up the curve25519 unit test by doing fewer iterations This test was accounting for about 2/3 of our unit tests' runtime, even on systems with a fast curve25519. No test should take so long. --- src/test/test_crypto.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index a1b5c52..33c3d44 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -943,6 +943,24 @@ test_crypto_curve25519_impl(void *arg) const int randomize_high_bit = (arg != NULL); +#ifdef SLOW_CURVE25519_TEST + const int loop_max=10000; + const char e1_expected[] = "4faf81190869fd742a33691b0e0824d5" + "7e0329f4dd2819f5f32d130f1296b500"; + const char e2k_expected[] = "05aec13f92286f3a781ccae98995a3b9" + "e0544770bc7de853b38f9100489e3e79"; + const char e1e2k_expected[] = "cd6e8269104eb5aaee886bd2071fba88" + "bd13861475516bc2cd2b6e005e805064"; +#else + const int loop_max=200; + const char e1_expected[] = "bc7112cde03f97ef7008cad1bdc56be3" + "c6a1037d74cceb3712e9206871dcf654"; + const char e2k_expected[] = "dd8fa254fb60bdb5142fe05b1f5de44d" + "8e3ee1a63c7d14274ea5d4c67f065467"; + const char e1e2k_expected[] = "7ddb98bd89025d2347776b33901b3e7e" + "c0ee98cb2257a4545c0cfb2ca3e1812b"; +#endif + unsigned char e1k[32]; unsigned char e2k[32]; unsigned char e1e2k[32]; @@ -951,7 +969,7 @@ test_crypto_curve25519_impl(void *arg) unsigned char e2[32] = {5}; unsigned char k[32] = {9}; int loop, i; - const int loop_max=10000; + char *mem_op_hex_tmp = NULL; for (loop = 0; loop < loop_max; ++loop) { @@ -977,15 +995,9 @@ test_crypto_curve25519_impl(void *arg) for (i = 0;i < 32;++i) k[i] ^= e1e2k[i]; } - test_memeq_hex(e1, - "4faf81190869fd742a33691b0e0824d5" - "7e0329f4dd2819f5f32d130f1296b500"); - test_memeq_hex(e2k, - "05aec13f92286f3a781ccae98995a3b9" - "e0544770bc7de853b38f9100489e3e79"); - test_memeq_hex(e1e2k, - "cd6e8269104eb5aaee886bd2071fba88" - "bd13861475516bc2cd2b6e005e805064"); + test_memeq_hex(e1, e1_expected); + test_memeq_hex(e2k, e2k_expected); + test_memeq_hex(e1e2k, e1e2k_expected); done: tor_free(mem_op_hex_tmp);

1 0

[tor/master] Refactor generating the m lines in a vote into its own function
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 194bd56c8a4d6bdb49f6896712bae422887975e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 11:52:51 2013 -0500 Refactor generating the m lines in a vote into its own function --- src/or/dirserv.c | 34 ++-------------------------------- src/or/dirvote.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/or/dirvote.h | 5 +++++ 3 files changed, 48 insertions(+), 32 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 6209842..294beb5 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -66,19 +66,6 @@ static cached_dir_t *the_directory = NULL; /** For authoritative directories: the current (v1) network status. */ static cached_dir_t the_runningrouters; -/** Array of start and end of consensus methods used for supported - microdescriptor formats. */ -static const struct consensus_method_range_t { - int low; - int high; -} microdesc_consensus_methods[] = { - {MIN_METHOD_FOR_MICRODESC, MIN_METHOD_FOR_A_LINES - 1}, - {MIN_METHOD_FOR_A_LINES, MIN_METHOD_FOR_P6_LINES - 1}, - {MIN_METHOD_FOR_P6_LINES, MIN_METHOD_FOR_NTOR_KEY - 1}, - {MIN_METHOD_FOR_NTOR_KEY, MAX_SUPPORTED_CONSENSUS_METHOD}, - {-1, -1} -}; - static void directory_remove_invalid(void); static cached_dir_t *dirserv_regenerate_directory(void); static char *format_versions_list(config_line_t *ln); @@ -2811,11 +2798,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, microdescriptors = smartlist_new(); SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) { - const struct consensus_method_range_t *cmr = NULL; if (ri->cache_info.published_on >= cutoff) { routerstatus_t *rs; vote_routerstatus_t *vrs; - microdesc_t *md; node_t *node = node_get_mutable_by_id(ri->cache_info.identity_digest); if (!node) continue; @@ -2833,23 +2818,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, rs->is_flagged_running = 0; vrs->version = version_from_platform(ri->platform); - for (cmr = microdesc_consensus_methods; - cmr->low != -1 && cmr->high != -1; - cmr++) { - md = dirvote_create_microdescriptor(ri, cmr->low); - if (md) { - char buf[128]; - vote_microdesc_hash_t *h; - dirvote_format_microdesc_vote_line(buf, sizeof(buf), md, - cmr->low, cmr->high); - h = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); - h->microdesc_hash_line = tor_strdup(buf); - h->next = vrs->microdesc; - vrs->microdesc = h; - md->last_listed = now; - smartlist_add(microdescriptors, md); - } - } + vrs->microdesc = dirvote_format_all_microdesc_vote_lines(ri, now, + microdescriptors); smartlist_add(routerstatuses, vrs); } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 469c86c..baaff48 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3651,6 +3651,47 @@ dirvote_format_microdesc_vote_line(char *out_buf, size_t out_buf_len, return ret; } +/** Array of start and end of consensus methods used for supported + microdescriptor formats. */ +static const struct consensus_method_range_t { + int low; + int high; +} microdesc_consensus_methods[] = { + {MIN_METHOD_FOR_MICRODESC, MIN_METHOD_FOR_A_LINES - 1}, + {MIN_METHOD_FOR_A_LINES, MIN_METHOD_FOR_P6_LINES - 1}, + {MIN_METHOD_FOR_P6_LINES, MIN_METHOD_FOR_NTOR_KEY - 1}, + {MIN_METHOD_FOR_NTOR_KEY, MAX_SUPPORTED_CONSENSUS_METHOD}, + {-1, -1} +}; + +vote_microdesc_hash_t * +dirvote_format_all_microdesc_vote_lines(const routerinfo_t *ri, time_t now, + smartlist_t *microdescriptors_out) +{ + const struct consensus_method_range_t *cmr; + vote_microdesc_hash_t *result = NULL; + + for (cmr = microdesc_consensus_methods; + cmr->low != -1 && cmr->high != -1; + cmr++) { + microdesc_t *md = dirvote_create_microdescriptor(ri, cmr->low); + if (md) { + char buf[128]; + vote_microdesc_hash_t *h; + dirvote_format_microdesc_vote_line(buf, sizeof(buf), md, + cmr->low, cmr->high); + h = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); + h->microdesc_hash_line = tor_strdup(buf); + h->next = result; + result = h; + md->last_listed = now; + smartlist_add(microdescriptors_out, md); + } + } + + return result; +} + /** If vrs has a hash made for the consensus method method with * the digest algorithm alg, decode it and copy it into * digest256_out and return 0. Otherwise return -1. */ diff --git a/src/or/dirvote.h b/src/or/dirvote.h index f134454..366b7cf 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -109,6 +109,11 @@ ssize_t dirvote_format_microdesc_vote_line(char *out, size_t out_len, const microdesc_t *md, int consensus_method_low, int consensus_method_high); +vote_microdesc_hash_t *dirvote_format_all_microdesc_vote_lines( + const routerinfo_t *ri, + time_t now, + smartlist_t *microdescriptors_out); + int vote_routerstatus_find_microdesc_hash(char *digest256_out, const vote_routerstatus_t *vrs, int method,

1 0

[tor/master] Coalesce identical adjacent microdescriptor vote lines.
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 2403ef66bada5f1fb851ce424af4ab5916faca67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 12:09:46 2013 -0500 Coalesce identical adjacent microdescriptor vote lines. --- changes/bug8158 | 3 ++ src/or/dirvote.c | 55 ++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/changes/bug8158 b/changes/bug8158 new file mode 100644 index 0000000..65b21c2 --- /dev/null +++ b/changes/bug8158 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Use less space when formatting identical microdescriptor lines in + directory votes. Fixes bug 8158; bugfix on 0.2.4.1-alpha. diff --git a/src/or/dirvote.c b/src/or/dirvote.c index baaff48..c10a60f 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3664,31 +3664,66 @@ static const struct consensus_method_range_t { {-1, -1} }; +typedef struct microdesc_vote_line_t { + int low; + int high; + microdesc_t *md; + struct microdesc_vote_line_t *next; +} microdesc_vote_line_t; + vote_microdesc_hash_t * dirvote_format_all_microdesc_vote_lines(const routerinfo_t *ri, time_t now, smartlist_t *microdescriptors_out) { const struct consensus_method_range_t *cmr; + microdesc_vote_line_t *entries = NULL, *ep; vote_microdesc_hash_t *result = NULL; + /* Generate the microdescriptors. */ for (cmr = microdesc_consensus_methods; cmr->low != -1 && cmr->high != -1; cmr++) { microdesc_t *md = dirvote_create_microdescriptor(ri, cmr->low); if (md) { - char buf[128]; - vote_microdesc_hash_t *h; - dirvote_format_microdesc_vote_line(buf, sizeof(buf), md, - cmr->low, cmr->high); - h = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); - h->microdesc_hash_line = tor_strdup(buf); - h->next = result; - result = h; - md->last_listed = now; - smartlist_add(microdescriptors_out, md); + microdesc_vote_line_t *e = + tor_malloc_zero(sizeof(microdesc_vote_line_t)); + e->md = md; + e->low = cmr->low; + e->high = cmr->high; + e->next = entries; + entries = e; } } + /* Compress adjacent identical ones */ + for (ep = entries; ep; ep = ep->next) { + while (ep->next && + fast_memeq(ep->md->digest, ep->next->md->digest, DIGEST256_LEN) && + ep->low == ep->next->high + 1) { + microdesc_vote_line_t *next = ep->next; + ep->low = next->low; + microdesc_free(next->md); + ep->next = next->next; + tor_free(next); + } + } + + /* Format them into vote_microdesc_hash_t, and add to microdescriptors_out.*/ + while ((ep = entries)) { + char buf[128]; + vote_microdesc_hash_t *h; + dirvote_format_microdesc_vote_line(buf, sizeof(buf), ep->md, + ep->low, ep->high); + h = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); + h->microdesc_hash_line = tor_strdup(buf); + h->next = result; + result = h; + ep->md->last_listed = now; + smartlist_add(microdescriptors_out, ep->md); + entries = ep->next; + tor_free(ep); + } + return result; }

1 0

[tor/master] Merge remote-tracking branch 'public/bug8158'
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 01184f164f027aa4e34a9f6b90c01120040f63cb Merge: 36e2eb6 c8f5f35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 13:32:38 2013 -0500 Merge remote-tracking branch 'public/bug8158' changes/bug8158 | 3 ++ src/or/dirserv.c | 34 +--------------------- src/or/dirvote.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/dirvote.h | 5 +++ 4 files changed, 91 insertions(+), 32 deletions(-)

1 0

[tor/master] Add doxygen for bug8158 functions
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit c8f5f35d6237de0ecd5ddac0a9a4c84915cbe177 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 12:12:09 2013 -0500 Add doxygen for bug8158 functions --- src/or/dirvote.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c10a60f..66dc50d 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3664,6 +3664,8 @@ static const struct consensus_method_range_t { {-1, -1} }; +/** Helper type used when generating the microdescriptor lines in a directory + * vote. */ typedef struct microdesc_vote_line_t { int low; int high; @@ -3671,6 +3673,9 @@ typedef struct microdesc_vote_line_t { struct microdesc_vote_line_t *next; } microdesc_vote_line_t; +/** Generate and return a linked list of all the lines that should appear to + * describe a router's microdescriptor versions in a directory vote. + * Add the generated microdescriptors to microdescriptors_out. */ vote_microdesc_hash_t * dirvote_format_all_microdesc_vote_lines(const routerinfo_t *ri, time_t now, smartlist_t *microdescriptors_out)

1 0

[tor/master] log the hostname that resolve_my_address() used to guess our IP
by arma＠torproject.org 11 Feb '13

11 Feb '13

commit dfbb12cabf958f0ff2a1004761c22fc093c73dd0 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 2 19:57:27 2012 -0400 log the hostname that resolve_my_address() used to guess our IP --- src/or/router.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 3fd8b3c..6c05af9 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2089,6 +2089,8 @@ check_descriptor_ipaddress_changed(time_t now) { uint32_t prev, cur; const or_options_t *options = get_options(); + char *hostname = NULL; + (void) now; if (!desc_routerinfo) @@ -2096,18 +2098,26 @@ check_descriptor_ipaddress_changed(time_t now) /* XXXX ipv6 */ prev = desc_routerinfo->addr; - if (resolve_my_address(LOG_INFO, options, &cur, NULL) < 0) { + if (resolve_my_address(LOG_INFO, options, &cur, &hostname) < 0) { log_info(LD_CONFIG,"options->Address didn't resolve into an IP."); return; } if (prev != cur) { + char *source; tor_addr_t tmp_prev, tmp_cur; + tor_addr_from_ipv4h(&tmp_prev, prev); tor_addr_from_ipv4h(&tmp_cur, cur); - log_addr_has_changed(LOG_NOTICE, &tmp_prev, &tmp_cur, "resolve"); + + tor_asprintf(&source, "resolved from %s", hostname); + log_addr_has_changed(LOG_NOTICE, &tmp_prev, &tmp_cur, source); + tor_free(source); + ip_address_changed(0); } + + tor_free(hostname); } /** The most recently guessed value of our IP address, based on directory

1 0

[tor/master] Refactor resolve_my_address() so logs are more accurate / helpful
by arma＠torproject.org 11 Feb '13

11 Feb '13

commit 92ea0b86de30dafe392a2dcd2eb12d9ab83114a7 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Feb 10 16:45:48 2013 -0500 Refactor resolve_my_address() so logs are more accurate / helpful It returns the method by which we decided our public IP address (explicitly configured, resolved from explicit hostname, guessed from interfaces, learned by gethostname). Now we can provide more helpful log messages when a relay guesses its IP address incorrectly (e.g. due to unexpected lines in /etc/hosts). Resolves ticket 2267. While we're at it, stop sending a stray "(null)" in some cases for the server status "EXTERNAL_ADDRESS" controller event. Resolves bug 8200. --- changes/bug8200 | 5 ++ changes/ticket2267 | 8 ++++ src/or/config.c | 107 ++++++++++++++++++++++++++++++++++++++------------- src/or/config.h | 3 +- src/or/dirserv.c | 8 ++- src/or/router.c | 12 ++++-- src/or/routerlist.c | 4 +- 7 files changed, 111 insertions(+), 36 deletions(-) diff --git a/changes/bug8200 b/changes/bug8200 new file mode 100644 index 0000000..65fc9dd --- /dev/null +++ b/changes/bug8200 @@ -0,0 +1,5 @@ + o Minor bugfix: + - Stop sending a stray "(null)" in some cases for the server status + "EXTERNAL_ADDRESS" controller event. Resolves bug 8200; bugfix + on 0.1.2.6-alpha. + diff --git a/changes/ticket2267 b/changes/ticket2267 new file mode 100644 index 0000000..b589b57 --- /dev/null +++ b/changes/ticket2267 @@ -0,0 +1,8 @@ + o Minor features: + - Refactor resolve_my_address() so it returns the method by which we + decided our public IP address (explicitly configured, resolved from + explicit hostname, guessed from interfaces, learned by gethostname). + Now we can provide more helpful log messages when a relay guesses + its IP address incorrectly (e.g. due to unexpected lines in + /etc/hosts). Resolves ticket 2267. + diff --git a/src/or/config.c b/src/or/config.c index 31695ba..3d054e6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1891,20 +1891,32 @@ list_torrc_options(void) /** Last value actually set by resolve_my_address. */ static uint32_t last_resolved_addr = 0; /** - * Based on options-\>Address, guess our public IP address and put it - * (in host order) into *addr_out. If hostname_out is provided, - * set *hostname_out to a new string holding the hostname we used to - * get the address. Return 0 if all is well, or -1 if we can't find a suitable + * Use options-\>Address to guess our public IP address. + * + * Return 0 if all is well, or -1 if we can't find a suitable * public IP address. + * + * If we are returning 0: + * - Put our public IP address (in host order) into *addr_out. + * - If method_out is non-NULL, set *method_out to a static + * string describing how we arrived at our answer. + * - If hostname_out is non-NULL, and we resolved a hostname to + * get our address, set *hostname_out to a newly allocated string + * holding that hostname. (If we didn't get our address by resolving a + * hostname, set *hostname_out to NULL.) + * * XXXX ipv6 */ int resolve_my_address(int warn_severity, const or_options_t *options, - uint32_t *addr_out, char **hostname_out) + uint32_t *addr_out, + const char **method_out, char **hostname_out) { struct in_addr in; uint32_t addr; /* host order */ char hostname[256]; + const char *method_used; + const char *hostname_used; int explicit_ip=1; int explicit_hostname=1; int from_interface=0; @@ -1915,6 +1927,10 @@ resolve_my_address(int warn_severity, const or_options_t *options, tor_assert(addr_out); + /* + * Step one: Fill in 'hostname' to be our best guess. + */ + if (address && *address) { strlcpy(hostname, address, sizeof(hostname)); } else { /* then we need to guess our address */ @@ -1925,10 +1941,14 @@ resolve_my_address(int warn_severity, const or_options_t *options, log_fn(warn_severity, LD_NET,"Error obtaining local hostname"); return -1; } - log_debug(LD_CONFIG,"Guessed local host name as '%s'",hostname); + log_debug(LD_CONFIG, "Guessed local host name as '%s'", hostname); } - /* now we know hostname. resolve it and keep only the IP address */ + /* + * Step two: Now that we know 'hostname', parse it or resolve it. If + * it doesn't parse or resolve, look at the interface address. Set 'addr' + * to be our (host-order) 32-bit answer. + */ if (tor_inet_aton(hostname, &in) == 0) { /* then we have to resolve it */ @@ -1985,6 +2005,11 @@ resolve_my_address(int warn_severity, const or_options_t *options, * illformed */ } + /* + * Step three: Check whether 'addr' is an internal IP address, and error + * out if it is and we don't want that. + */ + addr_string = tor_dup_ip(addr); if (is_internal_IP(addr, 0)) { /* make sure we're ok with publishing an internal IP */ @@ -2009,37 +2034,65 @@ resolve_my_address(int warn_severity, const or_options_t *options, } } - log_debug(LD_CONFIG, "Resolved Address to '%s'.", fmt_addr32(addr)); + /* + * Step four: We have a winner! 'addr' is our answer for sure, and + * 'addr_string' is its string form. Fill out the various fields to + * say how we decided it. + */ + + log_debug(LD_CONFIG, "Resolved Address to '%s'.", addr_string); + + if (explicit_ip) { + method_used = "CONFIGURED"; + hostname_used = NULL; + } else if (explicit_hostname) { + method_used = "RESOLVED"; + hostname_used = hostname; + } else if (from_interface) { + method_used = "INTERFACE"; + hostname_used = NULL; + } else { + method_used = "GETHOSTNAME"; + hostname_used = hostname; + } + *addr_out = addr; + if (method_out) + *method_out = method_used; + if (hostname_out) + *hostname_out = hostname_used ? tor_strdup(hostname_used) : NULL; + + /* + * Step five: Check if the answer has changed since last time (or if + * there was no last time), and if so call various functions to keep + * us up-to-date. + */ + if (last_resolved_addr && last_resolved_addr != *addr_out) { /* Leave this as a notice, regardless of the requested severity, * at least until dynamic IP address support becomes bulletproof. */ log_notice(LD_NET, - "Your IP address seems to have changed to %s. Updating.", - addr_string); + "Your IP address seems to have changed to %s " + "(METHOD=%s %s%s). Updating.", + addr_string, method_used, + hostname_used ? "HOSTNAME=" : "", + hostname_used ? hostname_used : ""); ip_address_changed(0); } + if (last_resolved_addr != *addr_out) { - const char *method; - const char *h = hostname; - if (explicit_ip) { - method = "CONFIGURED"; - h = NULL; - } else if (explicit_hostname) { - method = "RESOLVED"; - } else if (from_interface) { - method = "INTERFACE"; - h = NULL; - } else { - method = "GETHOSTNAME"; - } control_event_server_status(LOG_NOTICE, "EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s %s%s", - addr_string, method, h?"HOSTNAME=":"", h); + addr_string, method_used, + hostname_used ? "HOSTNAME=" : "", + hostname_used ? hostname_used : ""); } last_resolved_addr = *addr_out; - if (hostname_out) - *hostname_out = tor_strdup(hostname); + + /* + * And finally, clean up and return success. + */ + tor_free(addr_string); return 0; } @@ -2287,7 +2340,7 @@ options_validate(or_options_t *old_options, or_options_t *options, if (authdir_mode(options)) { /* confirm that our address isn't broken, so we can complain now */ uint32_t tmp; - if (resolve_my_address(LOG_WARN, options, &tmp, NULL) < 0) + if (resolve_my_address(LOG_WARN, options, &tmp, NULL, NULL) < 0) REJECT("Failed to resolve/guess local address. See logs for details."); } diff --git a/src/or/config.h b/src/or/config.h index 8e34655..e0748a0 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -27,7 +27,8 @@ setopt_err_t options_trial_assign(config_line_t *list, int use_defaults, int clear_first, char **msg); int resolve_my_address(int warn_severity, const or_options_t *options, - uint32_t *addr, char **hostname_out); + uint32_t *addr_out, + const char **method_out, char **hostname_out); int is_local_addr(const tor_addr_t *addr); void options_init(or_options_t *options); char *options_dump(const or_options_t *options, int minimal); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 6209842..a8f7d46 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2763,11 +2763,11 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, tor_assert(private_key); tor_assert(cert); - if (resolve_my_address(LOG_WARN, options, &addr, &hostname)<0) { + if (resolve_my_address(LOG_WARN, options, &addr, NULL, &hostname)<0) { log_warn(LD_NET, "Couldn't resolve my hostname"); return NULL; } - if (!strchr(hostname, '.')) { + if (!hostname || !strchr(hostname, '.')) { tor_free(hostname); hostname = tor_dup_ip(addr); } @@ -2990,10 +2990,12 @@ generate_v2_networkstatus_opinion(void) private_key = get_server_identity_key(); - if (resolve_my_address(LOG_WARN, options, &addr, &hostname)<0) { + if (resolve_my_address(LOG_WARN, options, &addr, NULL, &hostname)<0) { log_warn(LD_NET, "Couldn't resolve my hostname"); goto done; } + if (!hostname) + hostname = tor_dup_ip(addr); format_iso_time(published, now); diff --git a/src/or/router.c b/src/or/router.c index 6c05af9..735b579 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1712,7 +1712,7 @@ static int router_guess_address_from_dir_headers(uint32_t *guess); int router_pick_published_address(const or_options_t *options, uint32_t *addr) { - if (resolve_my_address(LOG_INFO, options, addr, NULL) < 0) { + if (resolve_my_address(LOG_INFO, options, addr, NULL, NULL) < 0) { log_info(LD_CONFIG, "Could not determine our address locally. " "Checking if directory headers provide any hints."); if (router_guess_address_from_dir_headers(addr) < 0) { @@ -2089,6 +2089,7 @@ check_descriptor_ipaddress_changed(time_t now) { uint32_t prev, cur; const or_options_t *options = get_options(); + const char *method = NULL; char *hostname = NULL; (void) now; @@ -2098,7 +2099,7 @@ check_descriptor_ipaddress_changed(time_t now) /* XXXX ipv6 */ prev = desc_routerinfo->addr; - if (resolve_my_address(LOG_INFO, options, &cur, &hostname) < 0) { + if (resolve_my_address(LOG_INFO, options, &cur, &method, &hostname) < 0) { log_info(LD_CONFIG,"options->Address didn't resolve into an IP."); return; } @@ -2110,7 +2111,10 @@ check_descriptor_ipaddress_changed(time_t now) tor_addr_from_ipv4h(&tmp_prev, prev); tor_addr_from_ipv4h(&tmp_cur, cur); - tor_asprintf(&source, "resolved from %s", hostname); + tor_asprintf(&source, "METHOD=%s %s%s", method, + hostname ? "HOSTNAME=" : "", + hostname ? hostname : ""); + log_addr_has_changed(LOG_NOTICE, &tmp_prev, &tmp_cur, source); tor_free(source); @@ -2151,7 +2155,7 @@ router_new_address_suggestion(const char *suggestion, } /* XXXX ipv6 */ - if (resolve_my_address(LOG_INFO, options, &cur, NULL) >= 0) { + if (resolve_my_address(LOG_INFO, options, &cur, NULL, NULL) >= 0) { /* We're all set -- we already know our address. Great. */ tor_addr_from_ipv4h(&last_guessed_ip, cur); /* store it in case we need it later */ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8f19947..90b707b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3951,12 +3951,14 @@ trusted_dir_server_new(const char *nickname, const char *address, dir_server_t *result; if (!address) { /* The address is us; we should guess. */ - if (resolve_my_address(LOG_WARN, get_options(), &a, &hostname) < 0) { + if (resolve_my_address(LOG_WARN, get_options(), &a, NULL, &hostname) < 0) { log_warn(LD_CONFIG, "Couldn't find a suitable address when adding ourself as a " "trusted directory server."); return NULL; } + if (!hostname) + hostname = tor_dup_ip(a); } else { if (tor_lookup_hostname(address, &a)) { log_warn(LD_CONFIG,

1 0

[tor/master] Avoid generating extra spaces when explaining how we guessed our address
by arma＠torproject.org 11 Feb '13

11 Feb '13

commit 36e2eb6775a2f52d34423f1319a0be1472506649 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 11 13:05:27 2013 -0500 Avoid generating extra spaces when explaining how we guessed our address --- src/or/config.c | 8 ++++---- src/or/router.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 3d054e6..0f8441b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2073,18 +2073,18 @@ resolve_my_address(int warn_severity, const or_options_t *options, * at least until dynamic IP address support becomes bulletproof. */ log_notice(LD_NET, "Your IP address seems to have changed to %s " - "(METHOD=%s %s%s). Updating.", + "(METHOD=%s%s%s). Updating.", addr_string, method_used, - hostname_used ? "HOSTNAME=" : "", + hostname_used ? " HOSTNAME=" : "", hostname_used ? hostname_used : ""); ip_address_changed(0); } if (last_resolved_addr != *addr_out) { control_event_server_status(LOG_NOTICE, - "EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s %s%s", + "EXTERNAL_ADDRESS ADDRESS=%s METHOD=%s%s%s", addr_string, method_used, - hostname_used ? "HOSTNAME=" : "", + hostname_used ? " HOSTNAME=" : "", hostname_used ? hostname_used : ""); } last_resolved_addr = *addr_out; diff --git a/src/or/router.c b/src/or/router.c index 735b579..f336f12 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2111,8 +2111,8 @@ check_descriptor_ipaddress_changed(time_t now) tor_addr_from_ipv4h(&tmp_prev, prev); tor_addr_from_ipv4h(&tmp_cur, cur); - tor_asprintf(&source, "METHOD=%s %s%s", method, - hostname ? "HOSTNAME=" : "", + tor_asprintf(&source, "METHOD=%s%s%s", method, + hostname ? " HOSTNAME=" : "", hostname ? hostname : ""); log_addr_has_changed(LOG_NOTICE, &tmp_prev, &tmp_cur, source);

1 0

[doctor/master] Check that authorities run recommended versions.
by karsten＠torproject.org 11 Feb '13

11 Feb '13

commit 091551f78899de8cc2e5b1d656df27e31e383a14 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Feb 11 17:38:21 2013 +0100 Check that authorities run recommended versions. Implements #7725. --- .gitignore | 2 + src/org/torproject/doctor/Checker.java | 51 ++++++++++++++++++++++- src/org/torproject/doctor/StatusFileReport.java | 7 +++- src/org/torproject/doctor/Warning.java | 5 ++- 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 14a8cb2..db27b77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.classpath +.project classes/ lib/ out/ diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index 2fbdcaf..3adc678 100644 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -2,7 +2,6 @@ * See LICENSE for licensing information */ package org.torproject.doctor; -import java.io.*; import java.text.*; import java.util.*; import org.torproject.descriptor.*; @@ -45,6 +44,7 @@ public class Checker { this.checkBandwidthScanners(); this.checkMissingAuthorities(); this.checkAuthorityRelayIdentityKeys(); + this.checkAuthorityVersions(); } } else { this.warnings.put(Warning.NoConsensusKnown, new TreeSet<String>()); @@ -364,7 +364,6 @@ public class Checker { private void warnAboutExpiringCertificates(Warning warningType, SortedMap<String, String> expiringCertificates) { SortedSet<String> details = new TreeSet<String>(); - StringBuilder sb = new StringBuilder(); for (Map.Entry<String, String> e : expiringCertificates.entrySet()) { String dir = e.getKey(); @@ -472,5 +471,53 @@ public class Checker { unexpectedFingerprints); } } + + private void checkAuthorityVersions() { + if (downloadedConsensus.getRecommendedServerVersions() == null) { + return; + } + Set<String> recommendedVersions = new HashSet<String>(); + for (String version : + downloadedConsensus.getRecommendedServerVersions()) { + recommendedVersions.add(version.split("-", 2)[0]); + } + SortedMap<String, String> authorities = new TreeMap<String, String>(); + authorities.put("f2044413dac2e02e3d6bcf4735a19bca1de97281", + "gabelmoo"); + authorities.put("847b1f850344d7876491a54892f904934e4eb85d", "tor26"); + authorities.put("f397038adc51336135e7b80bd99ca3844360292b", + "turtles"); + authorities.put("bd6a829255cb08e66fbe7d3748363586e46b3810", + "maatuska"); + authorities.put("7be683e65d48141321c5ed92f075c55364ac7123", + "dannenberg"); + authorities.put("0ad3fa884d18f89eea2d89c019379e0e7fd94417", "urras"); + authorities.put("9695dfc35ffeb861329b9f1ab04c46397020ce31", "moria1"); + authorities.put("7ea6ead6fd83083c538f44038bbfa077587dd755", "dizum"); + authorities.put("cf6d0aafb385be71b8e111fc5cff4b47923733bc", + "Faravahar"); + authorities.put("4a0ccd2ddc7995083d73f5d667100c8a5831f16d", "Tonga"); + SortedSet<String> unrecommendedVersions = new TreeSet<String>(); + for (Map.Entry<String, String> e : authorities.entrySet()) { + String fingerprint = e.getKey().toUpperCase(); + String nickname = e.getValue(); + if (this.downloadedConsensus.getStatusEntries().containsKey( + fingerprint)) { + String authorityVersion = this.downloadedConsensus.getStatusEntry( + fingerprint).getVersion(); + if (authorityVersion.startsWith("Tor ")) { + authorityVersion = authorityVersion.substring("Tor ".length()); + } + if (!recommendedVersions.contains( + authorityVersion.split("-", 2)[0])) { + unrecommendedVersions.add(nickname + "=" + authorityVersion); + } + } + } + if (!unrecommendedVersions.isEmpty()) { + this.warnings.put(Warning.UnrecommendedVersions, + unrecommendedVersions); + } + } } diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index 7ea29bb..1e23639 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -42,7 +42,6 @@ public class StatusFileReport { /* Read when we last emitted a warning to rate-limit some of them. */ private File lastWarnedFile = new File("out/state/last-warned"); private void readLastWarned() { - long now = System.currentTimeMillis(); try { if (this.lastWarnedFile.exists()) { BufferedReader br = new BufferedReader(new FileReader( @@ -60,6 +59,7 @@ public class StatusFileReport { String message = line.substring(line.indexOf(": ") + 2); lastWarned.put(message, warnedMillis); } + br.close(); } } catch (IOException e) { System.err.println("Could not read file '" @@ -174,6 +174,11 @@ public class StatusFileReport { + "different relay identity keys than expected: " + detailsString, 150L * 60L * 1000L); break; + case UnrecommendedVersions: + warningStrings.put("WARNING: The following authorities are " + + "running unrecommended Tor versions: " + + detailsString, 150L * 60L * 1000L); + break; } } long now = System.currentTimeMillis(); diff --git a/src/org/torproject/doctor/Warning.java b/src/org/torproject/doctor/Warning.java index 2fe87f0..fc7de0e 100644 --- a/src/org/torproject/doctor/Warning.java +++ b/src/org/torproject/doctor/Warning.java @@ -70,6 +70,9 @@ public enum Warning { /* One or more relays running on the IP addresses and dir ports of the * authorities are using a different relay identity key than * expected. */ - UnexpectedFingerprints + UnexpectedFingerprints, + + /* One or more authorities are running an unrecommended Tor version. */ + UnrecommendedVersions }

1 0

[tor/master] Fix numerous problems with Tor's weak RNG.
by nickm＠torproject.org 11 Feb '13

11 Feb '13

commit 8cdd8b83539e57fb1891cce5b527dda335ab1452 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 8 16:28:05 2013 -0500 Fix numerous problems with Tor's weak RNG. We need a weak RNG in a couple of places where the strong RNG is both needless and too slow. We had been using the weak RNG from our platform's libc implementation, but that was problematic (because many platforms have exceptionally horrible weak RNGs -- like, ones that only return values between 0 and SHORT_MAX) and because we were using it in a way that was wrong for LCG-based weak RNGs. (We were counting on the low bits of the LCG output to be as random as the high ones, which isn't true.) This patch adds a separate type for a weak RNG, adds an LCG implementation for it, and uses that exclusively where we had been using the platform weak RNG. --- src/common/compat.c | 24 ------------------------ src/common/compat.h | 5 ----- src/common/crypto.c | 8 ++++---- src/common/crypto.h | 2 ++ src/common/util.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/common/util.h | 14 ++++++++++++++ src/or/cpuworker.c | 11 +++++++++-- src/or/main.c | 1 + src/or/relay.c | 12 +++++++++++- src/or/relay.h | 2 ++ 10 files changed, 83 insertions(+), 36 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3b15f8a..d7ce894 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2059,30 +2059,6 @@ tor_lookup_hostname(const char *name, uint32_t *addr) return -1; } -/** Initialize the insecure libc RNG. */ -void -tor_init_weak_random(unsigned seed) -{ -#ifdef _WIN32 - srand(seed); -#else - srandom(seed); -#endif -} - -/** Return a randomly chosen value in the range 0..TOR_RAND_MAX. This - * entropy will not be cryptographically strong; do not rely on it - * for anything an adversary should not be able to predict. */ -long -tor_weak_random(void) -{ -#ifdef _WIN32 - return rand(); -#else - return random(); -#endif -} - /** Hold the result of our call to uname. */ static char uname_result[256]; /** True iff uname_result is set. */ diff --git a/src/common/compat.h b/src/common/compat.h index d2944e6..036acfb 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -582,11 +582,6 @@ typedef enum { SOCKS5_ADDRESS_TYPE_NOT_SUPPORTED = 0x08, } socks5_reply_status_t; -/* ===== Insecure rng */ -void tor_init_weak_random(unsigned seed); -long tor_weak_random(void); -#define TOR_RAND_MAX (RAND_MAX) - /* ===== OS compatibility */ const char *get_uname(void); diff --git a/src/common/crypto.c b/src/common/crypto.c index 70bd452..22d57c7 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2337,12 +2337,12 @@ crypto_dh_free(crypto_dh_t *dh) (OPENSSL_VERSION_NUMBER >= OPENSSL_V(0,9,8,'c')) /** Set the seed of the weak RNG to a random value. */ -static void -seed_weak_rng(void) +void +crypto_seed_weak_rng(tor_weak_rng_t *rng) { unsigned seed; crypto_rand((void*)&seed, sizeof(seed)); - tor_init_weak_random(seed); + tor_init_weak_random(rng, seed); } /** Try to get out_len bytes of the strongest entropy we can generate, @@ -2426,7 +2426,7 @@ crypto_seed_rng(int startup) } memwipe(buf, 0, sizeof(buf)); - seed_weak_rng(); + if (rand_poll_ok || load_entropy_ok) return 0; else diff --git a/src/common/crypto.h b/src/common/crypto.h index 08efc80..12fcfae 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -256,6 +256,8 @@ int crypto_strongest_rand(uint8_t *out, size_t out_len); int crypto_rand_int(unsigned int max); uint64_t crypto_rand_uint64(uint64_t max); double crypto_rand_double(void); +struct tor_weak_rng_t; +void crypto_seed_weak_rng(struct tor_weak_rng_t *rng); char *crypto_random_hostname(int min_rand_len, int max_rand_len, const char *prefix, const char *suffix); diff --git a/src/common/util.c b/src/common/util.c index 93e2ba8..0384040 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4996,3 +4996,43 @@ tor_check_port_forwarding(const char *filename, } } +/** Initialize the insecure RNG rng from a seed value seed. */ +void +tor_init_weak_random(tor_weak_rng_t *rng, unsigned seed) +{ + rng->state = (uint32_t)(seed & 0x7fffffff); +} + +/** Return a randomly chosen value in the range 0..TOR_WEAK_RANDOM_MAX based + * on the RNG state of rng. This entropy will not be cryptographically + * strong; do not rely on it for anything an adversary should not be able to + * predict. */ +int32_t +tor_weak_random(tor_weak_rng_t *rng) +{ + /* Here's a linear congruential generator. OpenBSD and glibc use it. We + * don't want to use windows's rand(), because that returns values in the + * range 0..INT16_MAX, which just isn't enough. */ + rng->state = (rng->state * 1103515245 + 12345) & 0x7fffffff; + return (int32_t) rng->state; +} + +/** Return a random number in the range [0 , top). {That is, the range + * of integers i such that 0 <= i < top.} Chooses uniformly. Requires that + * top is greater than 0. This randomness is not cryptographically strong; do + * not rely on it for anything an adversary should not be able to predict. */ +int32_t +tor_weak_random_range(tor_weak_rng_t *rng, int32_t top) +{ + /* We don't want to just do tor_weak_random() % top, since random() is often + * implemented with an LCG whose modulus is a power of 2, and those are + * cyclic in their low-order bits. */ + int divisor, result; + tor_assert(top > 0); + divisor = TOR_WEAK_RANDOM_MAX / top; + do { + result = (int32_t)(tor_weak_random(rng) / divisor); + } while (result >= top); + return result; +} + diff --git a/src/common/util.h b/src/common/util.h index 911b1b5..ac88f1c 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -494,6 +494,20 @@ int tor_terminate_process(process_handle_t *process_handle); void tor_process_handle_destroy(process_handle_t *process_handle, int also_terminate_process); +/* ===== Insecure rng */ +typedef struct tor_weak_rng_t { + uint32_t state; +} tor_weak_rng_t; + +#define TOR_WEAK_RNG_INIT {383745623} +#define TOR_WEAK_RANDOM_MAX (INT_MAX) +void tor_init_weak_random(tor_weak_rng_t *weak_rng, unsigned seed); +int32_t tor_weak_random(tor_weak_rng_t *weak_rng); +int32_t tor_weak_random_range(tor_weak_rng_t *rng, int32_t top); +/** Randomly return true according to rng with probability 1 in + * n */ +#define tor_weak_random_one_in_n(rng, n) (0==tor_weak_random_range((rng),(n))) + #ifdef UTIL_PRIVATE /* Prototypes for private functions only used by util.c (and unit tests) */ diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index b5740f0..6b52f3b 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -196,8 +196,10 @@ static uint64_t onionskins_usec_roundtrip[MAX_ONION_HANDSHAKE_TYPE+1]; * time. (microseconds) */ #define MAX_BELIEVABLE_ONIONSKIN_DELAY (2*1000*1000) +static tor_weak_rng_t request_sample_rng = TOR_WEAK_RNG_INIT; + /** Return true iff we'd like to measure a handshake of type - * onionskin_type. */ + * onionskin_type. Call only from the main thread. */ static int should_time_request(uint16_t onionskin_type) { @@ -210,7 +212,7 @@ should_time_request(uint16_t onionskin_type) return 1; /** Otherwise, measure with P=1/128. We avoid doing this for every * handshake, since the measurement itself can take a little time. */ - return tor_weak_random() < (TOR_RAND_MAX/128); + return tor_weak_random_one_in_n(&request_sample_rng, 128); } /** Return an estimate of how many microseconds we will need for a single @@ -560,6 +562,7 @@ static void spawn_enough_cpuworkers(void) { int num_cpuworkers_needed = get_num_cpus(get_options()); + int reseed = 0; if (num_cpuworkers_needed < MIN_CPUWORKERS) num_cpuworkers_needed = MIN_CPUWORKERS; @@ -572,7 +575,11 @@ spawn_enough_cpuworkers(void) return; } num_cpuworkers++; + reseed++; } + + if (reseed) + crypto_seed_weak_rng(&request_sample_rng); } /** Take a pending task from the queue and assign it to 'cpuworker'. */ diff --git a/src/or/main.c b/src/or/main.c index 79b0f25..aa601e5 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2391,6 +2391,7 @@ tor_init(int argc, char *argv[]) log_err(LD_BUG, "Unable to initialize OpenSSL. Exiting."); return -1; } + stream_choice_seed_weak_rng(); return 0; } diff --git a/src/or/relay.c b/src/or/relay.c index 5d06fd9..cbb2aca 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -70,6 +70,9 @@ uint64_t stats_n_relay_cells_relayed = 0; */ uint64_t stats_n_relay_cells_delivered = 0; +/** Used to tell which stream to read from first on a circuit. */ +static tor_weak_rng_t stream_choice_rng = TOR_WEAK_RNG_INIT; + /** Update digest from the payload of cell. Assign integrity part to * cell. */ @@ -1740,6 +1743,12 @@ circuit_resume_edge_reading(circuit_t *circ, crypt_path_t *layer_hint) circ, layer_hint); } +void +stream_choice_seed_weak_rng(void) +{ + crypto_seed_weak_rng(&stream_choice_rng); +} + /** A helper function for circuit_resume_edge_reading() above. * The arguments are the same, except that conn is the head * of a linked list of edge streams that should each be considered. @@ -1784,10 +1793,11 @@ circuit_resume_edge_reading_helper(edge_connection_t *first_conn, int num_streams = 0; for (conn = first_conn; conn; conn = conn->next_stream) { num_streams++; - if ((tor_weak_random() % num_streams)==0) + if (tor_weak_random_one_in_n(&stream_choice_rng, num_streams)) { chosen_stream = conn; /* Invariant: chosen_stream has been chosen uniformly at random from * among the first num_streams streams on first_conn. */ + } } } diff --git a/src/or/relay.h b/src/or/relay.h index d8da9ea..9e2d8af 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -65,6 +65,8 @@ const uint8_t *decode_address_from_payload(tor_addr_t *addr_out, int payload_len); void circuit_clear_cell_queue(circuit_t *circ, channel_t *chan); +void stream_choice_seed_weak_rng(void); + #ifdef RELAY_PRIVATE int relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, crypt_path_t **layer_hint, char *recognized);

1 0