commit 559171b5c4ac91f780d96ddbcce4664ab06a2654 Author: Isis Lovecruft <isis@torproject.org> Date: Sat Nov 3 01:16:27 2012 +0000 * Removing some of the old old old code. Everything that I've deleted is something I've read through and decided either has a replacement or else is useless in the current context. * These file in particular are all like 10 line bash scripts which, in most cases, don't do anything at all because the files they modify/wget/parse whatever do not exist. --- old_scripts/README | 47 ------------------------------------------- old_scripts/TODO | 6 ----- old_scripts/dns-checker.sh | 7 ------ old_scripts/host-prep.sh | 20 ------------------ old_scripts/run-tests.sh | 11 ---------- old_scripts/twitter-test.sh | 33 ------------------------------ 6 files changed, 0 insertions(+), 124 deletions(-) diff --git a/old_scripts/README b/old_scripts/README deleted file mode 100644 index 4903479..0000000 --- a/old_scripts/README +++ /dev/null @@ -1,47 +0,0 @@ - "Marco!" - - "Polo!" - - * * * - -The marco.py script tries to figure out who's out there. It does this -by trying to do a ssl handshake with a lot of Tor servers in parallel. -If it succeeds, it records their certificates. If it fails, it records -why. - -WHAT YOU MIGHT NEED: - - - I tested it with Python 2.6, and I think it should work with Python 2.5. - If your Python is older than that, it won't work. - -HOW TO USE IT: - - - Edit the top of marco.py to make sure you like the defaults. You - can adjust the timeout, where it writes stuff, and how many servers - it tests in parallel. - - - Run marco.py with one or more networkstatus files as command-line - arguments. If an addr:port appears more than once, marco will only - test it once. - -HOW TO READ THE OUTPUT: - - - Marco will generate a file called marco.out full of lines like: - ADDR:PORT STATUS MESSAGE. - - STATUS will be one of: - "ok" -- everything is fine - "noconnect" -- we couldn't open a TCP socket. - "nohandshake" -- we couldn't do a TLS handshake. - "err" -- we got an unexpected internal error - - MESSAGE will say more about what went wrong. - - The lines will be in the order that Marco received answers. If you want - them to be sorted by something else, you'll need to do that yourself. - - - If you have Python 2.6, Marco will also generate a file called - marco_certs.out, containing every TLS cert that it got for an "ok" - server. We can use this later to make sure identity keys were correct. - - If you only have Python 2.5, Marco will only get the DN for the cert. diff --git a/old_scripts/TODO b/old_scripts/TODO deleted file mode 100644 index c24a16f..0000000 --- a/old_scripts/TODO +++ /dev/null @@ -1,6 +0,0 @@ - -- Run anywhere, even older pythons. - -- Wrap the ssl stuff into its own class. - -- Decode certificates and detect MITM. diff --git a/old_scripts/dns-checker.sh b/old_scripts/dns-checker.sh deleted file mode 100644 index 9096c7f..0000000 --- a/old_scripts/dns-checker.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -for host in `cat twitter-host-list.txt` -do -echo "Trying to resolve: $host" -host -t any $host -done diff --git a/old_scripts/host-prep.sh b/old_scripts/host-prep.sh deleted file mode 100644 index b8f62d7..0000000 --- a/old_scripts/host-prep.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -SUITE="`lsb_release -c|cut -f2`"; -apt-get -y install tcptraceroute traceroute iputils-ping wget dnsutils \ - python-openssl rsync openssl libevent-1.4-2 zlib1g openssh-server - -# Lets make sure we can run these programs without ever becoming root again -chmod 4755 `which tcptraceroute` -chmod 4755 `which traceroute` - -# Install Tor from the Tor repo here... -#cp /etc/apt/sources.list /etc/apt/sources.list.bkp -#cat << "EOF" >> /etc/apt/sources.list -#deb http://deb.torproject.org/torproject.org $SOURCE main -#deb http://deb.torproject.org/torproject.org experimental-$SOURCE main -#EOF -# -#gpg --keyserver keys.gnupg.net --recv 886DDD89 -#gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - -#apt-get update -#apt-get install tor tor-geoipdb diff --git a/old_scripts/run-tests.sh b/old_scripts/run-tests.sh deleted file mode 100644 index 44d1c5a..0000000 --- a/old_scripts/run-tests.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -DATE="`date -u`"; -cd ~/.probe/logs/; -~/.probe/bin/marco.py ~/.probe/logs/cached-consensus 2>&1 >> ~/.probe/logs/run-tests-marco-"$DATE".log; -~/.probe/bin/dirconntest.sh 2>&1 >> ~/.probe/logs/run-tests-dirconntest-"$DATE".log; - -for host in `cat ~/.probe/logs/hosts.txt`; -do - ~/.probe/bin/generic-host-test.sh $host > 2>&1 >> ~/.probe/logs/generic-host-test-"$DATE".log; -done; diff --git a/old_scripts/twitter-test.sh b/old_scripts/twitter-test.sh deleted file mode 100644 index 5dfcb41..0000000 --- a/old_scripts/twitter-test.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# -# A quick hack to (tcp)traceroute to a list of hosts -# - -echo "tcp/conntest v0.6" -date -R -echo -/sbin/ifconfig -a -echo -/sbin/route -n -echo - -echo "Testing Twitter IP addresses..." -for ip in `cat twitter-ip-list.txt|grep 1` -do - echo "Testing $ip" - tcptraceroute -m 6 -w 1 $ip 80 - tcptraceroute -m 6 -w 1 $ip 0 - tcptraceroute -m 6 -w 1 $ip 123 - tcptraceroute -m 6 -w 1 $ip 443 -done -echo "Various traceroute attempts" -for ip in `cat twitter-ip-list.txt|grep 1` -do - traceroute -A $ip - traceroute -A -I $ip - traceroute -A -U $ip -done - -wget -q -O- https://check.torproject.org|grep "IP address" -echo -date -R