April 2014 - tor-commits - lists.torproject.org

[ooni-probe/master] Also print out the Tor version and print error messages.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit c701575ed1a13e5848c93d12c38141a76fb54592 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 01:39:28 2014 +0100 Also print out the Tor version and print error messages. --- ooni/nettests/blocking/bridge_reachability.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 5a12a1f..c191804 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/… [View More]

1 0

[ooni-probe/master] Refactoring of .gitignore
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 699302bf5c462a66109b447958637703cc27efcf Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Mar 27 16:27:18 2014 +0100 Refactoring of .gitignore --- .gitignore | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 5733f57..0a6915d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,41 @@ *.pyc -assets/* + ENV/* +.c9revisions +.ropeproject/* +.coverage +.idea/ +*~ +_trial_temp/* + build/* … [View More]

1 0

[ooni-probe/master] Iteration based on feedback from asn.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit ff2a352a8229e583ca5e0537f4f963a8fc1dff3a Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Mar 27 16:08:12 2014 +0100 Iteration based on feedback from asn. * Check that tor is installed before running the test (adding of new API method requirements used for doing checks before a test runs). * Add description to bridge_reachability test. * Consider the config.advanced.tor_binary option when running tor. * Add command line option -v for extra … [View More]verbosity (equivalent to debug: true) --- ooni/nettest.py | 16 ++++++++++------ ooni/nettests/blocking/bridge_reachability.py | 7 +++++++ ooni/oonicli.py | 10 ++++++++-- ooni/utils/log.py | 2 ++ ooni/utils/onion.py | 10 +++++++++- 5 files changed, 36 insertions(+), 9 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index aba768b..074f0bd 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -138,7 +138,7 @@ class NetTestLoader(object): requiresTor = False def __init__(self, options, test_file=None, test_string=None): - self.onionInputRegex = re.compile("(httpo://[a-z0-9]{16}\.onion)/input/([a-z0-9]{64})$") + self.onionInputRegex = re.compile("(httpo://[a-z0-9]{16}\.onion)/input/([a-z0-9]{64})$") self.options = options self.testCases = [] @@ -293,7 +293,7 @@ class NetTestLoader(object): if not test_cases: raise e.NoTestCasesFound - + self.setupTestCases(test_cases) def setupTestCases(self, test_cases): @@ -329,10 +329,6 @@ class NetTestLoader(object): """ Call processTest and processOptions methods of each NetTestCase """ - test_classes = set([]) - for test_class, test_method in self.testCases: - test_classes.add(test_class) - for klass in self.testClasses: options = self.usageOptions() options.parseOptions(self.options) @@ -345,6 +341,7 @@ class NetTestLoader(object): checkForRoot() if test_instance.requiresTor: self.requiresTor = True + test_instance.requirements() test_instance._checkRequiredOptions() test_instance._checkValidOptions() @@ -615,6 +612,13 @@ class NetTestCase(object): """ self.report = {} self.inputs = None + + def requirements(self): + """ + Place in here logic that will be executed before the test is to be run. + If some condition is not met then you should raise an exception. + """ + pass def setUp(self): """ diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 54bce73..5a12a1f 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -12,6 +12,8 @@ import txtorcon from ooni.utils import log, onion from ooni import nettest +class TorIsNotInstalled(Exception): pass + class UsageOptions(usage.Options): optParameters = [['timeout', 't', 120, 'Specify the timeout after which to consider the Tor bootstrapping process to have failed'], @@ -19,6 +21,7 @@ class UsageOptions(usage.Options): class BridgeReachability(nettest.NetTestCase): name = "Bridge Reachability" + description = "A test for checking if bridges are reachable from a given location." author = "Arturo Filastò" version = "0.1" @@ -30,6 +33,10 @@ class BridgeReachability(nettest.NetTestCase): 'TransportType IP:ORPort (ex. obfs2 127.0.0.1:443)'] requiredOptions = ['file'] + + def requirements(self): + if not onion.find_tor_binary(): + raise TorIsNotInstalled("For instructions on installing Tor see: https://www.torproject.org/download/download") def setUp(self): self.tor_progress = 0 diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 6f4ebe0..98c3ee6 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -32,7 +32,8 @@ class Options(usage.Options): ["resume", "r"], ["no-collector", "n"], ["list", "s"], - ["printdeck", "p"] + ["printdeck", "p"], + ["verbose", "v"] ] optParameters = [["reportfile", "o", None, "report file name"], @@ -101,6 +102,8 @@ def runWithDirector(logging=True, start_tor=True): config.global_options = global_options config.set_paths() config.read_config_file() + if global_options['verbose']: + config.advanced.debug = True if not start_tor: config.advanced.start_tor = False @@ -166,7 +169,10 @@ def runWithDirector(logging=True, start_tor=True): except usage.UsageError, e: log.err(e) print net_test_loader.usageOptions().getUsage() - sys.exit(2) + sys.exit(4) + except Exception as e: + log.err(e) + sys.exit(5) d = director.start(start_tor=start_tor) diff --git a/ooni/utils/log.py b/ooni/utils/log.py index cbad136..7fafcfb 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -71,6 +71,8 @@ def debug(msg, *arg, **kw): def err(msg, *arg, **kw): from ooni.settings import config if config.logging: + if isinstance(msg, Exception): + msg = "%s: %s" % (msg.__class__.__name__, msg) print "[!] %s" % msg def exception(error): diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py index 91d8a2d..0c54242 100644 --- a/ooni/utils/onion.py +++ b/ooni/utils/onion.py @@ -2,11 +2,19 @@ import string import subprocess from distutils.version import LooseVersion -from txtorcon.util import find_tor_binary +from txtorcon.util import find_tor_binary as tx_find_tor_binary + +from ooni.settings import config class TorVersion(LooseVersion): pass + +def find_tor_binary(): + if config.advanced.tor_binary: + return config.advanced.tor_binary + return tx_find_tor_binary() + def tor_version(): tor_binary = find_tor_binary() if not tor_binary: [View Less]

1 0

[ooni-probe/master] When we fail write the tor log to the report
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 17c2b901fb9ddc06d94406e35d55082ab05955dc Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 01:58:08 2014 +0100 When we fail write the tor log to the report --- ooni/nettests/blocking/bridge_reachability.py | 3 +++ ooni/utils/onion.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index d8efb70..d9df317 100644 --- a/ooni/… [View More]

1 0

[ooni-probe/master] Only print out a summary when it's appropriate.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit b96dcd2df0d9a1638d450f008f3134206cf7e85a Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 01:44:53 2014 +0100 Only print out a summary when it's appropriate. Replace prints with log.msg --- ooni/nettest.py | 2 ++ ooni/nettests/blocking/bridge_reachability.py | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 074f0bd..fb0bf95 100644 --- a/ooni/nettest.… [View More]

1 0

[ooni-probe/master] Add support for fteproxy to bridge_reachability
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 0f31af97d55291498457b44fe84d93c5988771d5 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 18:42:31 2014 +0100 Add support for fteproxy to bridge_reachability --- ooni/nettests/blocking/bridge_reachability.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index d9df317..9c2bdb6 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ … [View More]

1 0

[ooni-probe/master] Correct managed to --managed
by art＠torproject.org 30 Apr '14

30 Apr '14

commit e9786aba705ac806518c38002b0f695b7d50f463 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 18:58:14 2014 +0100 Correct managed to --managed --- ooni/nettests/blocking/bridge_reachability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 9c2bdb6..c0cdb76 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/… [View More]

1 0

[ooni-probe/master] Add support for installing fteproxy to install_on_planetlab script
by art＠torproject.org 30 Apr '14

30 Apr '14

commit f862bfa4316afe7dad4f1d7e1ac6eb62cc115ecc Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 18:42:47 2014 +0100 Add support for installing fteproxy to install_on_planetlab script --- scripts/install_on_planetlab.sh | 48 ++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index eb75375..b329228 100644 --- a/scripts/install_on_planetlab.sh +++ b/… [View More]

1 0

[ooni-probe/master] Merge pull request #297 from TheTorProject/feature/tor_version
by art＠torproject.org 30 Apr '14

30 Apr '14

commit 65c90a082030a37e1e3c2bc33f02d3e76fd41c65 Merge: 4f5d910 2822871 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Apr 30 18:38:44 2014 +0200 Merge pull request #297 from TheTorProject/feature/tor_version Add support for adding tor version to the bridge_reachability report. .gitignore | 35 +++++++++---- ooni/director.py | 4 +- ooni/errors.py | … [View More]

1 0

[ooni-probe/master] Don't complain if we fail to delete some files.
by art＠torproject.org 30 Apr '14

30 Apr '14

commit c392dff592ec8f4cc2c8ab8501308fcf9ab5750c Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Apr 30 18:18:46 2014 +0200 Don't complain if we fail to delete some files. --- ooni/tests/test_oonicli.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index b53b510..edd17c6 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -1,10 +1,8 @@ import os import sys … [View More]

1 0