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

[ooni-probe/develop] Change how we pass arguments to the nettest loader
by isis＠torproject.org 06 Jun '13

06 Jun '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/develop] Set the default collector via the command line option
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit b5c99e327a9c2ef1a2f2b9aa8d41d82a4dcc63d1 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 28 20:47:05 2013 +0100 Set the default collector via the command line option --- collector | 1 - ooni/oonicli.py | 11 +---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/collector b/collector deleted file mode 100644 index 0b260a1..0000000 --- a/collector +++ /dev/null @@ -1 +0,0 @@ -httpo://nkvphnp3p6agi5qq.onion diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 93bf8bf..af06ad2 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -29,8 +29,7 @@ class Options(usage.Options): " files listed on the command line") optFlags = [["help", "h"], - ["resume", "r"], - ["no-default-reporter", "n"]] + ["resume", "r"]] optParameters = [["reportfile", "o", None, "report file name"], ["testdeck", "i", None, @@ -154,14 +153,6 @@ def runWithDirector(): log.msg("for example: ooniprobe -c httpo://nkvphnp3p6agi5qq.onion") sys.exit(1) - # Select one of the baked-in reporters unless the user has requested otherwise - if not global_options['no-default-reporter']: - with open('collector') as f: - reporter_url = random.choice(f.readlines()) - reporter_url = reporter_url.split('#')[0].strip() - oonib_reporter = OONIBReporter(test_details, reporter_url) - reporters.append(oonib_reporter) - log.debug("adding callback for startNetTest") d.addCallback(director.startNetTest, net_test_loader, reporters) d.addCallback(shutdown)

1 0

[ooni-probe/develop] Update test decks with the proper key
by isis＠torproject.org 06 Jun '13

06 Jun '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

[ooni-probe/develop] Make the starting of tests more robust.
by isis＠torproject.org 06 Jun '13

06 Jun '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/develop] Fix so that parsing of test decks works properly
by isis＠torproject.org 06 Jun '13

06 Jun '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 file 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/develop] Raise NoMoreReporters exception on failure
by isis＠torproject.org 06 Jun '13

06 Jun '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/develop] Fix typo in test deck before_i_commit
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 7d0f96dcf6ab2ad9f110e6ebffb2af967e129904 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 1 11:31:42 2013 +0100 Fix typo in test deck before_i_commit --- decks/before_i_commit.testdeck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decks/before_i_commit.testdeck b/decks/before_i_commit.testdeck index ebbd53a..63bac62 100644 --- a/decks/before_i_commit.testdeck +++ b/decks/before_i_commit.testdeck @@ -23,7 +23,7 @@ logfile: reports/before_i_commit.log pcapfile: null reportfile: reports/http_host.yamloo - subargs: [-b, 'http://93.95.227.200', -c, 'http://nkvphnp3p6agi5qq.onion', -f, example_inputs/http_host_file.txt] + subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] test_file: nettests/manipulation/http_host.py - options: no-default-reporter: false

1 0

[ooni-probe/develop] Add fabfile for updating of ooniprobe docs on ooni.tpo
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 4a27bdbd4a2e306c013c0d8326b6e15aa8d5b4eb Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 31 13:41:12 2013 +0100 Add fabfile for updating of ooniprobe docs on ooni.tpo --- docs/fabfile.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/fabfile.py b/docs/fabfile.py new file mode 100644 index 0000000..d0461fd --- /dev/null +++ b/docs/fabfile.py @@ -0,0 +1,20 @@ +import os +from fabric.api import run +from fabric.context_managers import settings +from fabric.operations import sudo, local, put + +def update_docs(): + local('make html') + build_dir = os.path.join(os.getcwd(), 'build', 'html') + put(build_dir, '/tmp') + + run("sudo -u ooni rm -rf /home/ooni/website/build/docs/") + run("sudo -u ooni cp -R /tmp/html/ /home/ooni/website/build/docs") + + run("rm -rf /tmp/html") + update_website() + +def update_website(): + run("sudo -u mirroradm /usr/local/bin/static-master-update-component ooni.torproject.org") + +

1 0

[ooni-probe/develop] Add HTTP Filtering bypass tests and some HTTP Trix test
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 8598223e8526b79c86bb2a61ce2c81253137430c Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jan 30 22:46:15 2013 +0100 Add HTTP Filtering bypass tests and some HTTP Trix test Update HTTP Host test to check for bypassing strategies Remove InputFile from HTTP Invalid Request Line test Remove input file and superfluous test --- nettests/experimental/http_filtering_bypassing.py | 84 ++++++++++++++++++++ nettests/experimental/http_trix.py | 47 +++++++++++ nettests/manipulation/http_host.py | 22 ++++- nettests/manipulation/http_invalid_request_line.py | 5 +- 4 files changed, 153 insertions(+), 5 deletions(-) diff --git a/nettests/experimental/http_filtering_bypassing.py b/nettests/experimental/http_filtering_bypassing.py new file mode 100644 index 0000000..a82994a --- /dev/null +++ b/nettests/experimental/http_filtering_bypassing.py @@ -0,0 +1,84 @@ +# -*- encoding: utf-8 -*- +from twisted.python import usage + +from ooni.utils import log +from ooni.utils import randomStr, randomSTR +from ooni.templates import tcpt + +class UsageOptions(usage.Options): + optParameters = [['backend', 'b', '127.0.0.1', + 'The OONI backend that runs a TCP echo server'], + ['backendport', 'p', 80, 'Specify the port that the TCP echo server is running (should only be set for debugging)']] + +class HTTPFilteringBypass(tcpt.TCPTest): + name = "HTTPFilteringBypass" + version = "0.1" + authors = "xx" + + inputFile = ['file', 'f', None, + 'Specify a list of hostnames to use as inputs'] + + usageOptions = UsageOptions + requiredOptions = ['backend'] + + def setUp(self): + self.port = int(self.localOptions['backendport']) + self.address = self.localOptions['backend'] + + def check_for_manipulation(self, response, payload): + log.debug("Checking if %s == %s" % (response, payload)) + if response != payload: + self.report['tampering'] = True + else: + self.report['tampering'] = False + + def test_prepend_newline(self): + payload = "\nGET / HTTP/1.1\n\r" + payload += "Host: %s\n\r" % self.input + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + + def test_tab_trick(self): + payload = "GET / HTTP/1.1\n\r" + payload += "Host: %s\t\n\r" % self.input + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + + def test_subdomain_blocking(self): + payload = "GET / HTTP/1.1\n\r" + payload += "Host: %s\n\r" % randomStr(10) + '.' + self.input + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + + def test_fuzzy_domain_blocking(self): + hostname_field = randomStr(10) + '.' + self.input + '.' + randomStr(10) + payload = "GET / HTTP/1.1\n\r" + payload += "Host: %s\n\r" % hostname_field + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + + def test_fuzzy_match_blocking(self): + hostname_field = randomStr(10) + self.input ++ randomStr(10) + payload = "GET / HTTP/1.1\n\r" + payload += "Host: %s\n\r" % hostname_field + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + + def test_normal_request(self): + payload = "GET / HTTP/1.1\n\r" + payload += "Host: %s\n\r" % self.input + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + diff --git a/nettests/experimental/http_trix.py b/nettests/experimental/http_trix.py new file mode 100644 index 0000000..85a4ba2 --- /dev/null +++ b/nettests/experimental/http_trix.py @@ -0,0 +1,47 @@ +# -*- encoding: utf-8 -*- +from twisted.python import usage + +from ooni.utils import log +from ooni.utils import randomStr, randomSTR +from ooni.templates import tcpt + +class UsageOptions(usage.Options): + optParameters = [['backend', 'b', '127.0.0.1', + 'The OONI backend that runs a TCP echo server'], + ['backendport', 'p', 80, 'Specify the port that the TCP echo server is running (should only be set for debugging)']] + +class HTTPTrix(tcpt.TCPTest): + name = "HTTPTrix" + version = "0.1" + authors = "Arturo Filastò" + + usageOptions = UsageOptions + requiredOptions = ['backend'] + + def setUp(self): + self.port = int(self.localOptions['backendport']) + self.address = self.localOptions['backend'] + + def check_for_manipulation(self, response, payload): + log.debug("Checking if %s == %s" % (response, payload)) + if response != payload: + self.report['tampering'] = True + else: + self.report['tampering'] = False + + def test_for_squid_cache_object(self): + """ + This detects the presence of a squid transparent HTTP proxy by sending + a request for cache_object://localhost/info. + + This tests for the presence of a Squid Transparent proxy by sending: + + GET cache_object://localhost/info HTTP/1.1 + """ + payload = 'GET cache_object://localhost/info HTTP/1.1' + payload += '\n\r' + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + diff --git a/nettests/manipulation/http_host.py b/nettests/manipulation/http_host.py index 3ebfd04..3e0996a 100644 --- a/nettests/manipulation/http_host.py +++ b/nettests/manipulation/http_host.py @@ -9,6 +9,8 @@ import json from twisted.python import usage +from ooni.utils import randomStr, randomSTR + from ooni.utils import log from ooni.templates import httpt @@ -31,7 +33,7 @@ class HTTPHost(httpt.HTTPTest): """ name = "HTTP Host" author = "Arturo Filastò" - version = "0.2" + version = "0.2.1" usageOptions = UsageOptions @@ -40,6 +42,24 @@ class HTTPHost(httpt.HTTPTest): requiredOptions = ['backend'] + def test_filtering_add_tab_to_host(self): + headers = {} + headers["Host"] = [self.input + '\t'] + return self.doRequest('http://'+self.input, + headers=headers) + + def test_filtering_of_subdomain(self): + headers = {} + headers["Host"] = [randomStr(10) + '.' + self.input] + return self.doRequest('http://'+self.input, + headers=headers) + + def test_filtering_via_fuzzy_matching(self): + headers = {} + headers["Host"] = [randomStr(10) + self.input + randomStr(10)] + return self.doRequest('http://'+self.input, + headers=headers) + def test_send_host_header(self): """ Stuffs the HTTP Host header field with the site to be tested for diff --git a/nettests/manipulation/http_invalid_request_line.py b/nettests/manipulation/http_invalid_request_line.py index 01626ab..2482282 100644 --- a/nettests/manipulation/http_invalid_request_line.py +++ b/nettests/manipulation/http_invalid_request_line.py @@ -20,12 +20,9 @@ class HTTPInvalidRequestLine(tcpt.TCPTest): ascii letters or numbers ('XxXx' will be 4). """ name = "HTTP Invalid Request Line" - version = "0.1.3" + version = "0.1.4" authors = "Arturo Filastò" - inputFile = ['file', 'f', None, - 'Input file of list of hostnames to attempt to resolve'] - usageOptions = UsageOptions requiredOptions = ['backend']

1 0

[ooni-probe/develop] Add test that will prepend newline to request
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit dd314cc0a0beba5233084358ae8d493f3731d956 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jan 30 23:31:49 2013 +0100 Add test that will prepend newline to request --- nettests/manipulation/http_host.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nettests/manipulation/http_host.py b/nettests/manipulation/http_host.py index 3e0996a..1665992 100644 --- a/nettests/manipulation/http_host.py +++ b/nettests/manipulation/http_host.py @@ -35,6 +35,7 @@ class HTTPHost(httpt.HTTPTest): author = "Arturo Filastò" version = "0.2.1" + randomizeUA = False usageOptions = UsageOptions inputFile = ['file', 'f', None, @@ -42,6 +43,12 @@ class HTTPHost(httpt.HTTPTest): requiredOptions = ['backend'] + def test_filtering_prepend_newline_to_method(self): + headers = {} + headers["Host"] = [self.input] + return self.doRequest('http://'+self.input, method="\nGET", + headers=headers) + def test_filtering_add_tab_to_host(self): headers = {} headers["Host"] = [self.input + '\t']

1 0