April 2014 - tor-commits - lists.torproject.org

[torsocks/master] Find out if we really need libdl.
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 3876c9441ba3df0412b9740a28a72f79e31c4668 Author: Linus Nordberg <linus(a)nordberg.se> Date: Sun Aug 25 12:19:18 2013 +0200 Find out if we really need libdl. Some systems (like FreeBSD) have dlopen(3) and friends in libc and don't need -ldl. Removing the AC_CHECK_LIB for -ldl. Can't see the need for that, nor the 'have_libdl' outcome. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 9 +++------ src/lib/… [View More]

1 0

[torsocks/master] Fix: explicitly ignore fileno return value
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 6297d8508aec184cba7073a0ca553e1831f7b57d Author: David Goulet <dgoulet(a)efficios.com> Date: Wed Aug 28 19:08:14 2013 -0400 Fix: explicitly ignore fileno return value Signed-off-by: David Goulet <dgoulet(a)efficios.com> --- src/common/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/log.c b/src/common/log.c index e415721..472dc49 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -163,7 +163,7 @@ int log_init(int … [View More]

1 0

[torsocks/master] Use extern for tsocks_libc_* in torsocks.h
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit a25ae10b74dedc2c023449563a1471842fae4c99 Author: Luke Gallagher <luke(a)hypergeometric.net> Date: Fri Aug 30 09:53:45 2013 +1000 Use extern for tsocks_libc_* in torsocks.h Define tsocks_libc_* in the relevant source files and define them as external in torsocks.h to avoid duplicate symbol errors. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/connect.c | 3 +++ src/lib/getaddrinfo.c | 4 ++++ src/lib/gethostbyname.c | … [View More] 29 +++++++++++++++++++++++++++++ src/lib/getpeername.c | 4 ++++ src/lib/recv.c | 3 +++ src/lib/socket.c | 3 +++ src/lib/socketpair.c | 3 +++ src/lib/syscall.c | 6 ++++++ src/lib/torsocks.h | 36 ++++++++++++++++++------------------ 9 files changed, 73 insertions(+), 18 deletions(-) diff --git a/src/lib/connect.c b/src/lib/connect.c index 357a313..3d75a94 100644 --- a/src/lib/connect.c +++ b/src/lib/connect.c @@ -25,6 +25,9 @@ #include "torsocks.h" +/* connect(2) */ +TSOCKS_LIBC_DECL(connect, LIBC_CONNECT_RET_TYPE, LIBC_CONNECT_SIG) + /* * Torsocks call for connect(2). */ diff --git a/src/lib/getaddrinfo.c b/src/lib/getaddrinfo.c index 683bfc7..7a7a144 100644 --- a/src/lib/getaddrinfo.c +++ b/src/lib/getaddrinfo.c @@ -24,6 +24,10 @@ #include "torsocks.h" +/* getaddrinfo(3) */ +TSOCKS_LIBC_DECL(getaddrinfo, LIBC_GETADDRINFO_RET_TYPE, + LIBC_GETADDRINFO_SIG) + /* * Torsocks call for getaddrinfo(3). */ diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c index bab01b0..9ba5cee 100644 --- a/src/lib/gethostbyname.c +++ b/src/lib/gethostbyname.c @@ -25,6 +25,35 @@ #include "torsocks.h" +struct hostent tsocks_he; +char *tsocks_he_addr_list[2]; +char tsocks_he_addr[INET_ADDRSTRLEN]; +char tsocks_he_name[255]; + +/* gethostbyname(3) */ +TSOCKS_LIBC_DECL(gethostbyname, LIBC_GETHOSTBYNAME_RET_TYPE, + LIBC_GETHOSTBYNAME_SIG) + +/* gethostbyname_r(3) */ +TSOCKS_LIBC_DECL(gethostbyname_r, LIBC_GETHOSTBYNAME_R_RET_TYPE, + LIBC_GETHOSTBYNAME_R_SIG) + +/* gethostbyname2(3) */ +TSOCKS_LIBC_DECL(gethostbyname2, LIBC_GETHOSTBYNAME2_RET_TYPE, + LIBC_GETHOSTBYNAME2_SIG) + +/* gethostbyname2_r(3) */ +TSOCKS_LIBC_DECL(gethostbyname2_r, LIBC_GETHOSTBYNAME2_R_RET_TYPE, + LIBC_GETHOSTBYNAME2_R_SIG) + +/* gethostbyaddr(3) */ +TSOCKS_LIBC_DECL(gethostbyaddr, LIBC_GETHOSTBYADDR_RET_TYPE, + LIBC_GETHOSTBYADDR_SIG) + +/* gethostbyaddr_r(3) */ +TSOCKS_LIBC_DECL(gethostbyaddr_r, LIBC_GETHOSTBYADDR_R_RET_TYPE, + LIBC_GETHOSTBYADDR_R_SIG) + /* * Torsocks call for gethostbyname(3). * diff --git a/src/lib/getpeername.c b/src/lib/getpeername.c index 8e4b671..8e2bd44 100644 --- a/src/lib/getpeername.c +++ b/src/lib/getpeername.c @@ -22,6 +22,10 @@ #include "torsocks.h" +/* getpeername(2) */ +TSOCKS_LIBC_DECL(getpeername, LIBC_GETPEERNAME_RET_TYPE, + LIBC_GETPEERNAME_SIG) + /* * Torsocks call for getpeername(2). */ diff --git a/src/lib/recv.c b/src/lib/recv.c index 895892d..9f9aefc 100644 --- a/src/lib/recv.c +++ b/src/lib/recv.c @@ -22,6 +22,9 @@ #include "torsocks.h" +/* recvmsg(2) */ +TSOCKS_LIBC_DECL(recvmsg, LIBC_RECVMSG_RET_TYPE, LIBC_RECVMSG_SIG) + /* * Torsocks call for recvmsg(2) * diff --git a/src/lib/socket.c b/src/lib/socket.c index ce28576..aa5297e 100644 --- a/src/lib/socket.c +++ b/src/lib/socket.c @@ -21,6 +21,9 @@ #include "torsocks.h" +/* socket(2) */ +TSOCKS_LIBC_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG) + /* * Torsocks call for socket(2) */ diff --git a/src/lib/socketpair.c b/src/lib/socketpair.c index 97a5761..599b4c3 100644 --- a/src/lib/socketpair.c +++ b/src/lib/socketpair.c @@ -21,6 +21,9 @@ #include "torsocks.h" +/* socketpair(2) */ +TSOCKS_LIBC_DECL(socketpair, LIBC_SOCKETPAIR_RET_TYPE, LIBC_SOCKETPAIR_SIG) + /* * Torsocks call for socketpair(2) */ diff --git a/src/lib/syscall.c b/src/lib/syscall.c index af60060..0edd460 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -22,6 +22,12 @@ #include "torsocks.h" +/* syscall(2) */ +TSOCKS_LIBC_DECL(syscall, LIBC_SYSCALL_RET_TYPE, LIBC_SYSCALL_SIG) + +/* close(2) */ +TSOCKS_LIBC_DECL(close, LIBC_CLOSE_RET_TYPE, LIBC_CLOSE_SIG) + /* * Handle close syscall to be called with tsocks call. */ diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 3a23eb4..1554abc 100644 --- a/src/lib/torsocks.h +++ b/src/lib/torsocks.h @@ -83,10 +83,10 @@ * use free(). So, we use static memory here to mimic the libc call and avoid * memory leaks. This also void the need of hijacking freehostent(3). */ -struct hostent tsocks_he; -char *tsocks_he_addr_list[2]; -char tsocks_he_addr[INET_ADDRSTRLEN]; -char tsocks_he_name[255]; +extern struct hostent tsocks_he; +extern char *tsocks_he_addr_list[2]; +extern char tsocks_he_addr[INET_ADDRSTRLEN]; +extern char tsocks_he_name[255]; #define LIBC_GETHOSTBYNAME_NAME gethostbyname #define LIBC_GETHOSTBYNAME_NAME_STR XSTR(LIBC_GETHOSTBYNAME_NAME) @@ -208,83 +208,83 @@ struct hostent **__result, int *__h_errnop */ /* connect(2) */ -TSOCKS_LIBC_DECL(connect, LIBC_CONNECT_RET_TYPE, LIBC_CONNECT_SIG) +extern TSOCKS_LIBC_DECL(connect, LIBC_CONNECT_RET_TYPE, LIBC_CONNECT_SIG) TSOCKS_DECL(connect, LIBC_CONNECT_RET_TYPE, LIBC_CONNECT_SIG) #define LIBC_CONNECT_DECL \ LIBC_CONNECT_RET_TYPE LIBC_CONNECT_NAME(LIBC_CONNECT_SIG) /* recvmsg(2) */ -TSOCKS_LIBC_DECL(recvmsg, LIBC_RECVMSG_RET_TYPE, LIBC_RECVMSG_SIG) +extern TSOCKS_LIBC_DECL(recvmsg, LIBC_RECVMSG_RET_TYPE, LIBC_RECVMSG_SIG) #define LIBC_RECVMSG_DECL \ LIBC_RECVMSG_RET_TYPE LIBC_RECVMSG_NAME(LIBC_RECVMSG_SIG) /* socket(2) */ -TSOCKS_LIBC_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG) +extern TSOCKS_LIBC_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG) TSOCKS_DECL(socket, LIBC_SOCKET_RET_TYPE, LIBC_SOCKET_SIG) #define LIBC_SOCKET_DECL \ LIBC_SOCKET_RET_TYPE LIBC_SOCKET_NAME(LIBC_SOCKET_SIG) /* socketpair(2) */ -TSOCKS_LIBC_DECL(socketpair, LIBC_SOCKETPAIR_RET_TYPE, LIBC_SOCKETPAIR_SIG) +extern TSOCKS_LIBC_DECL(socketpair, LIBC_SOCKETPAIR_RET_TYPE, LIBC_SOCKETPAIR_SIG) TSOCKS_DECL(socketpair, LIBC_SOCKETPAIR_RET_TYPE, LIBC_SOCKETPAIR_SIG) #define LIBC_SOCKETPAIR_DECL \ LIBC_SOCKETPAIR_RET_TYPE LIBC_SOCKETPAIR_NAME(LIBC_SOCKETPAIR_SIG) /* syscall(2) */ -TSOCKS_LIBC_DECL(syscall, LIBC_SYSCALL_RET_TYPE, LIBC_SYSCALL_SIG) +extern TSOCKS_LIBC_DECL(syscall, LIBC_SYSCALL_RET_TYPE, LIBC_SYSCALL_SIG) #define LIBC_SYSCALL_DECL \ LIBC_SYSCALL_RET_TYPE LIBC_SYSCALL_NAME(LIBC_SYSCALL_SIG) /* close(2) */ -TSOCKS_LIBC_DECL(close, LIBC_CLOSE_RET_TYPE, LIBC_CLOSE_SIG) +extern TSOCKS_LIBC_DECL(close, LIBC_CLOSE_RET_TYPE, LIBC_CLOSE_SIG) TSOCKS_DECL(close, LIBC_CLOSE_RET_TYPE, LIBC_CLOSE_SIG) #define LIBC_CLOSE_DECL \ LIBC_CLOSE_RET_TYPE LIBC_CLOSE_NAME(LIBC_CLOSE_SIG) /* gethostbyname(3) */ -TSOCKS_LIBC_DECL(gethostbyname, LIBC_GETHOSTBYNAME_RET_TYPE, +extern TSOCKS_LIBC_DECL(gethostbyname, LIBC_GETHOSTBYNAME_RET_TYPE, LIBC_GETHOSTBYNAME_SIG) #define LIBC_GETHOSTBYNAME_DECL LIBC_GETHOSTBYNAME_RET_TYPE \ LIBC_GETHOSTBYNAME_NAME(LIBC_GETHOSTBYNAME_SIG) /* gethostbyname_r(3) */ -TSOCKS_LIBC_DECL(gethostbyname_r, LIBC_GETHOSTBYNAME_R_RET_TYPE, +extern TSOCKS_LIBC_DECL(gethostbyname_r, LIBC_GETHOSTBYNAME_R_RET_TYPE, LIBC_GETHOSTBYNAME_R_SIG) #define LIBC_GETHOSTBYNAME_R_DECL LIBC_GETHOSTBYNAME_R_RET_TYPE \ LIBC_GETHOSTBYNAME_R_NAME(LIBC_GETHOSTBYNAME_R_SIG) /* gethostbyname2(3) */ -TSOCKS_LIBC_DECL(gethostbyname2, LIBC_GETHOSTBYNAME2_RET_TYPE, +extern TSOCKS_LIBC_DECL(gethostbyname2, LIBC_GETHOSTBYNAME2_RET_TYPE, LIBC_GETHOSTBYNAME2_SIG) #define LIBC_GETHOSTBYNAME2_DECL LIBC_GETHOSTBYNAME2_RET_TYPE \ LIBC_GETHOSTBYNAME2_NAME(LIBC_GETHOSTBYNAME2_SIG) /* gethostbyname2_r(3) */ -TSOCKS_LIBC_DECL(gethostbyname2_r, LIBC_GETHOSTBYNAME2_R_RET_TYPE, +extern TSOCKS_LIBC_DECL(gethostbyname2_r, LIBC_GETHOSTBYNAME2_R_RET_TYPE, LIBC_GETHOSTBYNAME2_R_SIG) #define LIBC_GETHOSTBYNAME2_R_DECL LIBC_GETHOSTBYNAME2_R_RET_TYPE \ LIBC_GETHOSTBYNAME2_R_NAME(LIBC_GETHOSTBYNAME2_R_SIG) /* gethostbyaddr(3) */ -TSOCKS_LIBC_DECL(gethostbyaddr, LIBC_GETHOSTBYADDR_RET_TYPE, +extern TSOCKS_LIBC_DECL(gethostbyaddr, LIBC_GETHOSTBYADDR_RET_TYPE, LIBC_GETHOSTBYADDR_SIG) #define LIBC_GETHOSTBYADDR_DECL LIBC_GETHOSTBYADDR_RET_TYPE \ LIBC_GETHOSTBYADDR_NAME(LIBC_GETHOSTBYADDR_SIG) /* gethostbyaddr_r(3) */ -TSOCKS_LIBC_DECL(gethostbyaddr_r, LIBC_GETHOSTBYADDR_R_RET_TYPE, +extern TSOCKS_LIBC_DECL(gethostbyaddr_r, LIBC_GETHOSTBYADDR_R_RET_TYPE, LIBC_GETHOSTBYADDR_R_SIG) #define LIBC_GETHOSTBYADDR_R_DECL LIBC_GETHOSTBYADDR_R_RET_TYPE \ LIBC_GETHOSTBYADDR_R_NAME(LIBC_GETHOSTBYADDR_R_SIG) /* getaddrinfo(3) */ -TSOCKS_LIBC_DECL(getaddrinfo, LIBC_GETADDRINFO_RET_TYPE, +extern TSOCKS_LIBC_DECL(getaddrinfo, LIBC_GETADDRINFO_RET_TYPE, LIBC_GETADDRINFO_SIG) #define LIBC_GETADDRINFO_DECL LIBC_GETADDRINFO_RET_TYPE \ LIBC_GETADDRINFO_NAME(LIBC_GETADDRINFO_SIG) /* getpeername(2) */ -TSOCKS_LIBC_DECL(getpeername, LIBC_GETPEERNAME_RET_TYPE, +extern TSOCKS_LIBC_DECL(getpeername, LIBC_GETPEERNAME_RET_TYPE, LIBC_GETPEERNAME_SIG) #define LIBC_GETPEERNAME_DECL LIBC_GETPEERNAME_RET_TYPE \ LIBC_GETPEERNAME_NAME(LIBC_GETPEERNAME_SIG) [View Less]

1 0

[torsocks/master] Make sure __darwin__ is defined
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 6c589a8d181546f02092b3b599be660cc08c35ff Author: Luke Gallagher <luke(a)hypergeometric.net> Date: Fri Aug 30 09:23:22 2013 +1000 Make sure __darwin__ is defined Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/compat.h | 4 ++++ src/common/ref.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/common/compat.h b/src/common/compat.h index a433339..18404b2 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -18,6 +18,… [View More]

1 0

[torsocks/master] Tests: add onion pool subsystem unit test
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 1ed979d7f08eef29c51570a88517551e41e42732 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 30 20:15:20 2013 -0400 Tests: add onion pool subsystem unit test Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 1 + configure.ac | 1 + tests/Makefile.am | 2 +- tests/test_list | 1 + tests/unit/Makefile.am | 10 +++ tests/unit/test_onion.c | 175 +++++++++++++++++++++++++++++++++++++++++++… [View More]++++ 6 files changed, 189 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6e728a0..a293c55 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ doc/usewithtor.1 src/bin/torsocks tests/test_dns +tests/unit/test_onion diff --git a/configure.ac b/configure.ac index 8f2f392..6c89912 100644 --- a/configure.ac +++ b/configure.ac @@ -360,6 +360,7 @@ AC_CONFIG_FILES([ src/common/Makefile src/lib/Makefile tests/Makefile + tests/unit/Makefile tests/utils/Makefile tests/utils/tap/Makefile doc/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 66f3dde..18eb5a9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = utils +SUBDIRS = utils unit AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir) diff --git a/tests/test_list b/tests/test_list index 963e59b..ee705d6 100644 --- a/tests/test_list +++ b/tests/test_list @@ -1 +1,2 @@ ./test_dns +./unit/test_onion diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am new file mode 100644 index 0000000..ad8b361 --- /dev/null +++ b/tests/unit/Makefile.am @@ -0,0 +1,10 @@ +AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir) + +LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la + +LIBCOMMON=$(top_builddir)/src/common/libcommon.la + +noinst_PROGRAMS = test_onion + +test_onion_SOURCES = test_onion.c +test_onion_LDADD = $(LIBTAP) $(LIBCOMMON) diff --git a/tests/unit/test_onion.c b/tests/unit/test_onion.c new file mode 100644 index 0000000..0c91f71 --- /dev/null +++ b/tests/unit/test_onion.c @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2013 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <arpa/inet.h> +#include <netinet/in.h> +#include <stdio.h> +#include <sys/socket.h> + +#include <common/onion.h> +#include <common/defaults.h> + +#include <tap/tap.h> + +#define NUM_TESTS 12 + +static void test_onion_entry(struct onion_pool *pool) +{ + int ret; + struct onion_entry *entry; + const char *onion_addr1 = "87idq6tnejk5plpn.onion"; + const char *onion_addr2 = "97idq6tnejk5plpn.onion"; + const char *onion_addr1_typo = "87idq6tnejk5plpn.onio"; + + diag("Onion entry subsystem initialization test"); + + /* Create valid onion pool from default values. */ + ret = onion_pool_init(pool, inet_addr(DEFAULT_ONION_ADDR_RANGE), + (uint8_t) atoi(DEFAULT_ONION_ADDR_MASK)); + ok(ret == 0 && + pool->base == 0 && + pool->max_pos == 255 && + pool->size == 8 && + pool->count == 0 && + pool->next_entry_pos == 0, + "Valid onion pool created"); + + entry = onion_entry_create(pool, onion_addr1); + ok(entry && + pool->count == 1 && + pool->next_entry_pos == 1 && + strcmp(entry->hostname, onion_addr1) == 0 && + strcmp(DEFAULT_ONION_ADDR_RANGE, + inet_ntoa(*((struct in_addr *) &entry->ip))) == 0, + "Valid onion entry %s created", onion_addr1); + + entry = onion_entry_find_by_name("meh", pool); + ok(!entry, "Onion entry not found"); + + entry = onion_entry_find_by_name(onion_addr1_typo, pool); + ok(!entry, "Onion entry with typo not found"); + + entry = onion_entry_find_by_name(onion_addr1, pool); + ok(entry && + pool->count == 1 && + strcmp(entry->hostname, onion_addr1) == 0 && + strcmp(DEFAULT_ONION_ADDR_RANGE, + inet_ntoa(*((struct in_addr *) &entry->ip))) == 0, + "Valid onion entry found by name"); + + entry = onion_entry_find_by_ip(inet_addr(DEFAULT_ONION_ADDR_RANGE), pool); + ok(entry && + pool->count == 1 && + strcmp(entry->hostname, onion_addr1) == 0 && + strcmp(DEFAULT_ONION_ADDR_RANGE, + inet_ntoa(*((struct in_addr *) &entry->ip))) == 0, + "Valid onion entry found by IP"); + + entry = onion_entry_create(pool, onion_addr2); + ok(entry && + pool->count == 2 && + pool->next_entry_pos == 2 && + strcmp(entry->hostname, onion_addr2) == 0 && + strcmp("127.42.42.1", + inet_ntoa(*((struct in_addr *) &entry->ip))) == 0, + "Valid onion entry %s created", onion_addr2); + + onion_pool_destroy(pool); +} + +static void test_onion_init(struct onion_pool *pool) +{ + int ret; + uint8_t mask; + in_addr_t base; + + diag("Onion subsystem initialization test"); + + /* Valid default configuration test. */ + base = inet_addr(DEFAULT_ONION_ADDR_RANGE); + mask = (uint8_t) atoi(DEFAULT_ONION_ADDR_MASK); + ret = onion_pool_init(pool, base, mask); + ok(ret == 0 && + pool->entries && + pool->base == 0 && + pool->max_pos == 255 && + pool->size == 8 && + pool->count == 0 && + pool->next_entry_pos == 0, + "Valid onion pool of %s/%d", DEFAULT_ONION_ADDR_RANGE, mask); + + /* Valid test. */ + base = inet_addr("127.42.42.64"); + mask = 27; + ret = onion_pool_init(pool, base, mask); + ok(ret == 0 && + pool->entries && + pool->base == 64 && + pool->max_pos == 95 && + pool->size == 8 && + pool->count == 0 && + pool->next_entry_pos == 0, + "Valid onion pool of 127.42.42.64/27"); + + /* Valid test. */ + base = inet_addr("127.42.42.64"); + mask = 17; + ret = onion_pool_init(pool, base, mask); + ok(ret == 0 && + pool->entries && + pool->base == 0 && + pool->max_pos == 32767 && + pool->size == 8 && + pool->count == 0 && + pool->next_entry_pos == 0, + "Valid onion pool of 127.42.42.64/17"); + + /* Valid test with size less than default. */ + base = inet_addr("127.42.42.0"); + mask = 32; + ret = onion_pool_init(pool, base, mask); + ok(ret == 0 && + pool->entries && + pool->base == 0 && + pool->max_pos == 0 && + pool->size == 1 && + pool->count == 0 && + pool->next_entry_pos == 0, + "Valid onion pool of 127.42.42.0/32"); + + /* Invalid test. */ + base = inet_addr("127.42.42.64"); + mask = 42; + ret = onion_pool_init(pool, base, mask); + ok(ret == -EINVAL, + "Invalid onion pool of mask 42"); + + onion_pool_destroy(pool); +} + +int main(int argc, char **argv) +{ + struct onion_pool pool; + + /* Libtap call for the number of tests planned. */ + plan_tests(NUM_TESTS); + + test_onion_init(&pool); + test_onion_entry(&pool); + + return 0; +} [View Less]

1 0

[torsocks/master] Fix: Improve README file
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 17b3d9b0b92cefbf33dadccf5171678984dee8e4 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 31 11:37:54 2013 -0400 Fix: Improve README file Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- README | 55 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/README b/README index 475ff2c..a694a8a 100644 --- a/README +++ b/README @@ -1,20 +1,59 @@ What is torsocks? ----------------- … [View More]-Torsocks allows you to use most socks-friendly applications in a safe way with -Tor. It ensures that DNS requests are handled safely and explicitly rejects any -traffic other then TCP from the application you're using. +Torsocks allows you to use most applications in a safe way with Tor. It ensures +that DNS requests are handled safely and explicitly rejects any traffic other +then TCP from the application you're using. + +Torsocks is an ELF shared library that is loaded before all others. The library +overrides every needed Internet communication libc function calls such as +connect(2) or gethostbyname(3). + +This process is transparent to the user and if torsocks detects any +communication that can't go through the Tor network such as UDP traffic for +instance, the connection is denied. If, in some wayt, there is no way for +torsocks to provide the Tor anonymity guarantee with your application, torsocks +will force the application to quit and stop everything. + +Installation +----------------- + + $ ./configure + $ make + $ sudo make install + +If you are compiling it from the git repository, run ./autogen.sh before the +configure script. Using torsocks -------------- -Torsocks allows you to use most socks-friendly applications in a safe way with Tor. + Once you have installed torsocks, just launch it like so: - torsocks [application] + $ torsocks [application] So, for example you can use ssh to a some.ssh.com by doing: - torsocks ssh username(a)some.ssh.com + $ torsocks ssh username(a)some.ssh.com + +You can use the torsocks library without the script provided: + + $ LD_PREALOD=/full/path/to/libtorsocks.so your_app + +For more details, please see the torsocks.1, torsocks.8 and torsocks.conf.5 man +pages. Also, you can use -h, --help for all the possible options of the +torsocks script. + +A configuration file named *torsocks.conf* is also provided for the user to +control some parameters. + +More informations +-------------- + +torsocks is distributed under the GNU General Public License version 2. + +Mailing list for help is <tor-talk(a)lists.torproject.org> and for development +use <tor-dev(a)lists.torproject.org>. You can find the project also on IRC server +irc.oftc.net (OFTC) in #tor and #tor-dev. -The Tor project: -https://www.torproject.org +See more information about the Tor project at https://www.torproject.org. [View Less]

1 0

[torsocks/master] Tests: add connection object unit test
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit fc928e4dc81da50b32c4ac70e658c5a5c1359552 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 31 12:55:12 2013 -0400 Tests: add connection object unit test Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 1 + tests/test_list | 1 + tests/unit/Makefile.am | 5 +- tests/unit/test_connection.c | 148 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 1 deletion(-) … [View More]diff --git a/.gitignore b/.gitignore index a293c55..e04cf8d 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ src/bin/torsocks tests/test_dns tests/unit/test_onion +tests/unit/test_connection diff --git a/tests/test_list b/tests/test_list index ee705d6..7564c96 100644 --- a/tests/test_list +++ b/tests/test_list @@ -1,2 +1,3 @@ ./test_dns ./unit/test_onion +./unit/test_connection diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index ad8b361..9dd1bae 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -4,7 +4,10 @@ LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la LIBCOMMON=$(top_builddir)/src/common/libcommon.la -noinst_PROGRAMS = test_onion +noinst_PROGRAMS = test_onion test_connection test_onion_SOURCES = test_onion.c test_onion_LDADD = $(LIBTAP) $(LIBCOMMON) + +test_connection_SOURCES = test_connection.c +test_connection_LDADD = $(LIBTAP) $(LIBCOMMON) diff --git a/tests/unit/test_connection.c b/tests/unit/test_connection.c new file mode 100644 index 0000000..508e7db --- /dev/null +++ b/tests/unit/test_connection.c @@ -0,0 +1,148 @@ +/* + * Copyright (C) 2013 - David Goulet <dgoulet(a)ev0ke.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <arpa/inet.h> +#include <netinet/in.h> +#include <stdio.h> +#include <sys/socket.h> + +#include <common/connection.h> +#include <common/defaults.h> + +#include <tap/tap.h> + +#define NUM_TESTS 13 + +static void test_connection_usage(void) +{ + int ret; + struct connection *conn, *conn2, *l_conn; + struct connection_addr c_addr; + + diag("Connection subsystem creation test"); + + ret = connection_addr_set(CONNECTION_DOMAIN_INET, "127.0.0.1", 9050, + &c_addr); + ok(ret == 0 && + c_addr.domain == CONNECTION_DOMAIN_INET && + c_addr.u.sin.sin_family == AF_INET && + c_addr.u.sin.sin_port == htons(9050), + "Valid connection address creation"); + + conn = connection_create(42, (struct sockaddr *) &c_addr.u.sin); + ok(conn && + conn->fd == 42 && + conn->dest_addr.domain == CONNECTION_DOMAIN_INET && + conn->refcount.count == 1, + "Valid connection creation"); + + conn2 = connection_create(43, (struct sockaddr *) &c_addr.u.sin); + ok(conn2 && + conn2->fd == 43 && + conn2->dest_addr.domain == CONNECTION_DOMAIN_INET && + conn2->refcount.count == 1, + "Valid second connection creation"); + + connection_registry_lock(); + connection_insert(conn); + l_conn = connection_find(conn->fd); + ok(conn == l_conn, "Valid connection insert/find"); + + connection_insert(conn2); + l_conn = connection_find(conn2->fd); + ok(conn2 == l_conn, "Valid second connection insert/find"); + + connection_remove(conn); + l_conn = connection_find(conn->fd); + ok(conn != l_conn, "Valid connection remove/find"); + + connection_remove(conn2); + l_conn = connection_find(conn2->fd); + ok(conn2 != l_conn, "Valid second connection remove/find"); + connection_registry_unlock(); + + connection_destroy(conn); + connection_destroy(conn2); +} + +static void test_connection_creation(void) +{ + int ret; + struct connection *conn; + struct connection_addr c_addr; + + diag("Connection subsystem creation test"); + + ret = connection_addr_set(CONNECTION_DOMAIN_INET, "127.0.0.1", 9050, + &c_addr); + ok(ret == 0 && + c_addr.domain == CONNECTION_DOMAIN_INET && + c_addr.u.sin.sin_family == AF_INET && + c_addr.u.sin.sin_port == htons(9050), + "Valid connection address creation"); + + conn = connection_create(42, (struct sockaddr *) &c_addr.u.sin); + ok(conn && + conn->fd == 42 && + conn->dest_addr.domain == CONNECTION_DOMAIN_INET && + conn->refcount.count == 1, + "Valid connection creation"); + connection_destroy(conn); + + conn = connection_create(-1, (struct sockaddr *) &c_addr.u.sin); + ok(conn && + conn->fd == -1 && + conn->dest_addr.domain == CONNECTION_DOMAIN_INET && + conn->refcount.count == 1, + "Valid connection creation with fd -1"); + connection_destroy(conn); + + conn = connection_create(42, NULL); + ok(conn && + conn->fd == 42 && + conn->dest_addr.domain == 0 && + conn->refcount.count == 1, + "Valid connection creation with sockaddr NULL"); + connection_destroy(conn); + + ret = connection_addr_set(CONNECTION_DOMAIN_INET6, "::1", 9050, + &c_addr); + ok(ret == 0 && + c_addr.domain == CONNECTION_DOMAIN_INET6 && + c_addr.u.sin.sin_family == AF_INET6 && + c_addr.u.sin.sin_port == htons(9050), + "Valid connection address creation for IPv6"); + + conn = connection_create(42, (struct sockaddr *) &c_addr.u.sin6); + ok(conn && + conn->fd == 42 && + conn->dest_addr.domain == CONNECTION_DOMAIN_INET6 && + conn->refcount.count == 1, + "Valid connection creation for IPv6"); + connection_destroy(conn); +} + +int main(int argc, char **argv) +{ + /* Libtap call for the number of tests planned. */ + plan_tests(NUM_TESTS); + + test_connection_creation(); + test_connection_usage(); + + return 0; +} [View Less]

1 0

[torsocks/master] Fix: remove out of date and inaccurate FAQ
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 6672e820f2f0c5569ccf1ce1ba274d37de1d39db Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 31 13:27:22 2013 -0400 Fix: remove out of date and inaccurate FAQ Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- FAQ | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/FAQ b/FAQ deleted file mode 100644 index 291edc2..0000000 --- a/FAQ +++ /dev/null @@ -1,42 +0,0 @@ - -Q: tsocks doesn't seem to be working for … [View More]SSH, why? - -A: - -tsocks can be used a number of ways, the most common being the LD_PRELOAD -environment variable. When set (often through the 'tsocks' script) this -requests that the system dynamic loader load tsocks into each process -before execution of the process begins. This allows tsocks to redirect -calls to standard networking functions to force them to be socksified. - -Unfortunately LD_PRELOAD simply doesn't work for setuid programs when the -user running the program is not the same as the owner of the executable. -This is because being able to load code into a privileged executable -would be a major security flaw. To fix this problem you may wish to -removed the setuid bit from SSH (this will force it not to use privileged -TCP ports, disable some forms of RSA authentication to older servers and -may have other effects). Alternatively you might wish to force tsocks to -be loaded into all processes using the /etc/ld.so.preload file, for more -information please see the tsocks man page. - - -Q: tsocks doesn't seem to be working for ftp, why? - -A: - -tsocks can only socksify outgoing connection requests from applications, -in ftp there are normally two channels, one is made from the client to -the server (called the control channel) and another from the server back -to the client (called the data channel). If a SOCKS server is between the -client and the server the server will incorrectly try to connect back to -the SOCKS server rather than the client. Thus the data channel connection -will be fail (not that it would likely succeed even if it did try to -connect back to the correct client, given the SOCKS server is probably -firewalling the network off). - -The simplest solution to this problem is to use passive mode ftp, in this -form of ftp all connections are made from the client to server, even the -data channel. Most ftp clients and servers support passive mode, check -your documentation (as a tip the Linux command line ftp client uses -passive mode when invoced with the -p option) - [View Less]

1 0

[torsocks/master] Define LIBC_SYSCALL_ for OS X
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit b1394b89b901c53b265b3aa4f0a1373b474e1540 Author: Luke Gallagher <luke(a)hypergeometric.net> Date: Fri Aug 30 09:29:40 2013 +1000 Define LIBC_SYSCALL_ for OS X OS X has the same declaration as FreeBSD. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/torsocks.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h index 7c2ff59..3a23eb4 100644 --- a/src/lib/torsocks.h +++ b/src/… [View More]

1 0

[torsocks/master] Tests: add config-file tests
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 89194d2372d7d75ab599b1330424782c3d267bb0 Author: Luke Gallagher <luke(a)hypergeometric.net> Date: Sun Sep 8 15:45:25 2013 +1000 Tests: add config-file tests Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 1 + tests/test_list | 1 + tests/unit/Makefile.am | 11 ++- tests/unit/fixtures/config0 | 19 +++++ tests/unit/fixtures/config1 | 1 + tests/unit/fixtures/config2 | 1 + … [View More]tests/unit/fixtures/config3 | 1 + tests/unit/fixtures/config4 | 2 + tests/unit/fixtures/config5 | 2 + tests/unit/fixtures/config6 | 2 + tests/unit/fixtures/config7 | 2 + tests/unit/fixtures/config8 | 2 + tests/unit/fixtures/config9_32 | 2 + tests/unit/fixtures/config9_64 | 2 + tests/unit/test_config-file.c | 159 ++++++++++++++++++++++++++++++++++++++++ tests/utils/fixtures.h | 47 ++++++++++++ 16 files changed, 253 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5bd2399..9739a6f 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ tests/test_dns tests/unit/test_onion tests/unit/test_connection tests/unit/test_utils +tests/unit/test_config-file diff --git a/tests/test_list b/tests/test_list index d433edb..e1fa93b 100644 --- a/tests/test_list +++ b/tests/test_list @@ -2,3 +2,4 @@ ./unit/test_onion ./unit/test_connection ./unit/test_utils +./unit/test_config-file diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 3fb1150..a48450c 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -1,10 +1,14 @@ -AM_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/tests/utils/ -I$(srcdir) +AM_CFLAGS = -I$(top_srcdir)/include \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/tests/utils/ \ + -I$(srcdir) \ + -DTORSOCKS_FIXTURE_PATH=\"`pwd`/fixtures/\" LIBTAP=$(top_builddir)/tests/utils/tap/libtap.la LIBCOMMON=$(top_builddir)/src/common/libcommon.la -noinst_PROGRAMS = test_onion test_connection test_utils +noinst_PROGRAMS = test_onion test_connection test_utils test_config-file test_onion_SOURCES = test_onion.c test_onion_LDADD = $(LIBTAP) $(LIBCOMMON) @@ -14,3 +18,6 @@ test_connection_LDADD = $(LIBTAP) $(LIBCOMMON) test_utils_SOURCES = test_utils.c test_utils_LDADD = $(LIBTAP) $(LIBCOMMON) + +test_config_file_SOURCES = test_config-file.c +test_config_file_LDADD = $(LIBTAP) $(LIBCOMMON) diff --git a/tests/unit/fixtures/config0 b/tests/unit/fixtures/config0 new file mode 100644 index 0000000..f5b4924 --- /dev/null +++ b/tests/unit/fixtures/config0 @@ -0,0 +1,19 @@ +# This is the configuration for libtorsocks (transparent socks) for use +# with tor, which is providing a socks server on port 9050 by default. +# +# Lines beginning with # and blank lines are ignored +# Much more documentation than provided in these comments can be found in +# +# torsocks.conf(5), torsocks(1) and torsocks(8) manpages. + +# Default Tor address and port. By default, Tor will listen on localhost for +# any SOCKS connection and relay the traffic on the Tor network. +TorAddress 127.0.0.1 +TorPort 9050 + +# Tor hidden sites do not have real IP addresses. This specifies what range of +# IP addresses will be handed to the application as "cookies" for .onion names. +# Of course, you should pick a block of addresses which you aren't going to +# ever need to actually connect to. This is similar to the MapAddress feature +# of the main tor daemon. +OnionAddrRange 127.42.42.0/24 diff --git a/tests/unit/fixtures/config1 b/tests/unit/fixtures/config1 new file mode 100644 index 0000000..8f5d225 --- /dev/null +++ b/tests/unit/fixtures/config1 @@ -0,0 +1 @@ +# Empty config diff --git a/tests/unit/fixtures/config2 b/tests/unit/fixtures/config2 new file mode 100644 index 0000000..37aff43 --- /dev/null +++ b/tests/unit/fixtures/config2 @@ -0,0 +1 @@ +TorPort 65536 diff --git a/tests/unit/fixtures/config3 b/tests/unit/fixtures/config3 new file mode 100644 index 0000000..5c62206 --- /dev/null +++ b/tests/unit/fixtures/config3 @@ -0,0 +1 @@ +TorPort 0 diff --git a/tests/unit/fixtures/config4 b/tests/unit/fixtures/config4 new file mode 100644 index 0000000..d5413a7 --- /dev/null +++ b/tests/unit/fixtures/config4 @@ -0,0 +1,2 @@ +# invalid IPv4 +TorAddress 0.0 diff --git a/tests/unit/fixtures/config5 b/tests/unit/fixtures/config5 new file mode 100644 index 0000000..bee314c --- /dev/null +++ b/tests/unit/fixtures/config5 @@ -0,0 +1,2 @@ +# invalid IPv6 +TorAddress 2001:::1 diff --git a/tests/unit/fixtures/config6 b/tests/unit/fixtures/config6 new file mode 100644 index 0000000..a8cd5c7 --- /dev/null +++ b/tests/unit/fixtures/config6 @@ -0,0 +1,2 @@ +# invalid onion IPv4 range +OnionAddrRange 127.42.42.0 diff --git a/tests/unit/fixtures/config7 b/tests/unit/fixtures/config7 new file mode 100644 index 0000000..fdc9dea --- /dev/null +++ b/tests/unit/fixtures/config7 @@ -0,0 +1,2 @@ +# invalid onion IPv4 address +OnionAddrRange 127.42.42.256/24 diff --git a/tests/unit/fixtures/config8 b/tests/unit/fixtures/config8 new file mode 100644 index 0000000..c4c2e43 --- /dev/null +++ b/tests/unit/fixtures/config8 @@ -0,0 +1,2 @@ +# invalid onion IPv6 address +OnionAddrRange 2001:::1/64 diff --git a/tests/unit/fixtures/config9_32 b/tests/unit/fixtures/config9_32 new file mode 100644 index 0000000..0658bea --- /dev/null +++ b/tests/unit/fixtures/config9_32 @@ -0,0 +1,2 @@ +# invalid onion mask +OnionAddrRange 127.42.42.0/4294967295 diff --git a/tests/unit/fixtures/config9_64 b/tests/unit/fixtures/config9_64 new file mode 100644 index 0000000..4934a60 --- /dev/null +++ b/tests/unit/fixtures/config9_64 @@ -0,0 +1,2 @@ +# invalid onion mask +OnionAddrRange 127.42.42.0/18446744073709551615 diff --git a/tests/unit/test_config-file.c b/tests/unit/test_config-file.c new file mode 100644 index 0000000..59e3115 --- /dev/null +++ b/tests/unit/test_config-file.c @@ -0,0 +1,159 @@ +/* + * Copyright (C) 2013 - David Goulet <dgoulet(a)ev0ke.net> + * Luke Gallagher <luke(a)hypergeometric.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <stdio.h> +#include <arpa/inet.h> +#include <stdlib.h> +#include <limits.h> + +#include <common/utils.h> +#include <common/defaults.h> +#include <common/config-file.h> + +#include <tap/tap.h> +#include <fixtures.h> + +#define NUM_TESTS 11 + +static void test_config_file_read_none(void) +{ + int ret = 0; + struct configuration config; + char buf[DEFAULT_DOMAIN_NAME_SIZE]; + + diag("Config file read none"); + + ret = config_file_read(NULL, &config); + inet_ntop(AF_INET, &config.conf_file.onion_base, buf, sizeof(buf)); + ok(ret == 0 && + config.conf_file.tor_port == DEFAULT_TOR_PORT && + strcmp(config.conf_file.tor_address, DEFAULT_TOR_ADDRESS) == 0 && + strcmp(buf, DEFAULT_ONION_ADDR_RANGE) == 0 && + config.conf_file.onion_mask == strtoul(DEFAULT_ONION_ADDR_MASK, NULL, 0), + "Use default when no config file"); +} + +static void test_config_file_read_valid(void) +{ + int ret = 0; + struct configuration config; + char buf[DEFAULT_DOMAIN_NAME_SIZE]; + + diag("Config file read valid"); + + ret = config_file_read(fixture("config0"), &config); + inet_ntop(AF_INET, &config.conf_file.onion_base, buf, sizeof(buf)); + ok(ret == 0 && + config.conf_file.tor_port == DEFAULT_TOR_PORT && + strcmp(config.conf_file.tor_address, DEFAULT_TOR_ADDRESS) == 0 && + strcmp(buf, DEFAULT_ONION_ADDR_RANGE) == 0 && + config.conf_file.onion_mask == strtoul(DEFAULT_ONION_ADDR_MASK, NULL, 0), + "Read valid config file"); +} + +static void test_config_file_read_empty(void) +{ + int ret = 0; + struct configuration config; + char buf[DEFAULT_DOMAIN_NAME_SIZE]; + + diag("Config file read empty"); + + ret = config_file_read(fixture("config1"), &config); + inet_ntop(AF_INET, &config.conf_file.onion_base, buf, sizeof(buf)); + ok(ret == 0 && + config.conf_file.tor_port == 0 && + config.conf_file.tor_address == NULL && + strcmp(buf, "0.0.0.0") == 0 && + config.conf_file.onion_mask == 0, + "Read empty config file"); +} + +static void test_config_file_read_invalid_values(void) +{ + int ret = 0; + struct configuration config; + + diag("Config file read invalid values"); + + ret = config_file_read(fixture("config2"), &config); + ok(ret == -EINVAL && + config.conf_file.tor_port == 0, + "TorPort 65536 returns -EINVAL"); + + memset(&config, 0x0, sizeof(config)); + ret = config_file_read(fixture("config3"), &config); + ok(ret == -EINVAL && + config.conf_file.tor_port == 0, + "TorPort 0 returns -EINVAL"); + + memset(&config, 0x0, sizeof(config)); + ret = config_file_read(fixture("config4"), &config); + ok(ret == -1 && + config.conf_file.tor_address == NULL, + "TorAddress invalid IPv4 returns -1"); + + memset(&config, 0x0, sizeof(config)); + ret = config_file_read(fixture("config5"), &config); + ok(ret == -1 && + config.conf_file.tor_address == NULL, + "TorAddress invalid IPv6 returns -1"); + + memset(&config, 0x0, sizeof(config)); + ret = config_file_read(fixture("config6"), &config); + ok(ret == -EINVAL && + config.conf_file.onion_mask == 0, + "OnionAdrRange invalid range returns -EINVAL"); + + memset(&config, 0x0, sizeof(config)); + ret = config_file_read(fixture("config7"), &config); + ok(ret == -EINVAL && + config.conf_file.onion_base == 0, + "OnionAdrRange invalid IPv4 address returns -EINVAL"); + + memset(&config, 0x0, sizeof(config)); + ret = config_file_read(fixture("config8"), &config); + ok(ret == -EINVAL && + config.conf_file.onion_base == 0, + "OnionAdrRange invalid IPv6 address returns -EINVAL"); + + memset(&config, 0x0, sizeof(config)); +#if (defined(__LP64__)) + ret = config_file_read(fixture("config9_64"), &config); +#else + ret = config_file_read(fixture("config9_32"), &config); +#endif + ok(ret == -EINVAL && + config.conf_file.onion_base == 0, + "OnionAdrRange invalid mask returns -EINVAL"); +} + +int main(int argc, char **argv) +{ + /* Libtap call for the number of tests planned. */ + plan_tests(NUM_TESTS); + + test_config_file_read_none(); + skip_start(0 == TORSOCKS_FIXTURE_PATH, 10, "TORSOCKS_FIXTURE_PATH not defined"); + test_config_file_read_valid(); + test_config_file_read_empty(); + test_config_file_read_invalid_values(); + skip_end(); + + return exit_status(); +} diff --git a/tests/utils/fixtures.h b/tests/utils/fixtures.h new file mode 100644 index 0000000..bbcd2f5 --- /dev/null +++ b/tests/utils/fixtures.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2000-2008 - Shaun Clowes <delius(a)progsoc.org> + * 2008-2011 - Robert Hogan <robert(a)roberthogan.net> + * 2013 - David Goulet <dgoulet(a)ev0ke.net> + * Luke Gallagher <luke(a)hypergeometric.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License, version 2 only, as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef FIXTURES_H +#define FIXTURES_H + +#include <string.h> + +#if !defined(TORSOCKS_FIXTURE_PATH) +#define TORSOCKS_FIXTURE_PATH 0 +#endif /* TORSOCKS_FIXTURE_PATH */ + +static const char *fixture_path(const char *base, const char *filename) +{ + static char path[1024]; + size_t path_len; + + path_len = strlen(base); + strncpy(path, base, path_len); + strncpy(path + path_len, filename, sizeof(path) - path_len); + + return path; +} + +const char *fixture(const char *fixture_name) +{ + return fixture_path(TORSOCKS_FIXTURE_PATH, fixture_name); +} + +#endif /* FIXTURES_H */ [View Less]

1 0