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

[torsocks/master] Add tests to make check
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit 4c86527778f1a774192b0dd589479535914f6b34 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 13:57:06 2013 -0400 Add tests to make check Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- tests/Makefile.am | 6 ++++++ tests/run.sh | 21 +++++++++++++++++++++ tests/test_list | 1 + 3 files changed, 28 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index e0a3fba..66f3dde 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,3 +10,9 @@ noinst_PROGRAMS = test_dns test_dns_SOURCES = test_dns.c test_dns_LDADD = $(LIBTAP) $(LIBTORSOCKS) + +check-am: + ./run.sh test_list + +dist_noinst_SCRIPTS = test_list run.sh +EXTRA_DIST = run.sh test_list diff --git a/tests/run.sh b/tests/run.sh new file mode 100755 index 0000000..07d446f --- /dev/null +++ b/tests/run.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# +# Copyright (C) 2013 - Christian Babeux <christian.babeux(a)efficios.com> +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; only version 2 of the License. +# +# 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., 59 Temple +# Place - Suite 330, Boston, MA 02111-1307, USA. +# + +[ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1 + +prove --merge --exec '' - < $1 diff --git a/tests/test_list b/tests/test_list new file mode 100644 index 0000000..963e59b --- /dev/null +++ b/tests/test_list @@ -0,0 +1 @@ +./test_dns

1 0

[torsocks/master] Update torsocks.8 man page
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit 6e60a47a29a790c361e5402e0bc909904ed9a636 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 15:19:03 2013 -0400 Update torsocks.8 man page Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- doc/torsocks.8 | 268 +++++++++++++++++++++----------------------------------- 1 file changed, 100 insertions(+), 168 deletions(-) diff --git a/doc/torsocks.8 b/doc/torsocks.8 index 58672e5..1820465 100644 --- a/doc/torsocks.8 +++ b/doc/torsocks.8 @@ -1,189 +1,121 @@ -.TH TORSOCKS 8 "" "Shaun Clowes" \" -*- - \" nroff -* +.TH "TORSOCKS" "8" "August 24th, 2013" "" "" .SH NAME -.BR torsocks -\- Library for intercepting outgoing network connections and -redirecting them through a SOCKS server. -.SH SYNOPSIS +torsocks \(em Library for intercepting outgoing network connections and +redirecting them through the Tor SOCKS proxy. -Set LD_PRELOAD to load the library then use applications as normal +.SH DESCRIPTION -The syntax to force preload of the library for different shells is -specified below: - -Bash, Ksh and Bourne shell - +Torsocks library overloads the libc symbols use for Internet communication such +as \fBconnect(2)\fP system call. Using that technique, the library sends +everything through the Tor network including DNS resolution done by the +application. -export LD_PRELOAD=/lib/libtorsocks.so +For DNS, \fBgethostbyname(3)\fP family functions are rerouted through Tor. +Please note that the ISC res_* API is currently not supported. -C Shell - +Here is an example on how to use torsocks library with \fBssh(1)\fP: +.br -setenv LD_PRELOAD=/lib/libtorsocks.so +$ @LDPRELOAD@=/path/to/libtorsocks.so ssh -l kalexander -p 1234 prism.nsa.gov +[...] -This process can be automated (for Bash, Bourne and Korn shell -users) for a single command or for all commands in a shell session -by using the torsocks(1) script +.SH SHELL USAGE -You can also setup torsocks in such a way that all processes -automatically use it, a very useful configuration. For more -information on this configuration see the CAVEATS section of this -manual page. +Set @LDPRELOAD@ to load the library then use applications as normal. The syntax +to force preload of the library for different shells is specified below: -.SH DESCRIPTION +Bash, Ksh and Bourne shell: -.BR torsocks -is a library to allow transparent SOCKS proxying. It wraps the normal -connect() function. When a connection is attempted, it consults the -configuration file (which is defined at configure time but defaults to -/etc/torsocks.conf) and determines if the IP address specified is local. If -it is not, the library redirects the connection to a SOCKS server -specified in the configuration file. It then negotiates that connection -with the SOCKS server and passes the connection back to the calling -program. - -.BR torsocks -is designed for use in machines which are firewalled from the -Internet. It avoids the need to recompile applications like lynx or -telnet so they can use SOCKS to reach the Internet. It behaves much like -the SOCKSified TCP/IP stacks seen on other platforms. - -.SS ARGUMENTS -Most arguments to -.BR torsocks -are provided in the configuration file (the location of which is defined -at configure time by the \-\-with\-conf=<file> argument but defaults to -/etc/torsocks.conf). The structure of this file is documented in torsocks.conf(8) - -Some configuration options can be specified at run time using environment -variables as follows: - -.TP -.I TORSOCKS_CONFFILE -This environment variable overrides the default location of the torsocks -configuration file. This variable is not honored if the program torsocks -is embedded in is setuid. In addition this environment variable can -be compiled out of torsocks with the \-\-disable\-envconf argument to -configure at build time - -.TP -.I TORSOCKS_DEBUG -This environment variable sets the level of debug output that should be -generated by torsocks (debug output is generated in the form of output to -standard error). If this variable is not present by default the logging -level is set to 0 which indicates that only error messages should be output. -Setting it to higher values will cause torsocks to generate more messages -describing what it is doing. If set to \-1 torsocks will output absolutely no -error or debugging messages. This is only needed if torsocks output interferes -with a program it is embedded in. Message output can be permanently compiled -out of torsocks by specifying the \-\-disable\-debug option to configure at -build time - -.TP -.I TORSOCKS_DEBUG_FILE -This option can be used to redirect the torsocks output (which would normally -be sent to standard error) to a file. This variable is not honored if the -program torsocks is embedded in is setuid. For programs where torsocks output -interferes with normal operation this option is generally better than -disabling messages (with TORSOCKS_DEBUG = \-1) - -.TP -.I TORSOCKS_USERNAME -This environment variable can be used to specify the username to be used when -version 5 SOCKS servers request username/password authentication. This -overrides the default username that can be specified in the configuration -file using 'default_user', see torsocks.conf(8) for more information. This -variable is ignored for version 4 SOCKS servers. - -.TP -.I TORSOCKS_PASSWORD -This environment variable can be used to specify the password to be used when -version 5 SOCKS servers request username/password authentication. This -overrides the default password that can be specified in the configuration -file using 'default_pass', see torsocks.conf(8) for more information. This -variable is ignored for version 4 SOCKS servers. - -.SS DNS ISSUES -.BR torsocks -will normally not be able to send DNS queries through a SOCKS server since -SOCKS V4 works on TCP and DNS normally uses UDP. Version 1.5 and up do -however provide a method to force DNS lookups to use TCP, which then makes -them proxyable. This option can only enabled at compile time, please -consult the INSTALL file for more information. +$ export LD_PRELOAD=/path/to/libtorsocks.so + +C Shell: + +$ setenv LD_PRELOAD=/path/to/libtorsocks.so + +This process can be automated (for Bash, Bourne and Korn shell users) for a +single command or for all commands in a shell session by using the +\fBtorsocks(1)\fP script. + +You can also setup \fBtorsocks(1)\fP in such a way that all processes +automatically use it, a very useful configuration. Please refer to the torsocks +script documentation for more information. + +.SH "ENVIRONMENT VARIABLES" +.PP +.IP TORSOCKS_CONF_FILE +This environment variable overrides the default location of the torsocks +configuration file. This variable is not honored if the program torsocks is +embedded in is setuid. + +.PP +.IP TORSOCKS_LOG_LEVEL +Enable logging level of torsocks library. By default, warnings and errors are +printed (level 3). Note that each level includes the lower ones except the 1 +which disables any possible logging. (default: 3) + +.TS +tab (@); +l lx. +1@T{ +No log at all. +T} +2@T{ +Error messages. +T} +3@T{ +Warning messages. +T} +4@T{ +Notice messages. +T} +5@T{ +Debug messages. +T} +.TE + +.PP +.IP TORSOCKS_LOG_TIME +Control whether or not the time is added to each logging line. (default: 1) + +.PP +.IP TORSOCKS_LOG_FILE_PATH +If set, torsocks will log in the file set by this variable. (default: stderr) + +.SH KNOWN ISSUES + +.SS DNS +Torsocks is not able to send DNS queries through Tor since UDP is not +supported. Thus, any UDP socket is denied. However, DNS queries that can be +intercept are sent to Tor and sent back to the caller. .SS ERRORS -.BR torsocks -will generate error messages and print them to stderr when there are -problems with the configuration file or the SOCKS negotiation with the -server if the TORSOCKS_DEBUG environment variable is not set to \-1 or and -\-\-disable\-debug was not specified at compile time. This output may cause -some problems with programs that redirect standard error. - -.SS CAVEATS -.BR torsocks -will not in the above configuration be able to provide SOCKS proxying to -setuid applications or applications that are not run from a shell. You can -force all applications to LD_PRELOAD the library by placing the path to -libtorsocks in /etc/ld.so.preload. Please make sure you correctly enter the -full path to the library in this file if you do this. If you get it wrong, -you will be UNABLE TO DO ANYTHING with the machine and will have to boot -it with a rescue disk and remove the file (or try the saveme program, see -the INSTALL file for more info). THIS IS A ***WARNING***, please be -careful. Also be sure the library is in the root filesystem as all hell -will break loose if the directory it is in is not available at boot time. - -.SH BUGS - -.BR torsocks -can only proxy outgoing TCP connections - -.BR torsocks -does NOT work correctly with asynchronous sockets (though it does work with -non blocking sockets). This bug would be very difficult to fix and there -appears to be no demand for it (I know of no major application that uses -asynchronous sockets) - -.BR torsocks -is NOT fully RFC compliant in its implementation of version 5 of SOCKS, it -only supports the 'username and password' or 'no authentication' -authentication methods. The RFC specifies GSSAPI must be supported by any -compliant implementation. I haven't done this, anyone want to help? - -.BR torsocks -can force the libc resolver to use TCP for name queries, if it does this -it does it regardless of whether or not the DNS to be queried is local or -not. This introduces overhead and should only be used when needed. - -.BR torsocks -uses ELF dynamic loader features to intercept dynamic function calls from -programs in which it is embedded. As a result, it cannot trace the -actions of statically linked executables, non-ELF executables, or -executables that make system calls directly with the system call trap or -through the syscall() routine. +Torsocks might generate error messages and print them to stderr when there are +problems with the configuration file or the SOCKS negotiation with the Tor +daemon. The TORSOCKS_LOG_LEVEL environment variable controls that behavior as +well as the log file option. Keep in mind that this library can output on the +stderr of the application. -.SH FILES -@CONFDIR@/torsocks.conf - default torsocks configuration file +.SH LIMITATIONS -.SH SEE ALSO -torsocks.conf(5) -torsocks(1) -usewithtor(1) +Outgoing TCP connections can only be proxified through the Tor network. -.SH AUTHOR -Shaun Clowes (delius(a)progsoc.uts.edu.au) +Torsocks forces the libc resolver to use TCP for name queries, if it does this +it does it regardless of whether or not the DNS to be queried is local or not. +This introduces overhead and should only be used when needed. -.SH COPYRIGHT -Copyright 2000 Shaun Clowes +Torsocks uses ELF dynamic loader features to intercept dynamic function calls +from programs in which it is embedded. As a result, non-ELF executables, or +executables that make system calls directly with the system call trap (int +0x80). -Renamed for use by torsocks to avoid conflict with tsocks by Robert Hogan. +.SH FILES +@CONFDIR@/tor/torsocks.conf - default torsocks configuration file -torsocks and its documentation may be freely copied under the terms and -conditions of version 2 of the GNU General Public License, as published -by the Free Software Foundation (Cambridge, Massachusetts, United -States of America). +.SH SEE ALSO +.BR torsocks.conf(5), +.BR torsocks(1) -This documentation is based on the documentation for logwrites, another -shared library interceptor. One line of code from it was used in -torsocks and a lot of the documentation :) logwrites is by -adam(a)yggdrasil.com (Adam J. Richter) and can be had from ftp.yggdrasil.com -pub/dist/pkg +.SH AUTHOR +David Goulet <dgoulet(a)ev0ke.net>

1 0

[torsocks/master] Remove old tests and add tap library
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit dd3444cbc373d0dc5c3695025e1f29dbe63fc2c4 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 12:31:09 2013 -0400 Remove old tests and add tap library The old tests were broken with the new code base. Also, the new tests will use libtap that is quite a standard lib. to use for test management providing a known standard output format also. Both C lib. and a bash one is added. Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- Makefile.am | 2 +- configure.ac | 4 +- test/Makefile.am | 4 - test/test_torsocks.c | 494 ------------------------------------------- tests/Makefile.am | 1 + tests/utils/Makefile.am | 1 + tests/utils/tap/Makefile.am | 4 + tests/utils/tap/tap.c | 433 +++++++++++++++++++++++++++++++++++++ tests/utils/tap/tap.h | 89 ++++++++ tests/utils/tap/tap.sh | 456 +++++++++++++++++++++++++++++++++++++++ 10 files changed, 988 insertions(+), 500 deletions(-) diff --git a/Makefile.am b/Makefile.am index 91f4056..e982a1a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I config -SUBDIRS = src doc +SUBDIRS = src doc tests dist_doc_DATA = ChangeLog FAQ diff --git a/configure.ac b/configure.ac index d1726de..4382517 100644 --- a/configure.ac +++ b/configure.ac @@ -371,8 +371,10 @@ AC_CONFIG_FILES([ src/bin/torsocks src/common/Makefile src/lib/Makefile + tests/Makefile + tests/utils/Makefile + tests/utils/tap/Makefile doc/Makefile - test/Makefile ]) AC_OUTPUT diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index d42f10e..0000000 --- a/test/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -noinst_PROGRAMS= test_torsocks - -test_torsocks_SOURCES= test_torsocks.c -test_torsocks_LDFLAGS= $(TESTLDFLAGS) diff --git a/test/test_torsocks.c b/test/test_torsocks.c deleted file mode 100644 index d9ea32a..0000000 --- a/test/test_torsocks.c +++ /dev/null @@ -1,494 +0,0 @@ -/*************************************************************************** - * * - * Copyright (c) 2000 Alessandro Iurlano. * - * Copyright (C) 2004 Tomasz Kojm <tkojm(a)clamav.net> * - * Copyright (C) 2011 Robert Hogan <robert(a)roberthogan.net> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * 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., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -/* PreProcessor Defines */ -#include <config.h> - -#include <errno.h> -#include <fcntl.h> -#include <netdb.h> -#ifdef OPENBSD -#include <netinet/in_systm.h> -#endif -#include <sys/types.h> -#include <sys/socket.h> -#ifndef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif -#ifndef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#include <arpa/nameser.h> -#if defined(__APPLE__) || defined(__darwin__) -#include <arpa/nameser_compat.h> -#endif -#include <netinet/ip.h> -#include <netinet/ip_icmp.h> -#include <pthread.h> -#include <resolv.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/time.h> -#ifdef OPENBSD -#include <sys/uio.h> -#endif -#include <sys/un.h> -#include <sysexits.h> -#include <syslog.h> -#include <unistd.h> - -#ifndef LINUX -#include <sys/queue.h> -#else -#include "queue.h" -#endif - -#ifndef PACKETSZ -#define PACKETSZ 512 -#endif - -static unsigned short csum (unsigned short *buf, int nwords) -{ - unsigned long sum; - for (sum = 0; nwords > 0; nwords--) - sum += *buf++; - sum = (sum >> 16) + (sum & 0xffff); - sum += (sum >> 16); - return ~sum; -} - -static int icmp_test() -{ - - int sockfd; - char datagram[400]; - struct sockaddr_in dest; - struct ip *iphdr=(struct ip *) datagram; -#if defined(OPENBSD) || defined(FREEBSD) ||defined(__APPLE__) || defined(__darwin__) - struct icmp *icmphdr=(struct icmp *)(iphdr +1); -#else - struct icmphdr *icmphdr=(struct icmphdr *)(iphdr +1); -#endif - char *buff=(char *)(icmphdr +1); - printf("\n----------------icmp() TEST----------------------------\n\n"); - - if((sockfd=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP))<0) - { - perror("socket"); - exit(1); - } - - memset(datagram,0,400); - strcpy(buff,"entzwei"); - dest.sin_family=AF_INET; - dest.sin_addr.s_addr=inet_addr("192.168.1.33"); - - iphdr->ip_v=4; - iphdr->ip_hl=5; - iphdr->ip_len=sizeof(datagram); - iphdr->ip_id=(unsigned char)htonl(54321); - iphdr->ip_off=0; - iphdr->ip_ttl=225; - iphdr->ip_p=1; - iphdr->ip_sum=0; - iphdr->ip_tos=0; - iphdr->ip_src.s_addr=inet_addr("192.168.1.35"); - iphdr->ip_dst.s_addr=dest.sin_addr.s_addr; - iphdr->ip_sum=csum((unsigned short *)datagram,iphdr->ip_len >> 1); - -#if defined(OPENBSD) || defined(FREEBSD) ||defined(__APPLE__) || defined(__darwin__) - icmphdr->icmp_type=130; - icmphdr->icmp_code=0; - icmphdr->icmp_cksum=htons(0xc3b0); -#else - icmphdr->type=130; - icmphdr->code=0; - icmphdr->checksum=htons(0xc3b0); - icmphdr->un.echo.sequence=0; - icmphdr->un.echo.id=0; -#endif - int one=1; - int *val=&one; - if(setsockopt(sockfd,IPPROTO_IP,IP_HDRINCL,val,sizeof(one))<0) - printf("cannot set HDRINCL!\n"); - - - if(sendto(sockfd,datagram,35,0,(struct sockaddr *)&dest,sizeof(dest))<0) - { - perror("sendto"); - exit(1); - } - - return(0); -} - -static char *txtquery(const char *domain, unsigned int *ttl) -{ - unsigned char answer[PACKETSZ], *answend, *pt; - char *txt, host[128]; - int len, type, qtype; - unsigned int cttl, size, txtlen = 0; - - - *ttl = 0; - if(res_init() < 0) { - printf("^res_init failed\n"); - return NULL; - } - - printf("*Querying %s\n", domain); - - memset(answer, 0, PACKETSZ); - qtype = T_TXT; - if((len = res_query(domain, C_IN, qtype, answer, PACKETSZ)) < 0 || len > PACKETSZ) { - /* The DNS server in the SpeedTouch Alcatel 510 modem can't - * handle a TXT-query, but it can resolve an ANY-query to a - * TXT-record, so we try an ANY-query now. The thing we try - * to resolve normally only has a TXT-record anyway. - */ - memset(answer, 0, PACKETSZ); - qtype=T_ANY; - if((len = res_query(domain, C_IN, qtype, answer, PACKETSZ)) < 0) { - printf("^Can't query %s\n", domain); - return NULL; - } - } - - answend = answer + len; - pt = answer + sizeof(HEADER); - - if((len = dn_expand(answer, answend, pt, host, sizeof(host))) < 0) { - printf("^dn_expand failed\n"); - return NULL; - } - - pt += len; - if(pt > answend-4) { - printf("^Bad (too short) DNS reply\n"); - return NULL; - } - - GETSHORT(type, pt); - if(type != qtype) { - printf("^Broken DNS reply.\n"); - return NULL; - } - - pt += INT16SZ; /* class */ - size = 0; - do { /* recurse through CNAME rr's */ - pt += size; - if((len = dn_expand(answer, answend, pt, host, sizeof(host))) < 0) { - printf("^second dn_expand failed\n"); - return NULL; - } - printf("^Host: %s\n", host); - pt += len; - if(pt > answend-10) { - printf("^Bad (too short) DNS reply\n"); - return NULL; - } - GETSHORT(type, pt); - pt += INT16SZ; /* class */ - GETLONG(cttl, pt); - GETSHORT(size, pt); - if(pt + size < answer || pt + size > answend) { - printf("^DNS rr overflow\n"); - return NULL; - } - } while(type == T_CNAME); - - if(type != T_TXT) { - printf("^Not a TXT record\n"); - return NULL; - } - - if(!size || (txtlen = *pt) >= size || !txtlen) { - printf("^Broken TXT record (txtlen = %d, size = %d)\n", txtlen, size); - return NULL; - } - - if(!(txt = (char *) malloc(txtlen + 1))) - return NULL; - - memcpy(txt, pt+1, txtlen); - txt[txtlen] = 0; - *ttl = cttl; - - return txt; -} - -static int res_tests(char *ip, char *test) { - unsigned char dnsreply[1024]; - unsigned char host[128]; - int ret = 0, i; - char buf[16]; - struct sockaddr_in addr; - - memset( dnsreply, '\0', sizeof( dnsreply )); - - printf("\n---------------------- %s res_init() TEST----------------------\n\n", test); - if (res_init() == -1) { - printf("res_init failed\n"); - return -1; - } - - - addr.sin_family=AF_INET; - addr.sin_port=htons(53); - addr.sin_addr.s_addr=inet_addr(ip); - - for (i = 0; i < _res.nscount; i++) - memcpy(&_res.nsaddr_list[i], &addr, sizeof(struct sockaddr_in)); - - inet_ntop(AF_INET, &_res.nsaddr_list[0].sin_addr.s_addr, buf, sizeof(buf)); - printf("nameserver for test: %s\n", buf); - - /* Modifying _res directly doesn't work, so we have to use res_n* where available. - See: http://sourceware.org/ml/libc-help/2009-11/msg00013.html */ - printf("\n---------------------- %s res_query() TEST----------------------\n\n", test); - snprintf((char *)host, 127, "www.google.com"); -#if !defined(OPENBSD) && !defined(__APPLE__) && !defined(__darwin__) - ret = res_nquery(&_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -#else - ret = res_query((char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -#endif - printf("return code: %i\n", ret); - - printf("\n---------------------- %s res_search() TEST----------------------\n\n", test); - memset( dnsreply, '\0', sizeof( dnsreply )); -#if !defined(OPENBSD) && !defined(__APPLE__) && !defined(__darwin__) - ret = res_nsearch(&_res, (char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -#else - ret = res_search((char *) host, C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -#endif - printf("return code: %i\n", ret); - - printf("\n--------------- %s res_querydomain() TEST----------------------\n\n", test); - memset( dnsreply, '\0', sizeof( dnsreply )); -#if !defined(OPENBSD) && !defined(__APPLE__) && !defined(__darwin__) - ret = res_nquerydomain(&_res, "www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -#else - ret = res_querydomain("www.google.com", "google.com", C_IN, T_TXT, dnsreply, sizeof( dnsreply )); -#endif - printf("return code: %i\n", ret); - - printf("\n---------------------- %s res_send() TEST----------------------\n\n", test); - memset( dnsreply, '\0', sizeof( dnsreply )); -#if !defined(OPENBSD) && !defined(__APPLE__) && !defined(__darwin__) - ret = res_nsend(&_res, host, 32, dnsreply, sizeof( dnsreply )); -#else - ret = res_send(host, 32, dnsreply, sizeof( dnsreply )); -#endif -printf("return code: %i\n", ret); - - return ret; -} - -static int res_internet_tests() { - char *ip = "8.8.8.8"; - char *test = "internet"; - return res_tests(ip, test); -} - -static int res_local_tests() { - char *ip = "192.168.1.1"; - char *test = "local"; - return res_tests(ip, test); -} - -static int udp_test() { - struct sockaddr_in addr; - char testtext[]="This message should be sent via udp\nThis is row number 2\nAnd then number three\n"; - int sock,ret,wb,flags=0; - char *ip = "6.6.6.6"; - - printf("\n----------------------UDP TEST----------------------\n\n"); - - addr.sin_family=AF_INET; - addr.sin_port=53; - addr.sin_addr.s_addr=inet_addr(ip); - - sock=socket(AF_INET,SOCK_DGRAM,0); - - struct iovec iov; - struct msghdr msg; - - iov.iov_base = (void *)testtext; - iov.iov_len = strlen(testtext); - - msg.msg_name = (struct sockaddr *)&addr; - msg.msg_namelen = sizeof(addr); - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - msg.msg_control = NULL; - msg.msg_controllen = 0; - - printf("\n----------------------udp sendmsg() TEST-------------------\n\n"); - wb=0; - ret=sendmsg(sock, &msg, flags); - printf("sendmsg() returned ret=%d wb=%d\n",ret,wb); - - printf("\n----------------------udp sendto() TEST--------------------\n\n"); - wb=0; - ret=sendto(sock,testtext,strlen(testtext)+1,wb, (struct sockaddr*)&addr, sizeof(addr)); - ret=sendto(sock,"CiaoCiao",strlen("CiaoCiao")+1,wb, (struct sockaddr*)&addr, sizeof(addr)); - printf("sendto() returned ret=%d wb=%d\n",ret,wb); - - printf("\n----------------------udp connect() TEST-------------------\n\n"); - ret=connect(sock,(struct sockaddr*)&addr,sizeof(addr)); - printf("Connect returned ret=%d\n",ret); - - printf("\n----------------------udp send() TEST----------------------\n\n"); - wb=0; - ret=send(sock,testtext,strlen(testtext)+1,wb); - ret=send(sock,"CiaoCiao",strlen("CiaoCiao")+1,wb); - printf("Note: no interception by torsocks expected as send() requires a socket in a connected state.\n"); - printf("send() returned ret=%d wb=%d\n",ret,wb); - - return 0; -} - -static int gethostbyname_test() { - struct hostent *foo; - - printf("\n----------------------gethostbyname() TEST-----------------\n\n"); - - foo=gethostbyname("www.torproject.org"); - if (foo) { - int i; - for (i=0; foo->h_addr_list[i]; ++i) - printf("%s -> %s\n",foo->h_name,inet_ntoa(*(struct in_addr*)foo->h_addr_list[i])); -/* for (i=0; foo->h_aliases[i]; ++i) - printf(" also known as %s\n",foo->h_aliases[i]);*/ - } - return 0; -} - -static int gethostbyaddr_test() { - struct in_addr bar; - struct hostent *foo; - - printf("\n----------------------gethostbyaddr() TEST-----------------\n\n"); - - inet_aton("38.229.70.16", &bar); - foo=gethostbyaddr(&bar,4,AF_INET); - if (foo) { - int i; - for (i=0; foo->h_addr_list[i]; ++i) - printf("%s -> %s\n",foo->h_name,inet_ntoa(*(struct in_addr*)foo->h_addr_list[i])); - for (i=0; foo->h_aliases[i]; ++i) - printf(" also known as %s\n",foo->h_aliases[i]); - } - return 0; -} - -static int getaddrinfo_test() { - struct addrinfo hints; - struct addrinfo *result; - int s; - - printf("\n----------------------getaddrinfo() TEST-----------------\n\n"); - - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_INET; /* Allow IPv4 or IPv6 */ - hints.ai_socktype = SOCK_STREAM; /* Datagram socket */ - hints.ai_flags = AI_PASSIVE; /* For wildcard IP address */ - hints.ai_protocol = 0; /* Any protocol */ - hints.ai_canonname = NULL; - hints.ai_addr = NULL; - hints.ai_next = NULL; - - s = getaddrinfo(NULL, "www.torproject.org", &hints, &result); - if (s != 0) { - printf("getaddrinfo: %s\n", gai_strerror(s)); - } - - return 0; -} - -/* Unavailable in glibc. */ -/* -static int getipnodebyname_test() { - int error; - - printf("\n----------------------getipnodebyname() TEST-----------------\n\n"); - - getipnodebyname("www.torproject.org", AF_INET, 0, &error); - if (error != 0) { - printf("getipnodebyname error: %i\n", error); - } - - return 0; -} -*/ - -static int connect_test(const char *name, const char *ip, int port) -{ - int sock; - struct sockaddr_in addr; - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = inet_addr(ip); - addr.sin_port = htons(port); - - printf("\n---------------------- %s connect() TEST----------------------\n\n", name); - - if ((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) - return 1; - - if (connect(sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) - return 1; - - return 0; -} - -static int connect_local_test() -{ - const char *ip = "192.168.1.1"; - const char *name = "local"; - int port = 80; - return connect_test(name, ip, port); -} - -static int connect_internet_test() -{ - const char *ip = "8.8.8.8"; - int port = 53; - const char *name = "internet"; - return connect_test(name, ip, port); -} - -int main() { - - getaddrinfo_test(); - udp_test(); - gethostbyaddr_test(); - gethostbyname_test(); - connect_local_test(); - connect_internet_test(); - res_internet_tests(); - res_local_tests(); - icmp_test(); - - return 0; -} diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..97b7b2b --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = utils diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am new file mode 100644 index 0000000..feae65a --- /dev/null +++ b/tests/utils/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = tap diff --git a/tests/utils/tap/Makefile.am b/tests/utils/tap/Makefile.am new file mode 100644 index 0000000..d3b5b58 --- /dev/null +++ b/tests/utils/tap/Makefile.am @@ -0,0 +1,4 @@ +noinst_LTLIBRARIES = libtap.la +libtap_la_SOURCES = tap.c tap.h +dist_noinst_SCRIPTS = tap.sh +EXTRA_DIST = tap.sh diff --git a/tests/utils/tap/tap.c b/tests/utils/tap/tap.c new file mode 100644 index 0000000..8bf72f6 --- /dev/null +++ b/tests/utils/tap/tap.c @@ -0,0 +1,433 @@ +/*- + * Copyright (c) 2004 Nik Clayton + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#define _GNU_SOURCE +#include <ctype.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> + +#include "tap.h" + +static int no_plan = 0; +static int skip_all = 0; +static int have_plan = 0; +static unsigned int test_count = 0; /* Number of tests that have been run */ +static unsigned int e_tests = 0; /* Expected number of tests to run */ +static unsigned int failures = 0; /* Number of tests that failed */ +static char *todo_msg = NULL; +static char *todo_msg_fixed = "libtap malloc issue"; +static int todo = 0; +static int test_died = 0; + +/* Encapsulate the pthread code in a conditional. In the absence of + libpthread the code does nothing */ +#ifdef HAVE_LIBPTHREAD +#include <pthread.h> +static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER; +# define LOCK pthread_mutex_lock(&M); +# define UNLOCK pthread_mutex_unlock(&M); +#else +# define LOCK +# define UNLOCK +#endif + +static void _expected_tests(unsigned int); +static void _tap_init(void); +static void _cleanup(void); + +/* + * Generate a test result. + * + * ok -- boolean, indicates whether or not the test passed. + * test_name -- the name of the test, may be NULL + * test_comment -- a comment to print afterwards, may be NULL + */ +unsigned int +_gen_result(int ok, const char *func, char *file, unsigned int line, + char *test_name, ...) +{ + va_list ap; + char *local_test_name = NULL; + char *c; + int name_is_digits; + + LOCK; + + test_count++; + + /* Start by taking the test name and performing any printf() + expansions on it */ + if(test_name != NULL) { + va_start(ap, test_name); + if (vasprintf(&local_test_name, test_name, ap) == -1) { + local_test_name = NULL; + } + va_end(ap); + + /* Make sure the test name contains more than digits + and spaces. Emit an error message and exit if it + does */ + if(local_test_name) { + name_is_digits = 1; + for(c = local_test_name; *c != '\0'; c++) { + if(!isdigit(*c) && !isspace(*c)) { + name_is_digits = 0; + break; + } + } + + if(name_is_digits) { + diag(" You named your test '%s'. You shouldn't use numbers for your test names.", local_test_name); + diag(" Very confusing."); + } + } + } + + if(!ok) { + printf("not "); + failures++; + } + + printf("ok %d", test_count); + + if(test_name != NULL) { + printf(" - "); + + /* Print the test name, escaping any '#' characters it + might contain */ + if(local_test_name != NULL) { + flockfile(stdout); + for(c = local_test_name; *c != '\0'; c++) { + if(*c == '#') + fputc('\\', stdout); + fputc((int)*c, stdout); + } + funlockfile(stdout); + } else { /* vasprintf() failed, use a fixed message */ + printf("%s", todo_msg_fixed); + } + } + + /* If we're in a todo_start() block then flag the test as being + TODO. todo_msg should contain the message to print at this + point. If it's NULL then asprintf() failed, and we should + use the fixed message. + + This is not counted as a failure, so decrement the counter if + the test failed. */ + if(todo) { + printf(" # TODO %s", todo_msg ? todo_msg : todo_msg_fixed); + if(!ok) + failures--; + } + + printf("\n"); + + if(!ok) { + if(getenv("HARNESS_ACTIVE") != NULL) + fputs("\n", stderr); + + diag(" Failed %stest (%s:%s() at line %d)", + todo ? "(TODO) " : "", file, func, line); + } + free(local_test_name); + + UNLOCK; + + /* We only care (when testing) that ok is positive, but here we + specifically only want to return 1 or 0 */ + return ok ? 1 : 0; +} + +/* + * Initialise the TAP library. Will only do so once, however many times it's + * called. + */ +void +_tap_init(void) +{ + static int run_once = 0; + + if(!run_once) { + atexit(_cleanup); + + /* stdout needs to be unbuffered so that the output appears + in the same place relative to stderr output as it does + with Test::Harness */ + setbuf(stdout, 0); + run_once = 1; + } +} + +/* + * Note that there's no plan. + */ +int +plan_no_plan(void) +{ + + LOCK; + + _tap_init(); + + if(have_plan != 0) { + fprintf(stderr, "You tried to plan twice!\n"); + test_died = 1; + UNLOCK; + exit(255); + } + + have_plan = 1; + no_plan = 1; + + UNLOCK; + + return 1; +} + +/* + * Note that the plan is to skip all tests + */ +int +plan_skip_all(char *reason) +{ + + LOCK; + + _tap_init(); + + skip_all = 1; + + printf("1..0"); + + if(reason != NULL) + printf(" # Skip %s", reason); + + printf("\n"); + + UNLOCK; + + exit(0); +} + +/* + * Note the number of tests that will be run. + */ +int +plan_tests(unsigned int tests) +{ + + LOCK; + + _tap_init(); + + if(have_plan != 0) { + fprintf(stderr, "You tried to plan twice!\n"); + test_died = 1; + UNLOCK; + exit(255); + } + + if(tests == 0) { + fprintf(stderr, "You said to run 0 tests! You've got to run something.\n"); + test_died = 1; + UNLOCK; + exit(255); + } + + have_plan = 1; + + _expected_tests(tests); + + UNLOCK; + + return e_tests; +} + +unsigned int +diag(char *fmt, ...) +{ + va_list ap; + + fputs("# ", stderr); + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + + fputs("\n", stderr); + + return 0; +} + +void +_expected_tests(unsigned int tests) +{ + + printf("1..%d\n", tests); + e_tests = tests; +} + +int +skip(unsigned int n, char *fmt, ...) +{ + va_list ap; + char *skip_msg = NULL; + + LOCK; + + va_start(ap, fmt); + if (asprintf(&skip_msg, fmt, ap) == -1) { + skip_msg = NULL; + } + va_end(ap); + + while(n-- > 0) { + test_count++; + printf("ok %d # skip %s\n", test_count, + skip_msg != NULL ? + skip_msg : "libtap():malloc() failed"); + } + + free(skip_msg); + + UNLOCK; + + return 1; +} + +void +todo_start(char *fmt, ...) +{ + va_list ap; + + LOCK; + + va_start(ap, fmt); + if (vasprintf(&todo_msg, fmt, ap) == -1) { + todo_msg = NULL; + } + va_end(ap); + + todo = 1; + + UNLOCK; +} + +void +todo_end(void) +{ + + LOCK; + + todo = 0; + free(todo_msg); + + UNLOCK; +} + +int +exit_status(void) +{ + int r; + + LOCK; + + /* If there's no plan, just return the number of failures */ + if(no_plan || !have_plan) { + UNLOCK; + return failures; + } + + /* Ran too many tests? Return the number of tests that were run + that shouldn't have been */ + if(e_tests < test_count) { + r = test_count - e_tests; + UNLOCK; + return r; + } + + /* Return the number of tests that failed + the number of tests + that weren't run */ + r = failures + e_tests - test_count; + UNLOCK; + + return r; +} + +/* + * Cleanup at the end of the run, produce any final output that might be + * required. + */ +void +_cleanup(void) +{ + + LOCK; + + /* If plan_no_plan() wasn't called, and we don't have a plan, + and we're not skipping everything, then something happened + before we could produce any output */ + if(!no_plan && !have_plan && !skip_all) { + diag("Looks like your test died before it could output anything."); + UNLOCK; + return; + } + + if(test_died) { + diag("Looks like your test died just after %d.", test_count); + UNLOCK; + return; + } + + + /* No plan provided, but now we know how many tests were run, and can + print the header at the end */ + if(!skip_all && (no_plan || !have_plan)) { + printf("1..%d\n", test_count); + } + + if((have_plan && !no_plan) && e_tests < test_count) { + diag("Looks like you planned %d %s but ran %d extra.", + e_tests, e_tests == 1 ? "test" : "tests", test_count - e_tests); + UNLOCK; + return; + } + + if((have_plan || !no_plan) && e_tests > test_count) { + diag("Looks like you planned %d %s but only ran %d.", + e_tests, e_tests == 1 ? "test" : "tests", test_count); + UNLOCK; + return; + } + + if(failures) + diag("Looks like you failed %d %s of %d.", + failures, failures == 1 ? "test" : "tests", test_count); + + UNLOCK; +} diff --git a/tests/utils/tap/tap.h b/tests/utils/tap/tap.h new file mode 100644 index 0000000..0f05943 --- /dev/null +++ b/tests/utils/tap/tap.h @@ -0,0 +1,89 @@ +/*- + * Copyright (c) 2004 Nik Clayton + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* '## __VA_ARGS__' is a gcc'ism. C99 doesn't allow the token pasting + and requires the caller to add the final comma if they've ommitted + the optional arguments */ +#ifdef __GNUC__ +# define ok(e, test, ...) ((e) ? \ + _gen_result(1, __func__, __FILE__, __LINE__, \ + test, ## __VA_ARGS__) : \ + _gen_result(0, __func__, __FILE__, __LINE__, \ + test, ## __VA_ARGS__)) + +# define ok1(e) ((e) ? \ + _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \ + _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e)) + +# define pass(test, ...) ok(1, test, ## __VA_ARGS__); +# define fail(test, ...) ok(0, test, ## __VA_ARGS__); + +# define skip_start(test, n, fmt, ...) \ + do { \ + if((test)) { \ + skip(n, fmt, ## __VA_ARGS__); \ + continue; \ + } +#elif __STDC_VERSION__ >= 199901L /* __GNUC__ */ +# define ok(e, ...) ((e) ? \ + _gen_result(1, __func__, __FILE__, __LINE__, \ + __VA_ARGS__) : \ + _gen_result(0, __func__, __FILE__, __LINE__, \ + __VA_ARGS__)) + +# define ok1(e) ((e) ? \ + _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : \ + _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e)) + +# define pass(...) ok(1, __VA_ARGS__); +# define fail(...) ok(0, __VA_ARGS__); + +# define skip_start(test, n, ...) \ + do { \ + if((test)) { \ + skip(n, __VA_ARGS__); \ + continue; \ + } +#else /* __STDC_VERSION__ */ +# error "Needs gcc or C99 compiler for variadic macros." +#endif /* __STDC_VERSION__ */ + +#define skip_end() } while(0); + +unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...); + +int plan_no_plan(void); +int plan_skip_all(char *); +int plan_tests(unsigned int); + +unsigned int diag(char *, ...); + +int skip(unsigned int, char *, ...); + +void todo_start(char *, ...); +void todo_end(void); + +int exit_status(void); diff --git a/tests/utils/tap/tap.sh b/tests/utils/tap/tap.sh new file mode 100755 index 0000000..24ac1aa --- /dev/null +++ b/tests/utils/tap/tap.sh @@ -0,0 +1,456 @@ +#!/bin/bash +# +# Copyright 2010 Patrick LeBoutillier <patrick.leboutillier(a)gmail.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# 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, see <http://www.gnu.org/licenses/>. + + +_version='1.01' + +_plan_set=0 +_no_plan=0 +_skip_all=0 +_test_died=0 +_expected_tests=0 +_executed_tests=0 +_failed_tests=0 +TODO= + + +usage(){ + cat <<'USAGE' +tap-functions: A TAP-producing BASH library + +PLAN: + plan_no_plan + plan_skip_all [REASON] + plan_tests NB_TESTS + +TEST: + ok RESULT [NAME] + okx COMMAND + is RESULT EXPECTED [NAME] + isnt RESULT EXPECTED [NAME] + like RESULT PATTERN [NAME] + unlike RESULT PATTERN [NAME] + pass [NAME] + fail [NAME] + +SKIP: + skip [CONDITION] [REASON] [NB_TESTS=1] + + skip $feature_not_present "feature not present" 2 || { + is $a "a" + is $b "b" + } + +TODO: + Specify TODO mode by setting $TODO: + TODO="not implemented yet" + ok $result "some not implemented test" + unset TODO + +OTHER: + diag MSG + +EXAMPLE: + #!/bin/bash + + . tap-functions + + plan_tests 7 + + me=$USER + is $USER $me "I am myself" + like $HOME $me "My home is mine" + like "`id`" $me "My id matches myself" + + /bin/ls $HOME 1>&2 + ok $? "/bin/ls $HOME" + # Same thing using okx shortcut + okx /bin/ls $HOME + + [[ "`id -u`" != "0" ]] + i_am_not_root=$? + skip $i_am_not_root "Must be root" || { + okx ls /root + } + + TODO="figure out how to become root..." + okx [ "$HOME" == "/root" ] + unset TODO +USAGE + exit +} + +opt= +set_u= +while getopts ":sx" opt ; do + case $_opt in + u) set_u=1 ;; + *) usage ;; + esac +done +shift $(( OPTIND - 1 )) +# Don't allow uninitialized variables if requested +[[ -n "$set_u" ]] && set -u +unset opt set_u + +# Used to call _cleanup on shell exit +trap _exit EXIT + + +plan_no_plan(){ + (( _plan_set != 0 )) && "You tried to plan twice!" + + _plan_set=1 + _no_plan=1 + + return 0 +} + + +plan_skip_all(){ + local reason=${1:-''} + + (( _plan_set != 0 )) && _die "You tried to plan twice!" + + _print_plan 0 "Skip $reason" + + _skip_all=1 + _plan_set=1 + _exit 0 + + return 0 +} + +plan_tests(){ + local tests=${1:?} + + (( _plan_set != 0 )) && _die "You tried to plan twice!" + (( tests == 0 )) && _die "You said to run 0 tests! You've got to run something." + + _print_plan $tests + _expected_tests=$tests + _plan_set=1 + + return $tests +} + + +_print_plan(){ + local tests=${1:?} + local directive=${2:-''} + + echo -n "1..$tests" + [[ -n "$directive" ]] && echo -n " # $directive" + echo +} + + +pass(){ + local name=$1 + ok 0 "$name" +} + + +fail(){ + local name=$1 + ok 1 "$name" +} + +# This is the workhorse method that actually +# prints the tests result. +ok(){ + local result=${1:?} + local name=${2:-''} + + (( _plan_set == 0 )) && _die "You tried to run a test without a plan! Gotta have a plan." + + _executed_tests=$(( $_executed_tests + 1 )) + + if [[ -n "$name" ]] ; then + if _matches "$name" "^[0-9]+$" ; then + diag " You named your test '$name'. You shouldn't use numbers for your test names." + diag " Very confusing." + fi + fi + + if (( result != 0 )) ; then + echo -n "not " + _failed_tests=$(( _failed_tests + 1 )) + fi + echo -n "ok $_executed_tests" + + if [[ -n "$name" ]] ; then + local ename=${name//\#/\\#} + echo -n " - $ename" + fi + + if [[ -n "$TODO" ]] ; then + echo -n " # TODO $TODO" ; + if (( result != 0 )) ; then + _failed_tests=$(( _failed_tests - 1 )) + fi + fi + + echo + if (( result != 0 )) ; then + local file='tap-functions' + local func= + local line= + + local i=0 + local bt=$(caller $i) + while _matches "$bt" "tap-functions$" ; do + i=$(( $i + 1 )) + bt=$(caller $i) + done + local backtrace= + eval $(caller $i | (read line func file ; echo "backtrace=\"$file:$func() at line $line.\"")) + + local t= + [[ -n "$TODO" ]] && t="(TODO) " + + if [[ -n "$name" ]] ; then + diag " Failed ${t}test '$name'" + diag " in $backtrace" + else + diag " Failed ${t}test in $backtrace" + fi + fi + + return $result +} + + +okx(){ + local command="$@" + + local line= + diag "Output of '$command':" + "$@" | while read line ; do + diag "$line" + done + ok ${PIPESTATUS[0]} "$command" +} + + +_equals(){ + local result=${1:?} + local expected=${2:?} + + if [[ "$result" == "$expected" ]] ; then + return 0 + else + return 1 + fi +} + + +# Thanks to Aaron Kangas for the patch to allow regexp matching +# under bash < 3. + _bash_major_version=${BASH_VERSION%%.*} +_matches(){ + local result=${1:?} + local pattern=${2:?} + + if [[ -z "$result" || -z "$pattern" ]] ; then + return 1 + else + if (( _bash_major_version >= 3 )) ; then + [[ "$result" =~ "$pattern" ]] + else + echo "$result" | egrep -q "$pattern" + fi + fi +} + + +_is_diag(){ + local result=${1:?} + local expected=${2:?} + + diag " got: '$result'" + diag " expected: '$expected'" +} + + +is(){ + local result=${1:?} + local expected=${2:?} + local name=${3:-''} + + _equals "$result" "$expected" + (( $? == 0 )) + ok $? "$name" + local r=$? + (( r != 0 )) && _is_diag "$result" "$expected" + return $r +} + + +isnt(){ + local result=${1:?} + local expected=${2:?} + local name=${3:-''} + + _equals "$result" "$expected" + (( $? != 0 )) + ok $? "$name" + local r=$? + (( r != 0 )) && _is_diag "$result" "$expected" + return $r +} + + +like(){ + local result=${1:?} + local pattern=${2:?} + local name=${3:-''} + + _matches "$result" "$pattern" + (( $? == 0 )) + ok $? "$name" + local r=$? + (( r != 0 )) && diag " '$result' doesn't match '$pattern'" + return $r +} + + +unlike(){ + local result=${1:?} + local pattern=${2:?} + local name=${3:-''} + + _matches "$result" "$pattern" + (( $? != 0 )) + ok $? "$name" + local r=$? + (( r != 0 )) && diag " '$result' matches '$pattern'" + return $r +} + + +skip(){ + local condition=${1:?} + local reason=${2:-''} + local n=${3:-1} + + if (( condition == 0 )) ; then + local i= + for (( i=0 ; i<$n ; i++ )) ; do + _executed_tests=$(( _executed_tests + 1 )) + echo "ok $_executed_tests # skip: $reason" + done + return 0 + else + return + fi +} + + +diag(){ + local msg=${1:?} + + if [[ -n "$msg" ]] ; then + echo "# $msg" + fi + + return 1 +} + + +_die(){ + local reason=${1:-'<unspecified error>'} + + echo "$reason" >&2 + _test_died=1 + _exit 255 +} + + +BAIL_OUT(){ + local reason=${1:-''} + + echo "Bail out! $reason" >&2 + _exit 255 +} + + +_cleanup(){ + local rc=0 + + if (( _plan_set == 0 )) ; then + diag "Looks like your test died before it could output anything." + return $rc + fi + + if (( _test_died != 0 )) ; then + diag "Looks like your test died just after $_executed_tests." + return $rc + fi + + if (( _skip_all == 0 && _no_plan != 0 )) ; then + _print_plan $_executed_tests + fi + + local s= + if (( _no_plan == 0 && _expected_tests < _executed_tests )) ; then + s= ; (( _expected_tests > 1 )) && s=s + local extra=$(( _executed_tests - _expected_tests )) + diag "Looks like you planned $_expected_tests test$s but ran $extra extra." + rc=1 ; + fi + + if (( _no_plan == 0 && _expected_tests > _executed_tests )) ; then + s= ; (( _expected_tests > 1 )) && s=s + diag "Looks like you planned $_expected_tests test$s but only ran $_executed_tests." + fi + + if (( _failed_tests > 0 )) ; then + s= ; (( _failed_tests > 1 )) && s=s + diag "Looks like you failed $_failed_tests test$s of $_executed_tests." + fi + + return $rc +} + + +_exit_status(){ + if (( _no_plan != 0 || _plan_set == 0 )) ; then + return $_failed_tests + fi + + if (( _expected_tests < _executed_tests )) ; then + return $(( _executed_tests - _expected_tests )) + fi + + return $(( _failed_tests + ( _expected_tests - _executed_tests ))) +} + + +_exit(){ + local rc=${1:-''} + if [[ -z "$rc" ]] ; then + _exit_status + rc=$? + fi + + _cleanup + local alt_rc=$? + (( alt_rc != 0 )) && rc=$alt_rc + trap - EXIT + exit $rc +}

1 0

[torsocks/master] Update documentation Makefile
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit 708fdf00ce564855f4c5db16b3393e8827297c1c Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 15:32:16 2013 -0400 Update documentation Makefile Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- doc/Makefile.am | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 666abeb..4e1084c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,14 +1,10 @@ -# Makefile used by configure to create real Makefile - # Install configuration file confdir = $(CONFDIR)/ dist_conf_DATA = torsocks.conf -# Install man pages -dist_man_MANS = torsocks.1 torsocks.8 usewithtor.1 torsocks.conf.5 +dist_man1_MANS = torsocks.1 +dist_man3_MANS = torsocks.conf.5 +dist_man8_MANS = torsocks.8 -dist_data_DATA = socks/SOCKS5 socks/SOCKS4.protocol socks/socks-extensions.txt \ - patches/compilewarnings.patch patches/conffile.patch patches/getaddrbyhost.patch \ - patches/getpeername.patch patches/infiniteloop.patch patches/localaddresses.patch \ - patches/README patches/README.TORDNS patches/tordns.patch notes/DEBUG +dist_data_DATA = socks/SOCKS5 socks/socks-extensions.txt notes/DEBUG

1 0

[torsocks/master] Update torsocks.conf man page and example
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit 00cf8b474ad29a3bf80bd6e244624d2b2aa79396 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 15:30:26 2013 -0400 Update torsocks.conf man page and example Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- doc/torsocks.conf | 14 +--- doc/torsocks.conf.5 | 207 ++++++++------------------------------------------- 2 files changed, 35 insertions(+), 186 deletions(-) diff --git a/doc/torsocks.conf b/doc/torsocks.conf index 6f4fc04..f5b4924 100644 --- a/doc/torsocks.conf +++ b/doc/torsocks.conf @@ -4,16 +4,7 @@ # Lines beginning with # and blank lines are ignored # Much more documentation than provided in these comments can be found in # -# torsocks.conf(5) and torsocks(1) manpages. - -# We specify local as 127.0.0.0 - 127.191.255.255 because the -# Tor MAPADDRESS virtual IP range is the rest of net 127. -# Torsocks also treats as local all the subnets that Tor does. -local = 127.0.0.0/255.128.0.0 -local = 127.128.0.0/255.192.0.0 -local = 169.254.0.0/255.255.0.0 -local = 172.16.0.0/255.240.0.0 -local = 192.168.0.0/255.255.0.0 +# 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. @@ -23,5 +14,6 @@ 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. +# 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/doc/torsocks.conf.5 b/doc/torsocks.conf.5 index 7cd22d8..6018153 100644 --- a/doc/torsocks.conf.5 +++ b/doc/torsocks.conf.5 @@ -1,13 +1,11 @@ -.TH TORSOCKS.CONF 5 "" "Robert Hogan" \" -*- - \" nroff -* +.TH "TORSOCKS.CONF" "5" "August 24th, 2013" "" "" .SH NAME -.BR torsocks.conf -\- configuration file for torsocks(8) +torsocks.conf \(em Configuration file for torsocks(8) .SH SUMMARY -By default, torsocks will assume that it should connect to the SOCKS proxy +By default, torsocks will assume that it should connect to the Tor SOCKS proxy running at 127.0.0.1 on port 9050. This is the default address and port for Tor's socks server on most installations. If you are running a normal Tor installation and have no special requirements, then you should not need to @@ -17,198 +15,57 @@ Your installation of torsocks includes a default configuration file that contains values sensible for use with most Tor installations. The installation location for your default configuration file is: - @CONFDIR@/torsocks.conf + @CONFDIR@/tor/torsocks.conf In order to use a configuration file, you must set the environment variable TORSOCKS_CONF_FILE with the location of the file. -If TORSOCKS_CONF_FILE is not set, torsocks will attempt to read the configuration -file at @CONFDIR@/torsocks.conf. If that file cannot be read, torsocks will -use sensible defaults for most Tor installations, i.e. it will assume that -you want to use a SOCKS proxy running at 127.0.0.1 (localhost) on port 9050. - -An example of typical usage is provided under the 'example' heading at the -end of this manual page. The script 'usewithtor' provided with your torsocks -installation will set this environment variable for you, and load the -configuration file provided with your installation. - -If you want to use a custom file in a different location, you should set the -environment variable yourself and then use the torsocks command, rather than -usewithtor. - -.SH OVERVIEW - -The configuration for torsocks can be anything from two lines to hundreds of -lines based on the needs at any particular site. The basic idea is to define -any networks the machine can access directly (i.e without the use of a -SOCKS server) and define one or many SOCKS servers to be used to access -other networks (including a 'default' server). - -Local networks are declared using the 'local' keyword in the configuration -file. When applications attempt to connect to machines in networks marked -as local torsocks will not attempt to use a SOCKS server to negotiate the -connection. - -Obviously if a connection is not to a locally accessible network it will need -to be proxied over a SOCKS server. However, many installations have several -different SOCKS servers to be used to access different internal (and external) -networks. For this reason the configuration file allows the definition of -`paths' as well as a default SOCKS server. - -Paths are declared as blocks in the configuration file. That is, they begin -with a 'path {' line in the configuration file and end with a '}' line. Inside -this block directives should be used to declare a SOCKS server (as documented -later in this manual page) and 'reaches' directives should be used to declare -networks and even destination ports in those networks that this server should -be used to reach. N.B Each path MUST define a SOCKS server and contain one or -more 'reaches' directives. - -SOCKS server declaration directives that are not contained within a 'path' -block define the default SOCKS server. If torsocks needs to connect to a machine -via a SOCKS server (i.e it isn't a network declared as 'local') and no 'path' -has declared it can reach that network via a 'reaches' directive this server -is used to negotiate the connection. - -.SH CONFIGURATION SYNTAX +If TORSOCKS_CONF_FILE is not set, torsocks will attempt to read the +configuration file at @CONFDIR@/tor/torsocks.conf. If that file cannot be read, +torsocks will use sensible defaults for most Tor installations, i.e. it will +assume that you want to use a SOCKS proxy running at 127.0.0.1 (localhost) on +port 9050. -The basic structure of all lines in the configuration file is: - -.RS -<directive> = <parameters> -.RE +.SH CONFIGURATION -The exception to this is 'path' blocks which look like: +.SS SYNTAX +The basic structure of all lines in the configuration file is: .RS -path { -.RS -<directive> = <parameters> -.RE -} +<directive> <parameters> .RE -Empty lines are ignored and all input on a line after a '#' character is +Empty lines are ignored and all input on a line after a '#' character is ignored. -.SS DIRECTIVES +.SS DIRECTIVES The following directives are used in the torsocks configuration file: .TP -.I server -The IP address of the SOCKS server (e.g "server = 10.1.4.253"). Only one -server may be specified per path block, or one outside a path -block (to define the default server). Unless \-\-disable-hostnames was -specified to configure at compile time the server can be specified as -a hostname (e.g "server = socks.nec.com") - -.TP -.I server_port -The port on which the SOCKS server receives requests. Only one server_port -may be specified per path block, or one outside a path (for the default -server). This directive is not required if the server is on the -standard port (1080). - -.TP -.I server_type -SOCKS version used by the server. Versions 4 and 5 are supported (but both -for only the connect operation). The default is 4. Only one server_type -may be specified per path block, or one outside a path (for the default -server). - -You can use the inspectorsocks utility to determine the type of server, see -the 'UTILITIES' section later in this manual page. - -.TP -.I default_user -This specifies the default username to be used for username and password -authentication in SOCKS version 5. In order to determine the username to -use (if the socks server requires username and password authentication) -torsocks first looks for the environment variable TSOCKS_USERNAME, then -looks for this configuration option, then tries to get the local username. -This option is not valid for SOCKS version 4 servers. Only one default_user -may be specified per path block, or one outside a path (for the default -server) +.I TorAddress +The IP address of the Tor SOCKS server (e.g "server = 10.1.4.253"). Only one +server may be specified. Currently, torsocks does NOT support hostname. +(default: 127.0.0.1) .TP -.I default_pass -This specified the default password to be used for username and password -authentication in SOCKS version 5. In order to determine the password to -use (if the socks server requires username and password authentication) -torsocks first looks for the environment variable TSOCKS_PASSWORD, then -looks for this configuration option. This option is not valid for SOCKS -version 4 servers. Onle one default_pass may be specified per path block, -or one outside a path (for the default server) +.I TorPort +The port on which the Tor SOCKS server receives requests. (default: 9050) .TP -.I local -An IP/Subnet pair specifying a network which may be accessed directly without -proxying through a SOCKS server (e.g "local = 10.0.0.0/255.0.0.0"). -Obviously all SOCKS server IP addresses must be in networks specified as -local, otherwise torsocks would need a SOCKS server to reach SOCKS servers. - -.TP -.I reaches -This directive is only valid inside a path block. Its parameter is formed -as IP[:startport[\-endport]]/Subnet and it specifies a network (and a range -of ports on that network) that can be accessed by the SOCKS server specified -in this path block. For example, in a path block "reaches = -150.0.0.0:80-1024/255.0.0.0" indicates to torsocks that the SOCKS server -specified in the current path block should be used to access any IPs in the -range 150.0.0.0 to 150.255.255.255 when the connection request is for ports -80-1024. - -.TP -.I tordns_enable -This enables the use of the 'tordns' feature in torsocks, which overrides the -standard C library name resolution calls to use SOCKS. The default value is -`true'. - -.TP -.I tordns_deadpool_range -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. The default value is '127.0.69.0/255.255.255.0'. - -.TP -.I tordns_cache_size -This specifies the number of IP addresses looked up through SOCKS to cache. -The default value is 256. Each entry consumes 260 bytes of memory, so the -default adds 66,560 bytes of overhead to each 'torified' process. NOTE: if -the number of IP addresses in tordns_deadpool_range is less than the value -specified for tordns_cache_size, then the cache will be shrunk to fit the -deadpool range. This is to prevent duplicate deadpool addresses from ever -appearing in the cache. - -.SH UTILITIES -torsocks comes with two utilities that can be useful in creating and verifying -the torsocks configuration file. +.I OnionAddrRange +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. (default: 127.42.42.0/24) .SH EXAMPLE - - export TORSOCKS_CONF_FILE=$PWD/torsocks.conf - torsocks ssh account(a)sshserver.com + $ export TORSOCKS_CONF_FILE=$PWD/torsocks.conf + $ torsocks ssh account(a)sshserver.com .SH SEE ALSO -torsocks(8) +.BR torsocks(1), +.BR torsocks(8), .SH AUTHOR -Robert Hogan (robert(a)roberthogan.net) -Shaun Clowes (delius(a)progsoc.uts.edu.au) - -.SH COPYRIGHT -Copyright 2009 Robert Hogan -Copyright 2000 Shaun Clowes - -Renamed for use by torsocks to avoid conflict with torsocks by Robert Hogan. - -torsocks and its documentation may be freely copied under the terms and -conditions of version 2 of the GNU General Public License, as published -by the Free Software Foundation (Cambridge, Massachusetts, United -States of America). - -This documentation is based on the documentation for logwrites, another -shared library interceptor. One line of code from it was used in -torsocks and a lot of the documentation :) logwrites is by -adam(a)yggdrasil.com (Adam J. Richter) and can be had from ftp.yggdrasil.com -pub/dist/pkg +David Goulet <dgoulet(a)ev0ke.net>

1 0

[torsocks/master] Change torsocks config dir by adding /tor
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit 990b3628c5c3f8048a4d15b490531643a261e149 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 15:56:11 2013 -0400 Change torsocks config dir by adding /tor Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- doc/Makefile.am | 2 +- src/common/defaults.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 4e1084c..5d8783f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ # Install configuration file -confdir = $(CONFDIR)/ +confdir = $(CONFDIR)/tor dist_conf_DATA = torsocks.conf dist_man1_MANS = torsocks.1 diff --git a/src/common/defaults.h b/src/common/defaults.h index 1a2c2fc..b2ad372 100644 --- a/src/common/defaults.h +++ b/src/common/defaults.h @@ -38,7 +38,8 @@ */ #define DEFAULT_DOMAIN_NAME_SIZE 255 -#define DEFAULT_CONF_FILE "/etc/torsocks.conf" +#define DEFAULT_CONF_FILENAME "torsocks.conf" +#define DEFAULT_CONF_FILE CONFDIR "/tor/" DEFAULT_CONF_FILENAME #define DEFAULT_CONF_FILE_ENV "TORSOCKS_CONF_FILE" /*

1 0

[torsocks/master] Add proper usage message to torsocks shell script
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit 237f44e20078e555b1fc75d021030dd7fb3ab6eb Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 15:41:35 2013 -0400 Add proper usage message to torsocks shell script Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/bin/torsocks.in | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in index c000565..834816f 100644 --- a/src/bin/torsocks.in +++ b/src/bin/torsocks.in @@ -110,7 +110,21 @@ torify_app () usage () { - echo "$0: Please see torsocks(1) or read comment at top of $0" + echo "$0 [OPTIONS] [COMMAND [arg ...]]" + echo "" + echo "usage: $0 command args" + echo "" + echo "Options:" + echo " -h, --help Show this help" + echo " , --shell Spawn a torified shell" + echo " on, off Add or remove torsocks library from @LDPRELOAD@" + echo " show, sh Show the current value of the @LDPRELOAD@" + echo "" + echo "Example:" + echo " $ torsocks ssh user(a)host.com -p 1234" + echo "" + echo "Please see torsocks(1), torsocks.conf(5) and torsocks(8) for more information." + } if [ $# -eq 0 ] ; then

1 0

[torsocks/master] Remove unused configure options
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit 8449e1308a99a22ed2d83a0e478775f97e7c6677 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 16:00:03 2013 -0400 Remove unused configure options Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 9 --------- 1 file changed, 9 deletions(-) diff --git a/configure.ac b/configure.ac index 4382517..3a646ce 100644 --- a/configure.ac +++ b/configure.ac @@ -24,15 +24,6 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S -dnl Arguments we allow -AC_ARG_ENABLE(debug, -[ --disable-debug disable ALL error messages from torsocks ]) -AC_ARG_ENABLE(oldmethod, -[ --enable-oldmethod use the old method to override connect ]) -AC_ARG_ENABLE(envconf, -[ --disable-envconf do not allow TORSOCKS_CONF_FILE to specify configuration file ]) - - ############################################################################## # 2. Check for some standard headers and libraries ##############################################################################

1 0

[torsocks/master] Minor fixes in man pages
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit f393897a17a7988ab2009ad8df14bd8e934ce313 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 15:47:57 2013 -0400 Minor fixes in man pages Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- doc/torsocks.1 | 12 ++++++------ doc/torsocks.8 | 6 +++--- doc/torsocks.conf.5 | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/torsocks.1 b/doc/torsocks.1 index 885ff52..b4dab1f 100644 --- a/doc/torsocks.1 +++ b/doc/torsocks.1 @@ -18,7 +18,7 @@ By default, torsocks will assume that it should connect to the Tor SOCKS proxy running at 127.0.0.1 on port 9050 being the defaults of the Tor daemon. In order to use a configuration file, torsocks tries to read the -\fB@CONFDIR@/tor/torsocks.conf\fP file or look for the environment variable +\fB/etc/tor/torsocks.conf\fP file or look for the environment variable TORSOCKS_CONF_FILE with the location of the file. If that file cannot be read, torsocks will use sensible defaults for most Tor installations. @@ -32,24 +32,24 @@ For further information on configuration, see Show summary of possible options and commands. .TP .BR "\-\-shell" -Create a new shell with @LDPRELOAD@ including \fBtorsocks(8)\fP. +Create a new shell with LD_PRELOAD including \fBtorsocks(8)\fP. .TP .BR "on | off" -This option adds or removes \fBtorsocks(8)\fP from the @LDPRELOAD@ environment +This option adds or removes \fBtorsocks(8)\fP from the LD_PRELOAD environment variable for the current shell. If you want to use this option, you HAVE to source torsocks from yours. .br .nf -Add the torsocks library to @LDPRELOAD@ +Add the torsocks library to LD_PRELOAD $ . torsocks on .br -Remove the torsocks library from @LDPRELOAD@ +Remove the torsocks library from LD_PRELOAD $ . torsocks off .fi .TP .BR "show | sh" -Show the current value of the @LDPRELOAD@ environment variable. +Show the current value of the LD_PRELOAD environment variable. .SH "ENVIRONMENT VARIABLES" .PP diff --git a/doc/torsocks.8 b/doc/torsocks.8 index 1820465..e91c356 100644 --- a/doc/torsocks.8 +++ b/doc/torsocks.8 @@ -18,12 +18,12 @@ Please note that the ISC res_* API is currently not supported. Here is an example on how to use torsocks library with \fBssh(1)\fP: .br -$ @LDPRELOAD@=/path/to/libtorsocks.so ssh -l kalexander -p 1234 prism.nsa.gov +$ LD_PRELOAD=/path/to/libtorsocks.so ssh -l kalexander -p 1234 prism.nsa.gov [...] .SH SHELL USAGE -Set @LDPRELOAD@ to load the library then use applications as normal. The syntax +Set LD_PRELOAD to load the library then use applications as normal. The syntax to force preload of the library for different shells is specified below: Bash, Ksh and Bourne shell: @@ -111,7 +111,7 @@ executables that make system calls directly with the system call trap (int 0x80). .SH FILES -@CONFDIR@/tor/torsocks.conf - default torsocks configuration file +/etc/tor/torsocks.conf - default torsocks configuration file .SH SEE ALSO .BR torsocks.conf(5), diff --git a/doc/torsocks.conf.5 b/doc/torsocks.conf.5 index 6018153..cdafad0 100644 --- a/doc/torsocks.conf.5 +++ b/doc/torsocks.conf.5 @@ -15,13 +15,13 @@ Your installation of torsocks includes a default configuration file that contains values sensible for use with most Tor installations. The installation location for your default configuration file is: - @CONFDIR@/tor/torsocks.conf +/etc/tor/torsocks.conf In order to use a configuration file, you must set the environment variable TORSOCKS_CONF_FILE with the location of the file. If TORSOCKS_CONF_FILE is not set, torsocks will attempt to read the -configuration file at @CONFDIR@/tor/torsocks.conf. If that file cannot be read, +configuration file at /etc/tor/torsocks.conf. If that file cannot be read, torsocks will use sensible defaults for most Tor installations, i.e. it will assume that you want to use a SOCKS proxy running at 127.0.0.1 (localhost) on port 9050.

1 0

[torsocks/master] Revert "Optimize onion pool search by IP addr"
by dgoulet＠torproject.org 05 Apr '14

05 Apr '14

commit c710eda4bd8983576b934c76261d53344175b999 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 24 15:50:39 2013 -0400 Revert "Optimize onion pool search by IP addr" Without anything in the pool, this causes a segfault. Reverting patch completely. This reverts commit 826007d5a3110dac36d8c6ff8b88f060c80994ea. --- src/common/onion.c | 30 +++++++++++++++++++----------- src/common/onion.h | 1 - 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/common/onion.c b/src/common/onion.c index c34121a..573ca19 100644 --- a/src/common/onion.c +++ b/src/common/onion.c @@ -16,7 +16,6 @@ */ #include <assert.h> -#include <inttypes.h> #include "defaults.h" #include "log.h" @@ -112,7 +111,6 @@ int onion_pool_init(struct onion_pool *pool, in_addr_t addr, uint8_t mask) pool->max_pos = pool->base + ((1UL << (32 - mask)) - 1); pool->next_entry_pos = 0; pool->count = 0; - pool->mask = mask; tsocks_mutex_init(&pool->lock); /* @@ -130,8 +128,8 @@ int onion_pool_init(struct onion_pool *pool, in_addr_t addr, uint8_t mask) goto error; } - DBG("[onion] Pool initialized with mask %" PRIu8 ", base %lu, max_pos %lu " - "and size %lu", pool->mask, pool->base, pool->max_pos, pool->size); + DBG("[onion] Pool initialized with base %lu, max_pos %lu and size %lu", + pool->base, pool->max_pos, pool->size); error: return ret; @@ -228,7 +226,7 @@ struct onion_entry *onion_entry_find_by_name(const char *onion_name, assert(onion_name); assert(pool); - DBG("[onion] Finding onion entry by name %s", onion_name); + DBG("[onion] Finding onion entry for name %s", onion_name); for (i = 0; i < pool->count; i++) { if (strcmp(onion_name, pool->entries[i]->hostname) == 0) { @@ -253,17 +251,27 @@ ATTR_HIDDEN struct onion_entry *onion_entry_find_by_ip(in_addr_t ip, struct onion_pool *pool) { - uint32_t index; + int i; struct onion_entry *entry = NULL; DBG("[onion] Finding onion entry for IP %s", inet_ntoa(*((struct in_addr *) &ip))); - index = ip >> pool->mask; - entry = pool->entries[index]; - - DBG("[onion] Onion entry name %s found in pool at index %" PRIu32, - entry->hostname, index); + /* + * XXX: This can be improved by simply getting the offset of the IP with + * the pool subnet which gives the index in the pool entries. For instance, + * 127.0.0.45 with a ip_subnet set to 127.0.0.0/24, the index in the pool + * entries is 45. + */ + for (i = 0; i < pool->count; i++) { + if (pool->entries[i]->ip == ip) { + entry = pool->entries[i]; + DBG("[onion] Onion entry name %s found in pool.", + entry->hostname); + goto end; + } + } +end: return entry; } diff --git a/src/common/onion.h b/src/common/onion.h index e866ba6..90b4d5b 100644 --- a/src/common/onion.h +++ b/src/common/onion.h @@ -77,7 +77,6 @@ struct onion_pool { */ uint32_t base; uint32_t max_pos; - uint8_t mask; /* * Current size of the array. This is the number of allocated entry in the

1 0