October 2015 - tor-commits - lists.torproject.org

[torspec/master] Add additional comments to prop#188 on bridge reachability self-testing.
by isis＠torproject.org 30 Oct '15

30 Oct '15

commit eb9ac3b859b95d9a53bc850e79c04698bc5268d4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Oct 30 14:38:05 2015 +0000 Add additional comments to prop#188 on bridge reachability self-testing. --- proposals/188-bridge-guards.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/proposals/188-bridge-guards.txt b/proposals/188-bridge-guards.txt index 4303937..5d09412 100644 --- a/proposals/188-bridge-guards.txt +++ b/proposals/188-bridge-guards.txt @@ -482,6 +482,24 @@ Status: Accepted entirely, by automatically setting "AssumeReachable 1" for all bridge relays… although I am not sure if this is wise. + Our best idea thus far, for bridge reachability self-testing, is to create + a circuit like so: + + Bridge → Guard → Middle → OtherMiddle → Guard → Bridge + + While, clearly, that circuit is just a little bit insane, it must be that + way because we cannot simply do: + + Bridge → Guard → Middle → Guard → Bridge + + because the Middle would refuse to extend back to the previous node + (all ORs follow this rule). Similarly, it would be inane to do: + + Bridge → Guard → Middle → OtherMiddle → Bridge + + because, obviously, that merely shifts the problem to OtherMiddle and + accomplishes nothing. [XXX Is there something smarter we could do? —IL] + 5.2.2. Bridge Reachability Testing by the BridgeAuthority After receiving Bob's descriptors, the BridgeAuthority attempts to

1 0

[tor/master] Use NS_SUBMODULEs in test_dns.c
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 2f5d0ea13341367e086d2c7a795894ba34029bcb Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Sep 27 19:51:04 2015 +0300 Use NS_SUBMODULEs in test_dns.c --- src/test/test_dns.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/test/test_dns.c b/src/test/test_dns.c index ad81914..6549339 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -6,8 +6,12 @@ #include "dns.h" #include "connection.h" +#define NS_MODULE dns + +#define NS_SUBMODULE clip_ttl + static void -test_dns_clip_ttl(void *arg) +NS(test_main)(void *arg) { (void)arg; @@ -21,8 +25,12 @@ test_dns_clip_ttl(void *arg) return; } +#undef NS_SUBMODULE + +#define NS_SUBMODULE expiry_ttl + static void -test_dns_expiry_ttl(void *arg) +NS(test_main)(void *arg) { (void)arg; @@ -36,6 +44,10 @@ test_dns_expiry_ttl(void *arg) return; } +#undef NS_SUBMODULE + +#define NS_SUBMODULE resolve + static int resolve_retval = 0; static int resolve_made_conn_pending = 0; static char *resolved_name = NULL; @@ -130,7 +142,7 @@ connection_free_replacement(connection_t *conn) } static void -test_dns_resolve_outer(void *arg) +NS(test_main)(void *arg) { (void) arg; int retval; @@ -302,10 +314,14 @@ test_dns_resolve_outer(void *arg) return; } +#undef NS_SUBMODULE + struct testcase_t dns_tests[] = { - { "clip_ttl", test_dns_clip_ttl, 0, NULL, NULL }, - { "expiry_ttl", test_dns_expiry_ttl, 0, NULL, NULL }, - { "resolve_outer", test_dns_resolve_outer, TT_FORK, NULL, NULL }, + TEST_CASE(clip_ttl), + TEST_CASE(expiry_ttl), + TEST_CASE(resolve), END_OF_TESTCASES }; +#undef NS_MODULE +

1 0

[tor/master] First test case for dns_resolve_impl().
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 595bd9295c438ed0b889287845ef75da30abd2aa Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Oct 7 22:14:48 2015 +0300 First test case for dns_resolve_impl(). --- src/test/test_dns.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 654f813..04c84af 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -321,10 +321,144 @@ NS(test_main)(void *arg) #undef NS_SUBMODULE +#define NS_SUBMODULE ASPECT(resolve_impl, addr_is_ip_no_need_to_resolve) + +/* + * Given that exitconn->base_.address is IP address string, we + * want dns_resolve_impl() to parse it and store in + * exitconn->base_.addr. We expect dns_resolve_impl to return 1. + * Lastly, we want it to set the TTL value to default one for DNS queries. + */ + +static void +NS(test_main)(void *arg) +{ + int retval; + int made_pending; + const tor_addr_t *resolved_addr; + tor_addr_t addr_to_compare; + + tor_addr_parse(&addr_to_compare, "8.8.8.8"); + + or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + + edge_connection_t *exitconn = tor_malloc_zero(sizeof(edge_connection_t)); + TO_CONN(exitconn)->type = CONN_TYPE_EXIT; + TO_CONN(exitconn)->magic = EDGE_CONNECTION_MAGIC; + TO_CONN(exitconn)->purpose = EXIT_PURPOSE_RESOLVE; + TO_CONN(exitconn)->state = EXIT_CONN_STATE_RESOLVING; + exitconn->base_.s = TOR_INVALID_SOCKET; + + TO_CONN(exitconn)->address = tor_strdup("8.8.8.8"); + + retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, + NULL); + + resolved_addr = &(exitconn->base_.addr); + + tt_int_op(retval,==,1); + tt_assert(tor_addr_compare(resolved_addr, + (const tor_addr_t *)&addr_to_compare, CMP_EXACT) == 0); + tt_int_op(exitconn->address_ttl,==,DEFAULT_DNS_TTL); + + done: + tor_free(on_circ); + tor_free(TO_CONN(exitconn)->address); + tor_free(exitconn); + return; +} + +#undef NS_SUBMODULE + +#define NS_SUBMODULE ASPECT(resolve_impl, non_exit) + +static void +NS(test_main)(void *arg) +{ + tt_skip(); + + done: + return; +} + +#undef NS_SUBMODULE + +#define NS_SUBMODULE ASPECT(resolve_impl, addr_is_invalid_dest) + +static void +NS(test_main)(void *arg) +{ + tt_skip(); + + done: + return; +} + +#undef NS_SUBMODULE + +#define NS_SUBMODULE ASPECT(resolve_impl, malformed_ptr) + +static void +NS(test_main)(void *arg) +{ + tt_skip(); + + done: + return; +} + +#undef NS_SUBMODULE + +#define NS_SUBMODULE ASPECT(resolve_impl, cache_hit_pending) + +static void +NS(test_main)(void *arg) +{ + tt_skip(); + + done: + return; +} + +#undef NS_SUBMODULE + +#define NS_SUBMODULE ASPECT(resolve_impl, cache_hit_cached) + +static void +NS(test_main)(void *arg) +{ + tt_skip(); + + done: + return; +} + +#undef NS_SUBMODULE + +#define NS_SUBMODULE ASPECT(resolve_impl, cache_miss) + +static void +NS(test_main)(void *arg) +{ + tt_skip(); + + done: + return; +} + +#undef NS_SUBMODULE + struct testcase_t dns_tests[] = { TEST_CASE(clip_ttl), TEST_CASE(expiry_ttl), TEST_CASE(resolve), + TEST_CASE_ASPECT(resolve_impl, addr_is_ip_no_need_to_resolve), + TEST_CASE_ASPECT(resolve_impl, non_exit), + TEST_CASE_ASPECT(resolve_impl, addr_is_invalid_dest), + TEST_CASE_ASPECT(resolve_impl, malformed_ptr), + TEST_CASE_ASPECT(resolve_impl, cache_hit_pending), + TEST_CASE_ASPECT(resolve_impl, cache_hit_cached), + TEST_CASE_ASPECT(resolve_impl, cache_miss), END_OF_TESTCASES };

1 0

[tor/master] Using namespace macros for mock functions in test_dns.c
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 882d33a80c36cb4c2b137a0fedaf5758c1d1f748 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Sep 28 21:44:05 2015 +0300 Using namespace macros for mock functions in test_dns.c --- src/test/test_dns.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 6549339..654f813 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -55,6 +55,11 @@ static cached_resolve_t *cache_entry = NULL; static int n_fake_impl = 0; +NS_DECL(int, dns_resolve_impl, (edge_connection_t *exitconn, int is_resolve, + or_circuit_t *oncirc, char **hostname_out, + int *made_connection_pending_out, + cached_resolve_t **resolve_out)); + /** This will be our configurable substitute for dns_resolve_impl in * dns.c. It will return resolve_retval, * and set resolve_made_conn_pending to @@ -64,10 +69,10 @@ static int n_fake_impl = 0; * 1. */ static int -dns_resolve_fake_impl(edge_connection_t *exitconn, int is_resolve, - or_circuit_t *oncirc, char **hostname_out, - int *made_connection_pending_out, - cached_resolve_t **resolve_out) +NS(dns_resolve_impl)(edge_connection_t *exitconn, int is_resolve, + or_circuit_t *oncirc, char **hostname_out, + int *made_connection_pending_out, + cached_resolve_t **resolve_out) { (void)oncirc; (void)exitconn; @@ -94,8 +99,8 @@ static uint8_t last_answer_type = 0; static cached_resolve_t *last_resolved; static void -send_resolved_cell_replacement(edge_connection_t *conn, uint8_t answer_type, - const cached_resolve_t *resolved) +NS(send_resolved_cell)(edge_connection_t *conn, uint8_t answer_type, + const cached_resolve_t *resolved) { conn_for_resolved_cell = conn; @@ -110,8 +115,8 @@ static int n_send_resolved_hostname_cell_replacement = 0; static char *last_resolved_hostname = NULL; static void -send_resolved_hostname_cell_replacement(edge_connection_t *conn, - const char *hostname) +NS(send_resolved_hostname_cell)(edge_connection_t *conn, + const char *hostname) { conn_for_resolved_cell = conn; @@ -124,7 +129,7 @@ send_resolved_hostname_cell_replacement(edge_connection_t *conn, static int n_dns_cancel_pending_resolve_replacement = 0; static void -dns_cancel_pending_resolve_replacement(const char *address) +NS(dns_cancel_pending_resolve)(const char *address) { (void) address; n_dns_cancel_pending_resolve_replacement++; @@ -134,7 +139,7 @@ static int n_connection_free = 0; static connection_t *last_freed_conn = NULL; static void -connection_free_replacement(connection_t *conn) +NS(connection_free)(connection_t *conn) { n_connection_free++; @@ -161,9 +166,9 @@ NS(test_main)(void *arg) memset(exitconn,0,sizeof(edge_connection_t)); memset(nextconn,0,sizeof(edge_connection_t)); - MOCK(dns_resolve_impl,dns_resolve_fake_impl); - MOCK(send_resolved_cell,send_resolved_cell_replacement); - MOCK(send_resolved_hostname_cell,send_resolved_hostname_cell_replacement); + NS_MOCK(dns_resolve_impl); + NS_MOCK(send_resolved_cell); + NS_MOCK(send_resolved_hostname_cell); /* * CASE 1: dns_resolve_impl returns 1 and sets a hostname. purpose is @@ -276,8 +281,8 @@ NS(test_main)(void *arg) * on exitconn with type being RESOLVED_TYPE_ERROR. */ - MOCK(dns_cancel_pending_resolve,dns_cancel_pending_resolve_replacement); - MOCK(connection_free,connection_free_replacement); + NS_MOCK(dns_cancel_pending_resolve); + NS_MOCK(connection_free); exitconn->on_circuit = &(on_circuit->base_); exitconn->base_.purpose = EXIT_PURPOSE_RESOLVE; @@ -300,11 +305,11 @@ NS(test_main)(void *arg) tt_assert(last_freed_conn == TO_CONN(exitconn)); done: - UNMOCK(dns_resolve_impl); - UNMOCK(send_resolved_cell); - UNMOCK(send_resolved_hostname_cell); - UNMOCK(dns_cancel_pending_resolve); - UNMOCK(connection_free); + NS_UNMOCK(dns_resolve_impl); + NS_UNMOCK(send_resolved_cell); + NS_UNMOCK(send_resolved_hostname_cell); + NS_UNMOCK(dns_cancel_pending_resolve); + NS_UNMOCK(connection_free); tor_free(on_circuit); tor_free(exitconn); tor_free(nextconn);

1 0

[tor/master] A second test case for dns_resolve_impl.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 1096f7638e883f9a6dfc86b9804090f090afb68f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Oct 8 21:47:52 2015 +0300 A second test case for dns_resolve_impl. --- src/or/router.c | 4 ++-- src/or/router.h | 2 +- src/test/test_dns.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 9c6204c..1790416 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1714,8 +1714,8 @@ router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port) /** Return true iff my exit policy is reject *:*. Return -1 if we don't * have a descriptor */ -int -router_my_exit_policy_is_reject_star(void) +MOCK_IMPL(int, +router_my_exit_policy_is_reject_star,(void)) { if (!router_get_my_routerinfo()) /* make sure desc_routerinfo exists */ return -1; diff --git a/src/or/router.h b/src/or/router.h index 2e8c025..85f43d8 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -80,7 +80,7 @@ void check_descriptor_ipaddress_changed(time_t now); void router_new_address_suggestion(const char *suggestion, const dir_connection_t *d_conn); int router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port); -int router_my_exit_policy_is_reject_star(void); +MOCK_DECL(int, router_my_exit_policy_is_reject_star,(void)); MOCK_DECL(const routerinfo_t *, router_get_my_routerinfo, (void)); extrainfo_t *router_get_my_extrainfo(void); const char *router_get_my_descriptor(void); diff --git a/src/test/test_dns.c b/src/test/test_dns.c index f1b11a8..88a2f4a 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -5,6 +5,7 @@ #include "dns.h" #include "connection.h" +#include "router.h" #define NS_MODULE dns @@ -382,12 +383,38 @@ NS(test_main)(void *arg) #define NS_SUBMODULE ASPECT(resolve_impl, non_exit) +/** Given that Tor instance is not configured as an exit node, we want + * dns_resolve_impl() to fail with return value -1. + */ +static int +NS(router_my_exit_policy_is_reject_star)(void) +{ + return 1; +} + static void NS(test_main)(void *arg) { - tt_skip(); + int retval; + int made_pending; + + edge_connection_t *exitconn = create_valid_exitconn(); + or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); + + NS_MOCK(router_my_exit_policy_is_reject_star); + + retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, + NULL); + + tt_int_op(retval,==,-1); done: + tor_free(TO_CONN(exitconn)->address); + tor_free(exitconn); + tor_free(on_circ); + NS_UNMOCK(router_my_exit_policy_is_reject_star); return; }

1 0

[tor/master] Making it slightly cleaner.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 2fc841aacbfdb0e824ab3bed9e06db8d9c793747 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Oct 8 21:27:17 2015 +0300 Making it slightly cleaner. --- src/test/test_dns.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 04c84af..f1b11a8 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -321,6 +321,22 @@ NS(test_main)(void *arg) #undef NS_SUBMODULE +/** Create an edge_connection_t instance that is considered a + * valid exit connection by asserts in dns_resolve_impl. + */ +static edge_connection_t * +create_valid_exitconn(void) +{ + edge_connection_t *exitconn = tor_malloc_zero(sizeof(edge_connection_t)); + TO_CONN(exitconn)->type = CONN_TYPE_EXIT; + TO_CONN(exitconn)->magic = EDGE_CONNECTION_MAGIC; + TO_CONN(exitconn)->purpose = EXIT_PURPOSE_RESOLVE; + TO_CONN(exitconn)->state = EXIT_CONN_STATE_RESOLVING; + exitconn->base_.s = TOR_INVALID_SOCKET; + + return exitconn; +} + #define NS_SUBMODULE ASPECT(resolve_impl, addr_is_ip_no_need_to_resolve) /* @@ -342,12 +358,7 @@ NS(test_main)(void *arg) or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); - edge_connection_t *exitconn = tor_malloc_zero(sizeof(edge_connection_t)); - TO_CONN(exitconn)->type = CONN_TYPE_EXIT; - TO_CONN(exitconn)->magic = EDGE_CONNECTION_MAGIC; - TO_CONN(exitconn)->purpose = EXIT_PURPOSE_RESOLVE; - TO_CONN(exitconn)->state = EXIT_CONN_STATE_RESOLVING; - exitconn->base_.s = TOR_INVALID_SOCKET; + edge_connection_t *exitconn = create_valid_exitconn(); TO_CONN(exitconn)->address = tor_strdup("8.8.8.8"); @@ -357,8 +368,7 @@ NS(test_main)(void *arg) resolved_addr = &(exitconn->base_.addr); tt_int_op(retval,==,1); - tt_assert(tor_addr_compare(resolved_addr, - (const tor_addr_t *)&addr_to_compare, CMP_EXACT) == 0); + tt_assert(tor_addr_eq(resolved_addr, (const tor_addr_t *)&addr_to_compare)); tt_int_op(exitconn->address_ttl,==,DEFAULT_DNS_TTL); done:

1 0

[tor/master] Third test case for dns_resolve_impl.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 787a27be3e27d11d873352a8eb14e068ed3fdad5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Oct 10 17:49:24 2015 +0300 Third test case for dns_resolve_impl. --- src/test/test_dns.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 88a2f4a..aeabdf6 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -422,12 +422,40 @@ NS(test_main)(void *arg) #define NS_SUBMODULE ASPECT(resolve_impl, addr_is_invalid_dest) +/** Given that address is not a valid destination (as judged by + * address_is_invalid_destination() function), we want dns_resolve_impl() + * function to fail with return value -1. + */ + +static int +NS(router_my_exit_policy_is_reject_star)(void) +{ + return 0; +} + static void NS(test_main)(void *arg) { - tt_skip(); + int retval; + int made_pending; + + edge_connection_t *exitconn = create_valid_exitconn(); + or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + + NS_MOCK(router_my_exit_policy_is_reject_star); + + TO_CONN(exitconn)->address = tor_strdup("invalid#(a)!.org"); + + retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, + NULL); + + tt_int_op(retval,==,-1); done: + NS_UNMOCK(router_my_exit_policy_is_reject_star); + tor_free(TO_CONN(exitconn)->address); + tor_free(exitconn); + tor_free(on_circ); return; }

1 0

[tor/master] Add a fourth test case.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit 72bd192d80f8fed04c35f1a34b0e762562a41c48 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Oct 10 18:03:11 2015 +0300 Add a fourth test case. --- src/test/test_dns.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/test/test_dns.c b/src/test/test_dns.c index aeabdf6..510fec1 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -463,12 +463,49 @@ NS(test_main)(void *arg) #define NS_SUBMODULE ASPECT(resolve_impl, malformed_ptr) +/** Given that address is a malformed PTR name, we want dns_resolve_impl to + * fail. + */ + +static int +NS(router_my_exit_policy_is_reject_star)(void) +{ + return 0; +} + static void NS(test_main)(void *arg) { - tt_skip(); + int retval; + int made_pending; + + edge_connection_t *exitconn = create_valid_exitconn(); + or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + + TO_CONN(exitconn)->address = tor_strdup("127.0.0.1.in-addr.arpa"); + + NS_MOCK(router_my_exit_policy_is_reject_star); + + retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, + NULL); + + tt_int_op(retval,==,-1); + + tor_free(TO_CONN(exitconn)->address); + + TO_CONN(exitconn)->address = + tor_strdup("z01234567890123456789.in-addr.arpa"); + + retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, + NULL); + + tt_int_op(retval,==,-1); done: + NS_UNMOCK(router_my_exit_policy_is_reject_star); + tor_free(TO_CONN(exitconn)->address); + tor_free(exitconn); + tor_free(on_circ); return; }

1 0

[tor/master] Whitespace fixes.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit bb8ec2e1c61e7083cda37845ad40bc0997a16901 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Oct 12 21:13:01 2015 +0300 Whitespace fixes. --- src/test/test_dns.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_dns.c b/src/test/test_dns.c index 510fec1..f316de2 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -342,7 +342,7 @@ create_valid_exitconn(void) /* * Given that exitconn->base_.address is IP address string, we - * want dns_resolve_impl() to parse it and store in + * want dns_resolve_impl() to parse it and store in * exitconn->base_.addr. We expect dns_resolve_impl to return 1. * Lastly, we want it to set the TTL value to default one for DNS queries. */ @@ -361,7 +361,7 @@ NS(test_main)(void *arg) edge_connection_t *exitconn = create_valid_exitconn(); - TO_CONN(exitconn)->address = tor_strdup("8.8.8.8"); + TO_CONN(exitconn)->address = tor_strdup("8.8.8.8"); retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, NULL); @@ -371,7 +371,7 @@ NS(test_main)(void *arg) tt_int_op(retval,==,1); tt_assert(tor_addr_eq(resolved_addr, (const tor_addr_t *)&addr_to_compare)); tt_int_op(exitconn->address_ttl,==,DEFAULT_DNS_TTL); - + done: tor_free(on_circ); tor_free(TO_CONN(exitconn)->address); @@ -401,7 +401,7 @@ NS(test_main)(void *arg) edge_connection_t *exitconn = create_valid_exitconn(); or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); - TO_CONN(exitconn)->address = tor_strdup("torproject.org"); + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); NS_MOCK(router_my_exit_policy_is_reject_star);

1 0

[tor/master] Add a fifth unit test.
by nickm＠torproject.org 30 Oct '15

30 Oct '15

commit cc1bed9974f90e7021468f9f85b0a66b21ee9151 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Oct 18 18:04:48 2015 +0300 Add a fifth unit test. --- src/or/dns.c | 13 +++++++++++++ src/or/dns.h | 4 ++++ src/test/test_dns.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/src/or/dns.c b/src/or/dns.c index d71246d..234dfbe 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -2118,5 +2118,18 @@ assert_cache_ok_(void) } }); } + #endif +cached_resolve_t +*dns_get_cache_entry(cached_resolve_t *query) +{ + return HT_FIND(cache_map, &cache_root, query); +} + +void +dns_insert_cache_entry(cached_resolve_t *new_entry) +{ + HT_INSERT(cache_map, &cache_root, new_entry); +} + diff --git a/src/or/dns.h b/src/or/dns.h index 6af7796..163d61b 100644 --- a/src/or/dns.h +++ b/src/or/dns.h @@ -42,6 +42,10 @@ uint8_t answer_type,const cached_resolve_t *resolved)); MOCK_DECL(STATIC void,send_resolved_hostname_cell,(edge_connection_t *conn, const char *hostname)); + +cached_resolve_t *dns_get_cache_entry(cached_resolve_t *query); +void dns_insert_cache_entry(cached_resolve_t *new_entry); + #endif #endif diff --git a/src/test/test_dns.c b/src/test/test_dns.c index f316de2..3fbb6f2 100644 --- a/src/test/test_dns.c +++ b/src/test/test_dns.c @@ -513,12 +513,62 @@ NS(test_main)(void *arg) #define NS_SUBMODULE ASPECT(resolve_impl, cache_hit_pending) +/* Given that there is already a pending resolve for the given address, + * we want dns_resolve_impl to append our exit connection to list + * of pending connections for the pending DNS request and return 0. + */ + +static int +NS(router_my_exit_policy_is_reject_star)(void) +{ + return 0; +} + static void NS(test_main)(void *arg) { - tt_skip(); + int retval; + int made_pending = 0; + + pending_connection_t *pending_conn = NULL; + + edge_connection_t *exitconn = create_valid_exitconn(); + or_circuit_t *on_circ = tor_malloc_zero(sizeof(or_circuit_t)); + + cached_resolve_t *cache_entry = tor_malloc_zero(sizeof(cached_resolve_t)); + cache_entry->magic = CACHED_RESOLVE_MAGIC; + cache_entry->state = CACHE_STATE_PENDING; + cache_entry->minheap_idx = -1; + cache_entry->expire = time(NULL) + 60 * 60; + + TO_CONN(exitconn)->address = tor_strdup("torproject.org"); + + strlcpy(cache_entry->address, TO_CONN(exitconn)->address, + sizeof(cache_entry->address)); + + NS_MOCK(router_my_exit_policy_is_reject_star); + + dns_init(); + + dns_insert_cache_entry(cache_entry); + + retval = dns_resolve_impl(exitconn, 1, on_circ, NULL, &made_pending, + NULL); + + tt_int_op(retval,==,0); + tt_int_op(made_pending,==,1); + + pending_conn = cache_entry->pending_connections; + + tt_assert(pending_conn != NULL); + tt_assert(pending_conn->conn == exitconn); done: + NS_UNMOCK(router_my_exit_policy_is_reject_star); + tor_free(on_circ); + tor_free(TO_CONN(exitconn)->address); + tor_free(cache_entry->pending_connections); + tor_free(cache_entry); return; }

1 0