Clean the contrib directory with torch and machete.

We've accumulated a lot of cruft in this directory over the years: so
much, that it passed the point of being so disorganized that we no
longer browsed through it to see how bad it had gotten.

This patch (based on changes by rl1987) tries to remove the most
useless items, and split the others into reasonable directories.  It
creates a new scripts/ directory for maint and test scripts.

This patch was generated with the script below.  No other changes are made in
this patch.

#############
# new directories
mkdir -p contrib/test-tools
mkdir -p contrib/or-tools
mkdir -p contrib/dirauth-tools
mkdir -p contrib/operator-tools
mkdir -p contrib/client-tools
mkdir -p contrib/test-tools
mkdir -p contrib/dist
mkdir -p contrib/dist/suse
mkdir -p contrib/win32build

mkdir -p scripts/maint
mkdir -p scripts/test

############
# Deleted -- nobody who wants this is going to be looking for it here any
# longer.  Also, nobody wants it.
git rm contrib/auto-naming/README

# Deleted: We no longer do polipo.
git rm contrib/polipo/Makefile.mingw
git rm contrib/polipo/README
git rm contrib/polipo/polipo-mingw.nsi

# We haven't even tried to run this for ages. It is a relic of a bygone era
git rm contrib/mdd.py

# contrib/dir-tools/directory-archive/
# Tools for running a directory archive. No longer used - deleting them.
git rm contrib/directory-archive/crontab.sample
git rm contrib/directory-archive/fetch-all
git rm contrib/directory-archive/fetch-all-v3
git rm contrib/directory-archive/tar-them-up
git rm contrib/directory-archive/fetch-all-functions
git rm contrib/directory-archive/sort-into-month-folder

# This appears to be related to very old windows packaging stuff.
git rm contrib/bundle.nsi
git rm contrib/package_nsis-weasel.sh
git rm contrib/package_nsis.sh
git rm contrib/netinst.nsi
git rm contrib/torinst32.ico
git rm contrib/xenobite.ico

# This should not be needed for cross-compilation any more, should it?
git rm contrib/cross.sh

# I don't think anyone ever used this.
git rm contrib/make-signature.sh

# These are attempts to send tor controller commands from the command-line.
# They don't support modern authentication.
git rm contrib/tor-ctrl.sh

# this is for fetching about a tor server from a dirauth. But it
# doesn't authenticate the dirauth: yuck.
git rm contrib/sd

# wow, such unused, very perl4.
git rm contrib/tor-stress

####### contrib/dirauth-tools/
# Tools for running a directory authority

git mv contrib/add-tor contrib/dirauth-tools/
git mv contrib/nagios-check-tor-authority-cert contrib/dirauth-tools/

#######
# contrib/or-tools/
# Tools for examining relays
git mv contrib/check-tor contrib/or-tools/check-tor
git mv contrib/checksocks.pl contrib/or-tools/checksocks.pl
git mv contrib/exitlist contrib/or-tools/exitlist

#######
# contrib/operator-tools

# Tools for running a relay.
git mv contrib/linux-tor-prio.sh contrib/operator-tools/linux-tor-prio.sh
git mv contrib/tor-exit-notice.html contrib/operator-tools/tor-exit-notice.html
git mv contrib/tor.logrotate.in contrib/operator-tools/

######
# contrib/dist

git mv contrib/rc.subr contrib/dist/
git mv contrib/tor.sh.in contrib/dist/
git mv contrib/torctl.in contrib/dist/
git mv contrib/suse/* contrib/dist/suse/

######
# client-tools
git mv contrib/torify contrib/client-tools/torify
git mv contrib/tor-resolve.py contrib/client-tools/

######
# win32build

git mv contrib/package_nsis-mingw.sh contrib/win32build/
git mv contrib/tor.nsi.in contrib/win32build/
# Erinn didn't ask for this...
git mv contrib/tor-mingw.nsi.in contrib/win32build/
git mv contrib/tor.ico contrib/win32build/

######
# scripts/test
git mv contrib/cov-blame scripts/test/cov-blame
git mv contrib/cov-diff scripts/test/cov-diff
git mv contrib/coverage scripts/test/coverage
git mv contrib/scan-build.sh scripts/test/

######## scripts/maint
# Maintainance scripts
#
# These are scripts for developers to use when hacking on Tor.  They mostly
# look at the Tor source in one way or another.
git mv contrib/findMergedChanges.pl scripts/maint/findMergedChanges.pl
git mv contrib/checkOptionDocs.pl scripts/maint/checkOptionDocs.pl
git mv contrib/checkSpace.pl scripts/maint/checkSpace.pl
git mv contrib/redox.py scripts/maint/redox.py
git mv contrib/updateVersions.pl scripts/maint/updateVersions.pl
git mv contrib/checkLogs.pl scripts/maint/checkLogs.pl
git mv contrib/format_changelog.py scripts/maint/

2 files changed, 214 insertions, 0 deletions

diff --git a/contrib/client-tools/tor-resolve.py b/contrib/client-tools/tor-resolve.py
new file mode 100755
index 000000000..47ae1a0c3
--- /dev/null
+++ b/contrib/client-tools/tor-resolve.py
@@ -0,0 +1,153 @@
+#!/usr/bin/python
+
+import socket
+import struct
+import sys
+
+def socks4AResolveRequest(hostname):
+    version = 4
+    command = 0xF0
+    port = 0
+    addr = 0x0000001
+    username = ""
+    reqheader = struct.pack("!BBHL", version, command, port, addr)
+    return "%s%s\x00%s\x00"%(reqheader,username,hostname)
+
+def socks4AParseResponse(response):
+    RESPONSE_LEN = 8
+    if len(response) < RESPONSE_LEN:
+        return None
+    assert len(response) >= RESPONSE_LEN
+    version,status,port = struct.unpack("!BBH",response[:4])
+    assert version == 0
+    assert port == 0
+    if status == 90:
+        return "%d.%d.%d.%d"%tuple(map(ord, response[4:]))
+    else:
+        return "ERROR (status %d)"%status
+
+def socks5Hello():
+    return "\x05\x01\x00"
+def socks5ParseHello(response):
+    if response != "\x05\x00":
+        raise ValueError("Bizarre socks5 response")
+def socks5ResolveRequest(hostname, atype=0x03, command=0xF0):
+    version = 5
+    rsv = 0
+    port = 0
+    reqheader = struct.pack("!BBBB",version, command, rsv, atype)
+    if atype == 0x03:
+        reqheader += struct.pack("!B", len(hostname))
+    portstr = struct.pack("!H",port)
+    return "%s%s%s"%(reqheader,hostname,portstr)
+
+def socks5ParseResponse(r):
+    if len(r)<8:
+        return None
+    version, reply, rsv, atype = struct.unpack("!BBBB",r[:4])
+    assert version==5
+    assert rsv==0
+    if reply != 0x00:
+        return "ERROR",reply
+    assert atype in (0x01,0x03,0x04)
+    if atype != 0x03:
+        expected_len = 4 + ({1:4,4:16}[atype]) + 2
+        if len(r) < expected_len:
+            return None
+        elif len(r) > expected_len:
+            raise ValueError("Overlong socks5 reply!")
+        addr = r[4:-2]
+        if atype == 0x01:
+            return "%d.%d.%d.%d"%tuple(map(ord,addr))
+        else:
+            # not really the right way to format IPv6
+            return "IPv6: %s"%(":".join([hex(ord(c)) for c in addr]))
+    else:
+        hlen, = struct.unpack("!B", r[4])
+        expected_len = 5 + hlen + 2
+        if len(r) < expected_len:
+            return None
+        return r[5:-2]
+
+def socks5ResolvePTRRequest(hostname):
+    return socks5ResolveRequest(socket.inet_aton(hostname),
+                                atype=1, command = 0xF1)
+
+
+def parseHostAndPort(h):
+    host, port = "localhost", 9050
+    if ":" in h:
+        i = h.index(":")
+        host = h[:i]
+        try:
+            port = int(h[i+1:])
+        except ValueError:
+            print "Bad hostname %r"%h
+            sys.exit(1)
+    elif h:
+        try:
+            port = int(h)
+        except ValueError:
+            host = h
+
+    return host, port
+
+def resolve(hostname, sockshost, socksport, socksver=4, reverse=0):
+    assert socksver in (4,5)
+    if socksver == 4:
+        fmt = socks4AResolveRequest
+        parse = socks4AParseResponse
+    elif not reverse:
+        fmt = socks5ResolveRequest
+        parse = socks5ParseResponse
+    else:
+        fmt = socks5ResolvePTRRequest
+        parse = socks5ParseResponse
+
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    s.connect((sockshost,socksport))
+    if socksver == 5:
+        s.send(socks5Hello())
+        socks5ParseHello(s.recv(2))
+    s.send(fmt(hostname))
+    answer = s.recv(6)
+    result = parse(answer)
+    while result is None:
+        more = s.recv(1)
+        if not more:
+            return None
+        answer += more
+        result = parse(answer)
+    print "Got answer",result
+    m = s.recv(1)
+    if m:
+        print "Got extra data too: %r"%m
+    return result
+
+if __name__ == '__main__':
+    if len(sys.argv) not in (2,3,4):
+        print "Syntax: resolve.py [-4|-5] hostname [sockshost:socksport]"
+        sys.exit(0)
+    socksver = 4
+    reverse = 0
+    while sys.argv[1][0] == '-':
+        if sys.argv[1] in ("-4", "-5"):
+            socksver = int(sys.argv[1][1])
+            del sys.argv[1]
+        elif sys.argv[1] == '-x':
+            reverse = 1
+            del sys.argv[1]
+        elif sys.argv[1] == '--':
+            break
+
+    if len(sys.argv) >= 4:
+        print "Syntax: resolve.py [-x] [-4|-5] hostname [sockshost:socksport]"
+        sys.exit(0)
+    if len(sys.argv) == 3:
+        sh,sp = parseHostAndPort(sys.argv[2])
+    else:
+        sh,sp = parseHostAndPort("")
+
+    if reverse and socksver == 4:
+        socksver = 5
+    resolve(sys.argv[1], sh, sp, socksver, reverse)
diff --git a/contrib/client-tools/torify b/contrib/client-tools/torify
new file mode 100755
index 000000000..54acfed65
--- /dev/null
+++ b/contrib/client-tools/torify
@@ -0,0 +1,61 @@
+#! /bin/sh
+
+# This script used to call (the now deprecated) tsocks as a fallback in case
+# torsocks wasn't installed.
+# Now, it's just a backwards compatible shim around torsocks with reasonable
+# behavior if -v/--verbose or -h/--help arguments are passed.
+#
+# Copyright (c) 2004, 2006, 2009 Peter Palfrader
+# Modified by Jacob Appelbaum <jacob@appelbaum.net> April 16th 2006
+# Stripped of all the tsocks cruft by ugh on February 22nd 2012
+# May be distributed under the same terms as Tor itself
+
+
+compat() {
+	echo "torify is now just a wrapper around torsocks(1) for backwards compatibility."
+}
+
+usage() {
+	compat
+	echo "Usage: $0 [-hv] <command> [<options>...]"
+}
+
+case $# in 0)
+	usage >&2
+	exit 1
+esac
+
+case $# in 1)
+	case $1 in -h|--help)
+		usage
+		exit 0
+	esac
+esac
+
+case $1 in -v|--verbose)
+	compat >&2
+	shift
+esac
+
+# taken from Debian's Developer's Reference, 6.4
+pathfind() {
+       OLDIFS="$IFS"
+       IFS=:
+       for p in $PATH; do
+               if [ -x "$p/$*" ]; then
+                       IFS="$OLDIFS"
+                       return 0
+               fi
+       done
+       IFS="$OLDIFS"
+       return 1
+}
+
+if pathfind torsocks; then
+    exec torsocks "$@"
+    echo "$0: Failed to exec torsocks $@" >&2
+    exit 1
+else
+    echo "$0: torsocks not found in your PATH.  Perhaps it isn't installed?  (tsocks is no longer supported, for security reasons.)" >&2
+fi
+