- tor-commits - lists.torproject.org

[ooni-probe/master] Refactor the logic for running of tests
by art＠torproject.org 10 Nov '12

10 Nov '12

commit abd7de7fb6e64d0c1974d8554950d82bace7f983 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 12:26:43 2012 +0100 Refactor the logic for running of tests * There was a bug related to generators not being rewindable we now convert the generator of one input unit to a list --- ooni/oonicli.py | 2 +- ooni/reporter.py | 2 +- ooni/runner.py | 55 +++++++++++++++++++++++++++++++++++------------------ 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 8e4fa14..f7a6fe3 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -77,7 +77,7 @@ def testsEnded(*arg, **kw): """ You can place here all the post shutdown tasks. """ - log.debug("Finished running all tests") + log.debug("testsEnded: Finished running all tests") def run(): """ diff --git a/ooni/reporter.py b/ooni/reporter.py index 6d37838..33b4675 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -230,7 +230,7 @@ class OReporter(YamlReporter): self.writeReportEntry(report) def allDone(self): - log.debug("Finished running all tests") + log.debug("allDone: Finished running all tests") self.finish() try: reactor.stop() diff --git a/ooni/runner.py b/ooni/runner.py index 238d7d5..d03f6c6 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -13,6 +13,7 @@ import sys import time import inspect import traceback +import itertools from twisted.python import reflect, usage from twisted.internet import defer @@ -150,6 +151,29 @@ def loadTestsAndOptions(classes, cmd_line_options): return test_cases, options +def runTestWithInput(test_class, test_method, test_input, oreporter): + log.debug("Running %s with %s" % (test_method, test_input)) + def test_done(result, test_instance): + oreporter.testDone(test_instance) + + def test_error(error, test_instance): + log.err("%s\n" % error) + + test_instance = test_class() + test_instance.input = test_input + test_instance.report = {} + log.debug("Processing %s" % test_instance.name) + # use this to keep track of the test runtime + test_instance._start_time = time.time() + # call setup on the test + test_instance.setUp() + test = getattr(test_instance, test_method) + d = defer.maybeDeferred(test) + d.addCallback(test_done, test_instance) + d.addErrback(test_error, test_instance) + log.debug("returning %s input" % test_method) + return d + def runTestWithInputUnit(test_class, test_method, input_unit, oreporter): @@ -164,27 +188,17 @@ def runTestWithInputUnit(test_class, returns a deferred list containing all the tests to be run at this time """ - def test_done(result, test_instance): - oreporter.testDone(test_instance) - - def test_error(error, test_instance): - log.err("%s\n" % error) dl = [] - for i in input_unit: - test_instance = test_class() - test_instance.input = i - test_instance.report = {} - # use this to keep track of the test runtime - test_instance._start_time = time.time() - # call setup on the test - test_instance.setUp() - test = getattr(test_instance, test_method) - d = defer.maybeDeferred(test) - d.addCallback(test_done, test_instance) - d.addErrback(test_error, test_instance) + log.debug("input unit %s" % input_unit) + for test_input in input_unit: + log.debug("IU: %s" % test_input) + try: + d = runTestWithInput(test_class, test_method, test_input, oreporter) + except Exception, e: + print e + log.debug("here y0") dl.append(d) - return defer.DeferredList(dl) @defer.inlineCallbacks @@ -217,11 +231,14 @@ def runTestCases(test_cases, options, # it is used to store all the deferreds of the tests that # are run for input_unit in input_unit_factory: + # We do this because generators can't we rewound. + input_list = list(input_unit) for test_case in test_cases: + log.debug("Processing %s" % test_case[1]) test_class = test_case[0] test_method = test_case[1] yield runTestWithInputUnit(test_class, - test_method, input_unit, + test_method, input_list, oreporter) oreporter.allDone()

1 0

[ooni-probe/master] Add backend to the required options of http_requests test
by art＠torproject.org 10 Nov '12

10 Nov '12

commit e31917f5ac61b74f46b5fa52c678f7c19a56824f Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 12:29:17 2012 +0100 Add backend to the required options of http_requests test --- nettests/core/http_requests.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/nettests/core/http_requests.py b/nettests/core/http_requests.py index f1a16e0..4fc8205 100644 --- a/nettests/core/http_requests.py +++ b/nettests/core/http_requests.py @@ -27,6 +27,8 @@ class HTTPRequests(httpt.HTTPTest): optParameters = [['backend', 'b', None, 'URL of the backend to use for sending the requests']] + requiredOptions = ['backend'] + def processInputs(self): if self.localOptions['backend']: self.url = self.localOptions['backend']

1 0

[ooni-probe/master] Fix some docstrings
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 7147340125d728c775d7fa339a7eb94e522f96a0 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 14:54:05 2012 +0100 Fix some docstrings --- AUTHORS | 2 +- bin/ooniprobe | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index d8dc0b8..e395e88 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ Jacob Appelbaum <jacob(a)torproject.org> -Arturo Filasto <hellais(a)torproject.org> +Arturo Filasto <art(a)torproject.org> Linus Nordberg <linus(a)torproject.org> Isis Lovecruft <isis(a)torproject.org> diff --git a/bin/ooniprobe b/bin/ooniprobe index 9b9885f..36f0152 100755 --- a/bin/ooniprobe +++ b/bin/ooniprobe @@ -2,13 +2,10 @@ # -*- encoding: utf-8 -*- # oonicli # ----------- +# Runs ooniprobe tests from command line # -# Run the Twisted Trial (unittest module) based oonicli. Startup script based -# on twisted trial, see http://twistedmatrix.com/ . - # :authors: Arturo Filastò, Isis Lovecruft # :licence: see included LICENSE file -# :version: 0.0.1-pre-alpha import os, sys import copy_reg

1 0

[ooni-probe/master] Merge branch 'master' into http_requests
by art＠torproject.org 10 Nov '12

10 Nov '12

commit f2c08794156e94f1d0a32840c08e80bdd30cae73 Merge: e31917f 847617f Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 14:54:44 2012 +0100 Merge branch 'master' into http_requests * master: Add database support to oonib * We have function to automatically create tables based on the Storm db definition (borrowed from code I wrote for GLBackend) * Start plotting out the structure of the database support. Add basic configuration support to oonib Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups Continue work on OONIB Start defining the models of OONIB * Create runner for OONIB Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups Continue work on OONIB Start defining the models of OONIB * Create runner for OONIB bin/oonib | 41 +++++++++++++-- ooni/oonicli.py | 1 - ooni/utils/log.py | 18 ++++++- oonib/__init__.py | 22 ++++++++ oonib/config.py | 28 ++++++++++ oonib/db/__init__.py | 30 ++++++++++ oonib/db/tables.py | 123 +++++++++++++++++++++++++++++++++++++++++++ oonib/lib/__init__.py | 7 --- oonib/lib/ssl.py | 2 +- oonib/models.py | 122 ++++++++++++++++++++++++++++++++++++++++++ oonib/oonibackend.py | 46 ++++++++-------- oonib/report/api.py | 3 +- oonib/report/db/__init__.py | 33 ------------ oonib/report/models.py | 122 ++++++++++++++++++++++++++++++++++++++++++ oonib/runner.py | 25 +++++++++ oonib/testhelpers/daphn3.py | 4 +- oonib/testhelpers/httph.py | 100 ++++++++++++++--------------------- 17 files changed, 592 insertions(+), 135 deletions(-)

1 0

[ooni-probe/master] Implement basic HTTP request test that does capitalization variations on the HTTP method
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 2266e961595a167b12ee1a4aca617eb2dbb56b12 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 17:50:22 2012 +0100 Implement basic HTTP request test that does capitalization variations on the HTTP method * Due to a quirk in twisted.client.Agent that sets HTTP request headers to canonical form we are currently unable to test the request headers. This is ticketized here: https://trac.torproject.org/projects/tor/ticket/7432 --- nettests/core/http_requests.py | 90 +++++++++++++++++++++++++++++++++------- ooni/templates/httpt.py | 58 ++++++++++++++------------ oonib/testhelpers/httph.py | 26 ++++++++---- 3 files changed, 124 insertions(+), 50 deletions(-) diff --git a/nettests/core/http_requests.py b/nettests/core/http_requests.py index 4fc8205..0315145 100644 --- a/nettests/core/http_requests.py +++ b/nettests/core/http_requests.py @@ -4,6 +4,9 @@ # :licence: see LICENSE import random +import json + +from ooni.utils import log, net from ooni.templates import httpt def random_capitalization(string): @@ -21,11 +24,16 @@ class HTTPRequests(httpt.HTTPTest): This test is also known as Header Field manipulation. It performes HTTP requests with variations in capitalization towards the backend. """ - name = "HTTPRequests" + name = "HTTP Requests" author = "Arturo Filastò" version = 0.1 - optParameters = [['backend', 'b', None, 'URL of the backend to use for sending the requests']] + optParameters = [ + ['backend', 'b', None, + 'URL of the backend to use for sending the requests'], + ['headers', 'h', None, + 'Specify a yaml formatted file from which to read the request headers to send'] + ] requiredOptions = ['backend'] @@ -35,24 +43,76 @@ class HTTPRequests(httpt.HTTPTest): else: raise Exception("No backend specified") + def processResponseBody(self, data): + response = json.loads(data) + if response['request_method'] != self.request_method: + self.report['tampering'] = True + else: + self.report['tampering'] = False + # XXX add checks for validation of sent headers + + def get_headers(self): + headers = {} + if self.localOptions['headers']: + # XXX test this code + try: + f = open(self.localOptions['headers']) + except IOError: + raise Exception("Specified input file does not exist") + content = ''.join(f.readlines()) + f.close() + headers = yaml.load(content) + return headers + else: + headers = {"User-Agent": [random.choice(net.userAgents)], + "Accept": ["text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"], + "Accept-Encoding": ["gzip,deflate,sdch"], + "Accept-Language": ["en-US,en;q=0.8"], + "Accept-Charset": ["ISO-8859-1,utf-8;q=0.7,*;q=0.3"]} + return headers + + def get_random_caps_headers(self): + headers = {} + normal_headers = self.get_headers() + for k, v in normal_headers.items(): + new_key = random_capitalization(k) + headers[new_key] = v + return headers + def test_get(self): - return self.doRequest(self.url, "GET") + self.request_method = "GET" + self.request_headers = self.get_random_caps_headers() + return self.doRequest(self.url, self.request_method, + headers=self.request_headers) - def test_get_random_capitalization(self): - method = random_capitalization("GET") - return self.doRequest(self.url, method) + def a_test_get_random_capitalization(self): + self.request_method = random_capitalization("GET") + self.request_headers = self.get_random_caps_headers() + return self.doRequest(self.url, self.request_method, + headers=self.request_headers) - def test_post(self): - return self.doRequest(self.url, "POST") + def a_test_post(self): + self.request_method = "POST" + self.request_headers = self.get_headers() + return self.doRequest(self.url, self.request_method, + headers=self.request_headers) - def test_post_random_capitalization(self): - method = random_capitalization("POST") - return self.doRequest(self.url, method) + def a_test_post_random_capitalization(self): + self.request_method = random_capitalization("POST") + self.request_headers = self.get_random_caps_headers() + return self.doRequest(self.url, self.request_method, + headers=self.request_headers) - def test_put(self): - return self.doRequest(self.url, "PUT") + def a_test_put(self): + self.request_method = "PUT" + self.request_headers = self.get_headers() + return self.doRequest(self.url, self.request_method, + headers=self.request_headers) def test_put_random_capitalization(self): - method = random_capitalization("PUT") - return self.doRequest(self.url, method) + self.request_method = random_capitalization("PUT") + self.request_headers = self.get_random_caps_headers() + return self.doRequest(self.url, self.request_method, + headers=self.request_headers) + diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 4c42a3a..96b7cc8 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -2,7 +2,7 @@ # # :authors: Arturo Filastò # :licence: see LICENSE - +import copy import random from zope.interface import implements @@ -12,6 +12,10 @@ from twisted.plugin import IPlugin from twisted.internet import protocol, defer from twisted.internet.ssl import ClientContextFactory +from twisted.web.client import Agent +from twisted.internet import reactor + +from twisted.web._newclient import Request from twisted.web.http_headers import Headers from ooni.nettest import NetTestCase from ooni.utils import log @@ -39,8 +43,6 @@ class HTTPTest(NetTestCase): except: log.err("Warning! pyOpenSSL is not installed. https websites will" "not work") - from twisted.web.client import Agent - from twisted.internet import reactor self.agent = Agent(reactor) @@ -107,7 +109,7 @@ class HTTPTest(NetTestCase): method: the HTTP Method to be used - headers: the request headers to be sent + headers: the request headers to be sent as a dict body: the request body @@ -137,6 +139,31 @@ class HTTPTest(NetTestCase): d.addCallback(finished) return d + def build_request(self, url, method="GET", headers=None, body=None): + self.request['method'] = method + self.request['url'] = url + self.request['headers'] = headers if headers else {} + self.request['body'] = body + + if self.randomizeUA: + self.randomize_useragent() + + self.report['request'] = self.request + self.report['url'] = url + + # If we have a request body payload, set the request body to such + # content + if body: + body_producer = StringProducer(self.request['body']) + else: + body_producer = None + + headers = Headers(self.request['headers']) + + req = self.agent.request(self.request['method'], self.request['url'], + headers, body_producer) + return req + def _cbResponse(self, response, headers_processor, body_processor): log.debug("Got response %s" % response) if not response: @@ -167,27 +194,4 @@ class HTTPTest(NetTestCase): user_agent = random.choice(userAgents) self.request['headers']['User-Agent'] = [user_agent] - def build_request(self, url, method="GET", headers=None, body=None): - self.request['method'] = method - self.request['url'] = url - self.request['headers'] = headers if headers else {} - self.request['body'] = body - - if self.randomizeUA: - self.randomize_useragent() - - self.report['request'] = self.request - self.report['url'] = url - - # If we have a request body payload, set the request body to such - # content - if body: - body_producer = StringProducer(self.request['body']) - else: - body_producer = None - - req = self.agent.request(self.request['method'], self.request['url'], - Headers(self.request['headers']), - body_producer) - return req diff --git a/oonib/testhelpers/httph.py b/oonib/testhelpers/httph.py index b793852..7001fa6 100644 --- a/oonib/testhelpers/httph.py +++ b/oonib/testhelpers/httph.py @@ -12,16 +12,26 @@ from cyclone.web import RequestHandler, Application class HTTPTrapAll(RequestHandler): """ - Master class to be used to trap all the HTTP methods + Master class to be used to trap all the HTTP methods and make capitalized + requests pass. """ - def get(self, *arg, **kw): - self.all(*arg, **kw) + def _execute(self, transforms, *args, **kwargs): + self._transforms = transforms + defer.maybeDeferred(self.prepare).addCallbacks( + self._execute_handler, + lambda f: self._handle_request_exception(f.value), + callbackArgs=(args, kwargs)) - def post(self, *arg, **kw): - self.all(*arg, **kw) - - def put(self, *arg, **kw): - self.all(*arg, **kw) + def _execute_handler(self, r, args, kwargs): + if not self._finished: + args = [self.decode_argument(arg) for arg in args] + kwargs = dict((k, self.decode_argument(v, name=k)) + for (k, v) in kwargs.iteritems()) + # This is where we do the patching + # XXX this is somewhat hackish + d = defer.maybeDeferred(self.all, *args, **kwargs) + d.addCallbacks(self._execute_success, self._execute_failure) + self.notifyFinish().addCallback(self.on_connection_close) class HTTPReturnJSONHeaders(HTTPTrapAll): def all(self):

1 0

[ooni-probe/master] Merge branch 'master' into multiprotocoltraceroute
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 10ccfa0852179f495307ef1bb5181b29a7161537 Merge: 7147340 3b394e4 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 17:52:05 2012 +0100 Merge branch 'master' into multiprotocoltraceroute * master: Clean up unused code * Fix imports in oonib Add database support to oonib * We have function to automatically create tables based on the Storm db definition (borrowed from code I wrote for GLBackend) * Start plotting out the structure of the database support. Add basic configuration support to oonib Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups Continue work on OONIB Start defining the models of OONIB * Create runner for OONIB Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups Update example for writing scapy tests. * Make changes to test template of scapy tests Continue work on OONIB Start defining the models of OONIB * Create runner for OONIB bin/oonib | 41 +++++++++++- nettests/examples/example_scapyt.py | 22 +++++-- ooni/oonicli.py | 1 - ooni/templates/scapyt.py | 19 ++++-- ooni/utils/log.py | 18 +++++- oonib/__init__.py | 22 ++++++ oonib/config.py | 29 ++++++++ oonib/db/__init__.py | 30 +++++++++ oonib/db/tables.py | 123 +++++++++++++++++++++++++++++++++++ oonib/lib/__init__.py | 7 -- oonib/lib/ssl.py | 2 +- oonib/models.py | 122 ++++++++++++++++++++++++++++++++++ oonib/oonibackend.py | 46 +++++++------- oonib/report/api.py | 3 +- oonib/report/db/__init__.py | 33 --------- oonib/runner.py | 25 +++++++ oonib/testhelpers/daphn3.py | 4 +- oonib/testhelpers/httph.py | 100 +++++++++++----------------- 18 files changed, 501 insertions(+), 146 deletions(-)

1 0

[ooni-probe/master] Merge branch 'master' into http_requests
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 5415ecef19eaf6c46ef008595c9f748bae6a640d Merge: f2c0879 3b394e4 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 15:05:22 2012 +0100 Merge branch 'master' into http_requests * master: Clean up unused code * Fix imports in oonib oonib/__init__.py | 2 +- oonib/config.py | 1 + oonib/models.py | 2 +- oonib/report/api.py | 2 +- oonib/report/models.py | 122 ------------------------------------------------ 5 files changed, 4 insertions(+), 125 deletions(-)

1 0

[ooni-probe/master] Merge branch 'master' into multiprotocoltraceroute
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 5e6115557bb67653a8ed1001c53333501a182d67 Merge: 665267d 2266e96 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 18:13:03 2012 +0100 Merge branch 'master' into multiprotocoltraceroute * master: Implement basic HTTP request test that does capitalization variations on the HTTP method * Due to a quirk in twisted.client.Agent that sets HTTP request headers to canonical form we are currently unable to test the request headers. This is ticketized here: https://trac.torproject.org/projects/tor/ticket/7432 Add backend to the required options of http_requests test Refactor the logic for running of tests * There was a bug related to generators not being rewindable we now convert the generator of one input unit to a list Start working on HTTP Requests nettests/core/http_requests.py | 118 ++++++++++++++++++++++++++++++++++++++++ ooni/oonicli.py | 2 +- ooni/reporter.py | 2 +- ooni/runner.py | 55 ++++++++++++------- ooni/templates/httpt.py | 58 +++++++++++--------- oonib/testhelpers/httph.py | 26 ++++++--- 6 files changed, 205 insertions(+), 56 deletions(-)

1 0

[ooni-probe/master] Implement TCP and UDP multi port traceroute test
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 665267dc7f431f28e8f1017e9ebdce4740f92d1d Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 18:00:03 2012 +0100 Implement TCP and UDP multi port traceroute test --- nettests/core/traceroute.py | 19 +++++++++---------- ooni/templates/scapyt.py | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index d29a0fd..b14e013 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -4,6 +4,7 @@ # :licence: see LICENSE from twisted.python import usage +from twisted.internet import defer from ooni.utils import log from ooni.templates import scapyt @@ -12,7 +13,8 @@ from scapy.all import * class UsageOptions(usage.Options): optParameters = [ - ['backend', 'b', '8.8.8.8', 'Test backend to use'] + ['backend', 'b', '8.8.8.8', 'Test backend to use'], + ['timeout', 't', 5, 'The timeout for the traceroute test'] ] class TracerouteTest(scapyt.BaseScapyTest): @@ -26,26 +28,25 @@ class TracerouteTest(scapyt.BaseScapyTest): def test_tcp_traceroute(self): def finished(packets, port): - log.debug("Finished tcp") + log.debug("Finished tcp %s" % port) answered, unanswered = packets self.report['hops_'+str(port)] = [] for snd, rcv in answered: report = {'ttl': snd.ttl, 'address': rcv.src} log.debug("Writing %s" % report) self.report['hops_'+str(port)].append(report) - return dl = [] for port in self.dst_ports: packets = IP(dst=self.localOptions['backend'], - ttl=(4,25),id=RandShort())/TCP(flags=0x2, dport=port) - d = self.sr(packets, timeout=2) + ttl=(1,25),id=RandShort())/TCP(flags=0x2, dport=port) + d = self.sr(packets, timeout=5) d.addCallback(finished, port) dl.append(d) return defer.DeferredList(dl) def test_udp_traceroute(self): - def finished(packets): + def finished(packets, port): log.debug("Finished udp") answered, unanswered = packets self.report['hops_'+str(port)].append(report) @@ -53,13 +54,11 @@ class TracerouteTest(scapyt.BaseScapyTest): report = {'ttl': snd.ttl, 'address': rcv.src} log.debug("Writing %s" % report) self.report['hops_'+str(port)].append(report) - return - dl = [] for port in self.dst_ports: packets = IP(dst=self.localOptions['backend'], - ttl=(4,25),id=RandShort())/UDP(dport=port) - d = self.sr(packets, timeout=2) + ttl=(1,25),id=RandShort())/UDP(dport=port) + d = self.sr(packets, timeout=5) d.addCallback(finished, port) dl.append(d) return defer.DeferredList(dl) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 3087ac7..c443610 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -53,7 +53,7 @@ class BaseScapyTest(NetTestCase): self.report['answered_packets'] = [] self.report['sent_packets'] = [] for snd, rcv in answered: - log.debug("Writing report %s") + log.debug("Writing report %s" % snd) pkt_report_r = createPacketReport(rcv) pkt_report_s = createPacketReport(snd) self.report['answered_packets'].append(pkt_report_r)

1 0

[ooni-probe/master] Clean up
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 44bac35872571102a88d36f5c04a1afb8f0d372c Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 18:17:49 2012 +0100 Clean up --- nettests/core/traceroute.py | 8 +++----- ooni/utils/txscapy.py | 7 +------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index b14e013..23f124a 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -28,12 +28,11 @@ class TracerouteTest(scapyt.BaseScapyTest): def test_tcp_traceroute(self): def finished(packets, port): - log.debug("Finished tcp %s" % port) + log.debug("Finished running TCP traceroute test" % port) answered, unanswered = packets self.report['hops_'+str(port)] = [] for snd, rcv in answered: report = {'ttl': snd.ttl, 'address': rcv.src} - log.debug("Writing %s" % report) self.report['hops_'+str(port)].append(report) dl = [] @@ -47,12 +46,11 @@ class TracerouteTest(scapyt.BaseScapyTest): def test_udp_traceroute(self): def finished(packets, port): - log.debug("Finished udp") + log.debug("Finished running udp traceroute test") answered, unanswered = packets - self.report['hops_'+str(port)].append(report) + self.report['hops_'+str(port)] = [] for snd, rcv in answered: report = {'ttl': snd.ttl, 'address': rcv.src} - log.debug("Writing %s" % report) self.report['hops_'+str(port)].append(report) dl = [] for port in self.dst_ports: diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 2559d19..2b108ca 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -70,14 +70,10 @@ class ScapyProtocol(abstract.FileDescriptor): """ def processAnswer(self, packet, answer_hr): - log.debug("Got an answer processing it") + log.debug("Got a packet from %s" % packet.src) for i in range(len(answer_hr)): if packet.answers(answer_hr[i]): self.answered_packets.append((answer_hr[i], packet)) - if self.debug: - print packet.src, packet.ttl - #answer.show() - if not self.multi: del(answer_hr[i]) break @@ -87,7 +83,6 @@ class ScapyProtocol(abstract.FileDescriptor): def doRead(self): timeout = time.time() - self._start_time - log.debug("Checking for timeout %s > %s" % (timeout, self.timeout)) if self.timeout and time.time() - self._start_time > self.timeout: self.stopSending() packet = self.super_socket.recv()

1 0