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

[ooni-probe/master] Add better printing of results to stdout in handshakeSuccessful().
by art＠torproject.org 30 Apr '13

30 Apr '13

commit ba09aef6c8fd631817dafd6159003acba04c50e0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 28 17:58:28 2013 +0000 Add better printing of results to stdout in handshakeSuccessful(). --- nettests/experimental/tls_handshake.py | 62 ++++++++++++++++++++------------ 1 files changed, 39 insertions(+), 23 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index e443242..47e5091 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -625,45 +625,61 @@ class TLSHandshakeTest(nettest.NetTestCase): @returns: None. """ host, port = connection.getpeername() + log.msg("Handshake with %s:%d successful!" % (host, port)) + server_cert = self.getPeerCert(connection) server_cert_chain = self.getPeerCert(connection, get_chain=True) - s_cert = connection.get_peer_certificate() - cert_subject = self.getX509Name(s_cert.get_subject(), - get_components=True) - cert_subj_hash = s_cert.subject_name_hash() - cert_issuer = self.getX509Name(s_cert.get_issuer(), - get_components=True) - cert_public_key = self.getPublicKey(s_cert.get_pubkey()) - cert_serial_no = s_cert.get_serial_number() - cert_sig_algo = s_cert.get_signature_algorithm() + renegotiations = connection.total_renegotiations() + cipher_list = connection.get_cipher_list() + session_key = connection.master_key() + rawcert = connection.get_peer_certificate() + ## xxx TODO this hash needs to be formatted as SHA1, not long + cert_subj_hash = rawcert.subject_name_hash() + cert_serial = rawcert.get_serial_number() + cert_sig_algo = rawcert.get_signature_algorithm() + cert_subject = self.getX509Name(rawcert.get_subject(), + get_components=True) + cert_issuer = self.getX509Name(rawcert.get_issuer(), + get_components=True) + cert_pubkey = self.getPublicKey(rawcert.get_pubkey()) self.report['host'] = host self.report['port'] = port - self.report['state'] = connection.state_string() - self.report['renegotiations'] = connection.total_renegotiations() + self.report['state'] = self.state + self.report['renegotiations'] = renegotiations self.report['server_cert'] = server_cert self.report['server_cert_chain'] = \ ''.join([cert for cert in server_cert_chain]) - self.report['server_ciphersuite'] = connection.get_cipher_list() - self.report['cert_subject'] = str(cert_subject) - self.report['cert_subj_hash'] = str(cert_subj_hash) - self.report['cert_issuer'] = str(cert_issuer) - ## xxx this needs to be parsed into PEM also - self.report['cert_public_key'] = str(cert_public_key) - self.report['cert_serial_no'] = str(cert_serial_no) - self.report['cert_sig_algo'] = str(cert_sig_algo) - + self.report['server_ciphersuite'] = cipher_list + self.report['cert_subject'] = cert_subject + self.report['cert_subj_hash'] = cert_subj_hash + self.report['cert_issuer'] = cert_issuer + self.report['cert_public_key'] = cert_pubkey + self.report['cert_serial_no'] = cert_serial + self.report['cert_sig_algo'] = cert_sig_algo ## The session's master key is only valid for that session, and ## will allow us to decrypt any packet captures (if they were ## collected). Because we are not requesting URLs, only host:port ## (which would be visible in pcaps anyway, since the FQDN is ## never encrypted) I do not see a way for this to log any user or ## identifying information. Correct me if I'm wrong. - self.report['session_key'] = connection.master_key() + self.report['session_key'] = session_key + + log.msg("Server certificate:\n\n%s" % server_cert) + log.msg("Server certificate chain:\n\n%s" + % ''.join([cert for cert in server_cert_chain])) + log.msg("Negotiated ciphersuite:\n%s" + % '\n\t'.join([cipher for cipher in cipher_list])) + log.msg("Certificate subject: %s" % cert_subject) + log.msg("Certificate subject hash: %d" % cert_subj_hash) + log.msg("Certificate issuer: %s" % cert_issuer) + log.msg("Certificate public key:\n\n%s" % cert_pubkey) + log.msg("Certificate signature algorithm: %s" % cert_sig_algo) + log.msg("Certificate serial number: %s" % cert_serial) + log.msg("Total renegotiations: %d" % renegotiations) - ## xxx do we need this? - #return connection + return connection def handshakeFailed(connection, host): """

1 0

[ooni-probe/master] Rename private option to test_file to separate it from test string.
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 2ab970acc483611f556accbfd21cd1db0c162a4e Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:08:43 2013 +0100 Rename private option to test_file to separate it from test string. --- ooni/oonicli.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 2fd4688..243b90c 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -68,7 +68,7 @@ class Options(usage.Options): if self['testdeck']: return try: - self['test'] = args[0] + self['test_file'] = args[0] self['subargs'] = args[1:] except: raise usage.UsageError("No test filename specified!")

1 0

[ooni-probe/master] Fix director unittest
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 68fb840e72e338674b39b36b0b2798b015397ba1 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:11:22 2013 +0100 Fix director unittest --- ooni/tests/test_director.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ooni/tests/test_director.py b/ooni/tests/test_director.py index 79a1e96..a9dfbe8 100644 --- a/ooni/tests/test_director.py +++ b/ooni/tests/test_director.py @@ -42,10 +42,11 @@ class TestDirector(unittest.TestCase): pass def test_start_net_test(self): - options = {'test':net_test_string, 'subargs':dummyArgs} - net_test_loader = NetTestLoader(options) - net_test_loader.checkOptions() - d = self.director.startNetTest('', net_test_loader, self.reporters) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + + ntl.checkOptions() + d = self.director.startNetTest('', ntl, self.reporters) @d.addCallback def done(result):

1 0

[ooni-probe/master] Fix unittests for nettest
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 9ad9bfb76221cb12cca3e43993174dfbf66fb89f Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:05:27 2013 +0100 Fix unittests for nettest --- ooni/tests/test_nettest.py | 70 +++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 33 deletions(-) diff --git a/ooni/tests/test_nettest.py b/ooni/tests/test_nettest.py index 2d070c3..1d04791 100644 --- a/ooni/tests/test_nettest.py +++ b/ooni/tests/test_nettest.py @@ -60,7 +60,7 @@ class DummyTestCase(NetTestCase): self.report['foo'] = 'foo' """ -net_test_with_required_option = """ +net_test_string_with_required_option = """ from twisted.python import usage from ooni.nettest import NetTestCase @@ -123,8 +123,9 @@ class TestNetTest(unittest.TestCase): f.write(net_test_string) f.close() - options = {'subargs':dummyArgs, 'test':net_test_file} - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestFile(net_test_file) + self.verifyMethods(ntl.testCases) os.unlink(net_test_file) @@ -133,8 +134,9 @@ class TestNetTest(unittest.TestCase): Given a file like object verify that the net test cases are properly generated. """ - options = {'subargs':dummyArgs, 'test':net_test_string} - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + self.verifyMethods(ntl.testCases) def test_load_net_test_from_StringIO(self): @@ -142,46 +144,48 @@ class TestNetTest(unittest.TestCase): Given a file like object verify that the net test cases are properly generated. """ - options = {'subargs':dummyArgs, 'test':StringIO(net_test_string)} - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + self.verifyMethods(ntl.testCases) def test_load_with_option(self): - options = {'subargs':dummyArgs, 'test':StringIO(net_test_string)} - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + self.assertIsInstance(ntl, NetTestLoader) for test_klass, test_meth in ntl.testCases: for option in dummyOptions.keys(): self.assertIn(option, test_klass.usageOptions()) def test_load_with_invalid_option(self): - options = {'subargs':dummyInvalidArgs, - 'test':StringIO(net_test_string)} try: - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyInvalidArgs) + ntl.loadNetTestString(net_test_string) + ntl.checkOptions() raise Exception except UsageError: pass def test_load_with_required_option(self): - options = {'subargs':dummyArgsWithRequiredOptions, - 'test':StringIO(net_test_with_required_option)} - net_test = NetTestLoader(options) - self.assertIsInstance(net_test, NetTestLoader) + ntl = NetTestLoader(dummyArgsWithRequiredOptions) + ntl.loadNetTestString(net_test_string_with_required_option) + + self.assertIsInstance(ntl, NetTestLoader) def test_load_with_missing_required_option(self): - options = {'subargs':dummyArgs, - 'test':StringIO(net_test_with_required_option)} try: - net_test = NetTestLoader(options) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string_with_required_option) + except MissingRequiredOption: pass def test_net_test_inputs(self): - options = {'subargs':dummyArgsWithFile, - 'test':StringIO(net_test_string_with_file)} - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyArgsWithFile) + ntl.loadNetTestString(net_test_string_with_file) + ntl.checkOptions() # XXX: if you use the same test_class twice you will have consumed all @@ -193,18 +197,18 @@ class TestNetTest(unittest.TestCase): self.assertEqual(len(list(test_class.inputs)), 10) def test_setup_local_options_in_test_cases(self): - options = {'subargs':dummyArgs, 'test':StringIO(net_test_string)} - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_string) + ntl.checkOptions() for test_class, test_method in ntl.testCases: self.assertEqual(test_class.localOptions, dummyOptions) def test_generate_measurements_size(self): + ntl = NetTestLoader(dummyArgsWithFile) + ntl.loadNetTestString(net_test_string_with_file) - options = {'subargs':dummyArgsWithFile, - 'test':StringIO(net_test_string_with_file)} - ntl = NetTestLoader(options) ntl.checkOptions() net_test = NetTest(ntl, None) @@ -212,9 +216,9 @@ class TestNetTest(unittest.TestCase): self.assertEqual(len(measurements), 20) def test_net_test_completed_callback(self): - options = {'subargs':dummyArgsWithFile, - 'test':StringIO(net_test_string_with_file)} - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyArgsWithFile) + ntl.loadNetTestString(net_test_string_with_file) + ntl.checkOptions() director = Director() @@ -230,9 +234,9 @@ class TestNetTest(unittest.TestCase): def test_require_root_succeed(self): #XXX: will require root to run - options = {'subargs':dummyArgs, - 'test':StringIO(net_test_root_required)} - ntl = NetTestLoader(options) + ntl = NetTestLoader(dummyArgs) + ntl.loadNetTestString(net_test_root_required) + for test_class, method in ntl.testCases: self.assertTrue(test_class.requiresRoot)

1 0

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

30 Apr '13

commit c17906c3c54feecdb05bbfb64c4293775f953f4e Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 17:05:39 2013 +0100 Refactoring of NetTestLoader * Make it clear that calling one of those methods can be extremely dangerous * Kill a bug spotted thanks to unittesting --- ooni/nettest.py | 86 +++++++++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 40 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index bd6bd41..b264797 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -24,7 +24,10 @@ class NetTestLoader(object): def __init__(self, options): self.options = options - self.testCases = self.loadNetTest(options['test']) + if 'test_file' in options: + self.loadNetTestFile(options['test_file']) + elif 'test_string' in options: + self.loadNetTestString(options['test_string']) @property def testDetails(self): @@ -110,7 +113,45 @@ class NetTestLoader(object): assert usage_options == test_class.usageOptions return usage_options - def loadNetTest(self, net_test_file): + def loadNetTestString(self, net_test_string): + """ + Load NetTest from a string. + WARNING input to this function *MUST* be sanitized and *NEVER* be + untrusted. + Failure to do so will result in code exec. + + net_test_string: + + a string that contains the net test to be run. + """ + net_test_file_object = StringIO(net_test_string) + + ns = {} + test_cases = [] + exec net_test_file_object.read() in ns + for item in ns.itervalues(): + test_cases.extend(self._get_test_methods(item)) + + if not test_cases: + raise NoTestCasesFound + + self.setupTestCases(test_cases) + + def loadNetTestFile(self, net_test_file): + """ + Load NetTest from a file. + """ + test_cases = [] + module = filenameToModule(net_test_file) + for __, item in getmembers(module): + test_cases.extend(self._get_test_methods(item)) + + if not test_cases: + raise NoTestCasesFound + + self.setupTestCases(test_cases) + + def setupTestCases(self, test_cases): """ Creates all the necessary test_cases (a list of tuples containing the NetTestCase (test_class, test_method)) @@ -131,25 +172,10 @@ class NetTestLoader(object): is either a file path or a file like object that will be used to generate the test_cases. """ - test_cases = None - try: - if os.path.isfile(net_test_file): - test_cases = self._loadNetTestFile(net_test_file) - else: - net_test_file = StringIO(net_test_file) - raise TypeError("not a file path") - - except TypeError: - if hasattr(net_test_file, 'read'): - test_cases = self._loadNetTestFromFileObject(net_test_file) - - if not test_cases: - raise NoTestCasesFound - test_class, _ = test_cases[0] self.testVersion = test_class.version self.testName = test_class.name.lower().replace(' ','_') - return test_cases + self.testCases = test_cases def checkOptions(self): """ @@ -161,7 +187,8 @@ class NetTestLoader(object): for klass in test_classes: options = self.usageOptions() - options.parseOptions(self.options['subargs']) + options.parseOptions(self.options) + if options: klass.localOptions = options @@ -176,27 +203,6 @@ class NetTestLoader(object): inputs = [None] klass.inputs = inputs - def _loadNetTestFromFileObject(self, net_test_string): - """ - Load NetTest from a string - """ - ns = {} - test_cases = [] - exec net_test_string.read() in ns - for item in ns.itervalues(): - test_cases.extend(self._get_test_methods(item)) - return test_cases - - def _loadNetTestFile(self, net_test_file): - """ - Load NetTest from a file - """ - test_cases = [] - module = filenameToModule(net_test_file) - for __, item in getmembers(module): - test_cases.extend(self._get_test_methods(item)) - return test_cases - def _get_test_methods(self, item): """ Look for test_ methods in subclasses of NetTestCase

1 0

[ooni-probe/master] Change how we pass arguments to the nettest loader
by art＠torproject.org 30 Apr '13

30 Apr '13

commit a5f13f439d893c2b200d74549babe0ccf4077c63 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 18:11:30 2013 +0100 Change how we pass arguments to the nettest loader * Explicit the passing of the nettest file argument --- ooni/errors.py | 2 ++ ooni/nettest.py | 12 ++++++------ ooni/oonicli.py | 6 ++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index 69af726..f36abb9 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -141,3 +141,5 @@ class InsufficientPrivileges(Exception): class ProbeIPUnknown(Exception): pass +class GeoIPDataFilesNotFound(Exception): + pass diff --git a/ooni/nettest.py b/ooni/nettest.py index b264797..7108cd1 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -11,7 +11,7 @@ from ooni.utils import log, checkForRoot from ooni import config from ooni import otime -from ooni.errors import AllReportersFailed +from ooni import errors as e from inspect import getmembers from StringIO import StringIO @@ -22,12 +22,12 @@ class NoTestCasesFound(Exception): class NetTestLoader(object): method_prefix = 'test' - def __init__(self, options): + def __init__(self, options, test_file=None, test_string=None): self.options = options - if 'test_file' in options: - self.loadNetTestFile(options['test_file']) - elif 'test_string' in options: - self.loadNetTestString(options['test_string']) + if test_file: + self.loadNetTestFile(test_file) + elif test_string: + self.loadNetTestString(test_string) @property def testDetails(self): diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 243b90c..73d7709 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -107,10 +107,12 @@ def runWithDirector(): if global_options['testdeck']: test_deck = yaml.safe_load(open(global_options['testdeck'])) for test in test_deck: - test_list.append(NetTestLoader(test['options'])) + test_list.append(NetTestLoader(test['options'], + test_file=global_options['test_file'])) else: log.debug("No test deck detected") - test_list.append(NetTestLoader(global_options)) + test_list.append(NetTestLoader(global_options['subargs'], + test_file=global_options['test_file'])) # check each test's usageOptions for net_test_loader in test_list:

1 0

[ooni-probe/master] Make the starting of tests more robust.
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 1247a80ec046e9c3b132ca6b23f602ca852e6b1a Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 18:12:13 2013 +0100 Make the starting of tests more robust. --- ooni/nettest.py | 11 +++++++---- ooni/oonicli.py | 18 +++++++++++++----- ooni/utils/geodata.py | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 9 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 7108cd1..0260ca2 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -39,7 +39,11 @@ class NetTestLoader(object): config.privacy.includecountry or \ config.privacy.includecity): log.msg("We will include some geo data in the report") - client_geodata = geoip.IPToLocation(config.probe_ip.address) + try: + client_geodata = geodata.IPToLocation(config.probe_ip) + except e.GeoIPDataFilesNotFound: + log.err("Unable to find the geoip data files") + client_geodata = {'city': None, 'countrycode': None, 'asn': None} if config.privacy.includeip: client_geodata['ip'] = config.probe_ip.address @@ -52,8 +56,7 @@ class NetTestLoader(object): client_geodata['asn'] = 'AS0' elif 'asn' in client_geodata: # XXX this regexp should probably go inside of geodata - client_geodata['asn'] = \ - re.search('AS\d+', client_geodata['asn']).group(0) + client_geodata['asn'] = client_geodata['asn'] log.msg("Your AS number is: %s" % client_geodata['asn']) else: client_geodata['asn'] = None @@ -307,7 +310,7 @@ class NetTest(object): self.state.taskDone() if len(self.report.reporters) == 0: - raise AllReportersFailed + raise e.AllReportersFailed return report_results diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 73d7709..93bf8bf 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -35,8 +35,8 @@ class Options(usage.Options): optParameters = [["reportfile", "o", None, "report file name"], ["testdeck", "i", None, "Specify as input a test deck: a yaml file containig the tests to run an their arguments"], - ["collector", "c", None, - "Address of the collector of test results. (example: http://127.0.0.1:8888)"], + ["collector", "c", 'httpo://nkvphnp3p6agi5qq.onion', + "Address of the collector of test results. default: httpo://nkvphnp3p6agi5qq.onion"], ["logfile", "l", None, "log file name"], ["pcapfile", "O", None, "pcap file name"], ["parallelism", "p", "10", "input parallelism"], @@ -130,15 +130,22 @@ def runWithDirector(): director = Director() d = director.start() + def director_startup_failed(failure): + log.err("Failed to start the director") + log.exception(failure) + reactor.stop() + # Wait until director has started up (including bootstrapping Tor) before adding tess def post_director_start(_): for net_test_loader in test_list: - yaml_reporter = YAMLReporter(net_test_loader.testDetails) + test_details = net_test_loader.testDetails + + yaml_reporter = YAMLReporter(test_details) reporters = [yaml_reporter] if global_options['collector']: try: - oonib_reporter = OONIBReporter(net_test_loader.testDetails, + oonib_reporter = OONIBReporter(test_details, global_options['collector']) reporters.append(oonib_reporter) except InvalidOONIBCollectorAddress: @@ -152,7 +159,7 @@ def runWithDirector(): with open('collector') as f: reporter_url = random.choice(f.readlines()) reporter_url = reporter_url.split('#')[0].strip() - oonib_reporter = OONIBReporter(net_test_loader.testDetails, reporter_url) + oonib_reporter = OONIBReporter(test_details, reporter_url) reporters.append(oonib_reporter) log.debug("adding callback for startNetTest") @@ -160,4 +167,5 @@ def runWithDirector(): d.addCallback(shutdown) d.addCallback(post_director_start) + d.addErrback(director_startup_failed) reactor.run() diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py new file mode 100644 index 0000000..56ce05c --- /dev/null +++ b/ooni/utils/geodata.py @@ -0,0 +1,39 @@ +import re +import os + +from twisted.web.client import Agent +from twisted.internet import reactor, defer, protocol + +from ooni.utils import log, net +from ooni import config +from ooni.errors import GeoIPDataFilesNotFound + +try: + import pygeoip +except ImportError: + log.err("Unable to import pygeoip. We will not be able to run geo IP related measurements") + +def IPToLocation(ipaddr): + city_file = os.path.join(config.advanced.geoip_data_dir, 'GeoLiteCity.dat') + country_file = os.path.join(config.advanced.geoip_data_dir, 'GeoIP.dat') + asn_file = os.path.join(config.advanced.geoip_data_dir, 'GeoIPASNum.dat') + + location = {'city': None, 'countrycode': None, 'asn': None} + try: + city_dat = pygeoip.GeoIP(city_file) + location['city'] = city_dat.record_by_addr(ipaddr)['city'] + + country_dat = pygeoip.GeoIP(country_file) + location['countrycode'] = country_dat.country_code_by_addr(ipaddr) + + asn_dat = pygeoip.GeoIP(asn_file) + asn = asn_dat.org_by_addr(ipaddr) + location['asn'] = re.search('AS\d+', asn).group(0) + + except IOError: + log.err("Could not find GeoIP data files. Go into data/ " + "and run make geoip") + raise GeoIPDataFilesNotFound + + return location +

1 0

[ooni-probe/master] Fix so that parsing of test decks works properly
by art＠torproject.org 30 Apr '13

30 Apr '13

commit a8973a2e2b0bb1597f5ebd7f5433584bc5e7df40 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 28 21:05:26 2013 +0100 Fix so that parsing of test decks works properly --- ooni/oonicli.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index af06ad2..06aa20c 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -106,8 +106,8 @@ def runWithDirector(): if global_options['testdeck']: test_deck = yaml.safe_load(open(global_options['testdeck'])) for test in test_deck: - test_list.append(NetTestLoader(test['options'], - test_file=global_options['test_file'])) + test_list.append(NetTestLoader(test['options']['subargs'], + test_file=test['options']['test_file'])) else: log.debug("No test deck detected") test_list.append(NetTestLoader(global_options['subargs'],

1 0

[ooni-probe/master] Raise NoMoreReporters exception on failure
by art＠torproject.org 30 Apr '13

30 Apr '13

commit e389add3c449290f814f27ef578db5ee889affd5 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 6 15:24:56 2013 +0100 Raise NoMoreReporters exception on failure --- ooni/errors.py | 4 ++++ ooni/reporter.py | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index f36abb9..ac05463 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -135,6 +135,8 @@ class ReportAlreadyClosed(Exception): class TorStateNotFound(Exception): pass +class ReportNotCreated(Exception): + pass class InsufficientPrivileges(Exception): pass @@ -143,3 +145,5 @@ class ProbeIPUnknown(Exception): pass class GeoIPDataFilesNotFound(Exception): pass +class NoMoreReporters(Exception): + pass diff --git a/ooni/reporter.py b/ooni/reporter.py index fc73b67..a3811b7 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -415,8 +415,7 @@ class Report(object): # Don't forward the exception unless there are no more reporters if len(self.reporters) == 0: log.err("Removed last reporter %s" % reporter) - failure.reporter = reporter - return failure + raise NoMoreReporters def write(self, measurement): """

1 0

[ooni-probe/master] Update test decks with the proper key
by art＠torproject.org 30 Apr '13

30 Apr '13

commit 53eee22146d596ccd2582742e7a5b06db9fb70f4 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 28 20:48:47 2013 +0100 Update test decks with the proper key --- decks/before_i_commit.testdeck | 10 +++++----- decks/short_no_root.deck | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/decks/before_i_commit.testdeck b/decks/before_i_commit.testdeck index 24f62d7..ebbd53a 100644 --- a/decks/before_i_commit.testdeck +++ b/decks/before_i_commit.testdeck @@ -6,7 +6,7 @@ pcapfile: null reportfile: reports/captive_portal_test.yamloo subargs: [] - test: nettests/manipulation/captiveportal.py + test_file: nettests/manipulation/captiveportal.py - options: no-default-reporter: false collector: null @@ -15,7 +15,7 @@ pcapfile: null reportfile: reports/dns_tamper_test.yamloo subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] - test: nettests/blocking/dnsconsistency.py + test_file: nettests/blocking/dnsconsistency.py - options: no-default-reporter: false collector: null @@ -23,8 +23,8 @@ logfile: reports/before_i_commit.log pcapfile: null reportfile: reports/http_host.yamloo - subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] - test: nettests/manipulation/http_host.py + subargs: [-b, 'http://93.95.227.200', -c, 'http://nkvphnp3p6agi5qq.onion', -f, example_inputs/http_host_file.txt] + test_file: nettests/manipulation/http_host.py - options: no-default-reporter: false collector: null @@ -33,4 +33,4 @@ pcapfile: null reportfile: reports/header_field_manipulation.yamloo subargs: [-b, 'http://93.95.227.200'] - test: nettests/manipulation/http_header_field_manipulation.py + test_file: nettests/manipulation/http_header_field_manipulation.py diff --git a/decks/short_no_root.deck b/decks/short_no_root.deck index afb7b75..18117f5 100644 --- a/decks/short_no_root.deck +++ b/decks/short_no_root.deck @@ -8,7 +8,7 @@ reportfile: null resume: 0 subargs: [] - test: nettests/manipulation/captiveportal.py + test_file: nettests/manipulation/captiveportal.py testdeck: null - options: collector: null @@ -20,7 +20,7 @@ reportfile: null resume: 0 subargs: [-f, example_inputs/url_lists_file.txt] - test: nettests/blocking/http_requests.py + test_file: nettests/blocking/http_requests.py testdeck: null - options: collector: null @@ -32,7 +32,7 @@ reportfile: null resume: 0 subargs: [-f, example_inputs/tcpconnect_host_file.txt] - test: nettests/blocking/tcpconnect.py + test_file: nettests/blocking/tcpconnect.py testdeck: null - options: collector: null @@ -44,7 +44,7 @@ reportfile: null resume: 0 subargs: [-f, example_inputs/http_host_file.txt, -T, example_inputs/dns_tamper_test_resolvers.txt] - test: nettests/blocking/dnsconsistency.py + test_file: nettests/blocking/dnsconsistency.py testdeck: null - options: collector: null @@ -56,5 +56,5 @@ reportfile: null resume: 0 subargs: [-b, 'http://93.95.227.200'] - test: nettests/manipulation/http_header_field_manipulation.py + test_file: nettests/manipulation/http_header_field_manipulation.py testdeck: null

1 0