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

[tor/master] Add a unittest for the bridge-ip-transports extra-info line.
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit f4b36bee7e76f47953ed61529cdb4cca809eda86 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 25 21:28:10 2013 +0200 Add a unittest for the bridge-ip-transports extra-info line. --- src/test/test.c | 129 +++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 97 insertions(+), 32 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index 4874ada..c3b3684 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1620,6 +1620,34 @@ test_rend_fns(void) tor_free(intro_points_encrypted); } + /* Record odd numbered fake-IPs using ipv6, even numbered fake-IPs + * using ipv4. Since our fake geoip database is the same between + * ipv4 and ipv6, we should get the same result no matter which + * address family we pick for each IP. */ +#define SET_TEST_ADDRESS(i) do { \ + if ((i) & 1) { \ + SET_TEST_IPV6(i); \ + tor_addr_from_in6(&addr, &in6); \ + } else { \ + tor_addr_from_ipv4h(&addr, (uint32_t) i); \ + } \ + } while (0) + + /* Make sure that country ID actually works. */ +#define SET_TEST_IPV6(i) \ + do { \ + set_uint32(in6.s6_addr + 12, htonl((uint32_t) (i))); \ + } while (0) +#define CHECK_COUNTRY(country, val) do { \ + /* test ipv4 country lookup */ \ + test_streq(country, \ + geoip_get_country_name(geoip_get_country_by_ipv4(val))); \ + /* test ipv6 country lookup */ \ + SET_TEST_IPV6(val); \ + test_streq(country, \ + geoip_get_country_name(geoip_get_country_by_ipv6(&in6))); \ + } while (0) + /** Run unit tests for GeoIP code. */ static void test_geoip(void) @@ -1694,21 +1722,6 @@ test_geoip(void) test_eq(4, geoip_get_n_countries()); memset(&in6, 0, sizeof(in6)); - /* Make sure that country ID actually works. */ -#define SET_TEST_IPV6(i) \ - do { \ - set_uint32(in6.s6_addr + 12, htonl((uint32_t) (i))); \ - } while (0) -#define CHECK_COUNTRY(country, val) do { \ - /* test ipv4 country lookup */ \ - test_streq(country, \ - geoip_get_country_name(geoip_get_country_by_ipv4(val))); \ - /* test ipv6 country lookup */ \ - SET_TEST_IPV6(val); \ - test_streq(country, \ - geoip_get_country_name(geoip_get_country_by_ipv6(&in6))); \ - } while (0) - CHECK_COUNTRY("??", 3); CHECK_COUNTRY("ab", 32); CHECK_COUNTRY("??", 5); @@ -1721,21 +1734,6 @@ test_geoip(void) SET_TEST_IPV6(3); test_eq(0, geoip_get_country_by_ipv6(&in6)); -#undef CHECK_COUNTRY - - /* Record odd numbered fake-IPs using ipv6, even numbered fake-IPs - * using ipv4. Since our fake geoip database is the same between - * ipv4 and ipv6, we should get the same result no matter which - * address family we pick for each IP. */ -#define SET_TEST_ADDRESS(i) do { \ - if ((i) & 1) { \ - SET_TEST_IPV6(i); \ - tor_addr_from_in6(&addr, &in6); \ - } else { \ - tor_addr_from_ipv4h(&addr, (uint32_t) i); \ - } \ - } while (0) - get_options_mutable()->BridgeRelay = 1; get_options_mutable()->BridgeRecordUsageByCountry = 1; /* Put 9 observations in AB... */ @@ -1886,8 +1884,6 @@ test_geoip(void) test_streq(entry_stats_2, s); tor_free(s); -#undef SET_TEST_ADDRESS -#undef SET_TEST_IPV6 /* Stop collecting entry statistics. */ geoip_entry_stats_term(); @@ -1898,6 +1894,74 @@ test_geoip(void) tor_free(v); } +static void +test_geoip_with_pt(void) +{ + time_t now = 1281533250; /* 2010-08-11 13:27:30 UTC */ + char *s = NULL; + int i; + tor_addr_t addr; + struct in6_addr in6; + + get_options_mutable()->BridgeRelay = 1; + get_options_mutable()->BridgeRecordUsageByCountry = 1; + + /* No clients seen yet. */ + s = geoip_get_transport_history(); + tor_assert(!s); + + /* 4 connections without a pluggable transport */ + for (i=0; i < 4; ++i) { + SET_TEST_ADDRESS(i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now-7200); + } + + /* 9 connections with "when" */ + for (i=4; i < 13; ++i) { + SET_TEST_ADDRESS(i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "when", now-7200); + } + + /* one connection with "I" */ + SET_TEST_ADDRESS(13); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "I", now-7200); + + /* 14 connections with "was" */ + for (i=14; i < 28; ++i) { + SET_TEST_ADDRESS(i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "was", now-7200); + } + + /* 131 connections with "a" */ + for (i=28; i < 159; ++i) { + SET_TEST_ADDRESS(i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "a", now-7200); + } + + /* 8 connections with "yout" */ + for (i=159; i < 167; ++i) { + SET_TEST_ADDRESS(i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "yout", now-7200); + } + + + /* Test the transport history string. */ + s = geoip_get_transport_history(); + tor_assert(s); + test_streq(s, "<OR>=8,I=8,a=136,was=16,when=16,yout=8"); + + /* Stop collecting entry statistics. */ + geoip_entry_stats_term(); + get_options_mutable()->EntryStatistics = 0; + + done: + tor_free(s); +} + +#undef SET_TEST_ADDRESS +#undef SET_TEST_IPV6 +#undef CHECK_COUNTRY + /** Run unit tests for stats code. */ static void test_stats(void) @@ -2099,6 +2163,7 @@ static struct testcase_t test_array[] = { ENT(policies), ENT(rend_fns), ENT(geoip), + FORK(geoip_with_pt), FORK(stats), END_OF_TESTCASES

1 0

[tor/master] Add transport information to the GeoIP database.
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit 0ec4e5a698d248448aaf684a74fc51f31c84d313 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 11 20:51:41 2013 +0100 Add transport information to the GeoIP database. --- src/or/channel.c | 3 ++- src/or/directory.c | 4 +++- src/or/geoip.c | 16 +++++++++++++++- src/or/geoip.h | 3 ++- src/test/test.c | 24 ++++++++++++------------ 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 98c23d9..4b6c7e1 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2379,7 +2379,8 @@ channel_do_open_actions(channel_t *chan) /* only report it to the geoip module if it's not a known router */ if (!router_get_by_id_digest(chan->identity_digest)) { if (channel_get_addr_if_possible(chan, &remote_addr)) { - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &remote_addr, + /* XXXX 5040/4773 : Is this 'NULL' right? */ + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &remote_addr, NULL, now); } /* Otherwise the underlying transport can't tell us this, so skip it */ diff --git a/src/or/directory.c b/src/or/directory.c index 88d6717..97305ae 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2966,7 +2966,9 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, tor_addr_t addr; if (tor_inet_aton((TO_CONN(conn))->address, &in)) { tor_addr_from_ipv4h(&addr, ntohl(in.s_addr)); - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, time(NULL)); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, + &addr, NULL, + time(NULL)); geoip_note_ns_response(GEOIP_SUCCESS); /* Note that a request for a network status has started, so that we * can measure the download time later on. */ diff --git a/src/or/geoip.c b/src/or/geoip.c index 020075f..b1efefd 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -461,6 +461,10 @@ geoip_db_digest(sa_family_t family) typedef struct clientmap_entry_t { HT_ENTRY(clientmap_entry_t) node; tor_addr_t addr; + /* Name of pluggable transport used by this client. NULL if no + pluggable transport was used. */ + char *transport_name; + /** Time when we last saw this IP address, in MINUTES since the epoch. * * (This will run out of space around 4011 CE. If Tor is still in use around @@ -519,7 +523,9 @@ client_history_clear(void) * configured accordingly. */ void geoip_note_client_seen(geoip_client_action_t action, - const tor_addr_t *addr, time_t now) + const tor_addr_t *addr, + const char *transport_name, + time_t now) { const or_options_t *options = get_options(); clientmap_entry_t lookup, *ent; @@ -534,12 +540,18 @@ geoip_note_client_seen(geoip_client_action_t action, return; } + log_debug(LD_GENERAL, "Seen client from '%s' with transport '%s'.", + safe_str_client(fmt_addr((addr))), + transport_name ? transport_name : "<no transport>"); + tor_addr_copy(&lookup.addr, addr); lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); if (! ent) { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); tor_addr_copy(&ent->addr, addr); + if (transport_name) + ent->transport_name = tor_strdup(transport_name); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } @@ -566,6 +578,7 @@ remove_old_client_helper_(struct clientmap_entry_t *ent, void *_cutoff) { time_t cutoff = *(time_t*)_cutoff / 60; if (ent->last_seen_in_minutes < cutoff) { + tor_free(ent->transport_name); tor_free(ent); return 1; } else { @@ -1515,6 +1528,7 @@ geoip_free_all(void) for (ent = HT_START(clientmap, &client_history); ent != NULL; ent = next) { this = *ent; next = HT_NEXT_RMV(clientmap, &client_history, ent); + tor_free(this->transport_name); tor_free(this); } HT_CLEAR(clientmap, &client_history); diff --git a/src/or/geoip.h b/src/or/geoip.h index d670072..19855c9 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -29,7 +29,8 @@ const char *geoip_db_digest(sa_family_t family); country_t geoip_get_country(const char *countrycode); void geoip_note_client_seen(geoip_client_action_t action, - const tor_addr_t *addr, time_t now); + const tor_addr_t *addr, const char *transport_name, + time_t now); void geoip_remove_old_clients(time_t cutoff); void geoip_note_ns_response(geoip_ns_response_t response); diff --git a/src/test/test.c b/src/test/test.c index 9640169..4874ada 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1741,20 +1741,20 @@ test_geoip(void) /* Put 9 observations in AB... */ for (i=32; i < 40; ++i) { SET_TEST_ADDRESS(i); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now-7200); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now-7200); } SET_TEST_ADDRESS(225); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now-7200); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now-7200); /* and 3 observations in XY, several times. */ for (j=0; j < 10; ++j) for (i=52; i < 55; ++i) { SET_TEST_ADDRESS(i); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now-3600); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now-3600); } /* and 17 observations in ZZ... */ for (i=110; i < 127; ++i) { SET_TEST_ADDRESS(i); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now); } geoip_get_client_history(GEOIP_CLIENT_CONNECT, &s, &v); test_assert(s); @@ -1803,7 +1803,7 @@ test_geoip(void) /* Start testing dirreq statistics by making sure that we don't collect * dirreq stats without initializing them. */ SET_TEST_ADDRESS(100); - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, now); s = geoip_format_dirreq_stats(now + 86400); test_assert(!s); @@ -1811,7 +1811,7 @@ test_geoip(void) * dirreq-stats history string. */ geoip_dirreq_stats_init(now); SET_TEST_ADDRESS(100); - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, now); s = geoip_format_dirreq_stats(now + 86400); test_streq(dirreq_stats_1, s); tor_free(s); @@ -1820,7 +1820,7 @@ test_geoip(void) * don't generate a history string. */ geoip_dirreq_stats_term(); SET_TEST_ADDRESS(101); - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, now); s = geoip_format_dirreq_stats(now + 86400); test_assert(!s); @@ -1828,7 +1828,7 @@ test_geoip(void) * that we get an all empty history string. */ geoip_dirreq_stats_init(now); SET_TEST_ADDRESS(100); - geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_NETWORKSTATUS, &addr, NULL, now); geoip_reset_dirreq_stats(now); s = geoip_format_dirreq_stats(now + 86400); test_streq(dirreq_stats_2, s); @@ -1855,7 +1855,7 @@ test_geoip(void) /* Start testing entry statistics by making sure that we don't collect * anything without initializing entry stats. */ SET_TEST_ADDRESS(100); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now); s = geoip_format_entry_stats(now + 86400); test_assert(!s); @@ -1863,7 +1863,7 @@ test_geoip(void) * entry-stats history string. */ geoip_entry_stats_init(now); SET_TEST_ADDRESS(100); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now); s = geoip_format_entry_stats(now + 86400); test_streq(entry_stats_1, s); tor_free(s); @@ -1872,7 +1872,7 @@ test_geoip(void) * don't generate a history string. */ geoip_entry_stats_term(); SET_TEST_ADDRESS(101); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now); s = geoip_format_entry_stats(now + 86400); test_assert(!s); @@ -1880,7 +1880,7 @@ test_geoip(void) * that we get an all empty history string. */ geoip_entry_stats_init(now); SET_TEST_ADDRESS(100); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, now); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now); geoip_reset_entry_stats(now); s = geoip_format_entry_stats(now + 86400); test_streq(entry_stats_2, s);

1 0

[tor/master] Fix some unittests that broke when we added bridge-ip-transports.
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit f8a9591d3150dacadbae1b99ffa234c9821def5c Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 25 21:29:28 2013 +0200 Fix some unittests that broke when we added bridge-ip-transports. --- src/test/test.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test.c b/src/test/test.c index c3b3684..2ce9f66 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1658,7 +1658,8 @@ test_geoip(void) const char *bridge_stats_1 = "bridge-stats-end 2010-08-12 13:27:30 (86400 s)\n" "bridge-ips zz=24,xy=8\n" - "bridge-ip-versions v4=16,v6=16\n", + "bridge-ip-versions v4=16,v6=16\n" + "bridge-ip-transports <OR>=24\n", *dirreq_stats_1 = "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n" "dirreq-v3-ips ab=8\n"

1 0

[tor/master] Make check-spaces happy.
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit b2c7379aec503f6af3b7cc73660df80fd5edacf7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 28 15:23:24 2013 +0200 Make check-spaces happy. --- src/or/ext_orport.c | 1 - src/or/geoip.c | 4 ++-- src/test/test.c | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index ff752f4..f83002c 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -464,7 +464,6 @@ connection_ext_or_handle_cmd_transport(or_connection_t *conn, return 0; } - /** Process Extended ORPort messages from <b>or_conn</b>. */ int connection_ext_or_process_inbuf(or_connection_t *or_conn) diff --git a/src/or/geoip.c b/src/or/geoip.c index dbb7ddd..7244c56 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -865,7 +865,8 @@ geoip_get_transport_history(void) smartlist_add_asprintf(string_chunks, "%s=%u%s", transport_name, - round_to_next_multiple_of(transport_count, granularity), + round_to_next_multiple_of(transport_count, + granularity), i != smartlist_len(transports_used) ? "," : ""); } SMARTLIST_FOREACH_END(transport_name); @@ -1348,7 +1349,6 @@ validate_bridge_stats(const char *stats_str, time_t now) return 0; } - return 1; } diff --git a/src/test/test.c b/src/test/test.c index 2ce9f66..cf4febf 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1885,7 +1885,6 @@ test_geoip(void) test_streq(entry_stats_2, s); tor_free(s); - /* Stop collecting entry statistics. */ geoip_entry_stats_term(); get_options_mutable()->EntryStatistics = 0; @@ -1945,7 +1944,6 @@ test_geoip_with_pt(void) geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "yout", now-7200); } - /* Test the transport history string. */ s = geoip_get_transport_history(); tor_assert(s);

1 0

[tor/master] Add a changes file for #5040.
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit 4d325182886072107ec1e5089701d9152be2604c Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 28 15:18:32 2013 +0200 Add a changes file for #5040. --- changes/bug5040 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug5040 b/changes/bug5040 new file mode 100644 index 0000000..a2c37e7 --- /dev/null +++ b/changes/bug5040 @@ -0,0 +1,4 @@ + o Minor features: + - Bridges now track the usage of their pluggable transports and + report statistics in their extra-info descriptors. Resolves + ticket 5040.

1 0

[tor/master] Trivially change unittests to make them more readable.
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit 85c556a4c265f6ce9587c46d0040f57cb09618bc Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 29 14:46:45 2013 +0300 Trivially change unittests to make them more readable. Pluggable transport names are now in alphabetical order like they appear in the bridge-ip-transports string. --- src/test/test.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index cf4febf..822f93a 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1916,38 +1916,38 @@ test_geoip_with_pt(void) geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, NULL, now-7200); } - /* 9 connections with "when" */ + /* 9 connections with "alpha" */ for (i=4; i < 13; ++i) { SET_TEST_ADDRESS(i); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "when", now-7200); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "alpha", now-7200); } - /* one connection with "I" */ + /* one connection with "beta" */ SET_TEST_ADDRESS(13); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "I", now-7200); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "beta", now-7200); - /* 14 connections with "was" */ + /* 14 connections with "charlie" */ for (i=14; i < 28; ++i) { SET_TEST_ADDRESS(i); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "was", now-7200); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "charlie", now-7200); } - /* 131 connections with "a" */ + /* 131 connections with "ddr" */ for (i=28; i < 159; ++i) { SET_TEST_ADDRESS(i); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "a", now-7200); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "ddr", now-7200); } - /* 8 connections with "yout" */ + /* 8 connections with "entropy" */ for (i=159; i < 167; ++i) { SET_TEST_ADDRESS(i); - geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "yout", now-7200); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "entropy", now-7200); } /* Test the transport history string. */ s = geoip_get_transport_history(); tor_assert(s); - test_streq(s, "<OR>=8,I=8,a=136,was=16,when=16,yout=8"); + test_streq(s, "<OR>=8,alpha=16,beta=8,charlie=16,ddr=136,entropy=8"); /* Stop collecting entry statistics. */ geoip_entry_stats_term();

1 0

[tor/master] Fix a number of issues with the #5040 code.
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit cb54e44587473782c2865c3ea4aca6e0666943a8 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jun 27 17:50:56 2013 +0300 Fix a number of issues with the #5040 code. - Don't leak if a transport proxy sends us a TRANSPORT command more than once. - Don't use smartlist_string_isin() in geoip_get_transport_history(). (pointed out by Nick) - Use the 'join' argument of smartlist_join_strings() instead of trying to write the separator on our own. (pointed out by Nick) - Document 'ext_or_transport' a bit better. (pointed out by Nick) - Be a bit more consistent with the types of the values of 'transport_counts'. (pointed out by Nick) --- src/or/ext_orport.c | 6 ++++++ src/or/geoip.c | 13 +++++-------- src/or/or.h | 5 +++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index f83002c..8fd9b77 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -460,6 +460,12 @@ connection_ext_or_handle_cmd_transport(or_connection_t *conn, return -1; } + /* If ext_or_transport is already occupied (because the PT sent two + * TRANSPORT commands), deallocate the old name and keep the new + * one */ + if (conn->ext_or_transport) + tor_free(conn->ext_or_transport); + conn->ext_or_transport = transport_str; return 0; } diff --git a/src/or/geoip.c b/src/or/geoip.c index 7244c56..737512f 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -807,7 +807,6 @@ geoip_get_transport_history(void) const char *transport_name = NULL; smartlist_t *string_chunks = smartlist_new(); char *the_string = NULL; - int i = 0; /* If we haven't seen any clients yet, return NULL. */ if (HT_EMPTY(&client_history)) @@ -841,7 +840,7 @@ geoip_get_transport_history(void) strmap_set(transport_counts, transport_name, ptr); /* If it's the first time we see this transport, note it. */ - if (!smartlist_contains_string(transports_used, transport_name)) + if (val == 1) smartlist_add(transports_used, tor_strdup(transport_name)); log_debug(LD_GENERAL, "Client from '%s' with transport '%s'. " @@ -857,20 +856,18 @@ geoip_get_transport_history(void) /* Loop through all seen transports. */ SMARTLIST_FOREACH_BEGIN(transports_used, const char *, transport_name) { void *transport_count_ptr = strmap_get(transport_counts, transport_name); - unsigned int transport_count = (uintptr_t) transport_count_ptr; - i++; /* counter so that we don't add a comma if it's the last transport. */ + unsigned int transport_count = (intptr_t) transport_count_ptr; log_debug(LD_GENERAL, "We got %u clients with transport '%s'.", transport_count, transport_name); - smartlist_add_asprintf(string_chunks, "%s=%u%s", + smartlist_add_asprintf(string_chunks, "%s=%u", transport_name, round_to_next_multiple_of(transport_count, - granularity), - i != smartlist_len(transports_used) ? "," : ""); + granularity)); } SMARTLIST_FOREACH_END(transport_name); - the_string = smartlist_join_strings(string_chunks, "", 0, NULL); + the_string = smartlist_join_strings(string_chunks, ",", 0, NULL); log_debug(LD_GENERAL, "Final bridge-ip-transports string: '%s'", the_string); diff --git a/src/or/or.h b/src/or/or.h index 7916c47..9b519a7 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1452,8 +1452,9 @@ typedef struct or_connection_t { char *ext_or_conn_id; /** Client hash of the Extended ORPort authentication scheme */ char *ext_or_auth_correct_client_hash; - /** Name of the pluggable transport that is obfuscating this - connection. If no pluggable transports are used, it's NULL. */ + /** String carrying the name of the pluggable transport + * (e.g. "obfs2") that is obfuscating this connection. If no + * pluggable transports are used, it's NULL. */ char *ext_or_transport; char *nickname; /**< Nickname of OR on other side (if any). */

1 0

[tor/master] Use only uintptr_t for the value of transport_count
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit 656842441039399aca0dee95b7c51be7a3749ce0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 13:14:44 2013 -0400 Use only uintptr_t for the value of transport_count --- src/or/geoip.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 866f6a7..b4f54d4 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -810,8 +810,6 @@ geoip_get_transport_history(void) unsigned granularity = IP_GRANULARITY; /** String hash table <name of transport> -> <number of users>. */ strmap_t *transport_counts = strmap_new(); - void *ptr; - intptr_t val; /** Smartlist that contains copies of the names of the transports that have been used. */ @@ -847,13 +845,15 @@ geoip_get_transport_history(void) /* Loop through all clients. */ HT_FOREACH(ent, clientmap, &client_history) { + uintptr_t val; + void *ptr; transport_name = (*ent)->transport_name; if (!transport_name) transport_name = no_transport_str; /* Increase the count for this transport name. */ ptr = strmap_get(transport_counts, transport_name); - val = (intptr_t)ptr; + val = (uintptr_t)ptr; val++; ptr = (void*)val; strmap_set(transport_counts, transport_name, ptr); @@ -875,15 +875,16 @@ geoip_get_transport_history(void) /* Loop through all seen transports. */ SMARTLIST_FOREACH_BEGIN(transports_used, const char *, transport_name) { void *transport_count_ptr = strmap_get(transport_counts, transport_name); - unsigned int transport_count = (intptr_t) transport_count_ptr; + uintptr_t transport_count = (uintptr_t) transport_count_ptr; - log_debug(LD_GENERAL, "We got %u clients with transport '%s'.", - transport_count, transport_name); + log_debug(LD_GENERAL, "We got "U64_FORMAT" clients with transport '%s'.", + U64_PRINTF_ARG((uint64_t)transport_count), transport_name); - smartlist_add_asprintf(string_chunks, "%s=%u", + smartlist_add_asprintf(string_chunks, "%s="U64_FORMAT, transport_name, - round_to_next_multiple_of(transport_count, - granularity)); + U64_PRINTF_ARG(round_uint64_to_next_multiple_of( + (uint64_t)transport_count, + granularity))); } SMARTLIST_FOREACH_END(transport_name); the_string = smartlist_join_strings(string_chunks, ",", 0, NULL);

1 0

[tor/master] If a single client connects with multiple transports, note all transports.
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit 6ad535e6dca8e9e284a0fa3384679756dca34a87 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jun 27 18:27:44 2013 +0300 If a single client connects with multiple transports, note all transports. --- src/or/geoip.c | 19 +++++++++++++++++++ src/test/test.c | 7 ++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 737512f..866f6a7 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -492,6 +492,19 @@ clientmap_entry_hash(const clientmap_entry_t *a) static INLINE int clientmap_entries_eq(const clientmap_entry_t *a, const clientmap_entry_t *b) { + /* If one entry contains a transport and the other doesn't, then + they are not equal. */ + if (a->transport_name && !b->transport_name) + return 0; + if (!a->transport_name && b->transport_name) + return 0; + /* If entries contain different transports, they they are not + equal. */ + if (a->transport_name && + b->transport_name && + strcmp(a->transport_name, b->transport_name)) + return 0; + return !tor_addr_compare(&a->addr, &b->addr, CMP_EXACT) && a->action == b->action; } @@ -529,6 +542,8 @@ geoip_note_client_seen(geoip_client_action_t action, { const or_options_t *options = get_options(); clientmap_entry_t lookup, *ent; + memset(&lookup, 0, sizeof(clientmap_entry_t)); + if (action == GEOIP_CLIENT_CONNECT) { /* Only remember statistics as entry guard or as bridge. */ if (!options->EntryStatistics && @@ -546,7 +561,11 @@ geoip_note_client_seen(geoip_client_action_t action, tor_addr_copy(&lookup.addr, addr); lookup.action = (int)action; + if (transport_name) + lookup.transport_name = tor_strdup(transport_name); ent = HT_FIND(clientmap, &client_history, &lookup); + tor_free(lookup.transport_name); + if (! ent) { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); tor_addr_copy(&ent->addr, addr); diff --git a/src/test/test.c b/src/test/test.c index 822f93a..e0c6772 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1944,10 +1944,15 @@ test_geoip_with_pt(void) geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "entropy", now-7200); } + /* 2 connections from the same IP with two different transports. */ + SET_TEST_ADDRESS(++i); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "fire", now-7200); + geoip_note_client_seen(GEOIP_CLIENT_CONNECT, &addr, "google", now-7200); + /* Test the transport history string. */ s = geoip_get_transport_history(); tor_assert(s); - test_streq(s, "<OR>=8,alpha=16,beta=8,charlie=16,ddr=136,entropy=8"); + test_streq(s, "<OR>=8,alpha=16,beta=8,charlie=16,ddr=136,entropy=8,fire=8,google=8"); /* Stop collecting entry statistics. */ geoip_entry_stats_term();

1 0

[tor/master] Fix a variety of issues in 4773
by nickm＠torproject.org 15 Aug '13

15 Aug '13

commit 550af7be0ae49f98d6ee7724934de115c80de4a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 13:54:10 2013 -0400 Fix a variety of issues in 4773 memwipe some stack-allocated stuff Add DOCDOC comments for state machines Use memdup_nulterm as appropriate Check for NULs in useraddr Add a macro so that <= AUTH_MAX has a meaning. --- src/or/ext_orport.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index 72dbaa5..7dfe624 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -165,6 +165,7 @@ init_ext_or_cookie_authentication(int is_enabled) log_info(LD_GENERAL, "Generated Extended ORPort cookie file in '%s'.", fname); + memwipe(cookie_file_string, 0, sizeof(cookie_file_string)); tor_free(fname); return 0; } @@ -223,6 +224,9 @@ connection_ext_or_auth_handle_client_nonce(connection_t *conn) EXT_OR_PORT_AUTH_NONCE_LEN, conn) < 0) return -1; + /* DOCDOC comment this function more, with comments about what the + * protocol is. */ + /* Get our nonce */ if (crypto_rand(server_nonce, EXT_OR_PORT_AUTH_NONCE_LEN) < 0) return -1; @@ -271,6 +275,9 @@ connection_ext_or_auth_handle_client_nonce(connection_t *conn) with the hash sent by the client. */ TO_OR_CONN(conn)->ext_or_auth_correct_client_hash = correct_client_hash; + memwipe(hmac_s_msg, 0, hmac_s_msg_len); + memwipe(hmac_c_msg, 0, hmac_c_msg_len); + tor_free(hmac_s_msg); tor_free(hmac_c_msg); } @@ -290,6 +297,10 @@ connection_ext_or_auth_handle_client_nonce(connection_t *conn) log_debug(LD_GENERAL, "server_hash: '%s'\nserver_nonce: '%s'\nclient_nonce: '%s'", server_hash_encoded, server_nonce_encoded, client_nonce_encoded); + + memwipe(server_hash_encoded, 0, sizeof(server_hash_encoded)); + memwipe(server_nonce_encoded, 0, sizeof(server_nonce_encoded)); + memwipe(client_nonce_encoded, 0, sizeof(client_nonce_encoded)); } { /* write reply: (server_hash, server_nonce) */ @@ -297,6 +308,7 @@ connection_ext_or_auth_handle_client_nonce(connection_t *conn) memcpy(reply + EXT_OR_PORT_AUTH_HASH_LEN, server_nonce, EXT_OR_PORT_AUTH_NONCE_LEN); connection_write_to_buf(reply, sizeof(reply), conn); + memwipe(reply, 0, sizeof(reply)); } log_debug(LD_GENERAL, "Got client nonce, and sent our own nonce and hash."); @@ -362,6 +374,8 @@ connection_ext_or_auth_process_inbuf(or_connection_t *or_conn) { connection_t *conn = TO_CONN(or_conn); + /* DOCDOC Document the state machine here! */ + switch (conn->state) { /* Functionify */ case EXT_OR_CONN_STATE_AUTH_WAIT_AUTH_TYPE: return connection_ext_or_auth_neg_auth_type(conn); @@ -406,9 +420,12 @@ connection_ext_or_handle_cmd_useraddr(connection_t *conn, char *addr_str; char *address_part=NULL; int res; - addr_str = tor_malloc(len + 1); - memcpy(addr_str, payload, len); - addr_str[len] = 0; + if (memchr(payload, '\0', len)) { + log_fn(LOG_PROTOCOL_WARN, LD_NET, "Unexpected NUL in ExtORPort UserAddr"); + return -1; + } + + addr_str = tor_memdup_nulterm(payload, len); res = tor_addr_port_split(LOG_INFO, addr_str, &address_part, &port); tor_free(addr_str); @@ -470,6 +487,9 @@ connection_ext_or_handle_cmd_transport(or_connection_t *conn, return 0; } +#define EXT_OR_CONN_STATE_IS_AUTHENTICATING(st) \ + ((st) <= EXT_OR_CONN_STATE_AUTH_MAX) + /** Process Extended ORPort messages from <b>or_conn</b>. */ int connection_ext_or_process_inbuf(or_connection_t *or_conn) @@ -478,9 +498,11 @@ connection_ext_or_process_inbuf(or_connection_t *or_conn) ext_or_cmd_t *command; int r; + /* DOCDOC Document the state machine and transitions in this function */ + /* If we are still in the authentication stage, process traffic as authentication data: */ - while (conn->state <= EXT_OR_CONN_STATE_AUTH_MAX) { + while (EXT_OR_CONN_STATE_IS_AUTHENTICATING(conn->state)) { log_debug(LD_GENERAL, "Got Extended ORPort authentication data (%u).", (unsigned int) connection_get_inbuf_len(conn)); r = connection_ext_or_auth_process_inbuf(or_conn);

1 0