[or-cvs] r20297: {torflow} Update readme and format a pydoc string. (torflow/trunk/NetworkScanners/ExitAuthority)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-08-14 20:04:14 -0400 (Fri, 14 Aug 2009)
New Revision: 20297

Modified:
   torflow/trunk/NetworkScanners/ExitAuthority/README.ExitScanning
   torflow/trunk/NetworkScanners/ExitAuthority/soat.py
Log:

Update readme and format a pydoc string.



Modified: torflow/trunk/NetworkScanners/ExitAuthority/README.ExitScanning
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/README.ExitScanning	2009-08-15 00:02:18 UTC (rev 20296)
+++ torflow/trunk/NetworkScanners/ExitAuthority/README.ExitScanning	2009-08-15 00:04:14 UTC (rev 20297)
@@ -30,9 +30,7 @@
 
 A. Compiling Tor
 
-To run SoaT you will need Tor 0.2.1.13. SVN r18516 contains a timeout
-fix that is essential to scanning the network in any reasonable amount
-of time.
+To run SoaT you will need Tor 0.2.1.x or later.
 
 It is also strongly recommended that you have a custom Tor instance that
 is devoted only to exit scanning, and is not performing any other
@@ -73,11 +71,11 @@
 target only certain keywords/concepts/sites in a particular context.
 
 You can edit the contents of the wordlist files while SoaT runs. It will
-pick up the changes after it completes a full network scan with the old 
+pick up the changes after it completes a full network scan with the old
 list.
 
 
-IV. Running Tor, The Metatroller, and SoaT
+IV. Running Tor and SoaT
 
 Once you have everything compiled and configured, you should be ready to
 run the pieces. You probably want to do this as a separate, unprivileged
@@ -86,23 +84,13 @@
 First, start up your custom Tor with the sample torrc provided in the
 TorFlow svn root:
 
-# ~/src/tor-trunk/src/or/tor -f ~/src/torflow-trunk/torrc >& tor.log &
+# ~/src/tor-git/src/or/tor -f ./data/torrc &
 
-Then, start up the Metatroller:
+Then, start up SoaT:
 
-# ~/src/torflow-trunk/metatroller.py >& mt.log &
+# ./soat.py --ssl --html --http --dnsrebind >& ./data/soat.log &
 
-Finally, start up SoaT:
 
-# ./soat.py --ssl --html --http --dnsrebind >& soat.log &
-
-
-If your machine is shared, you probably want to set a control port 
-password. The location for this for metatroller and SoaT is the 
-control_pass variable at the top of torflow-trunk/TorCtl/TorUtil.py.
-Of course you also have to set it in the custom torrc as well.
-
-
 V. Monitoring and Results
 
 A. Watching for Captcha Problems

Modified: torflow/trunk/NetworkScanners/ExitAuthority/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/ExitAuthority/soat.py	2009-08-15 00:02:18 UTC (rev 20296)
+++ torflow/trunk/NetworkScanners/ExitAuthority/soat.py	2009-08-15 00:04:14 UTC (rev 20297)
@@ -71,6 +71,8 @@
 # The convention in TorCtl is that nicks have no $, and ids have $.
 # We should be using that here too...
 
+# XXX: Handle connectivity failures more gracefully..
+
 search_cookies=None
 scanhdlr=None
 datahandler=None
@@ -225,10 +227,11 @@
 
   # FIXME: Hrmm is this in the right place?
   def check_dns_rebind(self):
-    ''' 
-    A DNS-rebind attack test that runs in the background and monitors REMAP events
-    The test makes sure that external hosts are not resolved to private addresses  
     '''
+    A DNS-rebind attack test that runs in the background and monitors REMAP
+    events The test makes sure that external hosts are not resolved to private
+    addresses
+    '''
     plog('INFO', 'Monitoring REMAP events for weirdness')
     # establish a control port connection
     try: