- tor-commits - lists.torproject.org

[ooni-probe/master] Still need to fix problem with getHostByName() only returned one address
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit 891d16a70e59ea3a4324822a0b602743613530b1 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Fri Jun 15 17:55:32 2012 -0700 Still need to fix problem with getHostByName() only returned one address --- ooni/plugins/dnstamper.py | 195 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 195 insertions(+), 0 deletions(-) diff --git a/ooni/plugins/dnstamper.py b/ooni/plugins/dnstamper.py new file mode 100644 index 0000000..34aaa01 --- /dev/null +++ b/ooni/plugins/dnstamper.py @@ -0,0 +1,195 @@ +# -*- coding: utf-8 -*- +""" + dnstamper + ********* + + This test resolves DNS for a list of domain names, one per line, in the + file specified in the ooni-config under the setting "dns_experiment". If + the file is top-1m.txt, the test will be run using Amazon's list of top + one million domains. The experimental dns servers to query should + be specified one per line in assets/dns_servers.txt. + + The test reports censorship if the cardinality of the intersection of + the query result set from the control server and the query result set + from the experimental server is zero, which is to say, if the two sets + have no matching results whatsoever. + + NOTE: This test frequently results in false positives due to GeoIP-based + load balancing on major global sites such as google, facebook, and + youtube, etc. + + :copyright: (c) 2012 Arturo Filastò, Isis Lovecruft + :license: see LICENSE for more details + + TODO: + * Switch to using Twisted's DNS builtins instead of dnspython + * +""" + +import os + +from twisted.names import client +from twisted.internet import reactor +from twisted.internet.protocol import Factory, Protocol +from twisted.python import usage +from twisted.plugin import IPlugin +from zope.interface import implements + +from ooni.plugoo.assets import Asset +from ooni.plugoo.tests import ITest, OONITest +from ooni import log + +class Top1MAsset(Asset): + """ + Class for parsing the Alexa top-1m.txt as an asset. + """ + def __init__(self, file=None): + self = Asset.__init__(self, file) + + def parse_line(self, line): + self = Asset.parse_line(self, line) + return line.split(',')[1].replace('\n','') + +class DNSTamperArgs(usage.Options): + optParameters = [['asset', 'a', None, 'Asset file of hostnames to resolve'], + ['controlserver', 'c', '8.8.8.8', 'Known good DNS server'], + ['testservers', 't', None, 'Asset file of DNS servers to test'], + ['usereverse', 'r', False, 'Also try reverse DNS resolves'], + ['resume', 's', 0, 'Resume at this index in the asset file']] + +class DNSTamperTest(OONITest): + implements(IPlugin, ITest) + + shortName = "dnstamper" + description = "DNS censorship detection test" + requirements = None + options = DNSTamperArgs + blocking = False + + def load_assets(self): + assets = {} + if self.local_options: + if self.local_options['asset']: + assetf = self.local_options['asset'] + if assetf == 'top-1m.txt': + assets.update({'asset': Top1MAsset(assetf)}) + else: + assets.update({'asset': Asset(assetf)}) + elif self.local_options['testservers']: + assets.update({'testservers': + Asset(self.local_options['testservers'])}) + return assets + + def lookup(self, hostname, nameserver): + """ + Resolves a hostname through a DNS nameserver to the corresponding + IP addresses. + """ + def got_result(result): + log.msg('Resolved %s through %s to %s' + % (hostname, nameserver, result)) + reactor.stop() + return {'resolved': True, + 'domain': hostname, + 'nameserver': nameserver, + 'address': result} + + def got_error(err): + log.msg(err.printTraceback()) + reactor.stop() + return {'resolved': False, + 'domain': hostname, + 'nameserver': nameserver, + 'address': err} + + res = client.createResolver(servers=[(nameserver, 53)]) + d = res.getHostByName(hostname) + d.addCallbacks(got_result, got_error) + return d + + ## XXX MAY ALSO BE: + #answer = res.getAddress(servers=[('nameserver', 53)]) + + def reverse_lookup(self, address, nameserver): + """ + Attempt to do a reverse DNS lookup to determine if the control and exp + sets from a positive result resolve to the same domain, in order to + remove false positives due to GeoIP load balancing. + """ + res = client.createResolver(servers=[(nameserver, 53)]) + ptr = '.'.join(addr.split('.')[::-1]) + '.in-addr.arpa' + d = res.lookupPointer(ptr) + d.addCallback(lambda (ans, auth, add): util.println(ans[0].payload.name)) + d.addErrback(log.err) + d.addBoth(lambda r: reactor.stop()) + return d + + def experiment(self, args): + """ + Compares the lookup() sets of the control and experiment groups. + """ + test_server = self.local_options['testservers'] + hostname = args['asset'] + exp_address = self.lookup(hostname, test_server) + + #return {'control': control_server, + # 'domain': args['asset'], + # 'experiment_address': address} + + if self.local_options['usereverse']: + exp_reversed = self.reverse_lookup(exp_address, test_server) + return exp_address, hostname, test_server, exp_reversed + else: + return exp_address, hostname, test_server, False + + def control(self, experiment_result): + (exp_address, hostname, test_server, exp_reversed) = experiment_result + control_server = self.local_options['controlserver'] + ctrl_address = self.lookup(hostname, control_server) + + ## XXX getHostByName() appears to be returning only one IP... + + if len(set(exp_address) & set(ctrl_address)) > 0: + log.msg("Address %s has not tampered with on DNS server %s" + % (hostname, test_server)) + return {'hostname': hostname, + 'test-nameserver': test_server, + 'test-address': exp_address, + 'control-nameserver': control_server, + 'control-address': ctrl_address, + 'tampering-detected': False} + else: + log.msg("Address %s has possibly been tampered on %s:" + % (hostname, test_server)) + log.msg("DNS resolution through testserver %s yeilds: %s" + % (test_server, exp_address)) + log.msg("However, DNS resolution through controlserver %s yeilds: %s" + % (control_server, ctrl_address)) + + if self.local_options['usereverse']: + ctrl_reversed = self.reverse_lookup(experiment_result, control_server) + if len(set(ctrl_reversed) & set(exp_reversed)) > 0: + log.msg("Further testing has eliminated false positives") + else: + log.msg("Reverse DNS on the results returned by %s returned:" + % (test_server)) + log.msg("%s" % exp_reversed) + log.msg("which does not match the expected domainname: %s" + % ctrl_reversed) + return {'hostname': hostname, + 'test-nameserver': test_server, + 'test-address': exp_address, + 'test-reversed': exp_reversed, + 'control-nameserver': control_server, + 'control-address': ctrl_address, + 'control-reversed': ctrl_reversed, + 'tampering-detected': True} + else: + return {'hostname': hostname, + 'test-nameserver': test_server, + 'test-address': exp_address, + 'control-nameserver': control_server, + 'control-address': ctrl_address, + 'tampering-detected': False} + +dnstamper = DNSTamperTest(None, None, None)

1 0

[ooni-probe/master] Implemented logging verbosity levels with global options. There's also an option now to suppress stdout. By default, all emit() messages still go the oonicli.log, regardless of logging level -- this is easily changed, however, by default we want all the info we can get.
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit df762643f4df5e9caec69b3b649d26f1e51c2210 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Sep 13 12:47:40 2012 +0000 Implemented logging verbosity levels with global options. There's also an option now to suppress stdout. By default, all emit() messages still go the oonicli.log, regardless of logging level -- this is easily changed, however, by default we want all the info we can get. --- ooni/ooniprobe.py | 14 +++++- ooni/plugoo/tests.py | 10 +++- ooni/utils/log.py | 116 +++++++++++++++++++++++++++++++++++++------------ 3 files changed, 106 insertions(+), 34 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index 4b5c086..03b98b8 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -72,7 +72,13 @@ def runTest(test, options, global_options, reactor=reactor): test_class = plugoo[test].__class__ report = reports.Report(test, global_options['output']) - log.start(global_options['log'], 1) + log_to_stdout = True + if global_options['quiet']: + log_to_stdout = False + + log.start(log_to_stdout, + global_options['log'], + global_options['verbosity']) resume = 0 if not options: options = {} @@ -103,7 +109,8 @@ class Options(usage.Options): optFlags = [ #['remote', 'r', "If the test should be run remotely (not supported)"], #['status', 'x', 'Show current state'], - #['restart', 'r', 'Restart OONI'] + #['restart', 'r', 'Restart OONI'], + ['quiet', 'q', "Don't log to stdout"] ] optParameters = [ @@ -111,6 +118,7 @@ class Options(usage.Options): #['target-node', 't', 'localhost:31415', 'Select target node'], ['output', 'o', 'report.log', "Specify output report file"], ['log', 'l', 'oonicli.log', "Specify output log file"], + ['verbosity', 'v', 1, "Specify the logging level"], #['password', 'p', 'opennetwork', "Specify the password for authentication"], ] @@ -134,7 +142,7 @@ if __name__ == "__main__": config.parseOptions() if not config.subCommand: - print "Error! No Test Specified." + #print "Error! No Test Specified." config.opt_help() sys.exit(1) diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index 13c06ed..a827093 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -58,7 +58,8 @@ class OONITest(object): return {} def __repr__(self): - return "<OONITest %s %s %s>" % (self.options, self.global_options, + return "<OONITest %s %s %s>" % (self.local_options, + self.global_options, self.assets) def end(self): @@ -132,6 +133,11 @@ class OONITest(object): @param args: the asset(s) lines that we are working on. """ self.start_time = date.now() - log.msg("Starting test %s" % self.__class__) + + if self.shortName: + log.msg("Starting test %s" % self.shortName) + else: + log.msg("Starting test %s" % self.__class__) + return self._do_experiment(args) diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 3dc52dd..cf57186 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -1,43 +1,101 @@ """ OONI logging facility. """ -import sys -import logging -import warnings +from sys import stderr, stdout -from twisted.python import log - -# Logging levels -DEBUG = logging.DEBUG -INFO = logging.INFO -WARNING = logging.WARNING -ERROR = logging.ERROR -CRITICAL = logging.CRITICAL +from twisted.python import log, util +from twisted.python.failure import Failure def _get_log_level(level): + english = ['debug', 'info', 'warn', 'err', 'crit'] + + levels = dict(zip(range(len(english)), english)) + number = dict(zip(english, range(len(english)))) + if not level: - return INFO + return number['info'] else: - return level + ve = "Unknown log level: %s\n" % level + ve += "Allowed levels: %s\n" % [word for word in english] + + if type(level) is int: + if 0 <= level <= 4: + return level + elif type(level) is str: + if number.has_key(level.lower()): + return number[level] + else: + raise ValueError, ve + else: + raise ValueError, ve -def start(logfile=None, loglevel=None, logstdout=True): - if log.defaultObserver: - print "%s" % logstdout - loglevel = _get_log_level(loglevel) - file = open(logfile, 'a') if logfile else sys.stderr - observer = log.FileLogObserver(file) - if logstdout: - log.startLogging(sys.stdout) +class OONITestFailure(Failure): + """ + For handling Exceptions asynchronously. + + Can be given an Exception as an argument, else will use the + most recent Exception from the current stack frame. + """ + def __init__(self, exception=None, _type=None, + _traceback=None, _capture=False): + Failure.__init__(self, exc_value=exception, exc_type=_type, + exc_tb=_traceback, captureVars=_capture) + +class OONILogObserver(log.FileLogObserver): + """ + Supports logging level verbosity. + """ + def __init__(self, logfile, verb=None): + log.FileLogObserver.__init__(self, logfile) + self.level = _get_log_level(verb) if verb is not None else 1 + assert type(self.level) is int + + def emit(self, eventDict): + if 'logLevel' in eventDict: + msgLvl = _get_log_level(eventDict['logLevel']) + assert type(msgLvl) is int + ## only log our level and higher + if self.level <= msgLvl: + text = log.textFromEventDict(eventDict) + else: + text = None else: - log.startLogging() - log.addObserver(observer.emit) - msg("Started OONI") + text = log.textFromEventDict(eventDict) + + if text is None: + return + + timeStr = self.formatTime(eventDict['time']) + fmtDict = {'system': eventDict['system'], + 'text': text.replace('\n','\n\t')} + msgStr = log._safeFormat("[%(system)s] %(text)s\n", fmtDict) + + util.untilConcludes(self.write, timeStr + " " + msgStr) + util.untilConcludes(self.flush) + +def start(logstdout, logfile=None, verbosity=None): + if log.defaultObserver: + verbosity = _get_log_level(verbosity) + + ## Always log to file, keep level at info + file = open(logfile, 'a') if logfile else stderr + OONILogObserver(file, "info").start() + + if logstdout is True: + observerooni = OONILogObserver(stdout, verbosity) + log.addObserver(observerooni.emit) + + log.msg("Starting OONI...") + +def debug(message, level="debug", **kw): + log.msg(message, logLevel=level, **kw) -def msg(message, level=INFO, **kw): +def msg(message, level="info", **kw): log.msg(message, logLevel=level, **kw) -def err(message, **kw): - log.err(message, **kw) +## XXX fixme log.err messages get printed to stdout twice +def err(message, level="err", **kw): + log.err(message, logLevel=level, **kw) -def debug(message, **kw): - log.msg(message, logLevel=DEBUG, **kw) +def fail(message, exception=None, level="crit", **kw): + log.failure(message, OONITestFailure(exception, **kw), logLevel=level)

1 0

[ooni-probe/master] Fixed module import issues with directory structure.
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit 2c7552e3da6e72b1d55b9599dc3e7281a5ee266e Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Thu May 31 12:36:50 2012 -0300 Fixed module import issues with directory structure. --- ooni/__init__.py | 2 +- ooni/example_plugins/skel.py | 4 ++-- ooni/ooniprobe.py | 7 +++---- ooni/plugins/blocking.py | 4 ++-- ooni/plugins/httphost.py | 4 ++-- ooni/plugoo/reports.py | 2 +- ooni/plugoo/tests.py | 8 +++----- ooni/plugoo/work.py | 2 ++ 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index dbb3824..a03c856 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1 +1 @@ -__all__ = ['plugoo', 'utils', 'config', 'logo', 'lib'] +__all__ = ['plugoo', 'utils', 'config', 'logo', 'lib', 'log'] diff --git a/ooni/example_plugins/skel.py b/ooni/example_plugins/skel.py index 52c7d4f..5f46620 100644 --- a/ooni/example_plugins/skel.py +++ b/ooni/example_plugins/skel.py @@ -1,8 +1,8 @@ from zope.interface import implements from twisted.python import usage from twisted.plugin import IPlugin -from plugoo.tests import ITest, OONITest -from ooni.utils import log +from plugoo.tests import ITest, TwistedTest +import log class SkelArgs(usage.Options): optParameters = [['asset', 'a', None, 'Asset file'], diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index 4b5c086..3b48339 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -27,10 +27,9 @@ from zope.interface.verify import verifyObject from zope.interface.exceptions import BrokenImplementation from zope.interface.exceptions import BrokenMethodImplementation -from ooni.plugoo import tests, work, assets, reports -from ooni.utils.logo import getlogo -from ooni.utils import log -from ooni import plugins +from plugoo import tests, work, assets, reports +from logo import getlogo +import plugins, log __version__ = "0.0.1-prealpha" diff --git a/ooni/plugins/blocking.py b/ooni/plugins/blocking.py index 6ddb5a4..72fd49f 100644 --- a/ooni/plugins/blocking.py +++ b/ooni/plugins/blocking.py @@ -2,8 +2,8 @@ from zope.interface import implements from twisted.python import usage from twisted.plugin import IPlugin -from ooni.plugoo.assets import Asset -from ooni.plugoo.tests import ITest, OONITest +from plugoo.assets import Asset +from plugoo.tests import ITest, TwistedTest class BlockingArgs(usage.Options): optParameters = [['asset', 'a', None, 'Asset file'], diff --git a/ooni/plugins/httphost.py b/ooni/plugins/httphost.py index b57a50d..e8808bd 100644 --- a/ooni/plugins/httphost.py +++ b/ooni/plugins/httphost.py @@ -20,8 +20,8 @@ from zope.interface import implements from twisted.python import usage from twisted.plugin import IPlugin -from ooni.plugoo.assets import Asset -from ooni.plugoo.tests import ITest, OONITest +from plugoo.assets import Asset +from plugoo.tests import ITest, TwistedTest class HTTPHostArgs(usage.Options): optParameters = [['asset', 'a', None, 'Asset file'], diff --git a/ooni/plugoo/reports.py b/ooni/plugoo/reports.py index a543151..ef15a04 100644 --- a/ooni/plugoo/reports.py +++ b/ooni/plugoo/reports.py @@ -4,7 +4,7 @@ import os import yaml import itertools -from ooni.utils import log, date, net +import log class Report: """This is the ooni-probe reporting mechanism. It allows diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index 7c190eb..544d82d 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -7,11 +7,9 @@ import itertools from twisted.internet import reactor, defer, threads from twisted.python import failure -from ooni.utils import log -from ooni.utils import date -from ooni.plugoo import assets, work -from ooni.plugoo.reports import Report -from ooni.plugoo.interface import ITest +import log +from plugoo import assets, work +from plugoo.reports import Report class OONITest(object): diff --git a/ooni/plugoo/work.py b/ooni/plugoo/work.py index db88fbf..e32d76d 100644 --- a/ooni/plugoo/work.py +++ b/ooni/plugoo/work.py @@ -19,6 +19,8 @@ from zope.interface import Interface, Attribute from twisted.python import failure from twisted.internet import reactor, defer +from plugoo.nodes import LocalNode + class Worker(object): """ This is the core of OONI. It takes as input Work Units and

1 0

[ooni-probe/master] Mostly done porting to twisted, still need rewrite of reverse DNS lookup method.
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit 7150331304702d53e85a1b3123e768c551ac233d Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Wed Jun 13 20:41:17 2012 -0700 Mostly done porting to twisted, still need rewrite of reverse DNS lookup method. --- ooni/oonitests/dnstamper.py | 129 ++++++++++++++++++++++++++---------------- 1 files changed, 80 insertions(+), 49 deletions(-) diff --git a/ooni/oonitests/dnstamper.py b/ooni/oonitests/dnstamper.py index 498ba04..4ad7e7f 100644 --- a/ooni/oonitests/dnstamper.py +++ b/ooni/oonitests/dnstamper.py @@ -20,29 +20,26 @@ :copyright: (c) 2012 Arturo Filastò, Isis Lovecruft :license: see LICENSE for more details -""" -try: - from dns import resolver, reversename -except: - print "Error: dnspython is not installed! (http://www.dnspython.org/)" -try: - import gevent -except: - print "Error: gevent is not installed! (http://www.gevent.org/)" + TODO: + * Switch to using Twisted's DNS builtins instead of dnspython + * +""" import os -import plugoo -from plugoo.assets import Asset -from plugoo.tests import Test +from twisted.names import client +from twisted.python import usage +from twisted.plugin import IPlugin +from zope.interface import implements -__plugoo__ = "DNST" -__desc__ = "DNS censorship detection test" +from ooni.plugoo.assets import Asset +from ooni.plugoo.tests import ITest, OONITest +from ooni import log class Top1MAsset(Asset): """ - Class for parsing top-1m.txt as an asset. + Class for parsing the Alexa top-1m.txt as an asset. """ def __init__(self, file=None): self = Asset.__init__(self, file) @@ -51,22 +48,56 @@ class Top1MAsset(Asset): self = Asset.parse_line(self, line) return line.split(',')[1].replace('\n','') -class DNSTAsset(Asset): +class DNSTamperAsset(Asset): """ Creates DNS testing specific Assets. """ def __init__(self, file=None): self = Asset.__init__(self, file) -class DNST(Test): - def lookup(self, hostname, ns): +class DNSTamperArgs(usage.Options): + optParameters = [['asset', 'a', None, 'Asset file of hostnames to resolve'], + ['controlserver', 'c', '8.8.8.8', 'Known good DNS server'], + ['testservers', 't', None, 'Asset file of the DNS servers to test'], + ['resume', 'r', 0, 'Resume at this index in the asset file']] +''' + def control(self, experiment_result, args): + print "Experiment Result:", experiment_result + print "Args", args + return experiment_result + + def experiment(self, args): +''' + +class DNSTamperTest(OONITest): + implements(IPlugin, ITest) + + shortName = "DNSTamper" + description = "DNS censorship detection test" + requirements = None + options = DNSTamperArgs + blocking = False + + def load_asset(self): + if self.local_options: + if self.local_options['asset']: + assetf = self.local_options['asset'] + if assetf == 'top-1m.txt': + return {'asset': Top1MAsset(assetf)} + else: + return {'asset': DNSTamperAsset(assetf)} + else: + return {} + + def lookup(self, hostname, nameserver): """ - Resolves a hostname through a DNS nameserver, ns, to the corresponding - IP address(es). + Resolves a hostname through a DNS nameserver to the corresponding + IP addresses. """ - res = resolver.Resolver(configure=False) - res.nameservers = [ns] - answer = res.query(hostname) + res = client.createResolver(servers=[('nameserver', 53)]) + answer = res.getHostByName(hostname) + ## XXX MAY ALSO BE: + #answer = res.getAddress(servers=[('nameserver', 53)]) ret = [] @@ -75,14 +106,13 @@ class DNST(Test): return ret - def reverse_lookup(self, ip, ns): + def reverse_lookup(self, ip, nameserver): """ Attempt to do a reverse DNS lookup to determine if the control and exp sets from a positive result resolve to the same domain, in order to remove false positives due to GeoIP load balancing. """ - res = resolver.Resolver(configure=False) - res.nameservers = [ns] + res = client.createResolver(servers=nameserver) n = reversename.from_address(ip) revn = res.query(n, "PTR").__iter__().next().to_text()[:-1] @@ -131,26 +161,27 @@ class DNST(Test): print "\n" return result -def run(ooni): - """ - Run the test. - """ - config = ooni.config - urls = [] - - if (config.tests.dns_experiment == "top-1m.txt"): - dns_experiment = Top1MAsset(os.path.join(config.main.assetdir, - config.tests.dns_experiment)) - else: - dns_experiment = DNSTAsset(os.path.join(config.main.assetdir, - config.tests.dns_experiment)) - dns_experiment_dns = DNSTAsset(os.path.join(config.main.assetdir, - config.tests.dns_experiment_dns)) - - assets = [dns_experiment, dns_experiment_dns] - - dnstest = DNST(ooni) - ooni.logger.info("Beginning dnstamper test...") - dnstest.run(assets, {'index': 1}) - ooni.logger.info("Dnstamper test completed!") - +#def run(ooni): +# """ +# Run the test. +# """ +# config = ooni.config +# urls = [] +# +# if (config.tests.dns_experiment == "top-1m.txt"): +# dns_experiment = Top1MAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment)) +# else: +# dns_experiment = DNSTAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment)) +# dns_experiment_dns = DNSTAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment_dns)) +# +# assets = [dns_experiment, dns_experiment_dns] +# +# dnstest = DNST(ooni) +# ooni.logger.info("Beginning dnstamper test...") +# dnstest.run(assets, {'index': 1}) +# ooni.logger.info("Dnstamper test completed!") + +dnstamper = DNSTamperTest(None, None, None)

1 0

[ooni-probe/master] Added subclassed t.n.client.Resolver() to overcome query port randomization.
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit 5e748acc7f787d37274cbdab9a57b317919f2fa9 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Sat Jun 16 09:21:53 2012 -0700 Added subclassed t.n.client.Resolver() to overcome query port randomization. --- ooni/plugins/dnstamper.py | 75 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 68 insertions(+), 7 deletions(-) diff --git a/ooni/plugins/dnstamper.py b/ooni/plugins/dnstamper.py index 34aaa01..ca0e2e3 100644 --- a/ooni/plugins/dnstamper.py +++ b/ooni/plugins/dnstamper.py @@ -28,8 +28,9 @@ import os -from twisted.names import client +from twisted.names import client, dns from twisted.internet import reactor +from twisted.internet.error import CannotListenError from twisted.internet.protocol import Factory, Protocol from twisted.python import usage from twisted.plugin import IPlugin @@ -39,7 +40,7 @@ from ooni.plugoo.assets import Asset from ooni.plugoo.tests import ITest, OONITest from ooni import log -class Top1MAsset(Asset): +class AlexaAsset(Asset): """ Class for parsing the Alexa top-1m.txt as an asset. """ @@ -54,9 +55,60 @@ class DNSTamperArgs(usage.Options): optParameters = [['asset', 'a', None, 'Asset file of hostnames to resolve'], ['controlserver', 'c', '8.8.8.8', 'Known good DNS server'], ['testservers', 't', None, 'Asset file of DNS servers to test'], + ['localservers', 'l', False, 'Also test local servers'], + ['port', 'p', None, 'Local UDP port to send queries over'], ['usereverse', 'r', False, 'Also try reverse DNS resolves'], ['resume', 's', 0, 'Resume at this index in the asset file']] +class DNSTamperResolver(client.Resolver): + """ + Twisted by default issues DNS queries over cryptographically random + UDP ports to mitigate the Berstein/Kaminsky attack on limited DNS + Transaction ID numbers.[1][2][3] + + This is fine, unless the client has external restrictions which require + DNS queries to be conducted over UDP port 53. Twisted does not provide + an easy way to change this, ergo subclassing client.Resolver.[4] It + would perhaps be wise to patch twisted.names.client and request a merge + into upstream. + + [1] https://twistedmatrix.com/trac/ticket/3342 + [2] http://blog.netherlabs.nl/articles/2008/07/09/ \ + some-thoughts-on-the-recent-dns-vulnerability + [3] http://www.blackhat.com/presentations/bh-dc-09/Kaminsky/ \ + BlackHat-DC-09-Kaminsky-DNS-Critical-Infrastructure.pdf + [4] http://comments.gmane.org/gmane.comp.python.twisted/22794 + """ + def __init__(self): + super(DNSTamperResolver, self).__init__() + #client.Resolver.__init__(self) + + if self.local_options['port']: + self.port = self.local_options['port'] + else: + self.port = '53' + + def _connectedProtocol(self): + """ + Return a new DNSDatagramProtocol bound to a specific port + rather than the default cryptographically-random port. + """ + if 'protocol' in self.__dict__: + return self.protocol + proto = dns.DNSDatagramProtocol(self) + + ## XXX We may need to remove the while loop, which was + ## originally implemented to safeguard against attempts to + ## bind to the same random port twice...but then the code + ## would be blocking... + while True: + try: + self._reactor.listenUDP(self.port, proto) + except error.CannotListenError: + pass + else: + return proto + class DNSTamperTest(OONITest): implements(IPlugin, ITest) @@ -66,13 +118,20 @@ class DNSTamperTest(OONITest): options = DNSTamperArgs blocking = False + if self.local_options['localservers']: + ## client.createResolver() turns None into '/etc/resolv.conf' + ## on posix systems, ignored on Windows. + self.resolvconf = None + else: + self.resolvconf = '' + def load_assets(self): assets = {} if self.local_options: if self.local_options['asset']: assetf = self.local_options['asset'] if assetf == 'top-1m.txt': - assets.update({'asset': Top1MAsset(assetf)}) + assets.update({'asset': AlexaAsset(assetf)}) else: assets.update({'asset': Asset(assetf)}) elif self.local_options['testservers']: @@ -88,7 +147,7 @@ class DNSTamperTest(OONITest): def got_result(result): log.msg('Resolved %s through %s to %s' % (hostname, nameserver, result)) - reactor.stop() + #reactor.stop() return {'resolved': True, 'domain': hostname, 'nameserver': nameserver, @@ -96,13 +155,14 @@ class DNSTamperTest(OONITest): def got_error(err): log.msg(err.printTraceback()) - reactor.stop() + #reactor.stop() return {'resolved': False, 'domain': hostname, 'nameserver': nameserver, 'address': err} - res = client.createResolver(servers=[(nameserver, 53)]) + res = client.createResolver(resolvconf=self.resolvconf, + servers=[(nameserver, 53)]) d = res.getHostByName(hostname) d.addCallbacks(got_result, got_error) return d @@ -116,7 +176,8 @@ class DNSTamperTest(OONITest): sets from a positive result resolve to the same domain, in order to remove false positives due to GeoIP load balancing. """ - res = client.createResolver(servers=[(nameserver, 53)]) + res = client.createResolver(resolvconf=self.resolvconf, + servers=[(nameserver, 53)]) ptr = '.'.join(addr.split('.')[::-1]) + '.in-addr.arpa' d = res.lookupPointer(ptr) d.addCallback(lambda (ans, auth, add): util.println(ans[0].payload.name))

1 0

[ooni-probe/master] Added subclassed t.n.client.Resolver() to overcome query port randomization.
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit 507694c16715f76c17b061bc49bdb32f15c81983 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Sat Jun 16 09:21:53 2012 -0700 Added subclassed t.n.client.Resolver() to overcome query port randomization. --- ooni/oonitests/dnstamper.py | 187 ------------------------------------------- 1 files changed, 0 insertions(+), 187 deletions(-) diff --git a/ooni/oonitests/dnstamper.py b/ooni/oonitests/dnstamper.py deleted file mode 100644 index 4ad7e7f..0000000 --- a/ooni/oonitests/dnstamper.py +++ /dev/null @@ -1,187 +0,0 @@ -# -*- coding: utf-8 -*- -""" - dnstamper - ********* - - This test resolves DNS for a list of domain names, one per line, in the - file specified in the ooni-config under the setting "dns_experiment". If - the file is top-1m.txt, the test will be run using Amazon's list of top - one million domains. The experimental dns servers to query should - be specified one per line in assets/dns_servers.txt. - - The test reports censorship if the cardinality of the intersection of - the query result set from the control server and the query result set - from the experimental server is zero, which is to say, if the two sets - have no matching results whatsoever. - - NOTE: This test frequently results in false positives due to GeoIP-based - load balancing on major global sites such as google, facebook, and - youtube, etc. - - :copyright: (c) 2012 Arturo Filastò, Isis Lovecruft - :license: see LICENSE for more details - - TODO: - * Switch to using Twisted's DNS builtins instead of dnspython - * -""" - -import os - -from twisted.names import client -from twisted.python import usage -from twisted.plugin import IPlugin -from zope.interface import implements - -from ooni.plugoo.assets import Asset -from ooni.plugoo.tests import ITest, OONITest -from ooni import log - -class Top1MAsset(Asset): - """ - Class for parsing the Alexa top-1m.txt as an asset. - """ - def __init__(self, file=None): - self = Asset.__init__(self, file) - - def parse_line(self, line): - self = Asset.parse_line(self, line) - return line.split(',')[1].replace('\n','') - -class DNSTamperAsset(Asset): - """ - Creates DNS testing specific Assets. - """ - def __init__(self, file=None): - self = Asset.__init__(self, file) - -class DNSTamperArgs(usage.Options): - optParameters = [['asset', 'a', None, 'Asset file of hostnames to resolve'], - ['controlserver', 'c', '8.8.8.8', 'Known good DNS server'], - ['testservers', 't', None, 'Asset file of the DNS servers to test'], - ['resume', 'r', 0, 'Resume at this index in the asset file']] -''' - def control(self, experiment_result, args): - print "Experiment Result:", experiment_result - print "Args", args - return experiment_result - - def experiment(self, args): -''' - -class DNSTamperTest(OONITest): - implements(IPlugin, ITest) - - shortName = "DNSTamper" - description = "DNS censorship detection test" - requirements = None - options = DNSTamperArgs - blocking = False - - def load_asset(self): - if self.local_options: - if self.local_options['asset']: - assetf = self.local_options['asset'] - if assetf == 'top-1m.txt': - return {'asset': Top1MAsset(assetf)} - else: - return {'asset': DNSTamperAsset(assetf)} - else: - return {} - - def lookup(self, hostname, nameserver): - """ - Resolves a hostname through a DNS nameserver to the corresponding - IP addresses. - """ - res = client.createResolver(servers=[('nameserver', 53)]) - answer = res.getHostByName(hostname) - ## XXX MAY ALSO BE: - #answer = res.getAddress(servers=[('nameserver', 53)]) - - ret = [] - - for data in answer: - ret.append(data.address) - - return ret - - def reverse_lookup(self, ip, nameserver): - """ - Attempt to do a reverse DNS lookup to determine if the control and exp - sets from a positive result resolve to the same domain, in order to - remove false positives due to GeoIP load balancing. - """ - res = client.createResolver(servers=nameserver) - n = reversename.from_address(ip) - revn = res.query(n, "PTR").__iter__().next().to_text()[:-1] - - return revn - - def experiment(self, *a, **kw): - """ - Compares the lookup() sets of the control and experiment groups. - """ - # this is just a dirty hack - address = kw['data'][0] - ns = kw['data'][1] - - config = self.config - ctrl_ns = config.tests.dns_control_server - - print "ADDRESS: %s" % address - print "NAMESERVER: %s" % ns - - exp = self.lookup(address, ns) - control = self.lookup(address, ctrl_ns) - - result = [] - - if len(set(exp) & set(control)) > 0: - print "Address %s has not tampered with on DNS server %s\n" % (address, ns) - result = (address, ns, exp, control, False) - return result - else: - print "Address %s has possibly been tampered on %s:\nDNS resolution through %s yeilds:\n%s\nAlthough the control group DNS servers resolve to:\n%s" % (address, ns, ns, exp, control) - result = (address, ns, exp, control, True) - - if config.tests.dns_reverse_lookup: - - exprevn = [self.reverse_lookup(ip, ns) for ip in exp] - ctrlrevn = [self.reverse_lookup(ip, ctrl_ns) - for ip in control] - - if len(set(exprevn) & set(ctrlrevn)) > 0: - print "Further testing has eliminated this as a false positive." - else: - print "Reverse DNS on the results returned by %s returned:\n%s\nWhich does not match the expected domainname:\n%s\n" % (ns, exprevn, ctrlrevn) - return result - - else: - print "\n" - return result - -#def run(ooni): -# """ -# Run the test. -# """ -# config = ooni.config -# urls = [] -# -# if (config.tests.dns_experiment == "top-1m.txt"): -# dns_experiment = Top1MAsset(os.path.join(config.main.assetdir, -# config.tests.dns_experiment)) -# else: -# dns_experiment = DNSTAsset(os.path.join(config.main.assetdir, -# config.tests.dns_experiment)) -# dns_experiment_dns = DNSTAsset(os.path.join(config.main.assetdir, -# config.tests.dns_experiment_dns)) -# -# assets = [dns_experiment, dns_experiment_dns] -# -# dnstest = DNST(ooni) -# ooni.logger.info("Beginning dnstamper test...") -# dnstest.run(assets, {'index': 1}) -# ooni.logger.info("Dnstamper test completed!") - -dnstamper = DNSTamperTest(None, None, None)

1 0

[ooni-probe/master] Adding old dnstamper.py file so git doesn't wipe it. Don't include this commit.
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit eeed21131f3b955176ad7d0c1502f6f4551cc72a Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Mon Jun 25 11:34:15 2012 -0700 Adding old dnstamper.py file so git doesn't wipe it. Don't include this commit. --- ooni/oonitests/dnstamper.py | 200 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 200 insertions(+), 0 deletions(-) diff --git a/ooni/oonitests/dnstamper.py b/ooni/oonitests/dnstamper.py new file mode 100644 index 0000000..f73f494 --- /dev/null +++ b/ooni/oonitests/dnstamper.py @@ -0,0 +1,200 @@ +# -*- coding: utf-8 -*- +""" + dnstamper + ********* + + This test resolves DNS for a list of domain names, one per line, in the + file specified in the ooni-config under the setting "dns_experiment". If + the file is top-1m.txt, the test will be run using Amazon's list of top + one million domains. The experimental dns servers to query should + be specified one per line in assets/dns_servers.txt. + + The test reports censorship if the cardinality of the intersection of + the query result set from the control server and the query result set + from the experimental server is zero, which is to say, if the two sets + have no matching results whatsoever. + + NOTE: This test frequently results in false positives due to GeoIP-based + load balancing on major global sites such as google, facebook, and + youtube, etc. + + :copyright: (c) 2012 Arturo Filastò, Isis Lovecruft + :license: see LICENSE for more details + + TODO: + * Switch to using Twisted's DNS builtins instead of dnspython + * +""" + +import os + +from twisted.names import client +from twisted.internet import reactor +from twisted.internet.protocol import Factory, Protocol +from twisted.python import usage +from twisted.plugin import IPlugin +from zope.interface import implements + +from ooni.plugoo.assets import Asset +from ooni.plugoo.tests import ITest, OONITest +from ooni import log + +class Top1MAsset(Asset): + """ + Class for parsing the Alexa top-1m.txt as an asset. + """ + def __init__(self, file=None): + self = Asset.__init__(self, file) + + def parse_line(self, line): + self = Asset.parse_line(self, line) + return line.split(',')[1].replace('\n','') + +class DNSTamperAsset(Asset): + """ + Creates DNS testing specific Assets. + """ + def __init__(self, file=None): + self = Asset.__init__(self, file) + +class DNSTamperArgs(usage.Options): + optParameters = [['asset', 'a', None, 'Asset file of hostnames to resolve'], + ['controlserver', 'c', '8.8.8.8', 'Known good DNS server'], + ['testservers', 't', None, 'Asset file of the DNS servers to test'], + ['resume', 'r', 0, 'Resume at this index in the asset file']] +''' + def control(self, experiment_result, args): + print "Experiment Result:", experiment_result + print "Args", args + return experiment_result + + def experiment(self, args): +''' + +class DNSTamperTest(OONITest): + implements(IPlugin, ITest) + + shortName = "DNSTamper" + description = "DNS censorship detection test" + requirements = None + options = DNSTamperArgs + blocking = False + + def load_assets(self): + if self.local_options: + if self.local_options['asset']: + assetf = self.local_options['asset'] + if assetf == 'top-1m.txt': + return {'asset': Top1MAsset(assetf)} + else: + return {'asset': DNSTamperAsset(assetf)} + else: + return {} + + def lookup(self, hostname, nameserver): + """ + Resolves a hostname through a DNS nameserver to the corresponding + IP addresses. + """ + def got_result(result): + #self.logger.log(result) + print result + reactor.stop() + + def got_failure(failure): + failure.printTraceback() + reactor.stop() + + res = client.createResolver(servers=[(nameserver, 53)]) + d = res.getHostByName(hostname) + d.addCallbacks(got_result, got_failure) + + ## XXX MAY ALSO BE: + #answer = res.getAddress(servers=[('nameserver', 53)]) + + ret = [] + + for data in answer: + ret.append(data.address) + + return ret + + def reverse_lookup(self, ip, nameserver): + """ + Attempt to do a reverse DNS lookup to determine if the control and exp + sets from a positive result resolve to the same domain, in order to + remove false positives due to GeoIP load balancing. + """ + res = client.createResolver(servers=nameserver) + n = reversename.from_address(ip) + revn = res.query(n, "PTR").__iter__().next().to_text()[:-1] + + return revn + + def experiment(self, *a, **kw): + """ + Compares the lookup() sets of the control and experiment groups. + """ + # this is just a dirty hack + address = kw['data'][0] + ns = kw['data'][1] + + config = self.config + ctrl_ns = config.tests.dns_control_server + + print "ADDRESS: %s" % address + print "NAMESERVER: %s" % ns + + exp = self.lookup(address, ns) + control = self.lookup(address, ctrl_ns) + + result = [] + + if len(set(exp) & set(control)) > 0: + print "Address %s has not tampered with on DNS server %s\n" % (address, ns) + result = (address, ns, exp, control, False) + return result + else: + print "Address %s has possibly been tampered on %s:\nDNS resolution through %s yeilds:\n%s\nAlthough the control group DNS servers resolve to:\n%s" % (address, ns, ns, exp, control) + result = (address, ns, exp, control, True) + + if config.tests.dns_reverse_lookup: + + exprevn = [self.reverse_lookup(ip, ns) for ip in exp] + ctrlrevn = [self.reverse_lookup(ip, ctrl_ns) + for ip in control] + + if len(set(exprevn) & set(ctrlrevn)) > 0: + print "Further testing has eliminated this as a false positive." + else: + print "Reverse DNS on the results returned by %s returned:\n%s\nWhich does not match the expected domainname:\n%s\n" % (ns, exprevn, ctrlrevn) + return result + + else: + print "\n" + return result + +#def run(ooni): +# """ +# Run the test. +# """ +# config = ooni.config +# urls = [] +# +# if (config.tests.dns_experiment == "top-1m.txt"): +# dns_experiment = Top1MAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment)) +# else: +# dns_experiment = DNSTAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment)) +# dns_experiment_dns = DNSTAsset(os.path.join(config.main.assetdir, +# config.tests.dns_experiment_dns)) +# +# assets = [dns_experiment, dns_experiment_dns] +# +# dnstest = DNST(ooni) +# ooni.logger.info("Beginning dnstamper test...") +# dnstest.run(assets, {'index': 1}) +# ooni.logger.info("Dnstamper test completed!") + +dnstamper = DNSTamperTest(None, None, None)

1 0

[ooni-probe/master] Need to fix exp_address from d['address'] dict
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit 0264e482d01dbbfc0a5b1f94bd98118270b7cdd6 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Thu Jul 26 00:17:00 2012 +0000 Need to fix exp_address from d['address'] dict --- ooni/ooniprobe.log | 1 - ooni/plugins/dnstamper.py | 92 ++++++++++++++++++++++++++++++--------------- ooni/plugoo/reports.py | 9 +++- 3 files changed, 69 insertions(+), 33 deletions(-) diff --git a/ooni/ooniprobe.log b/ooni/ooniprobe.log deleted file mode 100644 index 700e820..0000000 --- a/ooni/ooniprobe.log +++ /dev/null @@ -1 +0,0 @@ -2012-05-31 02:27:28,010 ooniprobe INFO Started ooni-probe diff --git a/ooni/plugins/dnstamper.py b/ooni/plugins/dnstamper.py index a30cf27..e768dab 100644 --- a/ooni/plugins/dnstamper.py +++ b/ooni/plugins/dnstamper.py @@ -18,12 +18,14 @@ load balancing on major global sites such as google, facebook, and youtube, etc. - :copyright: (c) 2012 Arturo Filastò, Isis Lovecruft + :author: Isis Lovecruft, Arturo Filastò :license: see LICENSE for more details - TODO: - * Switch to using Twisted's DNS builtins instead of dnspython - * + TODO: + * Use OONI log instead of print + * Finish porting to twisted + * Finish the client.Resolver() subclass and test it + * Use the DNS tests from captiveportal """ import os @@ -52,13 +54,20 @@ class AlexaAsset(Asset): return line.split(',')[1].replace('\n','') class DNSTamperArgs(usage.Options): - optParameters = [['asset', 'a', None, 'Asset file of hostnames to resolve'], - ['controlserver', 'c', '8.8.8.8', 'Known good DNS server'], - ['testservers', 't', None, 'Asset file of DNS servers to test'], - ['localservers', 'l', False, 'Also test local servers'], - ['port', 'p', None, 'Local UDP port to send queries over'], - ['usereverse', 'r', False, 'Also try reverse DNS resolves'], - ['resume', 's', 0, 'Resume at this index in the asset file']] + optParameters = [['hostnames', 'h', None, + 'Asset file of hostnames to resolve'], + ['controlserver', 'c', '8.8.8.8', + 'Known good DNS server'], + ['testservers', 't', None, + 'Asset file of DNS servers to test'], + ['localservers', 'l', False, + 'Also test local servers'], + ['port', 'p', None, + 'Local UDP port to send queries over'], + ['usereverse', 'r', False, + 'Also try reverse DNS resolves'], + ['resume', 's', 0, + 'Resume at this index in the asset file']] class DNSTamperResolver(client.Resolver): """ @@ -137,23 +146,43 @@ class DNSTamperTest(OONITest): def initialize(self): if self.local_options: + + ## client.createResolver() turns 'None' into '/etc/resolv.conf' on + ## posix systems, ignored on Windows. if self.local_options['localservers']: self.resolvconf = None else: self.resolvconf = '' + else: + pass + + self.d = defer.Deferred() def load_assets(self): assets = {} + if self.local_options: - if self.local_options['asset']: - assetf = self.local_options['asset'] + + if self.local_options['hostnames']: + assetf = self.local_options['hostnames'] if assetf == 'top-1m.txt': - assets.update({'asset': AlexaAsset(assetf)}) + assets['hostnames'] = AlexaAsset(assetf) + #assets.update({'asset': AlexaAsset(assetf)}) else: - assets.update({'asset': Asset(assetf)}) - elif self.local_options['testservers']: - assets.update({'testservers': - Asset(self.local_options['testservers'])}) + assets['hostnames'] = Asset(assetf) + #assets.update({'asset': Asset(assetf)}) + else: + #default_hostnames = ['google.com', 'torrentz.eu', 'ooni.nu', + # 'twitter.com', 'baidu.com'] + #assets.update({'asset': [host for host in default_hostnames]}) + print "Error! We need a file containing the hostnames that we should test DNS for!" + + if self.local_options['testservers']: + #assets['testservers'] = Asset(self.local_options['testservers']) + self.testservers = Asset(self.local_options['testservers']) + else: + self.testservers = ['209.244.0.3', '208.67.222.222', '156.154.70.1'] + return assets def lookup(self, hostname, nameserver): @@ -164,7 +193,6 @@ class DNSTamperTest(OONITest): def got_result(result): log.msg('Resolved %s through %s to %s' % (hostname, nameserver, result)) - #reactor.stop() return {'resolved': True, 'domain': hostname, 'nameserver': nameserver, @@ -172,7 +200,6 @@ class DNSTamperTest(OONITest): def got_error(err): log.msg(err.printTraceback()) - #reactor.stop() return {'resolved': False, 'domain': hostname, 'nameserver': nameserver, @@ -182,11 +209,9 @@ class DNSTamperTest(OONITest): servers=[(nameserver, 53)]) d = res.getHostByName(hostname) d.addCallbacks(got_result, got_error) + return d - ## XXX MAY ALSO BE: - #answer = res.getAddress(servers=[('nameserver', 53)]) - def reverse_lookup(self, address, nameserver): """ Attempt to do a reverse DNS lookup to determine if the control and exp @@ -206,26 +231,33 @@ class DNSTamperTest(OONITest): """ Compares the lookup() sets of the control and experiment groups. """ - test_server = self.local_options['testservers'] - hostname = args['asset'] - exp_address = self.lookup(hostname, test_server) + hostnames = args + + for hostname in hostnames: + for testserver in self.testservers: + #exp_address = self.lookup(hostname, testserver) + self.d.addCallback(self.lookup, hostname, testserver) + + #print self.assets['hostnames'] + #hostname = args + #exp_address = self.lookup(hostname, testserver) #return {'control': control_server, # 'domain': args['asset'], # 'experiment_address': address} if self.local_options['usereverse']: - exp_reversed = self.reverse_lookup(exp_address, test_server) + exp_reversed = self.reverse_lookup(exp_address, testserver) ## XXX trying to fix errors: #d = defer.Deferred() - return (exp_address, hostname, test_server, exp_reversed) + return (exp_address, hostname, testserver, exp_reversed) else: - return (exp_address, hostname, test_server, False) + return (exp_address, hostname, testserver, False) def control(self, experiment_result): - (exp_address, hostname, test_server, exp_reversed) = experiment_result + (exp_address, hostname, testserver, exp_reversed) = experiment_result control_server = self.local_options['controlserver'] ctrl_address = self.lookup(hostname, control_server) diff --git a/ooni/plugoo/reports.py b/ooni/plugoo/reports.py index ef15a04..eb2cf4f 100644 --- a/ooni/plugoo/reports.py +++ b/ooni/plugoo/reports.py @@ -81,8 +81,13 @@ class Report: """ This reports to a file in YAML format """ - with open(self.file, 'a+') as f: - f.write(data) + if not file: + file = self.file + try: + with open(file, mode) as f: + f.write(data) + except Exception, e: + raise e def send_report(self, data, type): """

1 0

[ooni-probe/master] Unfinished, committing in order to merge changes from master. Fixed class initializations.
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit f85da56f489198358d7d1d7fbd2338037af88ce9 Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Thu Jul 19 18:00:00 2012 +0000 Unfinished, committing in order to merge changes from master. Fixed class initializations. --- ooni/plugins/dnstamper.py | 43 ++++++++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 11 deletions(-) diff --git a/ooni/plugins/dnstamper.py b/ooni/plugins/dnstamper.py index ca0e2e3..a30cf27 100644 --- a/ooni/plugins/dnstamper.py +++ b/ooni/plugins/dnstamper.py @@ -29,7 +29,7 @@ import os from twisted.names import client, dns -from twisted.internet import reactor +from twisted.internet import reactor, defer from twisted.internet.error import CannotListenError from twisted.internet.protocol import Factory, Protocol from twisted.python import usage @@ -80,7 +80,8 @@ class DNSTamperResolver(client.Resolver): [4] http://comments.gmane.org/gmane.comp.python.twisted/22794 """ def __init__(self): - super(DNSTamperResolver, self).__init__() + super(DNSTamperResolver, self).__init__(self, resolv, servers, + timeout, reactor) #client.Resolver.__init__(self) if self.local_options['port']: @@ -117,13 +118,29 @@ class DNSTamperTest(OONITest): requirements = None options = DNSTamperArgs blocking = False - - if self.local_options['localservers']: - ## client.createResolver() turns None into '/etc/resolv.conf' - ## on posix systems, ignored on Windows. - self.resolvconf = None - else: - self.resolvconf = '' + + #def __init__(self, local_options, global_options, + # report, ooninet=None, reactor=None): + # super(DNSTamperTest, self).__init__(local_options, global_options, + # report, ooninet, reactor) + # + # if self.reactor is None: + # self.reactor = reactor + # + # if self.local_options: + # if self.local_options['localservers']: + # ## client.createResolver() turns None into '/etc/resolv.conf' + # ## on posix systems, ignored on Windows. + # self.resolvconf = None + # else: + # self.resolvconf = '' + + def initialize(self): + if self.local_options: + if self.local_options['localservers']: + self.resolvconf = None + else: + self.resolvconf = '' def load_assets(self): assets = {} @@ -199,9 +216,13 @@ class DNSTamperTest(OONITest): if self.local_options['usereverse']: exp_reversed = self.reverse_lookup(exp_address, test_server) - return exp_address, hostname, test_server, exp_reversed + + ## XXX trying to fix errors: + #d = defer.Deferred() + + return (exp_address, hostname, test_server, exp_reversed) else: - return exp_address, hostname, test_server, False + return (exp_address, hostname, test_server, False) def control(self, experiment_result): (exp_address, hostname, test_server, exp_reversed) = experiment_result

1 0

[ooni-probe/master] Fixed module import issues with directory structure.
by isis＠torproject.org 13 Sep '12

13 Sep '12

commit 37c0e4e888416a6d0433a23a164c5bd565c357ca Author: Isis Lovecruft <isis(a)patternsinthevoid.net> Date: Thu May 31 12:36:50 2012 -0300 Fixed module import issues with directory structure. --- ooni/plugoo/reports.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/ooni/plugoo/reports.py b/ooni/plugoo/reports.py index a6b0ac9..ef15a04 100644 --- a/ooni/plugoo/reports.py +++ b/ooni/plugoo/reports.py @@ -4,11 +4,7 @@ import os import yaml import itertools -<<<<<<< HEAD import log -======= -from ooni.utils import log, date, net ->>>>>>> * Fix some bugs in Daphn3 class Report: """This is the ooni-probe reporting mechanism. It allows

1 0