nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
5dbcd48f0e
tor/src/test/test_entryconn.c

834 lines
28 KiB
C
Raw Normal View History

Run the copyright update script.
2017-03-15 21:13:17 +01:00
/* Copyright (c) 2014-2017, The Tor Project, Inc. */
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
/* See LICENSE for licensing information */
#include "orconfig.h"
#define CONNECTION_PRIVATE
#define CONNECTION_EDGE_PRIVATE
#include "or.h"
#include "test.h"
#include "addressmap.h"
#include "config.h"
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
#include "confparse.h"
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
#include "connection.h"
#include "connection_edge.h"
test: Add tests for fetching descs and handling SOCKS conns. - Add tests that ensure that SOCKS requests for v2/v3 addresses get intercepted and handled. - Add test that stores and lookups an HS descriptor in the client-side cache. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-01 13:35:39 +02:00
#include "nodelist.h"
#include "hs_cache.h"
#include "rendcache.h"
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
static void *
entryconn_rewrite_setup(const struct testcase_t *tc)
{
(void)tc;
entry_connection_t *ec = entry_connection_new(CONN_TYPE_AP, AF_INET);
addressmap_init();
return ec;
}
static int
entryconn_rewrite_teardown(const struct testcase_t *tc, void *arg)
{
(void)tc;
entry_connection_t *ec = arg;
if (ec)
connection_free_(ENTRY_TO_CONN(ec));
addressmap_free_all();
return 1;
}
static struct testcase_setup_t test_rewrite_setup = {
entryconn_rewrite_setup, entryconn_rewrite_teardown
};
/* Simple rewrite: no changes needed */
static void
test_entryconn_rewrite_basic(void *arg)
{
entry_connection_t *ec = arg;
rewrite_result_t rr;
tt_assert(ec->socks_request);
strlcpy(ec->socks_request->address, "www.TORproject.org",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_int_op(rr.automap, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.torproject.org");
tt_str_op(ec->socks_request->address, OP_EQ, "www.torproject.org");
tt_str_op(ec->original_dest_address, OP_EQ, "www.torproject.org");
done:
;
}
/* Rewrite but reject because of disallowed .exit */
static void
test_entryconn_rewrite_bad_dotexit(void *arg)
{
entry_connection_t *ec = arg;
rewrite_result_t rr;
tt_assert(ec->socks_request);
strlcpy(ec->socks_request->address, "www.TORproject.org.foo.exit",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.should_close, OP_EQ, 1);
tt_int_op(rr.end_reason, OP_EQ, END_STREAM_REASON_TORPROTOCOL);
done:
;
}
/* Automap on resolve, connect to automapped address, resolve again and get
* same answer. (IPv4) */
static void
test_entryconn_rewrite_automap_ipv4(void *arg)
{
entry_connection_t *ec = arg;
entry_connection_t *ec2=NULL, *ec3=NULL;
rewrite_result_t rr;
char *msg = NULL;
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET);
ec3 = entry_connection_new(CONN_TYPE_AP, AF_INET);
get_options_mutable()->AutomapHostsOnResolve = 1;
Automated change to use smartlist_add_strdup Use the following coccinelle script to change uses of smartlist_add(sl, tor_strdup(str)) to smartlist_add_strdup(sl, string) (coccinelle script from nickm via bug 20048): @@ expression a; expression b; @@ - smartlist_add + smartlist_add_strdup (a, - tor_strdup( b - ) )
2016-10-27 11:26:06 +02:00
smartlist_add_strdup(get_options_mutable()->AutomapHostsSuffixes, ".");
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
parse_virtual_addr_network("127.202.0.0/16", AF_INET, 0, &msg);
/* Automap this on resolve. */
strlcpy(ec->socks_request->address, "WWW.MIT.EDU",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.automap, OP_EQ, 1);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.mit.edu");
tt_str_op(ec->original_dest_address, OP_EQ, "www.mit.edu");
tt_assert(!strcmpstart(ec->socks_request->address,"127.202."));
/* Connect to it and make sure we get the original address back. */
strlcpy(ec2->socks_request->address, ec->socks_request->address,
sizeof(ec2->socks_request->address));
ec2->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec2, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, ec->socks_request->address);
tt_str_op(ec2->original_dest_address, OP_EQ, ec->socks_request->address);
tt_str_op(ec2->socks_request->address, OP_EQ, "www.mit.edu");
/* Resolve it again, make sure the answer is the same. */
strlcpy(ec3->socks_request->address, "www.MIT.EDU",
sizeof(ec3->socks_request->address));
ec3->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec3, &rr);
tt_int_op(rr.automap, OP_EQ, 1);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.mit.edu");
tt_str_op(ec3->original_dest_address, OP_EQ, "www.mit.edu");
tt_str_op(ec3->socks_request->address, OP_EQ,
ec->socks_request->address);
done:
connection_free_(ENTRY_TO_CONN(ec2));
connection_free_(ENTRY_TO_CONN(ec3));
}
/* Automap on resolve, connect to automapped address, resolve again and get
* same answer. (IPv6) */
static void
test_entryconn_rewrite_automap_ipv6(void *arg)
{
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
(void)arg;
entry_connection_t *ec =NULL;
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
entry_connection_t *ec2=NULL, *ec3=NULL;
rewrite_result_t rr;
char *msg = NULL;
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
ec = entry_connection_new(CONN_TYPE_AP, AF_INET6);
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET6);
ec3 = entry_connection_new(CONN_TYPE_AP, AF_INET6);
get_options_mutable()->AutomapHostsOnResolve = 1;
Automated change to use smartlist_add_strdup Use the following coccinelle script to change uses of smartlist_add(sl, tor_strdup(str)) to smartlist_add_strdup(sl, string) (coccinelle script from nickm via bug 20048): @@ expression a; expression b; @@ - smartlist_add + smartlist_add_strdup (a, - tor_strdup( b - ) )
2016-10-27 11:26:06 +02:00
smartlist_add_strdup(get_options_mutable()->AutomapHostsSuffixes, ".");
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
parse_virtual_addr_network("FE80::/32", AF_INET6, 0, &msg);
/* Automap this on resolve. */
strlcpy(ec->socks_request->address, "WWW.MIT.EDU",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.automap, OP_EQ, 1);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.mit.edu");
tt_str_op(ec->original_dest_address, OP_EQ, "www.mit.edu");
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
/* Yes, this [ should be here. */
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
tt_assert(!strcmpstart(ec->socks_request->address,"[fe80:"));
/* Connect to it and make sure we get the original address back. */
strlcpy(ec2->socks_request->address, ec->socks_request->address,
sizeof(ec2->socks_request->address));
ec2->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec2, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, ec->socks_request->address);
tt_str_op(ec2->original_dest_address, OP_EQ, ec->socks_request->address);
tt_str_op(ec2->socks_request->address, OP_EQ, "www.mit.edu");
/* Resolve it again, make sure the answer is the same. */
strlcpy(ec3->socks_request->address, "www.MIT.EDU",
sizeof(ec3->socks_request->address));
ec3->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec3, &rr);
tt_int_op(rr.automap, OP_EQ, 1);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.mit.edu");
tt_str_op(ec3->original_dest_address, OP_EQ, "www.mit.edu");
tt_str_op(ec3->socks_request->address, OP_EQ,
ec->socks_request->address);
done:
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
connection_free_(ENTRY_TO_CONN(ec));
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
connection_free_(ENTRY_TO_CONN(ec2));
connection_free_(ENTRY_TO_CONN(ec3));
}
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
#if 0
/* FFFF not actually supported. */
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
/* automap on resolve, reverse lookup. */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
static void
test_entryconn_rewrite_automap_reverse(void *arg)
{
entry_connection_t *ec = arg;
entry_connection_t *ec2=NULL;
rewrite_result_t rr;
char *msg = NULL;
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET);
get_options_mutable()->AutomapHostsOnResolve = 1;
get_options_mutable()->SafeLogging_ = SAFELOG_SCRUB_NONE;
smartlist_add(get_options_mutable()->AutomapHostsSuffixes,
tor_strdup(".bloom"));
parse_virtual_addr_network("127.80.0.0/16", AF_INET, 0, &msg);
/* Automap this on resolve. */
strlcpy(ec->socks_request->address, "www.poldy.BLOOM",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.automap, OP_EQ, 1);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.poldy.bloom");
tt_str_op(ec->original_dest_address, OP_EQ, "www.poldy.bloom");
tt_assert(!strcmpstart(ec->socks_request->address,"127.80."));
strlcpy(ec2->socks_request->address, ec->socks_request->address,
sizeof(ec2->socks_request->address));
ec2->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR;
connection_ap_handshake_rewrite(ec2, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 1);
tt_int_op(rr.end_reason, OP_EQ,
END_STREAM_REASON_DONE|END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
done:
connection_free_(ENTRY_TO_CONN(ec2));
}
Run our #else/#endif annotator on our source code.
2017-09-15 22:24:44 +02:00
#endif /* 0 */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
/* Rewrite because of cached DNS entry. */
static void
test_entryconn_rewrite_cached_dns_ipv4(void *arg)
{
entry_connection_t *ec = arg;
rewrite_result_t rr;
time_t expires = time(NULL) + 3600;
entry_connection_t *ec2=NULL;
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET);
addressmap_register("www.friendly.example.com",
tor_strdup("240.240.241.241"),
expires,
ADDRMAPSRC_DNS,
0, 0);
strlcpy(ec->socks_request->address, "www.friendly.example.com",
sizeof(ec->socks_request->address));
strlcpy(ec2->socks_request->address, "www.friendly.example.com",
sizeof(ec2->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
ec2->socks_request->command = SOCKS_COMMAND_CONNECT;
Merge branch 'bug7555_v2_squashed' Conflicts: src/or/connection_edge.c
2015-01-19 17:43:41 +01:00
ec2->entry_cfg.use_cached_ipv4_answers = 1; /* only ec2 gets this flag */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.friendly.example.com");
tt_str_op(ec->socks_request->address, OP_EQ, "www.friendly.example.com");
connection_ap_handshake_rewrite(ec2, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, expires);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.friendly.example.com");
tt_str_op(ec2->socks_request->address, OP_EQ, "240.240.241.241");
done:
connection_free_(ENTRY_TO_CONN(ec2));
}
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
/* Rewrite because of cached DNS entry. */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
static void
test_entryconn_rewrite_cached_dns_ipv6(void *arg)
{
entry_connection_t *ec = NULL;
rewrite_result_t rr;
time_t expires = time(NULL) + 3600;
entry_connection_t *ec2=NULL;
(void)arg;
ec = entry_connection_new(CONN_TYPE_AP, AF_INET6);
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET6);
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
addressmap_register("www.friendly.example.com",
tor_strdup("[::f00f]"),
expires,
ADDRMAPSRC_DNS,
0, 0);
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
strlcpy(ec->socks_request->address, "www.friendly.example.com",
sizeof(ec->socks_request->address));
strlcpy(ec2->socks_request->address, "www.friendly.example.com",
sizeof(ec2->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
ec2->socks_request->command = SOCKS_COMMAND_CONNECT;
Merge branch 'bug7555_v2_squashed' Conflicts: src/or/connection_edge.c
2015-01-19 17:43:41 +01:00
ec2->entry_cfg.use_cached_ipv6_answers = 1; /* only ec2 gets this flag */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.friendly.example.com");
tt_str_op(ec->socks_request->address, OP_EQ, "www.friendly.example.com");
connection_ap_handshake_rewrite(ec2, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, expires);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "www.friendly.example.com");
tt_str_op(ec2->socks_request->address, OP_EQ, "[::f00f]");
done:
connection_free_(ENTRY_TO_CONN(ec));
connection_free_(ENTRY_TO_CONN(ec2));
}
/* Fail to connect to unmapped address in virtual range. */
static void
test_entryconn_rewrite_unmapped_virtual(void *arg)
{
entry_connection_t *ec = arg;
rewrite_result_t rr;
entry_connection_t *ec2 = NULL;
char *msg = NULL;
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET6);
parse_virtual_addr_network("18.202.0.0/16", AF_INET, 0, &msg);
parse_virtual_addr_network("[ABCD::]/16", AF_INET6, 0, &msg);
strlcpy(ec->socks_request->address, "18.202.5.5",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.should_close, OP_EQ, 1);
tt_int_op(rr.end_reason, OP_EQ, END_STREAM_REASON_INTERNAL);
tt_int_op(rr.automap, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
strlcpy(ec2->socks_request->address, "[ABCD:9::5314:9543]",
sizeof(ec2->socks_request->address));
ec2->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec2, &rr);
tt_int_op(rr.should_close, OP_EQ, 1);
tt_int_op(rr.end_reason, OP_EQ, END_STREAM_REASON_INTERNAL);
tt_int_op(rr.automap, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
done:
connection_free_(ENTRY_TO_CONN(ec2));
}
/* Rewrite because of mapaddress option */
static void
test_entryconn_rewrite_mapaddress(void *arg)
{
entry_connection_t *ec = arg;
rewrite_result_t rr;
config_line_append(&get_options_mutable()->AddressMap,
"MapAddress", "meta metaobjects.example");
config_register_addressmaps(get_options());
strlcpy(ec->socks_request->address, "meta",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_int_op(rr.automap, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(ec->socks_request->address, OP_EQ, "metaobjects.example");
done:
;
}
/* Reject reverse lookups of internal address. */
static void
test_entryconn_rewrite_reject_internal_reverse(void *arg)
{
entry_connection_t *ec = arg;
rewrite_result_t rr;
strlcpy(ec->socks_request->address, "10.0.0.1",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.should_close, OP_EQ, 1);
tt_int_op(rr.end_reason, OP_EQ, END_STREAM_REASON_SOCKSPROTOCOL |
END_STREAM_REASON_FLAG_ALREADY_SOCKS_REPLIED);
tt_int_op(rr.automap, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
done:
;
}
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
Remove AllowDotExit. It's been deprecated since 0.2.9.2-alpha. Closes ticket 23426.
2017-09-07 15:51:45 +02:00
/* Rewrite into .exit because of virtual address mapping. */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
static void
test_entryconn_rewrite_automap_exit(void *arg)
{
entry_connection_t *ec = arg;
entry_connection_t *ec2=NULL;
rewrite_result_t rr;
char *msg = NULL;
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET);
Automated change to use smartlist_add_strdup Use the following coccinelle script to change uses of smartlist_add(sl, tor_strdup(str)) to smartlist_add_strdup(sl, string) (coccinelle script from nickm via bug 20048): @@ expression a; expression b; @@ - smartlist_add + smartlist_add_strdup (a, - tor_strdup( b - ) )
2016-10-27 11:26:06 +02:00
smartlist_add_strdup(get_options_mutable()->AutomapHostsSuffixes,
".EXIT");
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
parse_virtual_addr_network("127.1.0.0/16", AF_INET, 0, &msg);
Remove AllowDotExit. It's been deprecated since 0.2.9.2-alpha. Closes ticket 23426.
2017-09-07 15:51:45 +02:00
/* Try to automap this on resolve. */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
strlcpy(ec->socks_request->address, "website.example.exit",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec, &rr);
Remove AllowDotExit. It's been deprecated since 0.2.9.2-alpha. Closes ticket 23426.
2017-09-07 15:51:45 +02:00
/* Make sure it isn't allowed -- there is no longer an AllowDotExit
* option. */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
tt_int_op(rr.automap, OP_EQ, 0);
Remove AllowDotExit. It's been deprecated since 0.2.9.2-alpha. Closes ticket 23426.
2017-09-07 15:51:45 +02:00
tt_int_op(rr.should_close, OP_EQ, 1);
tt_int_op(rr.end_reason, OP_EQ, END_STREAM_REASON_TORPROTOCOL);
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
done:
connection_free_(ENTRY_TO_CONN(ec2));
}
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
/* Rewrite into .exit because of mapaddress */
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
static void
test_entryconn_rewrite_mapaddress_exit(void *arg)
{
entry_connection_t *ec = arg;
rewrite_result_t rr;
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
config_line_append(&get_options_mutable()->AddressMap,
"MapAddress", "*.example.com *.example.com.abc.exit");
config_register_addressmaps(get_options());
/* Automap this on resolve. */
strlcpy(ec->socks_request->address, "abc.example.com",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_TORRC);
tt_str_op(rr.orig_address, OP_EQ, "abc.example.com");
tt_str_op(ec->socks_request->address, OP_EQ, "abc.example.com.abc.exit");
done:
;
}
/* Map foo.onion to longthing.onion, and also automap. */
static void
test_entryconn_rewrite_mapaddress_automap_onion(void *arg)
{
entry_connection_t *ec = arg;
entry_connection_t *ec2 = NULL;
entry_connection_t *ec3 = NULL;
entry_connection_t *ec4 = NULL;
rewrite_result_t rr;
char *msg = NULL;
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET);
ec3 = entry_connection_new(CONN_TYPE_AP, AF_INET);
ec4 = entry_connection_new(CONN_TYPE_AP, AF_INET);
get_options_mutable()->AutomapHostsOnResolve = 1;
Automated change to use smartlist_add_strdup Use the following coccinelle script to change uses of smartlist_add(sl, tor_strdup(str)) to smartlist_add_strdup(sl, string) (coccinelle script from nickm via bug 20048): @@ expression a; expression b; @@ - smartlist_add + smartlist_add_strdup (a, - tor_strdup( b - ) )
2016-10-27 11:26:06 +02:00
smartlist_add_strdup(get_options_mutable()->AutomapHostsSuffixes,
".onion");
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
parse_virtual_addr_network("192.168.0.0/16", AF_INET, 0, &msg);
config_line_append(&get_options_mutable()->AddressMap,
"MapAddress", "foo.onion abcdefghijklmnop.onion");
config_register_addressmaps(get_options());
/* Connect to foo.onion. */
strlcpy(ec->socks_request->address, "foo.onion",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "foo.onion");
tt_str_op(ec->socks_request->address, OP_EQ, "abcdefghijklmnop.onion");
/* Okay, resolve foo.onion */
strlcpy(ec2->socks_request->address, "foo.onion",
sizeof(ec2->socks_request->address));
ec2->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec2, &rr);
tt_int_op(rr.automap, OP_EQ, 1);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "foo.onion");
tt_assert(!strcmpstart(ec2->socks_request->address, "192.168."));
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
/* Now connect */
strlcpy(ec3->socks_request->address, ec2->socks_request->address,
sizeof(ec3->socks_request->address));
ec3->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec3, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
Make check-spaces happier.
2015-01-19 17:56:03 +01:00
tt_assert(!strcmpstart(ec3->socks_request->address,
"abcdefghijklmnop.onion"));
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
/* Now resolve abcefghijklmnop.onion. */
strlcpy(ec4->socks_request->address, "abcdefghijklmnop.onion",
sizeof(ec4->socks_request->address));
ec4->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec4, &rr);
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
tt_int_op(rr.automap, OP_EQ, 1);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "abcdefghijklmnop.onion");
tt_assert(!strcmpstart(ec4->socks_request->address, "192.168."));
/* XXXX doesn't work
Make check-spaces happier.
2015-01-19 17:56:03 +01:00
tt_str_op(ec4->socks_request->address, OP_EQ, ec2->socks_request->address);
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
*/
done:
connection_free_(ENTRY_TO_CONN(ec2));
connection_free_(ENTRY_TO_CONN(ec3));
connection_free_(ENTRY_TO_CONN(ec4));
(Disabled, failing) test for the bug in 7555.
2015-01-13 18:26:04 +01:00
}
static void
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
test_entryconn_rewrite_mapaddress_automap_onion_common(entry_connection_t *ec,
int map_to_onion,
int map_to_address)
(Disabled, failing) test for the bug in 7555.
2015-01-13 18:26:04 +01:00
{
entry_connection_t *ec2 = NULL;
entry_connection_t *ec3 = NULL;
rewrite_result_t rr;
ec2 = entry_connection_new(CONN_TYPE_AP, AF_INET);
ec3 = entry_connection_new(CONN_TYPE_AP, AF_INET);
/* Connect to irc.example.com */
strlcpy(ec->socks_request->address, "irc.example.com",
sizeof(ec->socks_request->address));
ec->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec, &rr);
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
(Disabled, failing) test for the bug in 7555.
2015-01-13 18:26:04 +01:00
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "irc.example.com");
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
tt_str_op(ec->socks_request->address, OP_EQ,
map_to_onion ? "abcdefghijklmnop.onion" : "irc.example.com");
(Disabled, failing) test for the bug in 7555.
2015-01-13 18:26:04 +01:00
/* Okay, resolve irc.example.com */
strlcpy(ec2->socks_request->address, "irc.example.com",
sizeof(ec2->socks_request->address));
ec2->socks_request->command = SOCKS_COMMAND_RESOLVE;
connection_ap_handshake_rewrite(ec2, &rr);
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
tt_int_op(rr.automap, OP_EQ, map_to_onion && map_to_address);
(Disabled, failing) test for the bug in 7555.
2015-01-13 18:26:04 +01:00
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
tt_i64_op(rr.map_expires, OP_EQ, TIME_MAX);
tt_int_op(rr.exit_source, OP_EQ, ADDRMAPSRC_NONE);
tt_str_op(rr.orig_address, OP_EQ, "irc.example.com");
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
if (map_to_onion && map_to_address)
tt_assert(!strcmpstart(ec2->socks_request->address, "192.168."));
(Disabled, failing) test for the bug in 7555.
2015-01-13 18:26:04 +01:00
/* Now connect */
strlcpy(ec3->socks_request->address, ec2->socks_request->address,
sizeof(ec3->socks_request->address));
ec3->socks_request->command = SOCKS_COMMAND_CONNECT;
connection_ap_handshake_rewrite(ec3, &rr);
tt_int_op(rr.automap, OP_EQ, 0);
tt_int_op(rr.should_close, OP_EQ, 0);
tt_int_op(rr.end_reason, OP_EQ, 0);
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
if (map_to_onion)
tt_assert(!strcmpstart(ec3->socks_request->address,
"abcdefghijklmnop.onion"));
(Disabled, failing) test for the bug in 7555.
2015-01-13 18:26:04 +01:00
done:
connection_free_(ENTRY_TO_CONN(ec2));
connection_free_(ENTRY_TO_CONN(ec3));
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
}
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
/* This time is the same, but we start with a mapping from a non-onion
* address. */
static void
test_entryconn_rewrite_mapaddress_automap_onion2(void *arg)
{
char *msg = NULL;
get_options_mutable()->AutomapHostsOnResolve = 1;
Automated change to use smartlist_add_strdup Use the following coccinelle script to change uses of smartlist_add(sl, tor_strdup(str)) to smartlist_add_strdup(sl, string) (coccinelle script from nickm via bug 20048): @@ expression a; expression b; @@ - smartlist_add + smartlist_add_strdup (a, - tor_strdup( b - ) )
2016-10-27 11:26:06 +02:00
smartlist_add_strdup(get_options_mutable()->AutomapHostsSuffixes,
".onion");
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
parse_virtual_addr_network("192.168.0.0/16", AF_INET, 0, &msg);
config_line_append(&get_options_mutable()->AddressMap,
"MapAddress", "irc.example.com abcdefghijklmnop.onion");
config_register_addressmaps(get_options());
test_entryconn_rewrite_mapaddress_automap_onion_common(arg, 1, 1);
}
/* Same as above, with automapped turned off */
static void
test_entryconn_rewrite_mapaddress_automap_onion3(void *arg)
{
config_line_append(&get_options_mutable()->AddressMap,
"MapAddress", "irc.example.com abcdefghijklmnop.onion");
config_register_addressmaps(get_options());
test_entryconn_rewrite_mapaddress_automap_onion_common(arg, 1, 0);
}
/* As above, with no mapping. */
static void
test_entryconn_rewrite_mapaddress_automap_onion4(void *arg)
{
char *msg = NULL;
get_options_mutable()->AutomapHostsOnResolve = 1;
Automated change to use smartlist_add_strdup Use the following coccinelle script to change uses of smartlist_add(sl, tor_strdup(str)) to smartlist_add_strdup(sl, string) (coccinelle script from nickm via bug 20048): @@ expression a; expression b; @@ - smartlist_add + smartlist_add_strdup (a, - tor_strdup( b - ) )
2016-10-27 11:26:06 +02:00
smartlist_add_strdup(get_options_mutable()->AutomapHostsSuffixes,
".onion");
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
parse_virtual_addr_network("192.168.0.0/16", AF_INET, 0, &msg);
test_entryconn_rewrite_mapaddress_automap_onion_common(arg, 0, 1);
}
test: Add tests for fetching descs and handling SOCKS conns. - Add tests that ensure that SOCKS requests for v2/v3 addresses get intercepted and handled. - Add test that stores and lookups an HS descriptor in the client-side cache. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-01 13:35:39 +02:00
/** Test that rewrite functions can handle v2 addresses */
static void
test_entryconn_rewrite_onion_v2(void *arg)
{
int retval;
entry_connection_t *conn = arg;
(void) arg;
rend_cache_init();
/* Make a SOCKS request */
conn->socks_request->command = SOCKS_COMMAND_CONNECT;
strlcpy(conn->socks_request->address,
"pqeed46efnwmfuid.onion",
sizeof(conn->socks_request->address));
/* Make an onion connection using the SOCKS request */
conn->entry_cfg.onion_traffic = 1;
ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_SOCKS_WAIT;
tt_assert(!ENTRY_TO_EDGE_CONN(conn)->rend_data);
/* Handle SOCKS and rewrite! */
retval = connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
tt_int_op(retval, OP_EQ, 0);
/* Check connection state after rewrite */
tt_int_op(ENTRY_TO_CONN(conn)->state, OP_EQ, AP_CONN_STATE_RENDDESC_WAIT);
/* check that the address got rewritten */
tt_str_op(conn->socks_request->address, OP_EQ,
"pqeed46efnwmfuid");
/* check that HS information got attached to the connection */
tt_assert(ENTRY_TO_EDGE_CONN(conn)->rend_data);
tt_assert(!ENTRY_TO_EDGE_CONN(conn)->hs_ident);
done:
rend_cache_free_all();
/* 'conn' is cleaned by handler */
}
/** Test that rewrite functions can handle v3 onion addresses */
static void
test_entryconn_rewrite_onion_v3(void *arg)
{
int retval;
entry_connection_t *conn = arg;
(void) arg;
hs_cache_init();
/* Make a SOCKS request */
conn->socks_request->command = SOCKS_COMMAND_CONNECT;
strlcpy(conn->socks_request->address,
prop224 client-side: Start validating onion address pubkeys. Fix the test_build_address() test and its test vectors python script. They were both using a bogus pubkey for building an HS address which does not validate anymore. Also fix a few more unittests that were using bogus onion addresses and were failing the validation. I replaced the bogus address with the one generated from the test vector script.
2017-09-13 20:06:25 +02:00
"git.25njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid.onion",
test: Add tests for fetching descs and handling SOCKS conns. - Add tests that ensure that SOCKS requests for v2/v3 addresses get intercepted and handled. - Add test that stores and lookups an HS descriptor in the client-side cache. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-01 13:35:39 +02:00
sizeof(conn->socks_request->address));
/* Make an onion connection using the SOCKS request */
conn->entry_cfg.onion_traffic = 1;
ENTRY_TO_CONN(conn)->state = AP_CONN_STATE_SOCKS_WAIT;
tt_assert(!ENTRY_TO_EDGE_CONN(conn)->rend_data);
tt_assert(!ENTRY_TO_EDGE_CONN(conn)->hs_ident);
/* Handle SOCKS and rewrite! */
retval = connection_ap_handshake_rewrite_and_attach(conn, NULL, NULL);
tt_int_op(retval, OP_EQ, 0);
hs-v3: Attempt descriptor refetch when dirinfo changes When the directory information changes, callback to the HS client subsystem so it can check if any pending SOCKS connections are waiting for a descriptor. If yes, attempt a refetch for those. Fixes #23762 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-04 22:22:49 +02:00
/* Check connection state after rewrite. It should be in waiting for
* descriptor state. */
tt_int_op(ENTRY_TO_CONN(conn)->state, OP_EQ, AP_CONN_STATE_RENDDESC_WAIT);
test: Add tests for fetching descs and handling SOCKS conns. - Add tests that ensure that SOCKS requests for v2/v3 addresses get intercepted and handled. - Add test that stores and lookups an HS descriptor in the client-side cache. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-01 13:35:39 +02:00
/* check that the address got rewritten */
tt_str_op(conn->socks_request->address, OP_EQ,
prop224 client-side: Start validating onion address pubkeys. Fix the test_build_address() test and its test vectors python script. They were both using a bogus pubkey for building an HS address which does not validate anymore. Also fix a few more unittests that were using bogus onion addresses and were failing the validation. I replaced the bogus address with the one generated from the test vector script.
2017-09-13 20:06:25 +02:00
"25njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid");
test: Add tests for fetching descs and handling SOCKS conns. - Add tests that ensure that SOCKS requests for v2/v3 addresses get intercepted and handled. - Add test that stores and lookups an HS descriptor in the client-side cache. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-01 13:35:39 +02:00
/* check that HS information got attached to the connection */
tt_assert(ENTRY_TO_EDGE_CONN(conn)->hs_ident);
tt_assert(!ENTRY_TO_EDGE_CONN(conn)->rend_data);
done:
hs_free_all();
/* 'conn' is cleaned by handler */
}
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
#define REWRITE(name) \
{ #name, test_entryconn_##name, TT_FORK, &test_rewrite_setup, NULL }
struct testcase_t entryconn_tests[] = {
REWRITE(rewrite_basic),
REWRITE(rewrite_bad_dotexit),
REWRITE(rewrite_automap_ipv4),
REWRITE(rewrite_automap_ipv6),
More unit tests for rewriting entry connection addresses
2015-01-13 17:08:33 +01:00
// REWRITE(rewrite_automap_reverse),
REWRITE(rewrite_cached_dns_ipv4),
REWRITE(rewrite_cached_dns_ipv6),
REWRITE(rewrite_unmapped_virtual),
REWRITE(rewrite_mapaddress),
REWRITE(rewrite_reject_internal_reverse),
REWRITE(rewrite_automap_exit),
REWRITE(rewrite_mapaddress_exit),
REWRITE(rewrite_mapaddress_automap_onion),
(Disabled, failing) test for the bug in 7555.
2015-01-13 18:26:04 +01:00
REWRITE(rewrite_mapaddress_automap_onion2),
More tests as suggested by rl1987
2015-01-14 15:10:35 +01:00
REWRITE(rewrite_mapaddress_automap_onion3),
REWRITE(rewrite_mapaddress_automap_onion4),
test: Add tests for fetching descs and handling SOCKS conns. - Add tests that ensure that SOCKS requests for v2/v3 addresses get intercepted and handled. - Add test that stores and lookups an HS descriptor in the client-side cache. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-01 13:35:39 +02:00
REWRITE(rewrite_onion_v2),
REWRITE(rewrite_onion_v3),
Allow MapAddress and Automap to work together The trick here is to apply mapaddress first, and only then apply automapping. Otherwise, the automap checks don't get done. Fix for bug 7555; bugfix on all versions of Tor supporting both MapAddress and AutoMap.
2014-04-09 00:02:03 +02:00
Begin writing unit tests for rewrite code
2015-01-13 03:08:43 +01:00
END_OF_TESTCASES
};
Reference in New Issue Copy Permalink