2010-08-02 21:09:37 +02:00
|
|
|
/* Copyright (c) 2001-2004, Roger Dingledine.
|
|
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
2013-01-16 07:54:56 +01:00
|
|
|
* Copyright (c) 2007-2013, The Tor Project, Inc. */
|
2010-08-02 21:09:37 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
|
|
|
|
#include "orconfig.h"
|
2013-09-03 19:35:44 +02:00
|
|
|
|
|
|
|
#define CONFIG_PRIVATE
|
2010-08-02 21:09:37 +02:00
|
|
|
#include "or.h"
|
2012-10-28 21:13:58 +01:00
|
|
|
#include "addressmap.h"
|
2010-08-02 21:09:37 +02:00
|
|
|
#include "config.h"
|
2012-09-12 23:34:50 +02:00
|
|
|
#include "confparse.h"
|
2010-08-02 21:09:37 +02:00
|
|
|
#include "connection_edge.h"
|
|
|
|
#include "test.h"
|
2013-02-11 23:45:18 +01:00
|
|
|
#include "util.h"
|
|
|
|
#include "address.h"
|
2010-08-02 21:09:37 +02:00
|
|
|
|
|
|
|
static void
|
2011-09-08 17:19:06 +02:00
|
|
|
test_config_addressmap(void *arg)
|
2010-08-02 21:09:37 +02:00
|
|
|
{
|
|
|
|
char buf[1024];
|
|
|
|
char address[256];
|
|
|
|
time_t expires = TIME_MAX;
|
2011-09-08 17:19:06 +02:00
|
|
|
(void)arg;
|
|
|
|
|
2010-12-27 18:35:16 +01:00
|
|
|
strlcpy(buf, "MapAddress .invalidwildcard.com *.torserver.exit\n" // invalid
|
|
|
|
"MapAddress *invalidasterisk.com *.torserver.exit\n" // invalid
|
|
|
|
"MapAddress *.google.com *.torserver.exit\n"
|
2010-12-13 23:13:01 +01:00
|
|
|
"MapAddress *.yahoo.com *.google.com.torserver.exit\n"
|
2010-12-27 18:35:16 +01:00
|
|
|
"MapAddress *.cn.com www.cnn.com\n"
|
2010-12-13 23:13:01 +01:00
|
|
|
"MapAddress *.cnn.com www.cnn.com\n"
|
|
|
|
"MapAddress ex.com www.cnn.com\n"
|
|
|
|
"MapAddress ey.com *.cnn.com\n"
|
2010-08-02 21:09:37 +02:00
|
|
|
"MapAddress www.torproject.org 1.1.1.1\n"
|
|
|
|
"MapAddress other.torproject.org "
|
|
|
|
"this.torproject.org.otherserver.exit\n"
|
|
|
|
"MapAddress test.torproject.org 2.2.2.2\n"
|
|
|
|
"MapAddress www.google.com 3.3.3.3\n"
|
|
|
|
"MapAddress www.example.org 4.4.4.4\n"
|
2010-12-27 18:35:16 +01:00
|
|
|
"MapAddress 4.4.4.4 7.7.7.7\n"
|
2010-08-02 21:09:37 +02:00
|
|
|
"MapAddress 4.4.4.4 5.5.5.5\n"
|
|
|
|
"MapAddress www.infiniteloop.org 6.6.6.6\n"
|
|
|
|
"MapAddress 6.6.6.6 www.infiniteloop.org\n"
|
|
|
|
, sizeof(buf));
|
|
|
|
|
2011-11-30 20:10:22 +01:00
|
|
|
config_get_lines(buf, &(get_options_mutable()->AddressMap), 0);
|
2010-08-02 21:09:37 +02:00
|
|
|
config_register_addressmaps(get_options());
|
|
|
|
|
2012-11-25 19:45:36 +01:00
|
|
|
/* Use old interface for now, so we don't need to rewrite the unit tests */
|
|
|
|
#define addressmap_rewrite(a,s,eo,ao) \
|
|
|
|
addressmap_rewrite((a),(s),AMR_FLAG_USE_IPV4_DNS|AMR_FLAG_USE_IPV6_DNS, \
|
|
|
|
(eo),(ao))
|
|
|
|
|
2010-12-27 18:35:16 +01:00
|
|
|
/* MapAddress .invalidwildcard.com .torserver.exit - no match */
|
|
|
|
strlcpy(address, "www.invalidwildcard.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-27 18:35:16 +01:00
|
|
|
|
|
|
|
/* MapAddress *invalidasterisk.com .torserver.exit - no match */
|
|
|
|
strlcpy(address, "www.invalidasterisk.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-27 18:35:16 +01:00
|
|
|
|
2010-08-02 21:09:37 +02:00
|
|
|
/* Where no mapping for FQDN match on top-level domain */
|
2010-12-13 23:13:01 +01:00
|
|
|
/* MapAddress .google.com .torserver.exit */
|
2010-08-02 21:09:37 +02:00
|
|
|
strlcpy(address, "reader.google.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-13 23:13:01 +01:00
|
|
|
test_streq(address, "reader.torserver.exit");
|
|
|
|
|
|
|
|
/* MapAddress *.yahoo.com *.google.com.torserver.exit */
|
|
|
|
strlcpy(address, "reader.yahoo.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "reader.google.com.torserver.exit");
|
|
|
|
|
2010-12-13 23:13:01 +01:00
|
|
|
/*MapAddress *.cnn.com www.cnn.com */
|
|
|
|
strlcpy(address, "cnn.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-13 23:13:01 +01:00
|
|
|
test_streq(address, "www.cnn.com");
|
|
|
|
|
|
|
|
/* MapAddress .cn.com www.cnn.com */
|
|
|
|
strlcpy(address, "www.cn.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-13 23:13:01 +01:00
|
|
|
test_streq(address, "www.cnn.com");
|
|
|
|
|
|
|
|
/* MapAddress ex.com www.cnn.com - no match */
|
|
|
|
strlcpy(address, "www.ex.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-13 23:13:01 +01:00
|
|
|
|
|
|
|
/* MapAddress ey.com *.cnn.com - invalid expression */
|
|
|
|
strlcpy(address, "ey.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-13 23:13:01 +01:00
|
|
|
|
2010-08-02 21:09:37 +02:00
|
|
|
/* Where mapping for FQDN match on FQDN */
|
|
|
|
strlcpy(address, "www.google.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "3.3.3.3");
|
|
|
|
|
|
|
|
strlcpy(address, "www.torproject.org", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "1.1.1.1");
|
|
|
|
|
|
|
|
strlcpy(address, "other.torproject.org", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "this.torproject.org.otherserver.exit");
|
|
|
|
|
|
|
|
strlcpy(address, "test.torproject.org", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "2.2.2.2");
|
|
|
|
|
2010-12-27 18:35:16 +01:00
|
|
|
/* Test a chain of address mappings and the order in which they were added:
|
|
|
|
"MapAddress www.example.org 4.4.4.4"
|
|
|
|
"MapAddress 4.4.4.4 7.7.7.7"
|
|
|
|
"MapAddress 4.4.4.4 5.5.5.5"
|
|
|
|
*/
|
2010-08-02 21:09:37 +02:00
|
|
|
strlcpy(address, "www.example.org", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "5.5.5.5");
|
|
|
|
|
|
|
|
/* Test infinite address mapping results in no change */
|
|
|
|
strlcpy(address, "www.infiniteloop.org", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "www.infiniteloop.org");
|
|
|
|
|
|
|
|
/* Test we don't find false positives */
|
|
|
|
strlcpy(address, "www.example.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
|
|
|
|
/* Test top-level-domain matching a bit harder */
|
2014-04-26 06:27:21 +02:00
|
|
|
config_free_lines(get_options_mutable()->AddressMap);
|
2010-08-02 21:09:37 +02:00
|
|
|
addressmap_clear_configured();
|
2010-12-27 18:35:16 +01:00
|
|
|
strlcpy(buf, "MapAddress *.com *.torserver.exit\n"
|
|
|
|
"MapAddress *.torproject.org 1.1.1.1\n"
|
|
|
|
"MapAddress *.net 2.2.2.2\n"
|
2010-08-02 21:09:37 +02:00
|
|
|
, sizeof(buf));
|
2011-11-30 20:10:22 +01:00
|
|
|
config_get_lines(buf, &(get_options_mutable()->AddressMap), 0);
|
2010-08-02 21:09:37 +02:00
|
|
|
config_register_addressmaps(get_options());
|
|
|
|
|
|
|
|
strlcpy(address, "www.abc.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-13 23:13:01 +01:00
|
|
|
test_streq(address, "www.abc.torserver.exit");
|
2010-08-02 21:09:37 +02:00
|
|
|
|
|
|
|
strlcpy(address, "www.def.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-12-13 23:13:01 +01:00
|
|
|
test_streq(address, "www.def.torserver.exit");
|
2010-08-02 21:09:37 +02:00
|
|
|
|
|
|
|
strlcpy(address, "www.torproject.org", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "1.1.1.1");
|
|
|
|
|
|
|
|
strlcpy(address, "test.torproject.org", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "1.1.1.1");
|
|
|
|
|
|
|
|
strlcpy(address, "torproject.net", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
test_streq(address, "2.2.2.2");
|
|
|
|
|
2010-12-27 18:35:16 +01:00
|
|
|
/* We don't support '*' as a mapping directive */
|
2014-04-26 06:27:21 +02:00
|
|
|
config_free_lines(get_options_mutable()->AddressMap);
|
2010-08-02 21:09:37 +02:00
|
|
|
addressmap_clear_configured();
|
2010-12-27 18:35:16 +01:00
|
|
|
strlcpy(buf, "MapAddress * *.torserver.exit\n", sizeof(buf));
|
2011-11-30 20:10:22 +01:00
|
|
|
config_get_lines(buf, &(get_options_mutable()->AddressMap), 0);
|
2010-08-02 21:09:37 +02:00
|
|
|
config_register_addressmaps(get_options());
|
|
|
|
|
|
|
|
strlcpy(address, "www.abc.com", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
|
|
|
|
strlcpy(address, "www.def.net", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
|
|
|
|
strlcpy(address, "www.torproject.org", sizeof(address));
|
2012-05-11 23:00:41 +02:00
|
|
|
test_assert(!addressmap_rewrite(address, sizeof(address), &expires, NULL));
|
2010-08-02 21:09:37 +02:00
|
|
|
|
2012-11-25 19:45:36 +01:00
|
|
|
#undef addressmap_rewrite
|
|
|
|
|
2011-12-02 06:16:47 +01:00
|
|
|
done:
|
2014-04-26 06:27:21 +02:00
|
|
|
config_free_lines(get_options_mutable()->AddressMap);
|
|
|
|
get_options_mutable()->AddressMap = NULL;
|
2010-08-02 21:09:37 +02:00
|
|
|
}
|
2013-05-24 19:31:10 +02:00
|
|
|
|
2013-02-02 01:40:41 +01:00
|
|
|
static int
|
|
|
|
is_private_dir(const char* path)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
int r = stat(path, &st);
|
|
|
|
if (r) {
|
|
|
|
return 0;
|
|
|
|
}
|
2014-06-20 15:49:36 +02:00
|
|
|
#if !defined (_WIN32)
|
2013-05-24 19:31:10 +02:00
|
|
|
if ((st.st_mode & (S_IFDIR | 0777)) != (S_IFDIR | 0700)) {
|
2013-02-02 01:40:41 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
test_config_check_or_create_data_subdir(void *arg)
|
|
|
|
{
|
2013-05-24 19:31:10 +02:00
|
|
|
or_options_t *options = get_options_mutable();
|
2014-04-26 20:48:30 +02:00
|
|
|
char *datadir;
|
2013-05-24 19:31:10 +02:00
|
|
|
const char *subdir = "test_stats";
|
2014-04-26 20:48:30 +02:00
|
|
|
char *subpath;
|
2013-02-02 01:40:41 +01:00
|
|
|
struct stat st;
|
2013-05-24 19:31:10 +02:00
|
|
|
int r;
|
2014-06-20 15:49:36 +02:00
|
|
|
#if !defined (_WIN32)
|
2013-05-24 19:31:10 +02:00
|
|
|
unsigned group_permission;
|
2013-05-29 18:08:28 +02:00
|
|
|
#endif
|
2013-05-24 19:31:10 +02:00
|
|
|
(void)arg;
|
2013-02-02 01:40:41 +01:00
|
|
|
|
2014-04-26 20:48:30 +02:00
|
|
|
tor_free(options->DataDirectory);
|
|
|
|
datadir = options->DataDirectory = tor_strdup(get_fname("datadir-0"));
|
|
|
|
subpath = get_datadir_fname(subdir);
|
|
|
|
|
2014-06-20 15:49:36 +02:00
|
|
|
#if defined (_WIN32)
|
2013-06-18 18:31:03 +02:00
|
|
|
tt_int_op(mkdir(options->DataDirectory), ==, 0);
|
2013-02-02 01:40:41 +01:00
|
|
|
#else
|
2013-06-18 18:31:03 +02:00
|
|
|
tt_int_op(mkdir(options->DataDirectory, 0700), ==, 0);
|
2013-02-02 01:40:41 +01:00
|
|
|
#endif
|
|
|
|
|
2013-05-24 19:31:10 +02:00
|
|
|
r = stat(subpath, &st);
|
2013-02-02 01:40:41 +01:00
|
|
|
|
|
|
|
// The subdirectory shouldn't exist yet,
|
|
|
|
// but should be created by the call to check_or_create_data_subdir.
|
|
|
|
test_assert(r && (errno == ENOENT));
|
|
|
|
test_assert(!check_or_create_data_subdir(subdir));
|
|
|
|
test_assert(is_private_dir(subpath));
|
|
|
|
|
|
|
|
// The check should return 0, if the directory already exists
|
|
|
|
// and is private to the user.
|
|
|
|
test_assert(!check_or_create_data_subdir(subdir));
|
|
|
|
|
2014-02-15 11:48:58 +01:00
|
|
|
r = stat(subpath, &st);
|
|
|
|
if (r) {
|
|
|
|
tt_abort_perror("stat");
|
|
|
|
}
|
|
|
|
|
2014-06-20 15:49:36 +02:00
|
|
|
#if !defined (_WIN32)
|
2013-05-24 19:31:10 +02:00
|
|
|
group_permission = st.st_mode | 0070;
|
2013-02-02 01:40:41 +01:00
|
|
|
r = chmod(subpath, group_permission);
|
|
|
|
|
|
|
|
if (r) {
|
2014-02-15 11:48:58 +01:00
|
|
|
tt_abort_perror("chmod");
|
2013-02-02 01:40:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// If the directory exists, but its mode is too permissive
|
|
|
|
// a call to check_or_create_data_subdir should reset the mode.
|
|
|
|
test_assert(!is_private_dir(subpath));
|
|
|
|
test_assert(!check_or_create_data_subdir(subdir));
|
|
|
|
test_assert(is_private_dir(subpath));
|
|
|
|
#endif
|
|
|
|
|
2013-05-24 19:31:10 +02:00
|
|
|
done:
|
|
|
|
rmdir(subpath);
|
|
|
|
tor_free(datadir);
|
2013-06-18 17:28:30 +02:00
|
|
|
tor_free(subpath);
|
2013-02-02 01:40:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2013-05-24 19:31:10 +02:00
|
|
|
test_config_write_to_data_subdir(void *arg)
|
2013-02-02 01:40:41 +01:00
|
|
|
{
|
|
|
|
or_options_t* options = get_options_mutable();
|
2014-04-26 20:48:30 +02:00
|
|
|
char *datadir;
|
2014-02-12 00:10:33 +01:00
|
|
|
char *cp = NULL;
|
2013-02-02 01:40:41 +01:00
|
|
|
const char* subdir = "test_stats";
|
|
|
|
const char* fname = "test_file";
|
|
|
|
const char* str =
|
|
|
|
"Lorem ipsum dolor sit amet, consetetur sadipscing\n"
|
|
|
|
"elitr, sed diam nonumy eirmod\n"
|
|
|
|
"tempor invidunt ut labore et dolore magna aliquyam\n"
|
|
|
|
"erat, sed diam voluptua.\n"
|
|
|
|
"At vero eos et accusam et justo duo dolores et ea\n"
|
|
|
|
"rebum. Stet clita kasd gubergren,\n"
|
|
|
|
"no sea takimata sanctus est Lorem ipsum dolor sit amet.\n"
|
|
|
|
"Lorem ipsum dolor sit amet,\n"
|
|
|
|
"consetetur sadipscing elitr, sed diam nonumy eirmod\n"
|
|
|
|
"tempor invidunt ut labore et dolore\n"
|
|
|
|
"magna aliquyam erat, sed diam voluptua. At vero eos et\n"
|
|
|
|
"accusam et justo duo dolores et\n"
|
|
|
|
"ea rebum. Stet clita kasd gubergren, no sea takimata\n"
|
|
|
|
"sanctus est Lorem ipsum dolor sit amet.";
|
2014-05-01 19:27:20 +02:00
|
|
|
char* filepath = NULL;
|
2013-05-24 19:31:10 +02:00
|
|
|
(void)arg;
|
2013-02-02 01:40:41 +01:00
|
|
|
|
2014-04-26 20:48:30 +02:00
|
|
|
tor_free(options->DataDirectory);
|
|
|
|
datadir = options->DataDirectory = tor_strdup(get_fname("datadir-1"));
|
2014-05-01 19:27:20 +02:00
|
|
|
filepath = get_datadir_fname2(subdir, fname);
|
2014-04-26 20:48:30 +02:00
|
|
|
|
2014-06-20 15:49:36 +02:00
|
|
|
#if defined (_WIN32)
|
2013-06-18 18:31:03 +02:00
|
|
|
tt_int_op(mkdir(options->DataDirectory), ==, 0);
|
2013-02-02 01:40:41 +01:00
|
|
|
#else
|
2013-06-18 18:31:03 +02:00
|
|
|
tt_int_op(mkdir(options->DataDirectory, 0700), ==, 0);
|
2013-02-02 01:40:41 +01:00
|
|
|
#endif
|
|
|
|
|
|
|
|
// Write attempt shoudl fail, if subdirectory doesn't exist.
|
|
|
|
test_assert(write_to_data_subdir(subdir, fname, str, NULL));
|
2013-06-18 18:31:03 +02:00
|
|
|
test_assert(! check_or_create_data_subdir(subdir));
|
2013-02-02 01:40:41 +01:00
|
|
|
|
|
|
|
// Content of file after write attempt should be
|
|
|
|
// equal to the original string.
|
|
|
|
test_assert(!write_to_data_subdir(subdir, fname, str, NULL));
|
2014-02-12 00:10:33 +01:00
|
|
|
cp = read_file_to_str(filepath, 0, NULL);
|
|
|
|
test_streq(cp, str);
|
|
|
|
tor_free(cp);
|
2013-02-02 01:40:41 +01:00
|
|
|
|
|
|
|
// A second write operation should overwrite the old content.
|
|
|
|
test_assert(!write_to_data_subdir(subdir, fname, str, NULL));
|
2014-02-12 00:10:33 +01:00
|
|
|
cp = read_file_to_str(filepath, 0, NULL);
|
|
|
|
test_streq(cp, str);
|
|
|
|
tor_free(cp);
|
|
|
|
|
2013-02-02 01:40:41 +01:00
|
|
|
done:
|
2013-06-18 18:31:03 +02:00
|
|
|
(void) unlink(filepath);
|
2013-02-02 01:40:41 +01:00
|
|
|
rmdir(options->DataDirectory);
|
2013-05-24 19:31:10 +02:00
|
|
|
tor_free(datadir);
|
2013-06-18 17:28:30 +02:00
|
|
|
tor_free(filepath);
|
2014-02-12 00:10:33 +01:00
|
|
|
tor_free(cp);
|
2013-02-02 01:40:41 +01:00
|
|
|
}
|
2010-08-02 21:09:37 +02:00
|
|
|
|
2013-02-11 23:45:18 +01:00
|
|
|
/* Test helper function: Make sure that a bridge line gets parsed
|
|
|
|
* properly. Also make sure that the resulting bridge_line_t structure
|
|
|
|
* has its fields set correctly. */
|
|
|
|
static void
|
|
|
|
good_bridge_line_test(const char *string, const char *test_addrport,
|
|
|
|
const char *test_digest, const char *test_transport,
|
|
|
|
const smartlist_t *test_socks_args)
|
|
|
|
{
|
|
|
|
char *tmp = NULL;
|
|
|
|
bridge_line_t *bridge_line = parse_bridge_line(string);
|
|
|
|
test_assert(bridge_line);
|
|
|
|
|
|
|
|
/* test addrport */
|
|
|
|
tmp = tor_strdup(fmt_addrport(&bridge_line->addr, bridge_line->port));
|
|
|
|
test_streq(test_addrport, tmp);
|
|
|
|
tor_free(tmp);
|
|
|
|
|
|
|
|
/* If we were asked to validate a digest, but we did not get a
|
|
|
|
digest after parsing, we failed. */
|
|
|
|
if (test_digest && tor_digest_is_zero(bridge_line->digest))
|
|
|
|
test_assert(0);
|
|
|
|
|
|
|
|
/* If we were not asked to validate a digest, and we got a digest
|
|
|
|
after parsing, we failed again. */
|
|
|
|
if (!test_digest && !tor_digest_is_zero(bridge_line->digest))
|
|
|
|
test_assert(0);
|
|
|
|
|
|
|
|
/* If we were asked to validate a digest, and we got a digest after
|
|
|
|
parsing, make sure it's correct. */
|
|
|
|
if (test_digest) {
|
|
|
|
tmp = tor_strdup(hex_str(bridge_line->digest, DIGEST_LEN));
|
|
|
|
tor_strlower(tmp);
|
|
|
|
test_streq(test_digest, tmp);
|
|
|
|
tor_free(tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we were asked to validate a transport name, make sure tha it
|
|
|
|
matches with the transport name that was parsed. */
|
|
|
|
if (test_transport && !bridge_line->transport_name)
|
|
|
|
test_assert(0);
|
|
|
|
if (!test_transport && bridge_line->transport_name)
|
|
|
|
test_assert(0);
|
|
|
|
if (test_transport)
|
|
|
|
test_streq(test_transport, bridge_line->transport_name);
|
|
|
|
|
|
|
|
/* Validate the SOCKS argument smartlist. */
|
|
|
|
if (test_socks_args && !bridge_line->socks_args)
|
|
|
|
test_assert(0);
|
|
|
|
if (!test_socks_args && bridge_line->socks_args)
|
|
|
|
test_assert(0);
|
|
|
|
if (test_socks_args)
|
|
|
|
test_assert(smartlist_strings_eq(test_socks_args,
|
|
|
|
bridge_line->socks_args));
|
|
|
|
|
|
|
|
done:
|
|
|
|
tor_free(tmp);
|
|
|
|
bridge_line_free(bridge_line);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test helper function: Make sure that a bridge line is
|
|
|
|
* unparseable. */
|
|
|
|
static void
|
|
|
|
bad_bridge_line_test(const char *string)
|
|
|
|
{
|
|
|
|
bridge_line_t *bridge_line = parse_bridge_line(string);
|
2014-02-03 22:21:32 +01:00
|
|
|
if (bridge_line)
|
|
|
|
TT_FAIL(("%s was supposed to fail, but it didn't.", string));
|
2013-02-11 23:45:18 +01:00
|
|
|
test_assert(!bridge_line);
|
|
|
|
|
|
|
|
done:
|
|
|
|
bridge_line_free(bridge_line);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
test_config_parse_bridge_line(void *arg)
|
|
|
|
{
|
|
|
|
(void) arg;
|
|
|
|
good_bridge_line_test("192.0.2.1:4123",
|
|
|
|
"192.0.2.1:4123", NULL, NULL, NULL);
|
|
|
|
|
|
|
|
good_bridge_line_test("192.0.2.1",
|
|
|
|
"192.0.2.1:443", NULL, NULL, NULL);
|
|
|
|
|
|
|
|
good_bridge_line_test("transport [::1]",
|
|
|
|
"[::1]:443", NULL, "transport", NULL);
|
|
|
|
|
|
|
|
good_bridge_line_test("transport 192.0.2.1:12 "
|
|
|
|
"4352e58420e68f5e40bf7c74faddccd9d1349413",
|
|
|
|
"192.0.2.1:12",
|
|
|
|
"4352e58420e68f5e40bf7c74faddccd9d1349413",
|
|
|
|
"transport", NULL);
|
|
|
|
|
|
|
|
{
|
|
|
|
smartlist_t *sl_tmp = smartlist_new();
|
|
|
|
smartlist_add_asprintf(sl_tmp, "twoandtwo=five");
|
|
|
|
|
|
|
|
good_bridge_line_test("transport 192.0.2.1:12 "
|
|
|
|
"4352e58420e68f5e40bf7c74faddccd9d1349413 twoandtwo=five",
|
|
|
|
"192.0.2.1:12", "4352e58420e68f5e40bf7c74faddccd9d1349413",
|
|
|
|
"transport", sl_tmp);
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
|
|
|
|
smartlist_free(sl_tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
smartlist_t *sl_tmp = smartlist_new();
|
|
|
|
smartlist_add_asprintf(sl_tmp, "twoandtwo=five");
|
|
|
|
smartlist_add_asprintf(sl_tmp, "z=z");
|
|
|
|
|
|
|
|
good_bridge_line_test("transport 192.0.2.1:12 twoandtwo=five z=z",
|
|
|
|
"192.0.2.1:12", NULL, "transport", sl_tmp);
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
|
|
|
|
smartlist_free(sl_tmp);
|
2014-04-11 20:06:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
smartlist_t *sl_tmp = smartlist_new();
|
|
|
|
smartlist_add_asprintf(sl_tmp, "dub=come");
|
|
|
|
smartlist_add_asprintf(sl_tmp, "save=me");
|
|
|
|
|
|
|
|
good_bridge_line_test("transport 192.0.2.1:12 "
|
|
|
|
"4352e58420e68f5e40bf7c74faddccd9d1349666 "
|
|
|
|
"dub=come save=me",
|
|
|
|
|
|
|
|
"192.0.2.1:12",
|
|
|
|
"4352e58420e68f5e40bf7c74faddccd9d1349666",
|
|
|
|
"transport", sl_tmp);
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
|
|
|
|
smartlist_free(sl_tmp);
|
2013-02-11 23:45:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
good_bridge_line_test("192.0.2.1:1231 "
|
|
|
|
"4352e58420e68f5e40bf7c74faddccd9d1349413",
|
|
|
|
"192.0.2.1:1231",
|
|
|
|
"4352e58420e68f5e40bf7c74faddccd9d1349413",
|
|
|
|
NULL, NULL);
|
|
|
|
|
|
|
|
/* Empty line */
|
|
|
|
bad_bridge_line_test("");
|
|
|
|
/* bad transport name */
|
|
|
|
bad_bridge_line_test("tr$n_sp0r7 190.20.2.2");
|
|
|
|
/* weird ip address */
|
|
|
|
bad_bridge_line_test("a.b.c.d");
|
|
|
|
/* invalid fpr */
|
|
|
|
bad_bridge_line_test("2.2.2.2:1231 4352e58420e68f5e40bf7c74faddccd9d1349");
|
|
|
|
/* no k=v in the end */
|
|
|
|
bad_bridge_line_test("obfs2 2.2.2.2:1231 "
|
|
|
|
"4352e58420e68f5e40bf7c74faddccd9d1349413 what");
|
|
|
|
/* no addrport */
|
|
|
|
bad_bridge_line_test("asdw");
|
|
|
|
/* huge k=v value that can't fit in SOCKS fields */
|
|
|
|
bad_bridge_line_test(
|
|
|
|
"obfs2 2.2.2.2:1231 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
|
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
|
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
|
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
|
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
|
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
|
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
|
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
|
|
|
|
"aa=b");
|
|
|
|
}
|
|
|
|
|
2013-06-12 14:28:48 +02:00
|
|
|
static void
|
|
|
|
test_config_parse_transport_options_line(void *arg)
|
|
|
|
{
|
2013-07-15 19:26:47 +02:00
|
|
|
smartlist_t *options_sl = NULL, *sl_tmp = NULL;
|
2013-06-12 14:28:48 +02:00
|
|
|
|
|
|
|
(void) arg;
|
|
|
|
|
|
|
|
{ /* too small line */
|
|
|
|
options_sl = get_options_from_transport_options_line("valley", NULL);
|
|
|
|
test_assert(!options_sl);
|
|
|
|
}
|
|
|
|
|
|
|
|
{ /* no k=v values */
|
|
|
|
options_sl = get_options_from_transport_options_line("hit it!", NULL);
|
|
|
|
test_assert(!options_sl);
|
|
|
|
}
|
|
|
|
|
|
|
|
{ /* correct line, but wrong transport specified */
|
|
|
|
options_sl =
|
|
|
|
get_options_from_transport_options_line("trebuchet k=v", "rook");
|
|
|
|
test_assert(!options_sl);
|
|
|
|
}
|
|
|
|
|
|
|
|
{ /* correct -- no transport specified */
|
2013-07-15 19:26:47 +02:00
|
|
|
sl_tmp = smartlist_new();
|
2013-06-12 14:28:48 +02:00
|
|
|
smartlist_add_asprintf(sl_tmp, "ladi=dadi");
|
|
|
|
smartlist_add_asprintf(sl_tmp, "weliketo=party");
|
|
|
|
|
|
|
|
options_sl =
|
|
|
|
get_options_from_transport_options_line("rook ladi=dadi weliketo=party",
|
|
|
|
NULL);
|
|
|
|
test_assert(options_sl);
|
|
|
|
test_assert(smartlist_strings_eq(options_sl, sl_tmp));
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
|
|
|
|
smartlist_free(sl_tmp);
|
2013-07-15 19:26:47 +02:00
|
|
|
sl_tmp = NULL;
|
2013-06-12 14:28:48 +02:00
|
|
|
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
|
|
|
|
smartlist_free(options_sl);
|
2013-07-15 19:26:47 +02:00
|
|
|
options_sl = NULL;
|
2013-06-12 14:28:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
{ /* correct -- correct transport specified */
|
2013-07-15 19:26:47 +02:00
|
|
|
sl_tmp = smartlist_new();
|
2013-06-12 14:28:48 +02:00
|
|
|
smartlist_add_asprintf(sl_tmp, "ladi=dadi");
|
|
|
|
smartlist_add_asprintf(sl_tmp, "weliketo=party");
|
|
|
|
|
|
|
|
options_sl =
|
|
|
|
get_options_from_transport_options_line("rook ladi=dadi weliketo=party",
|
|
|
|
"rook");
|
|
|
|
test_assert(options_sl);
|
|
|
|
test_assert(smartlist_strings_eq(options_sl, sl_tmp));
|
|
|
|
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
|
|
|
|
smartlist_free(sl_tmp);
|
2013-07-15 19:26:47 +02:00
|
|
|
sl_tmp = NULL;
|
2013-06-12 14:28:48 +02:00
|
|
|
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
|
|
|
|
smartlist_free(options_sl);
|
2013-07-15 19:26:47 +02:00
|
|
|
options_sl = NULL;
|
2013-06-12 14:28:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
2013-07-15 19:26:47 +02:00
|
|
|
if (options_sl) {
|
|
|
|
SMARTLIST_FOREACH(options_sl, char *, s, tor_free(s));
|
|
|
|
smartlist_free(options_sl);
|
|
|
|
}
|
|
|
|
if (sl_tmp) {
|
|
|
|
SMARTLIST_FOREACH(sl_tmp, char *, s, tor_free(s));
|
|
|
|
smartlist_free(sl_tmp);
|
|
|
|
}
|
2013-06-12 14:28:48 +02:00
|
|
|
}
|
|
|
|
|
2013-08-31 05:49:04 +02:00
|
|
|
// Tests if an options with MyFamily fingerprints missing '$' normalises
|
|
|
|
// them correctly and also ensure it also works with multiple fingerprints
|
|
|
|
static void
|
|
|
|
test_config_fix_my_family(void *arg)
|
|
|
|
{
|
|
|
|
char *err = NULL;
|
2013-09-03 19:35:44 +02:00
|
|
|
const char *family = "$1111111111111111111111111111111111111111, "
|
|
|
|
"1111111111111111111111111111111111111112, "
|
|
|
|
"$1111111111111111111111111111111111111113";
|
2013-08-31 05:49:04 +02:00
|
|
|
|
|
|
|
or_options_t* options = options_new();
|
|
|
|
or_options_t* defaults = options_new();
|
2013-09-03 19:35:44 +02:00
|
|
|
(void) arg;
|
|
|
|
|
2013-08-31 05:49:04 +02:00
|
|
|
options_init(options);
|
|
|
|
options_init(defaults);
|
|
|
|
options->MyFamily = tor_strdup(family);
|
|
|
|
|
|
|
|
options_validate(NULL, options, defaults, 0, &err) ;
|
|
|
|
|
|
|
|
if (err != NULL) {
|
2013-09-03 19:35:44 +02:00
|
|
|
TT_FAIL(("options_validate failed: %s", err));
|
2013-08-31 05:49:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
test_streq(options->MyFamily, "$1111111111111111111111111111111111111111, "
|
|
|
|
"$1111111111111111111111111111111111111112, "
|
|
|
|
"$1111111111111111111111111111111111111113");
|
|
|
|
|
|
|
|
done:
|
|
|
|
if (err != NULL) {
|
|
|
|
tor_free(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
or_options_free(options);
|
|
|
|
or_options_free(defaults);
|
|
|
|
}
|
|
|
|
|
2010-08-02 21:09:37 +02:00
|
|
|
#define CONFIG_TEST(name, flags) \
|
|
|
|
{ #name, test_config_ ## name, flags, NULL, NULL }
|
|
|
|
|
|
|
|
struct testcase_t config_tests[] = {
|
2011-09-08 17:19:06 +02:00
|
|
|
CONFIG_TEST(addressmap, 0),
|
2013-02-11 23:45:18 +01:00
|
|
|
CONFIG_TEST(parse_bridge_line, 0),
|
2013-06-12 14:28:48 +02:00
|
|
|
CONFIG_TEST(parse_transport_options_line, 0),
|
2013-05-24 19:31:10 +02:00
|
|
|
CONFIG_TEST(check_or_create_data_subdir, TT_FORK),
|
|
|
|
CONFIG_TEST(write_to_data_subdir, TT_FORK),
|
2013-08-31 05:49:04 +02:00
|
|
|
CONFIG_TEST(fix_my_family, 0),
|
2010-08-02 21:09:37 +02:00
|
|
|
END_OF_TESTCASES
|
|
|
|
};
|
|
|
|
|