May 2011 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug3026' into maint-0.2.2
by nickm＠torproject.org 15 May '11

15 May '11

commit 69ff26b05c789e556c3e1401f5065ebf5e49c9d8 Merge: f287100 6b83b3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 12:18:23 2011 -0400 Merge branch 'bug3026' into maint-0.2.2 changes/bug3026 | 4 ++++ src/or/directory.c | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 15 May '11

15 May '11

commit 1f7b9e61ce3da7f19bdb44d4a9c5ec33da4cf083 Merge: 37e3fb8 69ff26b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 12:18:39 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3026 | 4 ++++ src/or/directory.c | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --cc src/or/directory.c index c0378a4,347ed42..e62c2f3 --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -301,8 -293,11 +303,11 @@@ directory_post_to_dirservers(uint8_t di if ((type & ds->type) == 0) continue; + if (exclude_self && router_digest_is_me(ds->digest)) + continue; + if (options->ExcludeNodes && options->StrictNodes && - routerset_contains_routerstatus(options->ExcludeNodes, rs)) { + routerset_contains_routerstatus(options->ExcludeNodes, rs, -1)) { log_warn(LD_DIR, "Wanted to contact authority '%s' for %s, but " "it's in our ExcludedNodes list and StrictNodes is set. " "Skipping.",

1 0

[tor/maint-0.2.2] Merge branch 'bug3026' into maint-0.2.2
by nickm＠torproject.org 15 May '11

15 May '11

commit 69ff26b05c789e556c3e1401f5065ebf5e49c9d8 Merge: f287100 6b83b3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 12:18:23 2011 -0400 Merge branch 'bug3026' into maint-0.2.2 changes/bug3026 | 4 ++++ src/or/directory.c | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] bug 3026: do not upload our vote to ourself
by nickm＠torproject.org 15 May '11

15 May '11

commit 6b83b3ba2aff4ba815241c76d712d149f13465e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 12 00:47:00 2011 -0400 bug 3026: do not upload our vote to ourself --- changes/bug3026 | 4 ++++ src/or/directory.c | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug3026 b/changes/bug3026 new file mode 100644 index 0000000..c0c0a38 --- /dev/null +++ b/changes/bug3026 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory authority) + - Do not upload our own vote or signature set to ourself. It would + tell us nothing new. Also, as of Tor 0.2.2.24-alpha, we started + to warn about receiving duplicate votes. Resolves bug 3026. diff --git a/src/or/directory.c b/src/or/directory.c index 8c6581a..86dcc8d 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -279,6 +279,8 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, int post_via_tor; smartlist_t *dirservers = router_get_trusted_dir_servers(); int found = 0; + const int exclude_self = (dir_purpose == DIR_PURPOSE_UPLOAD_VOTE || + dir_purpose == DIR_PURPOSE_UPLOAD_SIGNATURES); tor_assert(dirservers); /* This tries dirservers which we believe to be down, but ultimately, that's * harmless, and we may as well err on the side of getting things uploaded. @@ -291,6 +293,9 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, if ((type & ds->type) == 0) continue; + if (exclude_self && router_digest_is_me(ds->digest)) + continue; + if (options->ExcludeNodes && options->StrictNodes && routerset_contains_routerstatus(options->ExcludeNodes, rs)) { log_warn(LD_DIR, "Wanted to contact authority '%s' for %s, but "

1 0

[tor/master] When TrackExitHosts changes, remove all no-longer-valid mappings
by nickm＠torproject.org 15 May '11

15 May '11

commit a3ae591115ba5c4a43ff4fa3839be274aac9e5c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 13 16:22:58 2011 -0400 When TrackExitHosts changes, remove all no-longer-valid mappings This bug couldn't happen when TrackExitHosts changed in torrc, since the SIGHUP to reload the torrc would clear out all the transient addressmap entries before. But if you used SETCONF to change TrackExitHosts, old entries would be left alone: that's a bug, and so this is a bugfix on Tor 0.1.0.1-rc. --- changes/bug1345 | 5 ++++- src/or/config.c | 10 +++++++++- src/or/connection_edge.c | 6 ++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/changes/bug1345 b/changes/bug1345 index 6945b5f..b35e78f 100644 --- a/changes/bug1345 +++ b/changes/bug1345 @@ -1,4 +1,7 @@ o Minor bugfixes: - - On SIGHUP, do not clear out all TrackExitHost mappings, client DNS + - On SIGHUP, do not clear out all TrackHostExits mappings, client DNS cache entries, and virtual address mappings: that's what NEWNYM is for. Bugfix on Tor 0.1.0.1-rc; fixes bug 1345. + - When TrackHostExits is changed from a controller, remove any + mappings for hosts that should no longer have their exits tracked. + Bugfix on Tor 0.1.0.1-rc. diff --git a/src/or/config.c b/src/or/config.c index a7ff28f..147cc66 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1264,6 +1264,7 @@ options_act(or_options_t *old_options) /* Check for transitions that need action. */ if (old_options) { + int revise_trackexithosts = 0; if ((options->UseEntryGuards && !old_options->UseEntryGuards) || !routerset_equal(old_options->ExcludeNodes,options->ExcludeNodes) || !routerset_equal(old_options->ExcludeExitNodes, @@ -1276,9 +1277,16 @@ options_act(or_options_t *old_options) "excluded node lists. Abandoning previous circuits."); circuit_mark_all_unused_circs(); circuit_expire_all_dirty_circs(); - addressmap_clear_excluded_trackexithosts(options); + revise_trackexithosts = 1; } + if (!smartlist_strings_eq(old_options->TrackHostExits, + options->TrackHostExits)) + revise_trackexithosts = 1; + + if (revise_trackexithosts) + addressmap_clear_excluded_trackexithosts(options); + /* How long should we delay counting bridge stats after becoming a bridge? * We use this so we don't count people who used our bridge thinking it is * a relay. If you change this, don't forget to change the log message diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 037920b..5301471 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -810,7 +810,8 @@ clear_trackexithost_mappings(const char *exitname) } /** Remove all TRACKEXIT mappings from the addressmap for which the target - * host is unknown or no longer allowed. */ + * host is unknown or no longer allowed, or for which the source address + * is no longer in trackexithosts. */ void addressmap_clear_excluded_trackexithosts(or_options_t *options) { @@ -851,7 +852,8 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options) tor_free(nodename); if (!ri || (allow_nodes && !routerset_contains_router(allow_nodes, ri)) || - routerset_contains_router(exclude_nodes, ri)) { + routerset_contains_router(exclude_nodes, ri) || + !hostname_in_track_host_exits(options, address)) { /* We don't know this one, or we want to be rid of it. */ addressmap_ent_remove(address, ent); MAP_DEL_CURRENT(address);

1 0

[tor/master] Handle transitions in Automap*, VirtualAddrNetwork correctly
by nickm＠torproject.org 15 May '11

15 May '11

commit da8297dbcb6a44d2291878b01779500640e4d0b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 13 16:59:31 2011 -0400 Handle transitions in Automap*, VirtualAddrNetwork correctly Previously, if they changed in torrc during a SIGHUP, all was well, since we would just clear all transient entries from the addrmap thanks to bug 1345. But if you changed them from the controller, Tor would leave old mappings in place. The VirtualAddrNetwork bug has been here since 0.1.1.19-rc; the AutomapHosts* bug has been here since 0.2.0.1-alpha. --- changes/bug1345 | 6 ++++++ src/or/config.c | 15 +++++++++++++++ src/or/connection_edge.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- src/or/connection_edge.h | 1 + src/or/or.h | 3 +++ 5 files changed, 69 insertions(+), 1 deletions(-) diff --git a/changes/bug1345 b/changes/bug1345 index b35e78f..0c9375a 100644 --- a/changes/bug1345 +++ b/changes/bug1345 @@ -5,3 +5,9 @@ - When TrackHostExits is changed from a controller, remove any mappings for hosts that should no longer have their exits tracked. Bugfix on Tor 0.1.0.1-rc. + - When VirtualAddrNetwork option is changed from a controller, + remove any mappings for hosts that were automapped to + that network. Bugfix on 0.1.1.19-rc. + - When one of the AutomapHosts* options is changed from a + controller, remove any mappings for hosts that should no longer be + automapped. Bugfix on 0.2.0.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 147cc66..9c68b6f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1265,6 +1265,7 @@ options_act(or_options_t *old_options) /* Check for transitions that need action. */ if (old_options) { int revise_trackexithosts = 0; + int revise_automap_entries = 0; if ((options->UseEntryGuards && !old_options->UseEntryGuards) || !routerset_equal(old_options->ExcludeNodes,options->ExcludeNodes) || !routerset_equal(old_options->ExcludeExitNodes, @@ -1287,6 +1288,20 @@ options_act(or_options_t *old_options) if (revise_trackexithosts) addressmap_clear_excluded_trackexithosts(options); + if (old_options->AutomapHostsOnResolve && !options->AutomapHostsOnResolve) { + revise_automap_entries = 1; + } else if (options->AutomapHostsOnResolve) { + if (!smartlist_strings_eq(old_options->AutomapHostsSuffixes, + options->AutomapHostsSuffixes)) + revise_automap_entries = 1; + else if (!opt_streq(old_options->VirtualAddrNetwork, + options->VirtualAddrNetwork)) + revise_automap_entries = 1; + } + + if (revise_automap_entries) + addressmap_clear_invalid_automaps(options); + /* How long should we delay counting bridge stats after becoming a bridge? * We use this so we don't count people who used our bridge thinking it is * a relay. If you change this, don't forget to change the log message diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 5301471..7828f16 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -861,6 +861,49 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options) } STRMAP_FOREACH_END; } +/** Remove all AUTOMAP mappings from the addressmap for which the + * source address no longer matches AutomapHostsSuffixes, which is + * no longer allowed by AutomapHostsOnResolve, or for which the + * target address is no longer in the virtual network. */ +void +addressmap_clear_invalid_automaps(or_options_t *options) +{ + int clear_all = !options->AutomapHostsOnResolve; + const smartlist_t *suffixes = options->AutomapHostsSuffixes; + + if (!addressmap) + return; + + if (!suffixes) + clear_all = 1; /* This should be impossible, but let's be sure. */ + + STRMAP_FOREACH_MODIFY(addressmap, src_address, addressmap_entry_t *, ent) { + int remove = clear_all; + if (ent->source != ADDRMAPSRC_AUTOMAP) + continue; /* not an automap mapping. */ + + if (!remove) { + int suffix_found = 0; + SMARTLIST_FOREACH(suffixes, const char *, suffix, { + if (!strcasecmpend(src_address, suffix)) { + suffix_found = 1; + break; + } + }); + if (!suffix_found) + remove = 1; + } + + if (!remove && ! address_is_in_virtual_range(ent->new_address)) + remove = 1; + + if (remove) { + addressmap_ent_remove(src_address, ent); + MAP_DEL_CURRENT(src_address); + } + } STRMAP_FOREACH_END; +} + /** Remove all entries from the addressmap that were set via the * configuration file or the command line. */ void @@ -1372,7 +1415,7 @@ addressmap_register_virtual_address(int type, char *new_address) log_info(LD_APP, "Registering map from %s to %s", *addrp, new_address); if (vent_needs_to_be_added) strmap_set(virtaddress_reversemap, new_address, vent); - addressmap_register(*addrp, new_address, 2, ADDRMAPSRC_CONTROLLER); + addressmap_register(*addrp, new_address, 2, ADDRMAPSRC_AUTOMAP); #if 0 { diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 70d0dd2..8ba2faf 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -62,6 +62,7 @@ int address_is_invalid_destination(const char *address, int client); void addressmap_init(void); void addressmap_clear_excluded_trackexithosts(or_options_t *options); +void addressmap_clear_invalid_automaps(or_options_t *options); void addressmap_clean(time_t now); void addressmap_clear_configured(void); void addressmap_clear_transient(void); diff --git a/src/or/or.h b/src/or/or.h index a73d98a..5647691 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3150,6 +3150,9 @@ typedef enum setopt_err_t { typedef enum { /** We're remapping this address because the controller told us to. */ ADDRMAPSRC_CONTROLLER, + /** We're remapping this address because of an AutomapHostsOnResolve + * configuration. */ + ADDRMAPSRC_AUTOMAP, /** We're remapping this address because our configuration (via torrc, the * command line, or a SETCONF command) told us to. */ ADDRMAPSRC_TORRC,

1 0

[tor/master] Raise the TrackHostExits membership code into its own function
by nickm＠torproject.org 15 May '11

15 May '11

commit ec81d17d0c03d73f4d4acd9102893113b2883d76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 13 16:22:10 2011 -0400 Raise the TrackHostExits membership code into its own function --- src/or/circuituse.c | 35 ++++++++++++++++++++++------------- src/or/circuituse.h | 2 ++ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index e68fb4f..6e069b1 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1485,12 +1485,31 @@ link_apconn_to_circ(edge_connection_t *apconn, origin_circuit_t *circ, } } +/** Return true iff address is matched by one of the entries in + * TrackHostExits. */ +int +hostname_in_track_host_exits(or_options_t *options, const char *address) +{ + if (!options->TrackHostExits) + return 0; + SMARTLIST_FOREACH_BEGIN(options->TrackHostExits, const char *, cp) { + if (cp[0] == '.') { /* match end */ + if (cp[1] == '\0' || + !strcasecmpend(address, cp) || + !strcasecmp(address, &cp[1])) + return 1; + } else if (strcasecmp(cp, address) == 0) { + return 1; + } + } SMARTLIST_FOREACH_END(cp); + return 0; +} + /** If an exit wasn't specifically chosen, save the history for future * use. */ static void consider_recording_trackhost(edge_connection_t *conn, origin_circuit_t *circ) { - int found_needle = 0; or_options_t *options = get_options(); size_t len; char *new_address; @@ -1503,18 +1522,8 @@ consider_recording_trackhost(edge_connection_t *conn, origin_circuit_t *circ) options->TrackHostExitsExpire)) return; /* nothing to track, or already mapped */ - SMARTLIST_FOREACH(options->TrackHostExits, const char *, cp, { - if (cp[0] == '.') { /* match end */ - if (cp[1] == '\0' || - !strcasecmpend(conn->socks_request->address, cp) || - !strcasecmp(conn->socks_request->address, &cp[1])) - found_needle = 1; - } else if (strcasecmp(cp, conn->socks_request->address) == 0) { - found_needle = 1; - } - }); - - if (!found_needle || !circ->build_state->chosen_exit) + if (!hostname_in_track_host_exits(options, conn->socks_request->address) || + !circ->build_state->chosen_exit) return; /* write down the fingerprint of the chosen exit, not the nickname, diff --git a/src/or/circuituse.h b/src/or/circuituse.h index 9f393ab..bfeaea2 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -51,5 +51,7 @@ int connection_ap_handshake_attach_chosen_circuit(edge_connection_t *conn, crypt_path_t *cpath); int connection_ap_handshake_attach_circuit(edge_connection_t *conn); +int hostname_in_track_host_exits(or_options_t *options, const char *address); + #endif

1 0

[tor/master] Better doc for consider_recording_trackexithost
by nickm＠torproject.org 15 May '11

15 May '11

commit 2bb6bdc3f9354a57b3daf0dbb494123cf39ba29f Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:37:33 2011 -0400 Better doc for consider_recording_trackexithost --- src/or/circuituse.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 6e069b1..86db7c3 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1505,8 +1505,10 @@ hostname_in_track_host_exits(or_options_t *options, const char *address) return 0; } -/** If an exit wasn't specifically chosen, save the history for future - * use. */ +/** If an exit wasn't explicitly specified for conn, consider saving + * the exit that we *did* choose for use by future connections to + * conn's destination. + */ static void consider_recording_trackhost(edge_connection_t *conn, origin_circuit_t *circ) {

1 0

[tor/master] Replace a nasty add-malloc-snprintf with a nice clean asprintf
by nickm＠torproject.org 15 May '11

15 May '11

commit f2871009346e0589455be14e9cef930c19082c0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:41:49 2011 -0400 Replace a nasty add-malloc-snprintf with a nice clean asprintf --- src/or/circuituse.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 86db7c3..7289aa5 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1513,8 +1513,7 @@ static void consider_recording_trackhost(edge_connection_t *conn, origin_circuit_t *circ) { or_options_t *options = get_options(); - size_t len; - char *new_address; + char *new_address = NULL; char fp[HEX_DIGEST_LEN+1]; /* Search the addressmap for this conn's destination. */ @@ -1534,12 +1533,7 @@ consider_recording_trackhost(edge_connection_t *conn, origin_circuit_t *circ) circ->build_state->chosen_exit->identity_digest, DIGEST_LEN); /* Add this exit/hostname pair to the addressmap. */ - len = strlen(conn->socks_request->address) + 1 /* '.' */ + - strlen(fp) + 1 /* '.' */ + - strlen("exit") + 1 /* '\0' */; - new_address = tor_malloc(len); - - tor_snprintf(new_address, len, "%s.%s.exit", + tor_asprintf(&new_address, "%s.%s.exit", conn->socks_request->address, fp); addressmap_register(conn->socks_request->address, new_address,

1 0

[tor/master] Merge branch 'bug1345' into maint-0.2.2
by nickm＠torproject.org 15 May '11

15 May '11

commit a5d40c2d0f1372c119d4a4a4b0287ecea298322e Merge: 228b77f 2bb6bdc Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 15 11:40:14 2011 -0400 Merge branch 'bug1345' into maint-0.2.2 changes/bug1345 | 13 +++++++++++ src/common/container.c | 19 +++++++++++++++++ src/common/container.h | 2 + src/or/circuituse.c | 41 +++++++++++++++++++++++------------- src/or/circuituse.h | 2 + src/or/config.c | 23 ++++++++++++++++++++ src/or/connection_edge.c | 51 +++++++++++++++++++++++++++++++++++++++++++-- src/or/connection_edge.h | 1 + src/or/main.c | 1 - src/or/or.h | 3 ++ 10 files changed, 137 insertions(+), 19 deletions(-)

1 0