November 2012 - tor-commits - lists.torproject.org

[torsocks/pending-changes] Merge branch 'documentation' into pending-changes
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit 7336d5f60d59ab5699452231ac160ca142f2894f Merge: 24f6411 52330df Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 18:03:05 2012 -0800 Merge branch 'documentation' into pending-changes doc/torsocks.8.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torsocks/pending-changes] Add ChangeLog entry for issue 48
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit c0c8658888969c0ebd2890af2e6809cbaeda3da7 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 18:04:10 2012 -0800 Add ChangeLog entry for issue 48 --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a0ccf8..cfbc893 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ XXX XXX Added '--shell' as the documented way to spawn a shell with torsocks This removes the never working documented case where torsocks without arguments was supposed to spawn a shell. + o Issue 48: Typos in manpage + Updated man page to fix typos. Torsocks 1.2 2011-10-28 Robert Hogan <robert(a)roberthogan.net>

1 0

[torsocks/ipv6] set errno for connect failures related to AF_INET6
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit becf4bc03ea6dcb95d22106ebfe08b4d29b3610a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:56:32 2012 -0800 set errno for connect failures related to AF_INET6 --- src/torsocks.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/torsocks.c b/src/torsocks.c index 1c772be..74ead72 100644 --- a/src/torsocks.c +++ b/src/torsocks.c @@ -299,6 +299,7 @@ int torsocks_connect_guts(CONNECT_SIGNATURE, int (*original_connect)(CONNECT_SIG /* If this is an INET6, we'll refuse it. */ if ((connaddr->sin_family == AF_INET6)) { show_msg(MSGERR, "connect: Connection is IPv6: rejecting.\n"); + errno = EAFNOSUPPORT; return -1; }

1 0

[metrics-tasks/master] Make tweaks based on comments by gsathya (#6471).
by karsten＠torproject.org 07 Nov '12

07 Nov '12

commit b89d9da5ce6ecf46dd1dfe7bbf4522d8776ca322 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 6 20:51:20 2012 -0500 Make tweaks based on comments by gsathya (#6471). --- task-6471/python/pygeodate.py | 17 +++++------------ 1 files changed, 5 insertions(+), 12 deletions(-) diff --git a/task-6471/python/pygeodate.py b/task-6471/python/pygeodate.py index 83169e5..72f13d8 100644 --- a/task-6471/python/pygeodate.py +++ b/task-6471/python/pygeodate.py @@ -42,22 +42,15 @@ class Database: for line in input_file.readlines(): line = line.strip() if line.startswith('!'): - self.add_date(line) - continue + date = line.split("!")[1] + if date not in self.dates: + bisect.insort(self.dates, date) else: - self.add_range(line) + r = Range(line) + self.data.append((r.key, r)) self.data.sort() self.keys = [r[0] for r in self.data] - def add_date(self, line): - date = line.split("!")[1] - if date not in self.dates: - bisect.insort(self.dates, date) - - def add_range(self, line): - r = Range(line) - self.data.append((r.key, r)) - def lookup_address_and_date(self, address_string, date_string): if len(self.data) == 0: return '??'

1 0

[metrics-tasks/master] Make tweaks based on comments by atagar (#6471).
by karsten＠torproject.org 07 Nov '12

07 Nov '12

commit 12909c4cfa766c075714a6912458eb313071ce92 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 6 20:48:59 2012 -0500 Make tweaks based on comments by atagar (#6471). --- task-6471/python/pygeodate.py | 58 ++++++++--------------------------------- 1 files changed, 11 insertions(+), 47 deletions(-) diff --git a/task-6471/python/pygeodate.py b/task-6471/python/pygeodate.py index 6480f20..83169e5 100644 --- a/task-6471/python/pygeodate.py +++ b/task-6471/python/pygeodate.py @@ -1,6 +1,4 @@ import bisect -import socket -import struct import datetime class Range: @@ -10,21 +8,13 @@ class Range: # variable size, so we can use 48 bit keys for IPv4 (32 bit for the # IPv4 address and 16 bit for the database date) and 144 bit keys for # IPv6. - self.start_address = Database.address_ston(parts[0]) - self.end_address = Database.address_ston(parts[1]) + self.start_address = Database.address_string_to_number(parts[0]) + self.end_address = Database.address_string_to_number(parts[1]) self.code = parts[2] - self.start_date = Database.date_ston(parts[3]) - self.end_date = Database.date_ston(parts[4]) + self.start_date = Database.date_string_to_number(parts[3]) + self.end_date = Database.date_string_to_number(parts[4]) self.key = Database.create_key(self.start_address, self.start_date) - def __str__(self): - return "%s,%s,%s,%s,%s" % \ - (Database.address_ntos(self.start_address), - Database.address_ntos(self.end_address), - self.code, - Database.date_ntos(self.start_date), - Database.date_ntos(self.end_date)) - class Database: def __init__(self): # TODO Replace with crit-bit tree if performance becomes a problem @@ -33,43 +23,17 @@ class Database: self.keys = [] @staticmethod - def address_ston(address_string): - try: - address_struct = socket.inet_pton(socket.AF_INET, address_string) - except socket.error: - raise ValueError - return struct.unpack('!I', address_struct)[0] - - @staticmethod - def address_ntos(address): - return socket.inet_ntop(socket.AF_INET, struct.pack('!I', address)) + def address_string_to_number(address_string): + octets = address_string.split('.') + return long(''.join(["%02X" % long(octet) for octet in octets]), 16) @staticmethod - def date_ston(date_string): + def date_string_to_number(date_string): date_datetime = datetime.datetime.strptime(date_string, '%Y%m%d') + # Divide seconds by 86400=24*60*60 for number of days since 19700101 return int(date_datetime.strftime('%s')) / 86400 @staticmethod - def date_ntos(date): - return datetime.datetime.fromtimestamp(date * 86400).strftime('%Y%m%d') - - @staticmethod - def address_kton(key): - return key >> 16 - - @staticmethod - def date_kton(key): - return key & 0xffff - - @staticmethod - def address_ktos(key): - return Database.address_ntos(Database.address_kton(key)) - - @staticmethod - def date_ktos(key): - return Database.date_ntos(Database.date_kton(key)) - - @staticmethod def create_key(address, date): return (address << 16) + date @@ -98,8 +62,8 @@ class Database: if len(self.data) == 0: return '??' dates_pos = max(0, bisect.bisect(self.dates, date_string) - 1) - address = Database.address_ston(address_string) - date = Database.date_ston(self.dates[dates_pos]) + address = Database.address_string_to_number(address_string) + date = Database.date_string_to_number(self.dates[dates_pos]) key = Database.create_key(address, date) pos = bisect.bisect(self.keys, key + 1) # Look up address and date by iterating backwards over possibly

1 0

[torsocks/issue-47] remove old shell spawning code that cannot be reached
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit eb9ccc824e43717cb38ff2fada5190e42c412cdc Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:41:34 2012 -0800 remove old shell spawning code that cannot be reached --- src/torsocks.in | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 1a9952a..7537440 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -139,12 +139,6 @@ case "$1" in fi export DYLD_FORCE_FLAT_NAMESPACE=1 - if [ $# = 0 ] - then - echo "torsocks: new torified shell coming right up..." - ${SHELL:-/bin/sh} - fi - if [ $# -gt 0 ] then if [ -u `which "$1"` ]; then

1 0

[torsocks/issue-47] Only spawn a shell when called with "--shell"
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit b5dadbd0c5f36792234bd974ed970d1db54a6e1e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:38:29 2012 -0800 Only spawn a shell when called with "--shell" This effective reverts the patch by intrigeri for issue 47: http://code.google.com/p/torsocks/issues/detail?id=47 If torsocks is called with zero arguments, we will not spawn a shell we will error out and refuse to continue. If you wish to spawn a shell, we suggest calling torsocks like so: torsocks --shell --- doc/torsocks.1.in | 2 -- src/torsocks.in | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/torsocks.1.in b/doc/torsocks.1.in index 4ceba4c..555e661 100644 --- a/doc/torsocks.1.in +++ b/doc/torsocks.1.in @@ -54,8 +54,6 @@ Example: ". torsocks off" -- remove the torsocks lib from LD_PRELOAD .IP \fB[show|sh] show the current value of the LD_PRELOAD variable -.IP \fB<without\ any\ argument> -create a new shell with LD_PRELOAD including torsocks(8). .IP \fB[--shell] create a new shell with LD_PRELOAD including torsocks(8). .PP diff --git a/src/torsocks.in b/src/torsocks.in index f1052cc..1a9952a 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -4,6 +4,7 @@ # * * # * 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 * @@ -68,6 +69,11 @@ set_id () { exit 1 } +if [ $# = 0 ] ; then + echo "$0: insufficient arguments" + exit +fi + LIBDIR="@prefix@/lib/torsocks" LIB_NAME="libtorsocks" SHLIB_EXT="@SHLIB_EXT@"

1 0

[torsocks/issue-47] spawn a shell with --shell and not "shell"
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit c828075df50912711686bf96de7370927dfb4c0b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:33:08 2012 -0800 spawn a shell with --shell and not "shell" This updates documentation to match the implementation This is addressed as issue 47: http://code.google.com/p/torsocks/issues/detail?id=47 --- doc/torsocks.1.in | 4 +++- src/torsocks.in | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/torsocks.1.in b/doc/torsocks.1.in index b383859..4ceba4c 100644 --- a/doc/torsocks.1.in +++ b/doc/torsocks.1.in @@ -10,7 +10,7 @@ transparently allow an application to use a SOCKS proxy. Basically a renamed, pa .br or .B torsocks -.RB [on|off] +.RB [on|off|--shell] .br or .B torsocks @@ -56,6 +56,8 @@ Example: show the current value of the LD_PRELOAD variable .IP \fB<without\ any\ argument> create a new shell with LD_PRELOAD including torsocks(8). +.IP \fB[--shell] +create a new shell with LD_PRELOAD including torsocks(8). .PP .SH AUTHOR This script was created by Tamas SZERB <toma(a)rulez.org> for the debian diff --git a/src/torsocks.in b/src/torsocks.in index b42364f..f1052cc 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -111,7 +111,7 @@ case "$1" in -h|-?) echo "$0: Please see torsocks(1) or read comment at top of $0" ;; - --shell|shell) + --shell) if [ -z "$@LDPRELOAD@" ] then export @LDPRELOAD@="${SHLIB}"

1 0

[torsocks/issue-47] torsocks will run --shell by default; add --shell
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit 4e5f35b15bcf0a28b65a480892e8ca84d5c60946 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:28:31 2012 -0800 torsocks will run --shell by default; add --shell --- src/torsocks.in | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index 94a7b8f..b42364f 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -111,6 +111,18 @@ case "$1" in -h|-?) echo "$0: Please see torsocks(1) or read comment at top of $0" ;; + --shell|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

1 0

[torsocks/issue-47] Add verbose output before starting torified shell
by ioerror＠torproject.org 07 Nov '12

07 Nov '12

commit 2c6679aed5d21bafcdf30d98fabff76b566c38aa Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Nov 6 17:18:11 2012 -0800 Add verbose output before starting torified shell --- src/torsocks.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/torsocks.in b/src/torsocks.in index a3137fb..94a7b8f 100755 --- a/src/torsocks.in +++ b/src/torsocks.in @@ -123,6 +123,7 @@ case "$1" in if [ $# = 0 ] then + echo "torsocks: new torified shell coming right up..." ${SHELL:-/bin/sh} fi

1 0