tor-commits April 2014

tor-commits@lists.torproject.org

22 participants
2020 discussions

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

30 Apr '14

commit c701575ed1a13e5848c93d12c38141a76fb54592 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 01:39:28 2014 +0100 Also print out the Tor version and print error messages. --- ooni/nettests/blocking/bridge_reachability.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 5a12a1f..c191804 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -103,6 +103,7 @@ class BridgeReachability(nettest.NetTestCase): config = txtorcon.TorConfig() config.ControlPort = random.randint(2**14, 2**16) config.SocksPort = random.randint(2**14, 2**16) + log.msg("Connecting to %s with tor %s" % (self.bridge, onion.tor_details['version'])) transport_name = onion.transport_name(self.bridge) if transport_name and self.pyobfsproxy_bin: @@ -119,10 +120,12 @@ class BridgeReachability(nettest.NetTestCase): if transport_name and transport_name == 'scramblesuit' and \ onion.TorVersion('0.2.5.1') > onion.tor_details['version']: self.report['error'] = 'unsupported-tor-version' + log.err("Unsupported Tor version.") return elif transport_name and \ onion.TorVersion('0.2.4.1') > onion.tor_details['version']: self.report['error'] = 'unsupported-tor-version' + log.err("Unsupported Tor version.") return config.Bridge = self.bridge

1 0

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

30 Apr '14

commit 699302bf5c462a66109b447958637703cc27efcf Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Mar 27 16:27:18 2014 +0100 Refactoring of .gitignore --- .gitignore | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 5733f57..0a6915d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,41 @@ *.pyc -assets/* + ENV/* +.c9revisions +.ropeproject/* +.coverage +.idea/ +*~ +_trial_temp/* + build/* package/* +dist/ +packages/* + +assets/* proxy-lists/ip-cc.txt proxy-lists/ips.txt proxy-lists/italy-dns-ips.txt proxy-lists/italy-http-ips.txt -private/* ooni/assets/bridge*.txt ooni/lib/txtorcon ooni/plugins/dropin.cache -ooni/report*.yaml + fluff/ -pcaps/ -report*.yaml -docs/build/* data/*.dat -ooniprobe.conf +private/* + +ooni/report*.yaml +report*.yaml *.yamloo +pcaps/ + +ooniprobe.conf ooniprobe.resume *.log !before_i_commit.log -## ignore pycharm ide files: -.idea/ -*~ -.c9revisions + +docs/build/* + +.vagrant/*

1 0

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

30 Apr '14

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

1 0

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

30 Apr '14

commit 17c2b901fb9ddc06d94406e35d55082ab05955dc Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 01:58:08 2014 +0100 When we fail write the tor log to the report --- ooni/nettests/blocking/bridge_reachability.py | 3 +++ ooni/utils/onion.py | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index d8efb70..d9df317 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -50,6 +50,7 @@ class BridgeReachability(nettest.NetTestCase): self.report['tor_progress'] = 0 self.report['tor_progress_tag'] = None self.report['tor_progress_summary'] = None + self.report['tor_log'] = None self.report['bridge_address'] = None self.bridge = self.input @@ -130,6 +131,7 @@ class BridgeReachability(nettest.NetTestCase): config.Bridge = self.bridge config.UseBridges = 1 + config.log = 'notice' config.save() def updates(prog, tag, summary): @@ -152,6 +154,7 @@ class BridgeReachability(nettest.NetTestCase): @d.addErrback def setup_failed(failure): log.msg("Failed to connect to %s" % self.bridge) + self.report['tor_log'] = failure.value.message self.report['success'] = False return d diff --git a/ooni/utils/onion.py b/ooni/utils/onion.py index 0c54242..50e20c3 100644 --- a/ooni/utils/onion.py +++ b/ooni/utils/onion.py @@ -9,7 +9,6 @@ from ooni.settings import config class TorVersion(LooseVersion): pass - def find_tor_binary(): if config.advanced.tor_binary: return config.advanced.tor_binary

1 0

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

30 Apr '14

commit b96dcd2df0d9a1638d450f008f3134206cf7e85a Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 01:44:53 2014 +0100 Only print out a summary when it's appropriate. Replace prints with log.msg --- ooni/nettest.py | 2 ++ ooni/nettests/blocking/bridge_reachability.py | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 074f0bd..fb0bf95 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -440,6 +440,8 @@ class NetTest(object): return ' '.join(tc.name for tc, _ in self.testCases) def doneNetTest(self, result): + if not self.summary: + return print "Summary for %s" % self.testDetails['test_name'] print "------------" + "-"*len(self.testDetails['test_name']) for test_class in self.testClasses: diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index c191804..d8efb70 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -88,16 +88,16 @@ class BridgeReachability(nettest.NetTestCase): working_bridges = ', '.join(["%s %s" % (x['transport_name'], x['address']) for x in summary['successes']]) failing_bridges = ', '.join(["%s %s (at %s%%)" % (x['transport_name'], x['address'], x['tor_progress']) for x in summary['failures']]) - print "Total successes: %d" % len(summary['successes']) - print "Total failures: %d" % len(summary['failures']) + log.msg("Total successes: %d" % len(summary['successes'])) + log.msg("Total failures: %d" % len(summary['failures'])) for transport, count in successful_count.items(): - print "%s successes: %d" % (transport.title(), count) + log.msg("%s successes: %d" % (transport.title(), count)) for transport, count in failure_count.items(): - print "%s failures: %d" % (transport.title(), count) + log.msg("%s failures: %d" % (transport.title(), count)) - print "Working bridges: %s" % working_bridges - print "Failing bridges: %s" % failing_bridges + log.msg("Working bridges: %s" % working_bridges) + log.msg("Failing bridges: %s" % failing_bridges) def test_full_tor_connection(self): config = txtorcon.TorConfig()

1 0

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

30 Apr '14

commit 0f31af97d55291498457b44fe84d93c5988771d5 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 18:42:31 2014 +0100 Add support for fteproxy to bridge_reachability --- ooni/nettests/blocking/bridge_reachability.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index d9df317..9c2bdb6 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -57,6 +57,7 @@ class BridgeReachability(nettest.NetTestCase): if self.input.startswith('Bridge'): self.bridge = self.input.replace('Bridge ', '') self.pyobfsproxy_bin = find_executable('obfsproxy') + self.fteproxy_bin = find_executable('fteproxy') def postProcessor(self, measurements): if 'successes' not in self.summary: @@ -107,7 +108,15 @@ class BridgeReachability(nettest.NetTestCase): log.msg("Connecting to %s with tor %s" % (self.bridge, onion.tor_details['version'])) transport_name = onion.transport_name(self.bridge) - if transport_name and self.pyobfsproxy_bin: + if transport_name and transport_name == 'fte' and self.fteproxy_bin: + config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.fteproxy_bin) + self.report['transport_name'] = transport_name + self.report['bridge_address'] = self.bridge.split(' ')[1] + elif transport_name and transport_name == 'fte' and not self.fteproxy_bin: + log.err("Unable to test bridge because fteproxy is not installed") + self.report['error'] = 'missing-fteproxy' + return + elif transport_name and self.pyobfsproxy_bin: config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.pyobfsproxy_bin) self.report['transport_name'] = transport_name self.report['bridge_address'] = self.bridge.split(' ')[1]

1 0

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

30 Apr '14

commit e9786aba705ac806518c38002b0f695b7d50f463 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 18:58:14 2014 +0100 Correct managed to --managed --- ooni/nettests/blocking/bridge_reachability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index 9c2bdb6..c0cdb76 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -109,7 +109,7 @@ class BridgeReachability(nettest.NetTestCase): transport_name = onion.transport_name(self.bridge) if transport_name and transport_name == 'fte' and self.fteproxy_bin: - config.ClientTransportPlugin = "%s exec %s managed" % (transport_name, self.fteproxy_bin) + config.ClientTransportPlugin = "%s exec %s --managed" % (transport_name, self.fteproxy_bin) self.report['transport_name'] = transport_name self.report['bridge_address'] = self.bridge.split(' ')[1] elif transport_name and transport_name == 'fte' and not self.fteproxy_bin:

1 0

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

30 Apr '14

commit f862bfa4316afe7dad4f1d7e1ac6eb62cc115ecc Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 28 18:42:47 2014 +0100 Add support for installing fteproxy to install_on_planetlab script --- scripts/install_on_planetlab.sh | 48 ++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/scripts/install_on_planetlab.sh b/scripts/install_on_planetlab.sh index eb75375..b329228 100644 --- a/scripts/install_on_planetlab.sh +++ b/scripts/install_on_planetlab.sh @@ -7,16 +7,17 @@ sudo yum -y install zlib-devel bzip2-devel openssl-devel ncurses-devel sqlite-de cd `mktemp -d` # Install Python 2.7.6 -wget http://legacy.python.org/ftp//python/2.7.6/Python-2.7.6.tgz +curl -o Python-2.7.6.tgz http://legacy.python.org/ftp//python/2.7.6/Python-2.7.6.tgz tar xzf Python-2.7.6.tgz cd Python-2.7.6 ./configure --prefix=/usr/local --enable-unicode=ucs4 --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" make sudo make altinstall sudo ln -sf /usr/local/bin/python2.7 /usr/bin/python +cd .. # Install the latest version of libtool -wget http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz +curl -o libtool-2.4.2.tar.gz http://ftpmirror.gnu.org/libtool/libtool-2.4.2.tar.gz tar xzf libtool-2.4.2.tar.gz cd libtool-2.4.2 ./configure @@ -24,9 +25,10 @@ make sudo make install sudo mv /usr/bin/libtool /usr/bin/libtool.old sudo ln -s /usr/local/bin/libtool /usr/bin/libtool +cd .. # Install the latest version of autoconf -wget http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz +curl -o autoconf-2.69.tar.gz http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz tar xzf autoconf-2.69.tar.gz cd autoconf-2.69 ./configure @@ -34,9 +36,10 @@ make sudo make install sudo mv /usr/bin/autoconf /usr/bin/autoconf.old sudo ln -s /usr/local/bin/autoconf /usr/bin/autoconf +cd .. # Install the latest version of automake -wget http://ftp.gnu.org/gnu/automake/automake-1.14.1.tar.gz +curl -o automake-1.14.1.tar.gz http://ftp.gnu.org/gnu/automake/automake-1.14.1.tar.gz tar xzf automake-1.14.1.tar.gz cd automake-1.14.1 ./configure @@ -44,9 +47,10 @@ make sudo make install sudo mv /usr/bin/automake /usr/bin/automake.old sudo ln -s /usr/local/bin/automake /usr/bin/automake +cd .. # Install latest version of libevent -wget https://github.com/downloads/libevent/libevent/libevent-2.0.21-stable.tar.gz +curl -o libevent-2.0.21-stable.tar.gz https://github.com/downloads/libevent/libevent/libevent-2.0.21-stable.tar.gz tar xvzf libevent-2.0.21-stable.tar.gz cd libevent-2.0.21-stable ./autogen.sh @@ -54,9 +58,20 @@ cd libevent-2.0.21-stable cp /usr/bin/libtool libtool make sudo make install +cd .. + +# Install GMP +curl -o gmp-6.0.0a.tar.bz2 https://gmplib.org/download/gmp/gmp-6.0.0a.tar.bz2 +tar xjpf gmp-6.0.0a.tar.bz2 +cd gmp-6.0.0 +export ABI=32 +./configure --enable-cxx +make +sudo make install +cd .. # Install the latest version of Tor -wget -O tor.zip https://github.com/hellais/tor/archive/fix/fedora8.zip +curl -o tor.zip https://github.com/hellais/tor/archive/fix/fedora8.zip unzip tor.zip cd tor-fix-fedora8 ./autogen.sh @@ -111,27 +126,38 @@ EOF sudo mv tor.init /etc/init.d/tor sudo chmod +x /etc/init.d/tor sudo /etc/init.d/tor restart +cd .. # Install libGeoIP -wget -O master.zip https://github.com/maxmind/geoip-api-c/archive/master.zip +curl -o master.zip https://github.com/maxmind/geoip-api-c/archive/master.zip unzip master.zip cd geoip-api-c-master/ ./bootstrap ./configure make sudo make install +cd .. # Install the latest version of pip -wget -O get-pip.py --no-check-certificate https://raw.github.com/pypa/pip/master/contrib/get-pip.py +curl -o get-pip.py https://raw.github.com/pypa/pip/master/contrib/get-pip.py sudo python get-pip.py # Install the patched versions of cryptography and pyopenssl -sudo pip install https://github.com/hellais/cryptography/archive/fix/openssl0.9compat.zip -sudo pip install https://github.com/hellais/pyopenssl/archive/fix/openssl0.9.8compat.zip +sudo pip install cryptography +sudo pip install https://github.com/pyca/pyopenssl/archive/master.zip + +# Install pluggable transport related stuff +sudo pip install obfsproxy +curl -o 0.2.9.zip https://github.com/kpdyer/fteproxy/archive/0.2.9.zip +unzip 0.2.9.zip +cd fteproxy-0.2.9 +make +sudo cp bin/fteproxy /usr/bin/fteproxy +sudo python setup.py install +cd .. # Install ooniprobe and obfsproxy sudo pip install https://github.com/TheTorProject/ooni-probe/archive/master.zip -sudo pip install obfsproxy /usr/local/bin/ooniprobe # Update the Tor running in ooniprobe

1 0

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

30 Apr '14

commit 65c90a082030a37e1e3c2bc33f02d3e76fd41c65 Merge: 4f5d910 2822871 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Apr 30 18:38:44 2014 +0200 Merge pull request #297 from TheTorProject/feature/tor_version Add support for adding tor version to the bridge_reachability report. .gitignore | 35 +++++++++---- ooni/director.py | 4 +- ooni/errors.py | 3 ++ ooni/managers.py | 7 ++- ooni/nettest.py | 29 +++++++---- ooni/nettests/blocking/bridge_reachability.py | 69 ++++++++++++++++--------- ooni/nettests/blocking/dns_consistency.py | 3 +- ooni/oonicli.py | 28 ++++++---- ooni/tests/test_onion.py | 8 +++ ooni/tests/test_oonicli.py | 30 ++++++----- ooni/utils/__init__.py | 3 -- ooni/utils/log.py | 2 + ooni/utils/onion.py | 50 ++++++++++++++++++ scripts/install_on_planetlab.sh | 48 +++++++++++++---- 14 files changed, 231 insertions(+), 88 deletions(-)

1 0

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

30 Apr '14

commit c392dff592ec8f4cc2c8ab8501308fcf9ab5750c Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Apr 30 18:18:46 2014 +0200 Don't complain if we fail to delete some files. --- ooni/tests/test_oonicli.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index b53b510..edd17c6 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -1,10 +1,8 @@ import os import sys import yaml -import signal -import socket -from twisted.internet import base, defer +from twisted.internet import defer from twisted.trial import unittest from ooni.tests import is_internet_connected @@ -25,7 +23,7 @@ def verify_header(header): def verify_entry(entry): assert 'input' in entry - + class TestRunDirector(unittest.TestCase): def setUp(self): if not is_internet_connected(): @@ -68,7 +66,7 @@ class TestRunDirector(unittest.TestCase): assert 'factor' in entry assert 'headers_diff' in entry assert 'headers_match' in entry - yield self.run_test('blocking/http_requests', + yield self.run_test('blocking/http_requests', ['-u', 'http://torproject.org/'], verify_function) @@ -82,7 +80,7 @@ class TestRunDirector(unittest.TestCase): assert 'factor' in entry assert 'headers_diff' in entry assert 'headers_match' in entry - yield self.run_test('blocking/http_requests', + yield self.run_test('blocking/http_requests', ['-f', 'example-input.txt'], verify_function) @@ -114,6 +112,6 @@ class TestRunDirector(unittest.TestCase): assert 'request_line_capitalization' in entry['tampering'] assert 'total' in entry['tampering'] - yield self.run_test('manipulation/http_header_field_manipulation', + yield self.run_test('manipulation/http_header_field_manipulation', ['-b', 'http://64.9.225.221'], verify_function)

1 0

← Newer
1
2
3
4
5
6
7
8
...
202
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2014