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

[tor/release-0.2.4] Bug 8419: Apply the badexit fix from #2203 to validatio too
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 651e49713c38b8ec2bde285001e46b61c500d10c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Mar 26 14:15:58 2013 -0700 Bug 8419: Apply the badexit fix from #2203 to validatio too This was causing dirauths to emit flag weight validation warns if there was a sufficiently large amount of badexit bandwidth to make a difference in flag weight results. --- src/or/dirvote.c | 4 ++-- src/or/dirvote.h | 3 +++ src/or/routerparse.c | 13 ++++++++++--- src/or/routerparse.h | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index bcfe2b0..7043cef 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1913,7 +1913,7 @@ networkstatus_compute_consensus(smartlist_t *votes, } /* Fix bug 2203: Do not count BadExit nodes as Exits for bw weights */ - if (consensus_method >= 11) { + if (consensus_method >= MIN_METHOD_TO_CUT_BADEXIT_WEIGHT) { is_exit = is_exit && !is_bad_exit; } @@ -2210,7 +2210,7 @@ networkstatus_compute_consensus(smartlist_t *votes, } // Verify balancing parameters if (consensus_method >= MIN_METHOD_FOR_BW_WEIGHTS && added_weights) { - networkstatus_verify_bw_weights(c); + networkstatus_verify_bw_weights(c, consensus_method); } networkstatus_vote_free(c); } diff --git a/src/or/dirvote.h b/src/or/dirvote.h index fbb61b6..8d036d6 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -34,6 +34,9 @@ /** Lowest consensus method that generates microdescriptors */ #define MIN_METHOD_FOR_MICRODESC 8 +/** Lowest consensus method that doesn't count bad exits as exits for weight */ +#define MIN_METHOD_TO_CUT_BADEXIT_WEIGHT 11 + /** Lowest consensus method that ensures a majority of authorities voted * for a param. */ #define MIN_METHOD_FOR_MAJORITY_PARAMS 12 diff --git a/src/or/routerparse.c b/src/or/routerparse.c index a2b4f9e..f8edb84 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2257,7 +2257,7 @@ networkstatus_v2_parse_from_string(const char *s) /** Verify the bandwidth weights of a network status document */ int -networkstatus_verify_bw_weights(networkstatus_t *ns) +networkstatus_verify_bw_weights(networkstatus_t *ns, int consensus_method) { int64_t weight_scale; int64_t G=0, M=0, E=0, D=0, T=0; @@ -2343,14 +2343,21 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) // Then, gather G, M, E, D, T to determine case SMARTLIST_FOREACH_BEGIN(ns->routerstatus_list, routerstatus_t *, rs) { + int is_exit = 0; + if (consensus_method >= MIN_METHOD_TO_CUT_BADEXIT_WEIGHT) { + /* Bug #2203: Don't count bad exits as exits for balancing */ + is_exit = rs->is_exit && !rs->is_bad_exit; + } else { + is_exit = rs->is_exit; + } if (rs->has_bandwidth) { T += rs->bandwidth; - if (rs->is_exit && rs->is_possible_guard) { + if (is_exit && rs->is_possible_guard) { D += rs->bandwidth; Gtotal += Wgd*rs->bandwidth; Mtotal += Wmd*rs->bandwidth; Etotal += Wed*rs->bandwidth; - } else if (rs->is_exit) { + } else if (is_exit) { E += rs->bandwidth; Mtotal += Wme*rs->bandwidth; Etotal += Wee*rs->bandwidth; diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 859a691..7bf7d79 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -54,7 +54,7 @@ void dump_distinct_digest_count(int severity); int compare_routerstatus_entries(const void **_a, const void **_b); int compare_vote_routerstatus_entries(const void **_a, const void **_b); networkstatus_v2_t *networkstatus_v2_parse_from_string(const char *s); -int networkstatus_verify_bw_weights(networkstatus_t *ns); +int networkstatus_verify_bw_weights(networkstatus_t *ns, int); networkstatus_t *networkstatus_parse_vote_from_string(const char *s, const char **eos_out, networkstatus_type_t ns_type);

1 0

[tor/release-0.2.4] Changes file for 8230, 8477 and 8419.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 80d8fb23e39e16764447f608428356bd5c49e4c6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Mar 26 14:22:23 2013 -0700 Changes file for 8230, 8477 and 8419. --- changes/log-noise | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/log-noise b/changes/log-noise new file mode 100644 index 0000000..bbbf0d2 --- /dev/null +++ b/changes/log-noise @@ -0,0 +1,11 @@ + o Minor bugfixes (log message reduction) + - Fix a path state issue that triggered a notice during relay startup. + Fixes bug #8320; bugfix on 0.2.4.10-alpha. + - Reduce occurrences of warns about circuit purpose in + connection_ap_expire_building(). Fixes bug #8477; bugfix on + 0.2.4.11-alpha. + - Fix a directory authority warn caused when we have a large amount + of badexit bandwidth. Fixes bug #8419; bugfix on 0.2.2.10-alpha. + - Reduce a path bias length check notice log to info. The notice + is triggered when creating controller circuits. Fixes bug #8196; + bugfix on 0.2.4.8-alpha.

1 0

[tor/release-0.2.4] Merge branch '0.2.4-lognoise-fixes-rebased' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 8e05001dc60f6dc1e803f19e33cc2ccad12efc82 Merge: 33f86fa 9117b14 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 29 12:24:45 2013 -0400 Merge branch '0.2.4-lognoise-fixes-rebased' into maint-0.2.4 changes/log-noise | 11 +++++++++++ src/or/circuitbuild.c | 10 +++++----- src/or/connection_edge.c | 4 +++- src/or/dirvote.c | 4 ++-- src/or/dirvote.h | 3 +++ src/or/routerparse.c | 13 ++++++++++--- src/or/routerparse.h | 2 +- 7 files changed, 35 insertions(+), 12 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8427' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 2c155064aaa77d5a59169388c89723b8dd53d589 Merge: 8e05001 16f2e4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 2 10:36:15 2013 -0400 Merge remote-tracking branch 'public/bug8427' into maint-0.2.4 changes/bug8427 | 5 +++++ src/or/connection.c | 4 ++++ 2 files changed, 9 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.4] Clip invalid path bias counts at startup.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 2b05a8c6716f1c7e07e658719c093723809e19a6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Mar 25 16:04:30 2013 -0700 Clip invalid path bias counts at startup. There was a bug in Tor prior to 0.2.4.10-alpha that allowed counts to become invalid. Clipping the counts at startup allows us to rule out log messages due to corruption from these prior Tor versions. --- src/or/entrynodes.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 6b21d10..3234f4f 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1211,6 +1211,21 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) continue; } + if (use_cnt < success_cnt) { + int severity = LOG_INFO; + /* If this state file was written by a Tor that would have + * already fixed it, then the overcounting bug is still there.. */ + if (tor_version_as_new_as(state_version, "0.2.4.12-alpha")) { + severity = LOG_NOTICE; + } + log_fn(severity, LD_BUG, + "State file contains unexpectedly high usage success " + "counts %lf/%lf for Guard %s ($%s)", + success_cnt, use_cnt, + node->nickname, hex_str(node->identity, DIGEST_LEN)); + success_cnt = use_cnt; + } + node->use_attempts = use_cnt; node->use_successes = success_cnt; @@ -1261,6 +1276,21 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) unusable = 0; } + if (hop_cnt < success_cnt) { + int severity = LOG_INFO; + /* If this state file was written by a Tor that would have + * already fixed it, then the overcounting bug is still there.. */ + if (tor_version_as_new_as(state_version, "0.2.4.12-alpha")) { + severity = LOG_NOTICE; + } + log_fn(severity, LD_BUG, + "State file contains unexpectedly high success counts " + "%lf/%lf for Guard %s ($%s)", + success_cnt, hop_cnt, + node->nickname, hex_str(node->identity, DIGEST_LEN)); + success_cnt = hop_cnt; + } + node->circ_attempts = hop_cnt; node->circ_successes = success_cnt;

1 0

[tor/release-0.2.4] Add additional checks for Path Bias scaling.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 56e7dff7bd4769c2a255aac7c9d266914bbf9f57 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Mar 25 16:05:42 2013 -0700 Add additional checks for Path Bias scaling. Just in case more issues remain with scaling, it would be nice to pin-point them as such. --- src/or/circuitbuild.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 7db2b70..df56877 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1734,6 +1734,13 @@ pathbias_count_use_success(origin_circuit_t *circ) guard->use_successes++; entry_guards_changed(); + if (guard->use_attempts < guard->use_successes) { + log_notice(LD_BUG, "Unexpectedly high use successes counts (%f/%f) " + "for guard %s=%s", + guard->use_successes, guard->use_attempts, + guard->nickname, hex_str(guard->identity, DIGEST_LEN)); + } + log_debug(LD_CIRC, "Marked circuit %d (%f/%f) as used successfully for guard " "%s ($%s).", @@ -2481,6 +2488,9 @@ pathbias_scale_close_rates(entry_guard_t *guard) int opened_built = pathbias_count_circs_in_states(guard, PATH_STATE_BUILD_SUCCEEDED, PATH_STATE_USE_FAILED); + /* Verify that the counts are sane before and after scaling */ + int counts_are_sane = (guard->circ_attempts >= guard->circ_successes); + guard->circ_attempts -= opened_attempts; guard->circ_successes -= opened_built; @@ -2502,6 +2512,16 @@ pathbias_scale_close_rates(entry_guard_t *guard) guard->circ_successes, guard->successful_circuits_closed, guard->circ_attempts, opened_built, opened_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); + + /* Have the counts just become invalid by this scaling attempt? */ + if (counts_are_sane && guard->circ_attempts < guard->circ_successes) { + log_notice(LD_BUG, + "Scaling has mangled pathbias counts to %f/%f (%d/%d open) " + "for guard %s ($%s)", + guard->circ_successes, guard->circ_attempts, opened_built, + opened_attempts, guard->nickname, + hex_str(guard->identity, DIGEST_LEN)); + } } } @@ -2524,6 +2544,9 @@ pathbias_scale_use_rates(entry_guard_t *guard) double scale_ratio = pathbias_get_scale_ratio(options); int opened_attempts = pathbias_count_circs_in_states(guard, PATH_STATE_USE_ATTEMPTED, PATH_STATE_USE_SUCCEEDED); + /* Verify that the counts are sane before and after scaling */ + int counts_are_sane = (guard->use_attempts >= guard->use_successes); + guard->use_attempts -= opened_attempts; guard->use_attempts *= scale_ratio; @@ -2535,6 +2558,17 @@ pathbias_scale_use_rates(entry_guard_t *guard) "Scaled pathbias use counts to %f/%f (%d open) for guard %s ($%s)", guard->use_successes, guard->use_attempts, opened_attempts, guard->nickname, hex_str(guard->identity, DIGEST_LEN)); + + /* Have the counts just become invalid by this scaling attempt? */ + if (counts_are_sane && guard->use_attempts < guard->use_successes) { + log_notice(LD_BUG, + "Scaling has mangled pathbias usage counts to %f/%f " + "(%d open) for guard %s ($%s)", + guard->circ_successes, guard->circ_attempts, + opened_attempts, guard->nickname, + hex_str(guard->identity, DIGEST_LEN)); + } + entry_guards_changed(); } }

1 0

[tor/release-0.2.4] Changes file.
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 3207ace6050ea0463cfc26d6e95d737785baa5fa Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Mar 25 16:06:26 2013 -0700 Changes file. --- changes/bug8235-diagnosing | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug8235-diagnosing b/changes/bug8235-diagnosing new file mode 100644 index 0000000..b760035 --- /dev/null +++ b/changes/bug8235-diagnosing @@ -0,0 +1,5 @@ + o Minor features (diagnostic) + - If the state file's path bias counts are invalid (presumably from a + buggy tor prior to 0.2.4.10-alpha), make them correct. + - Add additional checks and log messages to the scaling of Path Bias + counts, in case there still are remaining issues with scaling.

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug7707_diagnostic' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 856d57531b3173ef04a9f8f69c5e6e6c16c25c00 Merge: 2c15506 452cfaa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 2 10:41:14 2013 -0400 Merge remote-tracking branch 'public/bug7707_diagnostic' into maint-0.2.4 changes/bug7707_diagnostic | 5 +++++ src/common/tortls.c | 25 +++++++++++++++++++++++++ src/common/tortls.h | 2 ++ src/or/status.c | 6 ++++++ 4 files changed, 38 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'public/bug8235-diagnostic-rebased' into maint-0.2.4
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 5efe5067670960384f0e4a42b5073e86fe3824a7 Merge: 856d575 3207ace Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 09:35:57 2013 -0400 Merge remote-tracking branch 'public/bug8235-diagnostic-rebased' into maint-0.2.4 changes/bug8235-diagnosing | 5 +++++ src/or/circuitbuild.c | 34 ++++++++++++++++++++++++++++++++++ src/or/entrynodes.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 0 deletions(-)

1 0

[tor/release-0.2.4] Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2)
by arma＠torproject.org 11 Apr '13

11 Apr '13

commit 74f5e304e49b8ccde2b97232c49e5025dba21f59 Author: Desoxy <desoxy(a)fastmail.fm> Date: Wed Apr 3 18:50:51 2013 +0200 Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2) Add keyword CACHED="YES"/"NO" to ADDRMAP control events to indicate whether the DNS response will be cached or not. --- changes/bug8596 | 3 +++ src/or/addressmap.c | 2 +- src/or/connection_edge.c | 9 ++++----- src/or/control.c | 14 ++++++++------ src/or/control.h | 3 ++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/changes/bug8596 b/changes/bug8596 new file mode 100644 index 0000000..dd36bad --- /dev/null +++ b/changes/bug8596 @@ -0,0 +1,3 @@ + o Minor features: + - Add CACHED keyword to ADDRMAP events in the control protocol to indicate + whether a DNS result will be cached or not. diff --git a/src/or/addressmap.c b/src/or/addressmap.c index 826eb30..79e4b7c 100644 --- a/src/or/addressmap.c +++ b/src/or/addressmap.c @@ -560,7 +560,7 @@ addressmap_register(const char *address, char *new_address, time_t expires, log_info(LD_CONFIG, "Addressmap: (re)mapped '%s' to '%s'", safe_str_client(address), safe_str_client(ent->new_address)); - control_event_address_mapped(address, ent->new_address, expires, NULL); + control_event_address_mapped(address, ent->new_address, expires, NULL, 1); } /** An attempt to resolve <b>address</b> failed at some OR. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 0519708..926fcab 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2044,18 +2044,17 @@ tell_controller_about_resolved_result(entry_connection_t *conn, if (answer_type == RESOLVED_TYPE_IPV4 && answer_len >= 4) { char *cp = tor_dup_ip(ntohl(get_uint32(answer))); control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL); + cp, expires, NULL, 0); tor_free(cp); } else if (answer_type == RESOLVED_TYPE_HOSTNAME && answer_len < 256) { char *cp = tor_strndup(answer, answer_len); control_event_address_mapped(conn->socks_request->address, - cp, expires, NULL); + cp, expires, NULL, 0); tor_free(cp); } else { control_event_address_mapped(conn->socks_request->address, - "<error>", - time(NULL)+ttl, - "error=yes"); + "<error>", time(NULL)+ttl, + "error=yes", 0); } } diff --git a/src/or/control.c b/src/or/control.c index 2a68464..f50b877 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2947,7 +2947,7 @@ handle_control_resolve(control_connection_t *conn, uint32_t len, send_control_done(conn); SMARTLIST_FOREACH(failed, const char *, arg, { control_event_address_mapped(arg, arg, time(NULL), - "internal"); + "internal", 0); }); SMARTLIST_FOREACH(args, char *, cp, tor_free(cp)); @@ -4024,15 +4024,17 @@ control_event_descriptors_changed(smartlist_t *routers) */ int control_event_address_mapped(const char *from, const char *to, time_t expires, - const char *error) + const char *error, const int cached) { if (!EVENT_IS_INTERESTING(EVENT_ADDRMAP)) return 0; if (expires < 3 || expires == TIME_MAX) send_control_event(EVENT_ADDRMAP, ALL_FORMATS, - "650 ADDRMAP %s %s NEVER %s\r\n", from, to, - error?error:""); + "650 ADDRMAP %s %s NEVER %s%s" + "CACHED=\"%s\"\r\n", + from, to, error?error:"", error?" ":"", + cached?"YES":"NO"); else { char buf[ISO_TIME_LEN+1]; char buf2[ISO_TIME_LEN+1]; @@ -4040,10 +4042,10 @@ control_event_address_mapped(const char *from, const char *to, time_t expires, format_iso_time(buf2,expires); send_control_event(EVENT_ADDRMAP, ALL_FORMATS, "650 ADDRMAP %s %s \"%s\"" - " %s%sEXPIRES=\"%s\"\r\n", + " %s%sEXPIRES=\"%s\" CACHED=\"%s\"\r\n", from, to, buf, error?error:"", error?" ":"", - buf2); + buf2, cached?"YES":"NO"); } return 0; diff --git a/src/or/control.h b/src/or/control.h index 51ae230..0ea7941 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -53,7 +53,8 @@ int control_event_stream_bandwidth_used(void); void control_event_logmsg(int severity, uint32_t domain, const char *msg); int control_event_descriptors_changed(smartlist_t *routers); int control_event_address_mapped(const char *from, const char *to, - time_t expires, const char *error); + time_t expires, const char *error, + const int cached); int control_event_or_authdir_new_descriptor(const char *action, const char *desc, size_t desclen,

1 0