[or-cvs] [torflow/master 31/92] Check usability of targets passed with --target= option

[mikeperry at torproject.org]

Author: John M. Schanck <john at anomos.info>
Date: Fri, 23 Jul 2010 01:52:17 -0400
Subject: Check usability of targets passed with --target= option
Commit: e1bf592c80772aa5a553ad8552840df1370df407

---
 NetworkScanners/ExitAuthority/soat.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index 5be9269..6dc3f68 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -1870,11 +1870,13 @@ class FixedTargetTest:
 class FixedTargetHTTPTest(FixedTargetTest, BaseHTTPTest):
   def __init__(self, targets):
     BaseHTTPTest.__init__(self)
+    utargets = [t for t in targets if self._is_useable_url(t, ['http'])]
     FixedTargetTest.__init__(self, targets)
 
 class FixedTargetHTMLTest(FixedTargetTest, BaseHTMLTest):
   def __init__(self, targets):
     BaseHTMLTest.__init__(self)
+    utargets = [t for t in targets if self._is_useable_url(t, ['http'])]
     FixedTargetTest.__init__(self, targets)
   def _add_recursive_targets(self, soup, orig_addr):
     # Don't recurse for FixedTarget tests
@@ -1883,6 +1885,7 @@ class FixedTargetHTMLTest(FixedTargetTest, BaseHTMLTest):
 class FixedTargetSSLTest(FixedTargetTest, BaseSSLTest):
   def __init__(self, targets):
     BaseSSLTest.__init__(self)
+    utargets = [t for t in targets if self._is_useable_url(t)]
     FixedTargetTest.__init__(self, targets)
 
 # Search Based Tests
-- 
1.7.1