tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

[torsocks/master] Update version to v2.0.0-rc6
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit f990d1c6ec9d49ba75e3d22842b53fa2f136b561 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Mar 17 14:32:27 2014 -0400 Update version to v2.0.0-rc6 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 807f334..c88f270 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-03-17 torsocks 2.0.0-rc6 + * Fix: set addr len for getsockname in accept + * Fix: use socket fd and NOT sockaddr in accept + 2014-03-17 torsocks 2.0.0-rc5 * Fix: strict aliasing in library * Add fclose() support diff --git a/configure.ac b/configure.ac index 1805835..88b5338 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ ############################################################################## # Process this file with autoconf to produce a configure script. -AC_INIT([torsocks], [2.0.0-rc5],[dgoulet@ev0ke.net],[],[https://torproject.org]) +AC_INIT([torsocks], [2.0.0-rc6],[dgoulet@ev0ke.net],[],[https://torproject.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET # Get hostname and other information.

1 0

[torsocks/master] Fix: support kfreebsd for mmap()
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 144827af33b7ae731eb0e8ef7fff249f1e34cbae Author: Jérémy Bobbio <lunar(a)debian.org> Date: Tue Mar 18 21:48:41 2014 -0400 Fix: support kfreebsd for mmap() Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 2 +- src/lib/syscall.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 88b5338..1444cc7 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,7 @@ dnl location on Unixish system. AC_MSG_CHECKING(file name of the C library) AS_CASE([$host_os], [darwin*], [libc_name="libSystem.dylib"], - [linux*], + [linux*|kfreebsd*-gnu], [ libc_name=`ldd /usr/bin/yes | grep 'libc\.' | cut -d ' ' -f 1 | tr -d '\t'` if test "${libc_name}" == ""; then diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 2539855..36d28ad 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -122,7 +122,7 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) ret = handle_close(args); break; case TSOCKS_NR_MMAP: -#if (defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__x86_64) +#if (defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(__x86_64) /* * On an 64 bit *BSD system, __syscall(2) should be used for mmap(). * This is NOT suppose to happen but for protection we deny that call. @@ -151,7 +151,7 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args) * own memory using mmap() called by syscall(). Same for munmap(). */ ret = handle_mmap(args); -#endif /* __NetBSD__, __FreeBSD__, __x86_64 */ +#endif /* __NetBSD__, __FreeBSD__, __FreeBSD_kernel__, __x86_64 */ break; case TSOCKS_NR_MUNMAP: ret = handle_munmap(args);

1 0

[torsocks/master] Update TODO list
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 98f5faa651ca9b1a7a1a4d4e0cbe30d764c727bd Author: David Goulet <dgoulet(a)ev0ke.net> Date: Sat Aug 17 20:07:53 2013 -0400 Update TODO list Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- TODO | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index fdd2365..66ae105 100644 --- a/TODO +++ b/TODO @@ -2,8 +2,11 @@ Version 2.0 ----------- * Support res_* API * Check recvmmsg() FD passing on Unix socket and for TCP socket, clean exit -* Deny ICMP -* Support the complete list of dangerous syscall number with syscall() +* Support the complete list of dangerous syscall numbers with syscall() +* Clean configure.ac +* Create new updated torsocks shell script +* Rename torsocks to something more meaningful +* Add tests and a bunch load of them! Version 1.0 -----------

1 0

[torsocks/master] Fix: gethostbyname IP address byte order
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit c623b9899b133ac9ee24988445c0767902511caa Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 23 11:48:26 2013 -0400 Fix: gethostbyname IP address byte order The gethostbyname() call was not returning the IP address in network byte order as stated in the man page. Reported-by: Micah Anderson <micah(a)riseup.net> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/gethostbyname.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lib/gethostbyname.c b/src/lib/gethostbyname.c index 3e3588e..bab01b0 100644 --- a/src/lib/gethostbyname.c +++ b/src/lib/gethostbyname.c @@ -34,7 +34,6 @@ LIBC_GETHOSTBYNAME_RET_TYPE tsocks_gethostbyname(LIBC_GETHOSTBYNAME_SIG) { int ret; uint32_t ip; - const char *ret_str; DBG("[gethostbyname] Requesting %s hostname", __name); @@ -54,12 +53,8 @@ LIBC_GETHOSTBYNAME_RET_TYPE tsocks_gethostbyname(LIBC_GETHOSTBYNAME_SIG) memset(tsocks_he_addr_list, 0, sizeof(tsocks_he_addr_list)); memset(tsocks_he_addr, 0, sizeof(tsocks_he_addr)); - ret_str = inet_ntop(AF_INET, &ip, tsocks_he_addr, sizeof(tsocks_he_addr)); - if (!ret_str) { - PERROR("inet_ntop"); - h_errno = NO_ADDRESS; - goto error; - } + /* Copy resolved network byte order IP address. */ + memcpy(tsocks_he_addr, &ip, sizeof(tsocks_he_addr)); tsocks_he_addr_list[0] = tsocks_he_addr; tsocks_he_addr_list[1] = NULL; @@ -70,7 +65,8 @@ LIBC_GETHOSTBYNAME_RET_TYPE tsocks_gethostbyname(LIBC_GETHOSTBYNAME_SIG) tsocks_he.h_addrtype = AF_INET; tsocks_he.h_addr_list = tsocks_he_addr_list; - DBG("Hostname %s resolved to %s", __name, tsocks_he_addr); + DBG("Hostname %s resolved to %s", __name, + inet_ntoa(*((struct in_addr *) &ip))); errno = 0; return &tsocks_he;

1 0

[torsocks/master] Improve torsocks script in src/bin
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 3922f91c0fa2f3bf49c49098cae451d9e940068e Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 23 18:36:09 2013 -0400 Improve torsocks script in src/bin Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- configure.ac | 2 + src/Makefile.am | 2 +- src/bin/Makefile.am | 10 +++ src/bin/torsocks | 154 +++++++++++++++++++++++++++++++++++++++++++++ src/bin/torsocks.in | 154 +++++++++++++++++++++++++++++++++++++++++++++ src/lib/Makefile.am | 4 -- src/lib/torsocks.in | 167 ------------------------------------------------- src/lib/usewithtor.in | 113 --------------------------------- 8 files changed, 321 insertions(+), 285 deletions(-) diff --git a/configure.ac b/configure.ac index 4cd3b14..d1726de 100644 --- a/configure.ac +++ b/configure.ac @@ -367,6 +367,8 @@ AC_SUBST(DEFAULT_INCLUDES) AC_CONFIG_FILES([ Makefile src/Makefile + src/bin/Makefile + src/bin/torsocks src/common/Makefile src/lib/Makefile doc/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 67c8cf5..103337c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1 @@ -SUBDIRS = common lib +SUBDIRS = common lib bin diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am new file mode 100644 index 0000000..396e2c0 --- /dev/null +++ b/src/bin/Makefile.am @@ -0,0 +1,10 @@ +# Makefile used by configure to create real Makefile + +libdir = @libdir@/torsocks + +# Install invocation scripts +bin_SCRIPTS = torsocks +INSTALL_SCRIPT = $(install_sh) -c -m 755 + +# Install main library to $(prefix)/lib/tor (must match torsocks.in) +CLEANFILES = torsocks diff --git a/src/bin/torsocks b/src/bin/torsocks new file mode 100644 index 0000000..17bc458 --- /dev/null +++ b/src/bin/torsocks @@ -0,0 +1,154 @@ +#!/bin/sh +# *************************************************************************** +# * * +# * * +# * Copyright (C) 2008 by Robert Hogan * +# * robert(a)roberthogan.net * +# * Copyright (C) 2012 by Jacob Appelbaum <jacob(a)torproject.org> * +# * Copyright (C) 2013 by David Goulet <dgoulet(a)ev0ke.net> * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU General Public License 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 Tor project. * +# * Original copyright information follows: * +# *************************************************************************** +# Wrapper script for use of the torsocks(8) transparent socksification library +# +# There are three forms of usage for this script: +# +# /usr/local/bin/torsocks program [program arguments...] +# +# This form sets the users LD_PRELOAD environment variable so that torsocks(8) +# will be loaded to socksify the application then executes the specified +# program (with the provided arguments). The following simple example might +# be used to ssh to www.foo.org via a torsocks.conf(5) configured socks server: +# +# /usr/local/bin/torsocks ssh www.foo.org +# +# The second form allows for torsocks(8) to be switched on and off for a +# session (that is, it adds and removes torsocks from the LD_PRELOAD environment +# variable). This form must be _sourced_ into the user's existing session +# (and will only work with bourne shell users): +# +# . /usr/local/bin/torsocks on +# telnet www.foo.org +# . /usr/local/bin/torsocks off +# +# Or +# +# source /usr/local/bin/torsocks on +# telnet www.foo.org +# source /usr/local/bin/torsocks off +# +# This script is originally from the debian torsocks package by +# Tamas Szerb <toma(a)rulez.org> +# Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 +# Modified by David Goulet <dgoulet(a)ev0ke.net> 2013 + +LIBDIR="/usr/local/${exec_prefix}/lib/torsocks" +LIB_NAME="libtorsocks" +SHLIB_EXT="so" +SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" + +# Set LD_PRELOAD variable with torsocks library path. +set_ld_preload () +{ + if [ -z "$LD_PRELOAD" ]; then + export LD_PRELOAD="${SHLIB}" + else + echo $LD_PRELOAD | grep -q "${SHLIB}" || \ + export LD_PRELOAD="${SHLIB} $LD_PRELOAD" + fi + + # OS X specific env variable + case "$OSTYPE" in + darwin*) + export DYLD_FORCE_FLAT_NAMESPACE=1 + ;; + esac +} + +# Spawn a torified shell. +tor_shell () +{ + set_ld_preload + echo "$0: New torified shell coming right up..." + ${SHELL:-/bin/sh} +} + +torify_app () +{ + local app_path=`which $1` + + # NEVER remove that line or else nothing it torified. + set_ld_preload + + if [ -z $app_path ]; then + echo "ERROR: $1 cannot be found." >&2 + exit 1 + elif [ -u $app_path -o -g $app_path ]; then + echo "ERROR: $1 is set${2}id. torsocks will not work on a set${2}id executable." >&2 + exit 1 + fi + + exec "$@" +} + +usage () +{ + echo "$0: Please see torsocks(1) or read comment at top of $0" +} + +if [ $# -eq 0 ] ; then + usage + exit 1 +fi + +# Ensure libtorsocks exists, +if [ ! -f $SHLIB ]; then + echo "$0: $SHLIB does not exist! Try re-installing torsocks." + exit +fi + +case "$1" in + on) + set_ld_preload + ;; + off) + export LD_PRELOAD=`echo -n $LD_PRELOAD | sed "s#$SHLIB *##"` + if [ -z "$LD_PRELOAD" ]; then + unset LD_PRELOAD + case "$OSTYPE" in + darwin*) + unset DYLD_FORCE_FLAT_NAMESPACE + ;; + esac + fi + ;; + show|sh) + echo "LD_PRELOAD=\"$LD_PRELOAD\"" + ;; + -h|--help|-?) + usage + ;; + --shell) + tor_shell + ;; + *) + torify_app $@ + ;; +esac diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in new file mode 100644 index 0000000..c000565 --- /dev/null +++ b/src/bin/torsocks.in @@ -0,0 +1,154 @@ +#!/bin/sh +# *************************************************************************** +# * * +# * * +# * Copyright (C) 2008 by Robert Hogan * +# * robert(a)roberthogan.net * +# * Copyright (C) 2012 by Jacob Appelbaum <jacob(a)torproject.org> * +# * Copyright (C) 2013 by David Goulet <dgoulet(a)ev0ke.net> * +# * * +# * This program is free software; you can redistribute it and/or modify * +# * it under the terms of the GNU General Public License 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 Tor project. * +# * Original copyright information follows: * +# *************************************************************************** +# Wrapper script for use of the torsocks(8) transparent socksification library +# +# There are three forms of usage for this script: +# +# @prefix@/bin/torsocks program [program arguments...] +# +# This form sets the users @LDPRELOAD@ environment variable so that torsocks(8) +# will be loaded to socksify the application then executes the specified +# program (with the provided arguments). The following simple example might +# be used to ssh to www.foo.org via a torsocks.conf(5) configured socks server: +# +# @prefix@/bin/torsocks ssh www.foo.org +# +# The second form allows for torsocks(8) to be switched on and off for a +# session (that is, it adds and removes torsocks from the @LDPRELOAD@ environment +# variable). This form must be _sourced_ into the user's existing session +# (and will only work with bourne shell users): +# +# . @prefix@/bin/torsocks on +# telnet www.foo.org +# . @prefix@/bin/torsocks off +# +# Or +# +# source @prefix@/bin/torsocks on +# telnet www.foo.org +# source @prefix@/bin/torsocks off +# +# This script is originally from the debian torsocks package by +# Tamas Szerb <toma(a)rulez.org> +# Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 +# Modified by David Goulet <dgoulet(a)ev0ke.net> 2013 + +LIBDIR="@prefix@/@libdir@/torsocks" +LIB_NAME="libtorsocks" +SHLIB_EXT="@SHLIB_EXT@" +SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" + +# Set @LDPRELOAD@ variable with torsocks library path. +set_ld_preload () +{ + if [ -z "$@LDPRELOAD@" ]; then + export @LDPRELOAD@="${SHLIB}" + else + echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ + export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" + fi + + # OS X specific env variable + case "$OSTYPE" in + darwin*) + export DYLD_FORCE_FLAT_NAMESPACE=1 + ;; + esac +} + +# Spawn a torified shell. +tor_shell () +{ + set_ld_preload + echo "$0: New torified shell coming right up..." + ${SHELL:-/bin/sh} +} + +torify_app () +{ + local app_path=`which $1` + + # NEVER remove that line or else nothing it torified. + set_ld_preload + + if [ -z $app_path ]; then + echo "ERROR: $1 cannot be found." >&2 + exit 1 + elif [ -u $app_path -o -g $app_path ]; then + echo "ERROR: $1 is set${2}id. torsocks will not work on a set${2}id executable." >&2 + exit 1 + fi + + exec "$@" +} + +usage () +{ + echo "$0: Please see torsocks(1) or read comment at top of $0" +} + +if [ $# -eq 0 ] ; then + usage + exit 1 +fi + +# Ensure libtorsocks exists, +if [ ! -f $SHLIB ]; then + echo "$0: $SHLIB does not exist! Try re-installing torsocks." + exit +fi + +case "$1" in + on) + set_ld_preload + ;; + off) + export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s#$SHLIB *##"` + if [ -z "$@LDPRELOAD@" ]; then + unset @LDPRELOAD@ + case "$OSTYPE" in + darwin*) + unset DYLD_FORCE_FLAT_NAMESPACE + ;; + esac + fi + ;; + show|sh) + echo "@LDPRELOAD@=\"$@LDPRELOAD@\"" + ;; + -h|--help|-?) + usage + ;; + --shell) + tor_shell + ;; + *) + torify_app $@ + ;; +esac diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index f445c01..f043392 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -4,10 +4,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(builddir) libdir = @libdir@/torsocks # Install invocation scripts -#bin_SCRIPTS = torsocks usewithtor -#INSTALL_SCRIPT = $(install_sh) -c -m 755 -EXTRA_DIST = torsocks.in usewithtor.in - lib_LTLIBRARIES = libtorsocks.la libtorsocks_la_SOURCES = torsocks.c torsocks.h \ diff --git a/src/lib/torsocks.in b/src/lib/torsocks.in deleted file mode 100644 index 4eaed8f..0000000 --- a/src/lib/torsocks.in +++ /dev/null @@ -1,167 +0,0 @@ -#!/bin/sh -# *************************************************************************** -# * * -# * * -# * Copyright (C) 2008 by Robert Hogan * -# * robert(a)roberthogan.net * -# * Copyright (C) 2012 by Jacob Appelbaum <jacob(a)torproject.org> * -# * * -# * 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 Tor project. * -# * Original copyright information follows: * -# *************************************************************************** -# Wrapper script for use of the torsocks(8) transparent socksification library -# -# There are three forms of usage for this script: -# -# @prefix@/bin/torsocks program [program arguments...] -# -# This form sets the users @LDPRELOAD@ environment variable so that torsocks(8) -# will be loaded to socksify the application then executes the specified -# program (with the provided arguments). The following simple example might -# be used to telnet to www.foo.org via a torsocks.conf(5) configured socks server: -# -# @prefix@/bin/torsocks telnet www.foo.org -# -# The second form allows for torsocks(8) to be switched on and off for a -# session (that is, it adds and removes torsocks from the @LDPRELOAD@ environment -# variable). This form must be _sourced_ into the user's existing session -# (and will only work with bourne shell users): -# -# . @prefix@/bin/torsocks on -# telnet www.foo.org -# . @prefix@/bin/torsocks off -# -# Or -# -# source @prefix@/bin/torsocks on -# telnet www.foo.org -# source @prefix@/bin/torsocks off -# -# The third form creates a new shell with @LDPRELOAD@ set and is achieved -# simply by running the script with no arguments -# -# @prefix@/bin/torsocks -# -# When finished the user can simply terminate the shell with 'exit' -# -# This script is originally from the debian torsocks package by -# Tamas Szerb <toma(a)rulez.org> -# Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 - -not_found () { - echo "ERROR: $1 cannot be found in PATH." >&2 - exit 1 -} - -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 -fi - -LIBDIR="@prefix@/lib/torsocks" -LIB_NAME="libtorsocks" -SHLIB_EXT="@SHLIB_EXT@" -SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" - -# Check for libtorsocks and if set the 64bit variant -if [ ! -f $SHLIB ]; then - LIBDIR="@prefix@/lib64/torsocks" - SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" -fi - -# Ensure libtorsocks exists, -if [ ! -f $SHLIB ]; then - echo "$0: $SHLIB does not exist! Try re-installing torsocks." - exit -fi - -case "$1" in - on) - if [ -z "$@LDPRELOAD@" ] - then - export @LDPRELOAD@="${SHLIB}" - else - echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ - export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" - fi - # FIXME: This env variable is only meaningful on Mac OSX, so it would be better - # not to set it at all on other platforms. - export DYLD_FORCE_FLAT_NAMESPACE=1 - ;; - off) - #replace '/' with '\/' in @prefix@ - # escprefix=`echo '@prefix@' |sed 's/\\//\\\\\//g'` - # export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s/$escprefix\/lib\/torsocks\/libtorsocks.so \?//"` - export @LDPRELOAD@=`echo -n $@LDPRELOAD@ | sed "s#@prefix@/lib/torsocks/libtorsocks\.@SHLIB_EXT@ *##"` - if [ -z "$@LDPRELOAD@" ] - then - unset @LDPRELOAD@ - # FIXME: This env variable is only meaningful on Mac OSX, so it would be better - # not to set it at all on other platforms. - unset DYLD_FORCE_FLAT_NAMESPACE=1 - fi - ;; - show|sh) - echo "@LDPRELOAD@=\"$@LDPRELOAD@\"" - ;; - -h|-?) - echo "$0: Please see torsocks(1) or read comment at top of $0" - ;; - --shell) - if [ -z "$@LDPRELOAD@" ] - then - export @LDPRELOAD@="${SHLIB}" - else - echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ - export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" - fi - export DYLD_FORCE_FLAT_NAMESPACE=1 - echo "torsocks: new torified shell coming right up..." - ${SHELL:-/bin/sh} - ;; - *) - if [ -z "$@LDPRELOAD@" ] - then - export @LDPRELOAD@="${SHLIB}" - else - echo $@LDPRELOAD@ | grep -q "${SHLIB}" || \ - export @LDPRELOAD@="${SHLIB} $@LDPRELOAD@" - fi - export DYLD_FORCE_FLAT_NAMESPACE=1 - - if [ $# -gt 0 ] - then - if ! which "$1" >/dev/null 2>&1; then - not_found $1 - elif [ -u `which "$1"` ]; then - set_id $1 u - elif [ -g `which "$1"` ]; then - set_id $1 g - fi - exec "$@" - fi - ;; -esac - -#EOF diff --git a/src/lib/usewithtor.in b/src/lib/usewithtor.in deleted file mode 100644 index e606760..0000000 --- a/src/lib/usewithtor.in +++ /dev/null @@ -1,113 +0,0 @@ -#! /bin/sh -# *************************************************************************** -# * * -# * 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 * -# * 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 Tor project. * -# * Original copyright notice from tsocks source file follows: * -# *************************************************************************** - -# Wrapper script for use of the tsocks(8) transparent socksification library -# See the tsocks(1) and torify(1) manpages. - -# Copyright (c) 2004, 2006 Peter Palfrader -# Modified by Jacob Appelbaum <jacob(a)appelbaum.net> April 16th 2006 -# Modified by Marcus Griep <marcus(a)griep.us> June 16 2009 -# May be distributed under the same terms as Tor itself - - -# Define and ensure we have tsocks -# XXX: what if we don't have which? -TORSOCKS="`which torsocks`" -PROG= -VERBOSE= - -usage () { - echo "Usage: $0 [-hv] <command> [<options>...]" -} - -not_found () { - echo "ERROR: $1 cannot be found in PATH." >&2 - exit 1 -} - -set_id () { - echo "ERROR: $1 is set${2}id. usewithtor will not work on a set${2}id executable." >&2 - exit 1 -} - -# Check for any argument list -if [ "$#" = 0 ]; then - usage >&2 - exit 1 -fi - -while [ "$1" ]; do - case "$1" in - -h|--h*) - usage - exit 0 - ;; - -v|--v*) - VERBOSE=YesPlease - shift - ;; - *) - break; - esac -done - -if ! which "$1" >/dev/null 2>&1; then - not_found $1 -elif [ -u `which "$1"` ]; then - set_id $1 u -elif [ -g `which "$1"` ]; then - set_id $1 g -fi - -if [ -x "$TORSOCKS" ]; then - PROG=torsocks -else - echo "$0: Unable to find torsocks in PATH." >&2 - echo " Perhaps you haven't installed it?" >&2 - exit 1 -fi - -if [ "$VERBOSE" ]; then - echo "We're armed with the following torsocks: $TORSOCKS" - echo "We're attempting to use $PROG for all tor action." -fi - -if [ "$PROG" = "torsocks" ]; then - # Define our torsocks config file - TORSOCKS_CONF_FILE="@CONFDIR@/torsocks.conf" - export TORSOCKS_CONF_FILE - - # Check that we've got a torsocks config file - if [ -r "$TORSOCKS_CONF_FILE" ]; then - exec torsocks "$@" - else - echo "$0: Missing torsocks configuration file \"$TORSOCKS_CONF_FILE\" - torsocks will use defaults sensible for Tor." >&2 - exec torsocks "$@" - fi -fi - -# We should have hit an exec. If we get here, we didn't exec -echo "$0: failed to exec $PROG $@" >&2 -exit 1

1 0

[torsocks/master] Remove old INSTALL file out of date
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit d6a9002d5c87b40f9274d35a76d0f53e361088f4 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 23 18:37:12 2013 -0400 Remove old INSTALL file out of date Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- INSTALL | 95 --------------------------------------------------------------- 1 file changed, 95 deletions(-) diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 42ed266..0000000 --- a/INSTALL +++ /dev/null @@ -1,95 +0,0 @@ -To Compile from CVS/SVN ------------------------ - - make -f Makefile.cvs - ./configure - make - make install - - -============================================================================== -Original Installation Instructions For Tsocks ---------------------------------------------- - -1. Explenations of the ./configure options which might be of interest (and that are - specific to tsocks include): - --disable-tordns This option disables tordns, which causes - names to be looked up in a way designed to - work well with Tor. - --enable-socksdns This option causes tsocks to intercept - DNS lookups and attempt to force them - to use TCP instead of UDP and thus - be proxied through the socks server. This - is not a very elegant thing to do and - should be avoided where possible. - --disable-debug This configuration option tells tsocks - to never output error messages to stderr. - This can also be achieved at run time - by defining the environment variable - TSOCKS_NO_ERROR to be "yes" - --enable-oldmethod This forces tsocks not to use the - RTLD_NEXT parameter to dlsym to get the - address of the connect() method tsocks - overrides, instead it loads a reference - to the libc shared library and then uses - dlsym(). Again this is not very elegant - and shouldn't be required. - --enable-hostnames This enables DNS lookups on names - provided as socks servers in the config - file. This option is not compatible with - tordns or socks dns, since tsocks - can't send a socks dns request to resolve - the location of the socks server. - --with-conf=<filename> You can specify the location of the tsocks - configuration file using this option, it - defaults to '/etc/tsocks.conf' - -Other standard autoconf options are provided by typing './configure ---help' - -2. Created files: - - - libtsocks.so - the libtsocks library - - validateconf - a utility to verify the tsocks configuration file - - inspectsocks - a utility to determine the version of a socks server - - saveme - a statically linked utility to remove /etc/ld.so.preload - if it becomes corrupt - - man pages - tsocks(8), tsocks(1) and tsocks.conf(5) - -3. Configuration - -You'll need to create the tsocks configuration file. -There are two samples provided in the build directory and -/usr/local/share/examples/tsocks called -tsocks.conf.simple.example and tsocks.conf.complex.example. -Documentation on the configuration file format is provided in the -tsocks.conf man page ('man tsocks.conf'). - -4. Having created the tsocks.conf file you should verify it using -validateconf (some detail on validateconf can be found in the tsocks.conf -man page). Normally validateconf is run without arguments -('./validateconf'). Any errors which are displayed by validateconf need -to be rectified before tsocks will function correctly. - -5. You can now choose to make the library affect all users or just those -who choose to use it. If you want users to use it themselves, they can -simply use the tsocks(1) shell script to run programs (see 'man tsocks') -or do the following in their shell before running applications that need -to be transparently proxied: - - (in Bash) export LD_PRELOAD=<path to library> - - (in CSH) setenv LD_PRELOAD <path to library> - - <path to library> = e.g /usr/local/lib/tsocks/libtsocks.so.1.8 - -6. Go ahead and use it! At this point everything should work. Again, if -you experience any problems, use the contact points listed at -http://tsocks.sourceforge.net/contact.php. - -Thats it, - -Thanks, Shaun Clowes (delius(a)progsoc.org) - - -Adapted for FreeBSD by Marcin Jessa (yazzy(a)yazzy.org)

1 0

[torsocks/master] Update INSTALL file and autogen.sh
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 5e07cf7b5a6babe521947f881f975e0542ab6805 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 23 18:40:26 2013 -0400 Update INSTALL file and autogen.sh Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- INSTALL | 365 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ autogen.sh | 14 +-- 2 files changed, 370 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..7d1c323 --- /dev/null +++ b/INSTALL @@ -0,0 +1,365 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009 Free Software Foundation, Inc. + + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + + The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package, generally using the just-built uninstalled binaries. + + 4. Type `make install' to install the programs and any data files and + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. + + 6. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS + KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/autogen.sh b/autogen.sh index 0592f16..a110b71 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,13 +1,9 @@ #!/bin/sh -if [ -x "`which autoreconf 2>/dev/null`" ] ; then - exec autoreconf -ivf -fi +set -x -set -e +if [ ! -e config ]; then + mkdir config +fi -# Run this to generate all the initial makefiles, etc. -aclocal && \ - autoheader && \ - autoconf && \ - automake --add-missing --copy +autoreconf -i

1 0

[torsocks/master] Fix: add generated torsocks to gitignore
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit 2c07a439ccaef7a058cfa153996c87ba52241bc7 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 23 19:23:56 2013 -0400 Fix: add generated torsocks to gitignore Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- .gitignore | 3 +- src/bin/torsocks | 154 ------------------------------------------------------ 2 files changed, 1 insertion(+), 156 deletions(-) diff --git a/.gitignore b/.gitignore index 2054342..7f13a81 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ doc/torsocks.8 doc/torsocks.conf.5 doc/usewithtor.1 -src/torsocks -src/usewithtor +src/bin/torsocks test/test_torsocks diff --git a/src/bin/torsocks b/src/bin/torsocks deleted file mode 100644 index 17bc458..0000000 --- a/src/bin/torsocks +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/sh -# *************************************************************************** -# * * -# * * -# * Copyright (C) 2008 by Robert Hogan * -# * robert(a)roberthogan.net * -# * Copyright (C) 2012 by Jacob Appelbaum <jacob(a)torproject.org> * -# * Copyright (C) 2013 by David Goulet <dgoulet(a)ev0ke.net> * -# * * -# * This program is free software; you can redistribute it and/or modify * -# * it under the terms of the GNU General Public License 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 Tor project. * -# * Original copyright information follows: * -# *************************************************************************** -# Wrapper script for use of the torsocks(8) transparent socksification library -# -# There are three forms of usage for this script: -# -# /usr/local/bin/torsocks program [program arguments...] -# -# This form sets the users LD_PRELOAD environment variable so that torsocks(8) -# will be loaded to socksify the application then executes the specified -# program (with the provided arguments). The following simple example might -# be used to ssh to www.foo.org via a torsocks.conf(5) configured socks server: -# -# /usr/local/bin/torsocks ssh www.foo.org -# -# The second form allows for torsocks(8) to be switched on and off for a -# session (that is, it adds and removes torsocks from the LD_PRELOAD environment -# variable). This form must be _sourced_ into the user's existing session -# (and will only work with bourne shell users): -# -# . /usr/local/bin/torsocks on -# telnet www.foo.org -# . /usr/local/bin/torsocks off -# -# Or -# -# source /usr/local/bin/torsocks on -# telnet www.foo.org -# source /usr/local/bin/torsocks off -# -# This script is originally from the debian torsocks package by -# Tamas Szerb <toma(a)rulez.org> -# Modified by Robert Hogan <robert(a)roberthogan.net> April 16th 2006 -# Modified by David Goulet <dgoulet(a)ev0ke.net> 2013 - -LIBDIR="/usr/local/${exec_prefix}/lib/torsocks" -LIB_NAME="libtorsocks" -SHLIB_EXT="so" -SHLIB="${LIBDIR}/${LIB_NAME}.${SHLIB_EXT}" - -# Set LD_PRELOAD variable with torsocks library path. -set_ld_preload () -{ - if [ -z "$LD_PRELOAD" ]; then - export LD_PRELOAD="${SHLIB}" - else - echo $LD_PRELOAD | grep -q "${SHLIB}" || \ - export LD_PRELOAD="${SHLIB} $LD_PRELOAD" - fi - - # OS X specific env variable - case "$OSTYPE" in - darwin*) - export DYLD_FORCE_FLAT_NAMESPACE=1 - ;; - esac -} - -# Spawn a torified shell. -tor_shell () -{ - set_ld_preload - echo "$0: New torified shell coming right up..." - ${SHELL:-/bin/sh} -} - -torify_app () -{ - local app_path=`which $1` - - # NEVER remove that line or else nothing it torified. - set_ld_preload - - if [ -z $app_path ]; then - echo "ERROR: $1 cannot be found." >&2 - exit 1 - elif [ -u $app_path -o -g $app_path ]; then - echo "ERROR: $1 is set${2}id. torsocks will not work on a set${2}id executable." >&2 - exit 1 - fi - - exec "$@" -} - -usage () -{ - echo "$0: Please see torsocks(1) or read comment at top of $0" -} - -if [ $# -eq 0 ] ; then - usage - exit 1 -fi - -# Ensure libtorsocks exists, -if [ ! -f $SHLIB ]; then - echo "$0: $SHLIB does not exist! Try re-installing torsocks." - exit -fi - -case "$1" in - on) - set_ld_preload - ;; - off) - export LD_PRELOAD=`echo -n $LD_PRELOAD | sed "s#$SHLIB *##"` - if [ -z "$LD_PRELOAD" ]; then - unset LD_PRELOAD - case "$OSTYPE" in - darwin*) - unset DYLD_FORCE_FLAT_NAMESPACE - ;; - esac - fi - ;; - show|sh) - echo "LD_PRELOAD=\"$LD_PRELOAD\"" - ;; - -h|--help|-?) - usage - ;; - --shell) - tor_shell - ;; - *) - torify_app $@ - ;; -esac

1 0

[torsocks/master] Add gpl, FAQ and Changelog file to extra dist
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit b4565d9a5e532d1c704d46bdef51979b39fd6adf Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 23 18:44:57 2013 -0400 Add gpl, FAQ and Changelog file to extra dist Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index cf49cc8..91f4056 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ -# not a GNU package. You can remove this line, if -# have all needed files, that a GNU package needs -AUTOMAKE_OPTIONS = foreign 1.4 - ACLOCAL_AMFLAGS = -I config SUBDIRS = src doc + +dist_doc_DATA = ChangeLog FAQ + +EXTRA_DIST = gpl-2.0.txt

1 0

[torsocks/master] Remove useless files
by dgoulet＠torproject.org 04 Apr '14

04 Apr '14

commit aeea98a337d763490fc0f7b8868efffd4b9454b8 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Fri Aug 23 18:42:38 2013 -0400 Remove useless files Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- Doxyfile | 283 --------------------------------------------------------- README.TORDNS | 187 -------------------------------------- 2 files changed, 470 deletions(-) diff --git a/Doxyfile b/Doxyfile deleted file mode 100644 index 220991e..0000000 --- a/Doxyfile +++ /dev/null @@ -1,283 +0,0 @@ -# Doxyfile 1.5.1-KDevelop - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = torsocks -PROJECT_NUMBER = 0.1 -OUTPUT_DIRECTORY = -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = /home/robert/ -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = NO -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -BUILTIN_STL_SUPPORT = NO -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = NO -EXTRACT_STATIC = NO -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = YES -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = YES -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = /backup/robert/Development/torsocks -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.C \ - *.CC \ - *.C++ \ - *.II \ - *.I++ \ - *.H \ - *.HH \ - *.H++ \ - *.CS \ - *.PHP \ - *.PHP3 \ - *.M \ - *.MM \ - *.PY \ - *.C \ - *.H \ - *.tlh \ - *.diff \ - *.patch \ - *.moc \ - *.xpm \ - *.dox -RECURSIVE = yes -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = NO -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = yes -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = torsocks.tag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 1000 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO diff --git a/README.TORDNS b/README.TORDNS deleted file mode 100644 index 0b7dafd..0000000 --- a/README.TORDNS +++ /dev/null @@ -1,187 +0,0 @@ - -TORDNS -====== - -What is it? ------------ - -This patch modifies the tsocks library to use SOCKS for name resolution. - - -Why should I use it? --------------------- - -* It's easier. - -When using this patch you don't (always..) need to run 'tor-resolve' when -using 'torify' anymore. Also, 'torify' now works directly with SSH without -the need for connect scripts or other fiddling. [As long as SSH is not -installed suid root]. - -* It allows you to use programs which are not SOCKS aware to connect to -.onion sites. - -For example, you can ssh directly to a .onion site, or use telnet / netcat -without hassle. - - -QUICK: what do I need to do to make it work? --------------------------------------------- - -Configuration instructions: - -1) Get the sources - -wget http://ftp1.sourceforge.net/tsocks/tsocks-1.8beta5.tar.gz -wget http://www.totalinfosecurity.com/patches/tor-tsocks/tordns-1.8b5.patch - -2) Unpack and apply the tsocks patch - -tar xzvf tsocks-1.8beta5.tar.gz -cd tsocks-1.8 -patch -p1 < ../tordns-1.8b5.patch - -3) Configure, compile and install - -NOTE: The default 'configure' settings for tsocks have been changed by -this patch. The --disable-hostnames option (don't try to use DNS to look -up SOCKS servers) is now enabled by default. Also, tordns is enabled -by default. - -./configure -make -make install - -All the tordns config options have sane default values which you should -not need to change. - - -Why did I need to use 'tor-resolve' with 'torify' in the first place? ---------------------------------------------------------------------- - -Because if you run "torify telnet bar.foo.com 31337", for example, then -you're leaking information about what sites you're visiting to DNS servers. - -The tor-resolve utility resolves names through tor using SOCKS, in a way -that shouldn't compromise your privacy. - - -What won't work with this? --------------------------- - -The 'tordns' feature for tsocks only works with applications using the -standard c library name lookup mechanisms. - -Some programs roll their own name lookup functions, for example, 'curl' -uses the 'adns' library, not the standard c library name lookup calls. -In this case, you'll still be leaking DNS requests. - -However, it seems that most programs which go to the trouble of implementing -asynchronous DNS requests or doing other tricky things have native SOCKS or -HTTP proxy support. - -Requests for reverse name lookups are not intercepted. - -Finally, the tsocks library is NOT thread-safe, with or without this patch. -You should not 'torify' multithreaded applications. - - -How does it work? ------------------ - -This patch adds interceptors for common name resolution calls to tsocks. -Specifically, the 'gethostbyname', 'getaddrinfo' and 'getipnodebyname' library -functions. (gethostbyname_r is not supported). - -When a call to one of these functions is intercepted, a SOCKS4A resolve -request is used to retrieve the relevant information, and the results are -cached. - -When the application calls 'connect', the cache is consulted and instead -of making a SOCKS5 request and supplying the IP address, we connect using -the name. This prevents those messages in the tor logs which look like: - - Sep 23 10:12:20.901 [warn] fetch_from_buf_socks(): Your application (using s - ocks5 on port 80) is giving Tor only an IP address. Applications that do DNS - resolves themselves may leak information. Consider using Socks4A (e.g. via - privoxy or socat) instead. - -There are special provisions for handling .onion sites. When a program asks -to resolve a name ending in '.onion', no name lookup is performed. A bogus IP -address is returned. The range of unused IP addresses to hand out is called the -"deadpool". This IP address doesn't mean anything in particular, and could be -considered a cookie associated with the name. When the application eventually -calls 'connect' with this bogus IP, the cache is consulted and the result is a -SOCKS5 request which includes the name of the .onion site. - -The default deadpool range is '127.0.69.0/255.255.255.0'. NOTE: if a resolve -request results in an IP from the deadpool range then the response is rejected, -and it appears to the application that the lookup failed. - -The lookup cache is kept in mmap'd memory and shared across fork() calls. -This is because some programs perform name lookups in a child process and -then invoke 'connect' in the parent as a kind of "poor man's async DNS". - - -Advanced configuration options ------------------------------- - -The following options have been added to the tsocks configuration file: - -tordns_enable - - The default value is 'true'. If you set it to 'false', tsocks should work - just like it did without the tordns patch. - - -tordns_deadpool_range - - The default value is '127.0.69.0/255.255.255.0'. 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. - - -tordns_cache_size - - This specifies the number of IP addresses looked up through socks to cache. - The default value is 256. 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. - - -TODO ----- - -* Think about how local names get resolved. Is it important? For example, - if I 'telnet localhost' which using tordns, what should happen? Should - we search through /etc/hosts ourselves or what? - -* What about the isc library calls like res_init and so on? How widely are - they use? Does this present a more elegant way to implement this stuff? - -* Perhaps intercept res_query etc and try to do something appropriate. - -* It should be possible to make this thread-safe with --enable-threads. - -* validateconf needs to be updated to understand (and show information about) - the tordns configuration options. - -* Perhaps intercept reverse name lookups? - -* In fact, one could modify tsocks further to play nicely with tor. For - example, you could prevent nonlocal UDP traffic from being sent at all, - and so on. - - -****************************************************** -Questions or comments, please contact: -Blair Strang (bls(a)totalinfosecurity.com) -Caleb Anderson (caleb.anderson(a)totalinfosecurity.com) -Carl Purvis (carl.purvis(a)totalinfosecurity.com) - -Total Information Security Ltd. -http://www.totalinfosecurity.com/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014