- tor-commits - lists.torproject.org

[torsocks/osx] Remove socksdns, tordns and hostnames configure options.
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit a445ee509995cca33595647b37c290884944743f Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Feb 14 20:49:28 2011 +0000 Remove socksdns, tordns and hostnames configure options. These options are defunct: 1. socksdns (force dns lookups to use tcp) torsocks does this by default, no reason to make it optional. 2. tordns (force dns lookups through tor) torsocks does this by default, option has been a no-op for a long time. 3. hostnames (resolve name of socks server if required) potentially useful, but not really a good idea for tor. --- configure.in | 26 -------------------------- src/common.c | 48 +++++++++++++++++++++++------------------------- src/torsocks.c | 2 +- 3 files changed, 24 insertions(+), 52 deletions(-) diff --git a/configure.in b/configure.in index a962b55..ca5af2a 100644 --- a/configure.in +++ b/configure.in @@ -14,16 +14,10 @@ dnl /etc/ld.so.preload file dnl test "$libdir" = "\${exec_prefix}/lib" && libdir="/lib" dnl Arguments we allow -AC_ARG_ENABLE(socksdns, -[ --enable-socksdns force dns lookups to use tcp ]) -AC_ARG_ENABLE(tordns, -[ --disable-tordns don't override name lookup calls to use SOCKS ]) 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(hostnames, -[ --enable-hostnames enable hostname lookups for socks servers ]) AC_ARG_ENABLE(envconf, [ --disable-envconf do not allow TORSOCKS_CONF_FILE to specify configuration file ]) @@ -176,10 +170,6 @@ AC_EGREP_CPP(yes, ]) ]) -if test "${enable_socksdns}" = "yes"; then - AC_DEFINE([USE_SOCKS_DNS],[],[Description]) -fi - if test "x${enable_envconf}" = "x"; then AC_DEFINE([ALLOW_ENV_CONFIG],[],[Description]) fi @@ -189,22 +179,6 @@ if test "${enable_oldmethod}" = "yes"; then oldmethod="yes" fi -AC_DEFINE([HOSTNAMES],[0],[Description]) - -if test "x${enable_hostnames}" = "xyes"; then - AC_DEFINE([HOSTNAMES],[1],[Description]) -fi - -if test "${enable_socksdns}" = "yes" -a \ - "x${enable_hostnames}" = "xyes" ; then - AC_MSG_ERROR("--enable-socksdns is not valid with --enable-hostnames") -fi - -if test "x${enable_tordns}" = "x" -a \ - "x${enable_hostnames}" = "xyes" ; then - AC_MSG_ERROR("--enable-tordns is not valid with --enable-hostnames") -fi - dnl If we have to use the old method of overriding connect (i.e no dnl RTLD_NEXT) we need to know the location of the library that dnl contains connect(), select(), poll() and close() diff --git a/src/common.c b/src/common.c index 53a60b2..3826d3b 100644 --- a/src/common.c +++ b/src/common.c @@ -96,34 +96,32 @@ set_uint32(char *cp, uint32_t v) memcpy(cp,&v,4); } - - unsigned int resolve_ip(char *host, int showmsg, int allownames) { - struct hostent *new; - unsigned int hostaddr; - struct in_addr *ip; - - if ((hostaddr = inet_addr(host)) == (unsigned int) -1) { - /* We couldn't convert it as a numerical ip so */ - /* try it as a dns name */ - if (allownames) { - #ifdef HAVE_GETHOSTBYNAME - if ((new = gethostbyname(host)) == (struct hostent *) 0) { - #endif - return(0); - #ifdef HAVE_GETHOSTBYNAME - } else { - ip = ((struct in_addr *) * new->h_addr_list); - hostaddr = ip -> s_addr; - if (showmsg) - printf("Connecting to %s...\n", inet_ntoa(*ip)); - } - #endif - } else - return(0); - } - - return (hostaddr); + struct hostent *new; + unsigned int hostaddr; + struct in_addr *ip; + + if ((hostaddr = inet_addr(host)) == (unsigned int) -1) { + /* We couldn't convert it as a numerical ip so */ + /* try it as a dns name */ + if (allownames) { + #ifdef HAVE_GETHOSTBYNAME + if ((new = gethostbyname(host)) == (struct hostent *) 0) { + #endif + return(0); + #ifdef HAVE_GETHOSTBYNAME + } else { + ip = ((struct in_addr *) * new->h_addr_list); + hostaddr = ip -> s_addr; + if (showmsg) + printf("Connecting to %s...\n", inet_ntoa(*ip)); + } + #endif + } else + return(0); + } + + return (hostaddr); } /* Set logging options, the options are as follows: */ diff --git a/src/torsocks.c b/src/torsocks.c index 6f3bb39..46557f3 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -423,7 +423,7 @@ int tsocks_connect_guts(CONNECT_SIGNATURE, int (*original_connect)(CONNECT_SIGNA "the server has not been " "specified for this path\n", path->lineno); - } else if ((res = resolve_ip(path->address, 0, HOSTNAMES)) == -1) { + } else if ((res = resolve_ip(path->address, 0, 0)) == -1) { show_msg(MSGERR, "The SOCKS server (%s) listed in the configuration " "file which needs to be used for this connection " "is invalid\n", path->address);

1 0

[torsocks/osx] Whitespace cleanups in common.c
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit a03f0f1db0180d4ff738d02e3975f1cd64ec3f9d Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Feb 14 20:55:13 2011 +0000 Whitespace cleanups in common.c --- src/common.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/common.c b/src/common.c index 3826d3b..d48e853 100644 --- a/src/common.c +++ b/src/common.c @@ -26,7 +26,7 @@ ***************************************************************************/ /* - commmon.c - Common routines for the tsocks package + commmon.c - Common routines for the torsocks package */ @@ -61,9 +61,9 @@ int logstamp = 0; /* Timestamp (and pid stamp) messages */ uint16_t get_uint16(const char *cp) { - uint16_t v; - memcpy(&v,cp,2); - return v; + uint16_t v; + memcpy(&v,cp,2); + return v; } /** * Read a 32-bit value beginning at cp. Equivalent to @@ -73,9 +73,9 @@ get_uint16(const char *cp) uint32_t get_uint32(const char *cp) { - uint32_t v; - memcpy(&v,cp,4); - return v; + uint32_t v; + memcpy(&v,cp,4); + return v; } /** * Set a 16-bit value beginning at cp to v. Equivalent to @@ -84,7 +84,7 @@ get_uint32(const char *cp) void set_uint16(char *cp, uint16_t v) { - memcpy(cp,&v,2); + memcpy(cp,&v,2); } /** * Set a 32-bit value beginning at cp to v. Equivalent to @@ -93,7 +93,7 @@ set_uint16(char *cp, uint16_t v) void set_uint32(char *cp, uint32_t v) { - memcpy(cp,&v,4); + memcpy(cp,&v,4); } unsigned int resolve_ip(char *host, int showmsg, int allownames) { @@ -204,16 +204,16 @@ void show_msg(int level, const char *fmt, ...) { if (logstamp) { fprintf(logfile, "(%d)", getpid()); } - + fputs(": ", logfile); - + va_start(ap, fmt); /* Save errno */ saveerr = errno; vfprintf(logfile, fmt, ap); - + fflush(logfile); errno = saveerr;

1 0

[torsocks/osx] Tidy up copyright in parser.h
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 5c401fb4bd98cdb23facef6f9cd97a9fd6d44442 Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Feb 14 20:59:49 2011 +0000 Tidy up copyright in parser.h --- src/parser.h | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/parser.h b/src/parser.h index ef35982..462f6fe 100644 --- a/src/parser.h +++ b/src/parser.h @@ -1,9 +1,7 @@ /*************************************************************************** * * - * $Id: parser.h,v 1.3 2008-10-03 19:37:29 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by Robert Hogan * - * robert(a)roberthogan.net * + * Copyright (C) 2000-2008 Shaun Clowes <delius(a)progsoc.org> * + * Copyright (C) 2008-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 * @@ -19,32 +17,27 @@ * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * (Source file contained no copyright information.) * ***************************************************************************/ -/* parser.h - Structures, functions and global variables for the - tsocks parsing routines */ +/* parser.h - Structures, functions and global variables for the + torsocks parsing routines */ #ifndef _PARSER_H -#define _PARSER_H 1 +#define _PARSER_H 1 /* Structure definitions */ /* Structure representing one server specified in the config */ struct serverent { - int lineno; /* Line number in conf file this path started on */ - char *address; /* Address/hostname of server */ - int port; /* Port number of server */ - int type; /* Type of server (4/5) */ - char *defuser; /* Default username for this socks server */ - char *defpass; /* Default password for this socks server */ - struct netent *reachnets; /* Linked list of nets from this server */ - struct serverent *next; /* Pointer to next server entry */ + int lineno; /* Line number in conf file this path started on */ + char *address; /* Address/hostname of server */ + int port; /* Port number of server */ + int type; /* Type of server (4/5) */ + char *defuser; /* Default username for this socks server */ + char *defpass; /* Default password for this socks server */ + struct netent *reachnets; /* Linked list of nets from this server */ + struct serverent *next; /* Pointer to next server entry */ }; /* Structure representing a network */

1 0

[torsocks/osx] Whitespace cleanup in parser.h
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit f7b902f88d97c7a54b7c23f669752eb49867055b Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Feb 14 21:01:28 2011 +0000 Whitespace cleanup in parser.h --- src/parser.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/parser.h b/src/parser.h index 462f6fe..91e6d04 100644 --- a/src/parser.h +++ b/src/parser.h @@ -30,23 +30,23 @@ /* Structure representing one server specified in the config */ struct serverent { - int lineno; /* Line number in conf file this path started on */ - char *address; /* Address/hostname of server */ - int port; /* Port number of server */ - int type; /* Type of server (4/5) */ - char *defuser; /* Default username for this socks server */ - char *defpass; /* Default password for this socks server */ + int lineno; /* Line number in conf file this path started on */ + char *address; /* Address/hostname of server */ + int port; /* Port number of server */ + int type; /* Type of server (4/5) */ + char *defuser; /* Default username for this socks server */ + char *defpass; /* Default password for this socks server */ struct netent *reachnets; /* Linked list of nets from this server */ - struct serverent *next; /* Pointer to next server entry */ + struct serverent *next; /* Pointer to next server entry */ }; /* Structure representing a network */ struct netent { - struct in_addr localip; /* Base IP of the network */ - struct in_addr localnet; /* Mask for the network */ - unsigned long startport; /* Range of ports for the */ - unsigned long endport; /* network */ - struct netent *next; /* Pointer to next network entry */ + struct in_addr localip; /* Base IP of the network */ + struct in_addr localnet; /* Mask for the network */ + unsigned long startport; /* Range of ports for the */ + unsigned long endport; /* network */ + struct netent *next; /* Pointer to next network entry */ }; /* Structure representing a complete parsed file */

1 0

[torsocks/osx] More whitespace cleanups
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 2e51187b0f9e9b9530a9404fbee8b304edf67e5a Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Feb 14 21:12:11 2011 +0000 More whitespace cleanups --- src/darwin_warts.c | 6 +++--- src/dead_pool.c | 5 +++-- src/parser.c | 13 +++++++------ src/torsocks.h | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/darwin_warts.c b/src/darwin_warts.c index 0a1b922..4cb86f0 100644 --- a/src/darwin_warts.c +++ b/src/darwin_warts.c @@ -56,9 +56,9 @@ int torsocks_select_guts(SELECT_SIGNATURE, int (*original_select)(SELECT_SIGNATU int select(SELECT_SIGNATURE) { if (!realselect) { - dlerror(); - if ((realselect = dlsym(RTLD_NEXT, "select")) == NULL) - LOAD_ERROR("select", MSGERR); + dlerror(); + if ((realselect = dlsym(RTLD_NEXT, "select")) == NULL) + LOAD_ERROR("select", MSGERR); } return torsocks_select_guts(SELECT_ARGNAMES, realselect); } diff --git a/src/dead_pool.c b/src/dead_pool.c index 3a6f243..c3d8b9b 100644 --- a/src/dead_pool.c +++ b/src/dead_pool.c @@ -28,6 +28,7 @@ #include <stdlib.h> #include <string.h> #include <sys/mman.h> + #include "common.h" #include "dead_pool.h" @@ -137,7 +138,7 @@ init_pool(unsigned int pool_size, struct in_addr deadrange_base, return newpool; } -int +int is_dead_address(dead_pool *pool, uint32_t addr) { uint32_t haddr = ntohl(addr); @@ -156,7 +157,7 @@ get_next_dead_address(dead_pool *pool, uint32_t *result) } } -int +int store_pool_entry(dead_pool *pool, char *hostname, struct in_addr *addr) { int position = pool->write_pos; diff --git a/src/parser.c b/src/parser.c index fe4af0f..9234f8d 100644 --- a/src/parser.c +++ b/src/parser.c @@ -33,6 +33,7 @@ #include <stdlib.h> #include <errno.h> #include <config.h> + #include "common.h" #include "parser.h" @@ -277,7 +278,7 @@ static int handle_path(struct parsedfile *config, int lineno, int nowords, char config->paths = newserver; currentcontext = newserver; } - + return(0); } @@ -406,7 +407,7 @@ static int handle_port(struct parsedfile *config, int lineno, char *value) { currentcontext->port = 0; } } - + return(0); } @@ -425,7 +426,7 @@ static int handle_defuser(struct parsedfile *config, int lineno, char *value) { } else { currentcontext->defuser = strdup(value); } - + return(0); } @@ -444,7 +445,7 @@ static int handle_defpass(struct parsedfile *config, int lineno, char *value) { } else { currentcontext->defpass = strdup(value); } - + return(0); } @@ -472,7 +473,7 @@ static int handle_type(struct parsedfile *config, int lineno, char *value) { currentcontext->type = 0; } } - + return(0); } @@ -486,7 +487,7 @@ static int handle_flag(char *value) return 0; } else { return -1; - } + } } static int handle_tordns_enabled(struct parsedfile *config, int lineno, diff --git a/src/torsocks.h b/src/torsocks.h index 92ac35c..e75e9a8 100644 --- a/src/torsocks.h +++ b/src/torsocks.h @@ -24,7 +24,7 @@ #define _TORSOCKS_H 1 -#include <parser.h> +#include "parser.h" /* Structure representing a socks connection request */ struct sockreq {

1 0

[torsocks/osx] More renaming of tsocks to torsocks
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit a4ee2c5b39afbaa269b0458a2803aff0e336f307 Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Feb 14 22:17:30 2011 +0000 More renaming of tsocks to torsocks --- src/dead_pool.c | 2 +- src/parser.c | 4 ++-- src/torsocks.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dead_pool.c b/src/dead_pool.c index c3d8b9b..bba90d3 100644 --- a/src/dead_pool.c +++ b/src/dead_pool.c @@ -754,7 +754,7 @@ our_getipnodebyname(dead_pool *pool, const char *name, int af, int flags, service their request. */ if((flags & AI_V4MAPPED) == 0) { show_msg(MSGWARN, "getipnodebyname: asked for V6 addresses only, " - "but tsocks can't handle that\n"); + "but torsocks can't handle that\n"); *error_num = NO_RECOVERY; return NULL; } else { diff --git a/src/parser.c b/src/parser.c index 9234f8d..592af18 100644 --- a/src/parser.c +++ b/src/parser.c @@ -294,7 +294,7 @@ static int handle_endpath(struct parsedfile *config, int lineno, int nowords) { /* We could perform some checking on the validty of data in */ /* the completed path here, but thats what verifyconf is */ - /* designed to do, no point in weighing down libtsocks */ + /* designed to do, no point in weighing down libtorsocks */ return(0); } @@ -366,7 +366,7 @@ static int handle_server(struct parsedfile *config, int lineno, char *value) { ip = strsplit(NULL, &value, " "); /* We don't verify this ip/hostname at this stage, */ - /* its resolved immediately before use in tsocks.c */ + /* its resolved immediately before use in torsocks.c */ if (currentcontext->address == NULL) currentcontext->address = strdup(ip); else { diff --git a/src/torsocks.h b/src/torsocks.h index e75e9a8..396aa5e 100644 --- a/src/torsocks.h +++ b/src/torsocks.h @@ -18,7 +18,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -/* torsocks.h - Structures used by tsocks to form SOCKS requests */ +/* torsocks.h - Structures used by torsocks to form SOCKS requests */ #ifndef _TORSOCKS_H

1 0

[torsocks/osx] Refuse connections to local network addresses.
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit f9626fe6c27a4a9aa9bb8feb1702aec38f78147b Author: Robert Hogan <robert(a)roberthogan.net> Date: Sat Feb 12 14:12:04 2011 +0000 Refuse connections to local network addresses. If a DNS request is made to a DNS server on a local network over TCP we need to reject it. So for now, reject all attempts to connect to servers on the local network using torsocks. If torsocks is used with programs that expect to use local network services - this will probably break them. I'm not aware of any. --- src/tsocks.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/tsocks.c b/src/tsocks.c index 02e21fc..1287d9b 100644 --- a/src/tsocks.c +++ b/src/tsocks.c @@ -349,10 +349,23 @@ int tsocks_connect_guts(CONNECT_SIGNATURE, int (*original_connect)(CONNECT_SIGNA show_msg(MSGDEBUG, "sockopt: %i \n", sock_type); + /* If the address is local refuse it. We do this because it could + be a TCP DNS request to a local DNS server.*/ + if (!(is_local(&config, &(connaddr->sin_addr))) && + !is_dead_address(pool, connaddr->sin_addr.s_addr)) { + char buf[16]; + inet_ntop(AF_INET, &(connaddr->sin_addr), buf, sizeof(buf)); + show_msg(MSGERR, "connect: Connection is to a local address (%s), may be a " + "TCP DNS request to a local DNS server so have to reject to be safe. " + "Please report a bug to http://code.google.com/p/torsocks/issues/entry if " + "this is preventing a program from working properly with torsocks.\n", buf); + return -1; + } + /* If this isn't an INET socket we can't */ /* handle it, just call the real connect now */ if ((connaddr->sin_family != AF_INET)) { - show_msg(MSGDEBUG, "Connection isn't a TCP stream ignoring\n"); + show_msg(MSGDEBUG, "connect: Connection isn't IPv4, ignoring\n"); return(original_connect(__fd, __addr, __len)); } @@ -419,13 +432,6 @@ int tsocks_connect_guts(CONNECT_SIGNATURE, int (*original_connect)(CONNECT_SIGNA show_msg(MSGDEBUG, "Got connection request for socket %d to " "%s\n", __fd, inet_ntoa(connaddr->sin_addr)); - /* If the address is local call original_connect */ - if (!(is_local(&config, &(connaddr->sin_addr))) && - !is_dead_address(pool, connaddr->sin_addr.s_addr)) { - show_msg(MSGDEBUG, "Connection for socket %d is local\n", __fd); - return(original_connect(__fd, __addr, __len)); - } - /* Ok, so its not local, we need a path to the net */ pick_server(&config, &path, &(connaddr->sin_addr), ntohs(connaddr->sin_port));

1 0

[torsocks/osx] Prevent execution of suid/sgid programs by torsocks
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 5875e3afc294a6e92dc4b66986387b9fa3e62dfe Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Jan 2 13:46:39 2011 +0000 Prevent execution of suid/sgid programs by torsocks We already do this in usewithtor. Closes off http://code.google.com/p/torsocks/issues/detail?id=5 --- src/torsocks.in | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index d4e4f17..075a5e4 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -63,6 +63,11 @@ # Tamas Szerb <toma(a)rulez.org> # Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 +set_id () { + echo "ERROR: $1 is set${2}id. torsocks will not work on a set${2}id executable." >&2 + exit 1 +} + if [ $# = 0 ] ; then echo "$0: insufficient arguments" exit @@ -122,6 +127,11 @@ case "$1" in if [ $# -gt 0 ] then + if [ -u `which "$1"` ]; then + set_id $1 u + elif [ -g `which "$1"` ]; then + set_id $1 g + fi exec "$@" fi ;;

1 0

[torsocks/osx] Remove unused source files
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 71204c20eb080350e0e4dc8eafe71fc2ea41e8be Author: Robert Hogan <robert(a)roberthogan.net> Date: Mon Feb 14 19:47:05 2011 +0000 Remove unused source files Removing these supplementary utilities as they've been disabled for some time now. They can be restored by popular demand if necessary. --- configure.in | 2 +- src/Makefile.am | 11 -- src/inspectsocks.c | 200 ------------------------------------ src/saveme.c | 60 ----------- src/tsocks.announce | 13 --- src/validateconf.c | 285 --------------------------------------------------- 6 files changed, 1 insertions(+), 570 deletions(-) diff --git a/configure.in b/configure.in index 9a41cf1..7cfa02c 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/saveme.c) +AC_INIT() AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(torsocks, 0.1) diff --git a/src/Makefile.am b/src/Makefile.am index f0ae121..aa61a21 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,17 +3,6 @@ LIBS = -ldl -lc -lresolv libdir = @libdir@/torsocks -# Install helper programs -#bin_PROGRAMS = validateconf inspectsocks saveme -#validateconf_SOURCES = validateconf.c common.c parser.c -#validateconf_CFLAGS = $(AM_CFLAGS) - -#inspectsocks_SOURCES = inspectsocks.c common.c -#inspectsocks_CFLAGS = $(AM_CFLAGS) - -#saveme_SOURCES = saveme.c -#saveme_CFLAGS = $(AM_CFLAGS) - # Install configuration file usewithtorconfdir = $(CONFDIR)/ usewithtorconf_DATA = torsocks.conf diff --git a/src/inspectsocks.c b/src/inspectsocks.c deleted file mode 100644 index d93bddf..0000000 --- a/src/inspectsocks.c +++ /dev/null @@ -1,200 +0,0 @@ -/*************************************************************************** - * * - * $Id: inspectsocks.c,v 1.2 2008-07-06 15:17:35 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by 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. * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * * - ***************************************************************************/ -/* - - INSPECTSOCKS - Part of the tsocks package - This utility can be used to determine the protocol - level of a SOCKS server. - - Copyright (C) 2000 Shaun Clowes - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/* Global configuration variables */ -const char *torsocks_progname = "inspectsocks"; /* Name for error msgs */ -int defaultport = 1080; /* Default SOCKS port */ - -/* Header Files */ -#include <config.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <string.h> -#include <strings.h> -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <errno.h> -#include <common.h> - -int send_request(struct sockaddr_in *server, void *req, - int reqlen, void *rep, int replen); - -int main(int argc, char *argv[]) { - const char *usage = "Usage: <socks server name/ip> [portno]"; - char req[9]; - char resp[100]; - unsigned short int portno = defaultport; - int ver = 0; - int read_bytes; - struct sockaddr_in server; - - if ((argc < 2) || (argc > 3)) { - show_msg(MSGERR, "Invalid number of arguments\n"); - show_msg(MSGERR, "%s\n", usage); - exit(1); - } - - switch (argc) { - case 3: - portno = (unsigned short int) - strtol(argv[2], (char **) 0, 10); - if ((portno == 0) || (errno == EINVAL)) { - show_msg(MSGERR, "%s\n", usage); - exit(1); - } - case 2: - if ((server.sin_addr.s_addr = resolve_ip(argv[1], 1,HOSTNAMES)) - == 0) { - show_msg(MSGERR, "Invalid IP/host specified (%s)\n", argv[1]); - show_msg(MSGERR, "%s\n", usage); - exit(1); - } - } - - server.sin_family = AF_INET; /* host byte order */ - server.sin_port = htons(portno); /* short, network byte order */ - bzero(&(server.sin_zero), 8);/* zero the rest of the struct */ - - /* Now, we send a SOCKS V5 request which happens to be */ - /* the same size as the smallest possible SOCKS V4 */ - /* request. In this packet we specify we have 7 auth */ - /* methods but specify them all as NO AUTH. */ - bzero(req, sizeof(req)); - req[0] = '\x05'; - req[1] = '\x07'; - read_bytes = send_request(&server, req, - sizeof(req), resp, sizeof(resp)); - if (read_bytes > 0) { - if ((int) resp[0] == 0) { - ver = 4; - } else if ((int) resp[0] == 5) { - ver = 5; - } - if (ver != 0) { - printf("Reply indicates server is a version " - "%d socks server\n", ver); - } else { - show_msg(MSGERR, "Invalid SOCKS version reply (%d), " - "probably not a socks server\n", - ver); - } - exit(0); - } - - /* Hmmm.... disconnected so try a V4 request */ - printf("Server disconnected V5 request, trying V4\n"); - req[0] = '\x04'; - req[1] = '\x01'; - read_bytes = send_request(&server, req, - sizeof(req), resp, sizeof(resp)); - if (read_bytes > 0) { - if ((int) resp[0] == 0) { - ver = 4; - } - if (ver == 4) { - printf("Reply indicates server is a version " - "4 socks server\n"); - } else { - show_msg(MSGERR, "Invalid SOCKS version reply (%d), " - "probably not a socks server\n", - (int) resp[0]); - } - exit(0); - } else { - show_msg(MSGERR, "Server disconnected, probably not a " - "socks server\n"); - } - - return(0); -} - -int send_request(struct sockaddr_in *server, void *req, - int reqlen, void *rep, int replen) { - int sock; - int rc; - - if ((sock = socket(server->sin_family, SOCK_STREAM, 0)) < 0) - { - show_msg(MSGERR, "Could not create socket (%s)\n", - strerror(errno)); - exit(1); - } - - if (connect(sock, (struct sockaddr *) server, - sizeof(struct sockaddr_in)) != -1) { - } else { - show_msg(MSGERR, "Connect failed! (%s)\n", - strerror(errno)); - exit(1); - } - - if (send(sock, (void *) req, reqlen,0) < 0) { - show_msg(MSGERR, "Could not send to server (%s)\n", - strerror(errno)); - exit(1); - } - - /* Now wait for reply */ - if ((rc = recv(sock, (void *) rep, replen, 0)) < 0) { - show_msg(MSGERR, "Could not read from server\n", - strerror(errno)); - exit(1); - } - - close(sock); - - return(rc); - -} diff --git a/src/saveme.c b/src/saveme.c deleted file mode 100644 index 43e490a..0000000 --- a/src/saveme.c +++ /dev/null @@ -1,60 +0,0 @@ -/*************************************************************************** - * * - * $Id: saveme.c,v 1.2 2008-07-06 15:17:35 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by 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. * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * * - ***************************************************************************/ -/* - - SAVEME - Part of the tsocks package - This program is designed to be statically linked so - that if a user breaks their ld.so.preload file and - cannot run any dynamically linked program it can - delete the offending ld.so.preload file. - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include <stdio.h> -#include <unistd.h> - -int main() { - - unlink("/etc/ld.so.preload"); - - return(0); -} diff --git a/src/tsocks.announce b/src/tsocks.announce deleted file mode 100644 index 5b905e1..0000000 --- a/src/tsocks.announce +++ /dev/null @@ -1,13 +0,0 @@ -torsocks 1.8- Provide transparent, DNS-safe SOCKS support for Tor - -tsocks provides transparent network access through a SOCKS proxy. This -is common in firewalled LAN environments where all connections to the -internet need to pass through a SOCKS server on the firewall. -tsocks intercepts the calls applications make to create tcp connections -and determines if they can be directly accessed or need the SOCKS server. -If they need the SOCKS server they connection is negotiated with the -server transparently to the application. This allows existing applications -to use SOCKS without recompilation or modification. tsocks is a wrapper -library for a number of socket networking functions. Essentially it's the -equivalent of the socksified winsock.dll libraries that are available for -Windows. diff --git a/src/validateconf.c b/src/validateconf.c deleted file mode 100644 index 1d2eb44..0000000 --- a/src/validateconf.c +++ /dev/null @@ -1,285 +0,0 @@ -/*************************************************************************** - * * - * $Id: validateconf.c,v 1.2 2008-07-06 15:17:35 hoganrobert Exp $ * - * * - * Copyright (C) 2008 by 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. * - *************************************************************************** - * * - * This is a modified version of a source file from the tsocks project. * - * Original copyright notice from tsocks source file follows: * - * * - ***************************************************************************/ -/* - - VALIDATECONF - Part of the tsocks package - This utility can be used to validate the torsocks.conf - configuration file - - Copyright (C) 2000 Shaun Clowes - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/* Global configuration variables */ -const char *torsocks_progname = "validateconf"; /* Name for error msgs */ - -/* Header Files */ -#include <config.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <string.h> -#include <sys/types.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <errno.h> -#include <common.h> -#include <parser.h> - -void show_server(struct parsedfile *, struct serverent *, int); -void show_conf(struct parsedfile *config); -void test_host(struct parsedfile *config, char *); - -int main(int argc, char *argv[]) { - const char *usage = "Usage: [-f conf file] [-t hostname/ip[:port]]"; - char *filename = NULL; - char *testhost = NULL; - struct parsedfile config; - int i; - - if ((argc > 5) || (((argc - 1) % 2) != 0)) { - show_msg(MSGERR, "Invalid number of arguments\n"); - show_msg(MSGERR, "%s\n", usage); - exit(1); - } - - for (i = 1; i < argc; i = i + 2) { - if (!strcmp(argv[i], "-f")) { - filename = argv[(i + 1)]; - } else if (!strcmp(argv[i], "-t")) { - testhost = argv[(i + 1)]; - } else { - show_msg(MSGERR, "Unknown option %s\n", argv[i]); - show_msg(MSGERR, "%s\n", usage); - exit(1); - } - } - - if (!filename) - filename = strdup(CONF_FILE); - - printf("Reading configuration file %s...\n", filename); - if (read_config(filename, &config) == 0) - printf("... Read complete\n\n"); - else - exit(1); - - /* If they specified a test host, test it, otherwise */ - /* dump the configuration */ - if (!testhost) - show_conf(&config); - else - test_host(&config, testhost); - - return(0); -} - -void test_host(struct parsedfile *config, char *host) { - struct in_addr hostaddr; - struct serverent *path; - char *hostname, *port; - char separator; - unsigned long portno = 0; - - /* See if a port has been specified */ - hostname = strsplit(&separator, &host, ": \t\n"); - if (separator == ':') { - port = strsplit(NULL, &host, " \t\n"); - if (port) - portno = strtol(port, NULL, 0); - } - - /* First resolve the host to an ip */ - if ((hostaddr.s_addr = resolve_ip(hostname, 0, 1)) == 0) { - fprintf(stderr, "Error: Cannot resolve %s\n", host); - return; - } else { - printf("Finding path for %s...\n", inet_ntoa(hostaddr)); - if (!(is_local(config, &(hostaddr)))) { - printf("Path is local\n"); - } else { - pick_server(config, &path, &hostaddr, portno); - if (path == &(config->defaultserver)) { - printf("Path is via default server:\n"); - show_server(config, path, 1); - } else { - printf("Host is reached via this path:\n"); - show_server(config, path, 0); - } - } - } - - return; -} - -void show_conf(struct parsedfile *config) { - struct netent *net; - struct serverent *server; - - /* Show the local networks */ - printf("=== Local networks (no socks server needed) ===\n"); - net = (config->localnets); - while (net != NULL) { - printf("Network: %15s ", - inet_ntoa(net->localip)); - printf("NetMask: %15s\n", - inet_ntoa(net->localnet)); - net = net->next; - } - printf("\n"); - - /* If we have a default server configuration show it */ - printf("=== Default Server Configuration ===\n"); - if ((config->defaultserver).address != NULL) { - show_server(config, &(config->defaultserver), 1); - } else { - printf("No default server specified, this is rarely a " - "good idea\n"); - } - printf("\n"); - - /* Now show paths */ - if ((config->paths) != NULL) { - server = (config->paths); - while (server != NULL) { - printf("=== Path (line no %d in configuration file)" - " ===\n", server->lineno); - show_server(config, server, 0); - printf("\n"); - server = server->next; - } - } - - /* Show tordns configuration options */ - printf("=== TorDNS Configuration Options ===\n"); - printf("Tor DNS enabled: %s\n", - config->tordns_enabled ? "yes" : "no"); - printf("Tor DNS deadpool range: %s/", - inet_ntoa(config->tordns_deadpool_range->localip)); - printf("%s\n", - inet_ntoa(config->tordns_deadpool_range->localnet)); - printf("Tor DNS cache size: %d\n", config->tordns_cache_size); - printf("\n"); - - return; -} - -void show_server(struct parsedfile *config, struct serverent *server, int def) { - struct in_addr res; - struct netent *net; - - /* Show address */ - if (server->address != NULL) - printf("Server: %s (%s)\n", server->address, - ((res.s_addr = resolve_ip(server->address, 0, - HOSTNAMES)) == 0 - ? "Invalid!" : inet_ntoa(res))); - else - printf("Server: ERROR! None specified\n"); - - /* Check the server is on a local net */ - if ((server->address != NULL) && (res.s_addr != 0) && - (is_local(config, &res))) - fprintf(stderr, "Error: Server is not on a network " - "specified as local\n"); - - /* Show port */ - printf("Port: %d\n", server->port); - - /* Show SOCKS type */ - printf("SOCKS type: %d\n", server->type); - - /* Show default username and password info */ - if (server->type == 5) { - /* Show the default user info */ - printf("Default user: %s\n", - (server->defuser == NULL) ? - "Not Specified" : server->defuser); - printf("Default pass: %s\n", - (server->defpass == NULL) ? - "Not Specified" : "******** (Hidden)"); - if ((server->defuser == NULL) && - (server->defpass != NULL)) - fprintf(stderr, "Error: Default user must be specified " - "if default pass is specified\n"); - } else { - if (server->defuser) printf("Default user: %s\n", - server->defuser); - if (server->defpass) printf("Default pass: %s\n", - server->defpass); - if ((server->defuser != NULL) || (server->defpass != NULL)) - fprintf(stderr, "Error: Default user and password " - "may only be specified for version 5 " - "servers\n"); - } - - /* If this is the default servers and it has reachnets, thats stupid */ - if (def) { - if (server->reachnets != NULL) { - fprintf(stderr, "Error: The default server has " - "specified networks it can reach (reach statements), " - "these statements are ignored since the " - "default server will be tried for any network " - "which is not specified in a reach statement " - "for other servers\n"); - } - } else if (server->reachnets == NULL) { - fprintf(stderr, "Error: No reach statements specified for " - "server, this server will never be used\n"); - } else { - printf("This server can be used to reach:\n"); - net = server->reachnets; - while (net != NULL) { - printf("Network: %15s ", - inet_ntoa(net->localip)); - printf("NetMask: %15s ", - inet_ntoa(net->localnet)); - if (net->startport) - printf("Ports: %5lu - %5lu", - net->startport, net->endport); - printf("\n"); - net = net->next; - } - } -}

1 0

[torsocks/osx] Fix 'symbol res_send() was not found in any shared library'
by hoganrobert＠torproject.org 23 Oct '11

23 Oct '11

commit 441fb10e475efa3cf9977fcf223db8344b005555 Author: Robert Hogan <robert(a)roberthogan.net> Date: Sun Feb 13 12:41:23 2011 +0000 Fix 'symbol res_send() was not found in any shared library' Solution found by Nicolas Pouillard (nicolas.pouillard(a)gmail.com) However I am still not clear why this is necessary for just this symbol on Linux. To test that it works: cd test/ gcc -fPIC -g -O2 -Wall -I. -o resinit resinit.c -lc -lresolv cd .. export TORSOCKS_DEBUG=2 torsocks test/resinit Expected result: 12:45:33 libtorsocks(21307): Got res_send request http://code.google.com/p/torsocks/issues/detail?id=3 --- src/expansion_table.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/expansion_table.h b/src/expansion_table.h index 441a009..e981f5d 100644 --- a/src/expansion_table.h +++ b/src/expansion_table.h @@ -1,6 +1,6 @@ /*************************************************************************** * * - * Copyright (C) 2010 alex(a)ohmantics.net * + * Copyright (C) 2010 Alex Rosenberg <alex(a)ohmantics.net> * * Copyright (C) 2011 Robert Hogan <robert(a)roberthogan.net> * * * * This program is free software; you can redistribute it and/or modify * @@ -76,7 +76,12 @@ /*RES_FUNC (ERR, int, RES_INIT_, res_init, res_init, "res_init") */ RES_FUNC (ERR, int, RES_QUERY_, res_query, res_query, "res_query") RES_FUNC (ERR, int, RES_SEARCH_, res_search, res_search, "res_search") +#if defined(__APPLE__) || defined(__darwin__) RES_FUNC (ERR, int, RES_SEND_, res_send, res_send, "res_send") +#else +/* It is a bit of a mystery why this is required on Linux. See http://code.google.com/p/torsocks/issues/detail?id=3 */ +RES_FUNC (ERR, int, RES_SEND_, res_send, res_send, "__res_send") +#endif RES_FUNC (ERR, int, RES_QUERYDOMAIN_, res_querydomain, res_querydomain, "res_querydomain") DNS_FUNC (ERR, struct hostent *, GETHOSTBYNAME_, gethostbyname, gethostbyname, "gethostbyname")

1 0