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

[ooni-probe/master] Fix import lost in merge
by art＠torproject.org 19 Jun '13

19 Jun '13

commit 8277bf7463537b5f438e6f23db0bf041698aa10e Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jun 6 17:50:21 2013 +0200 Fix import lost in merge --- ooni/nettest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ooni/nettest.py b/ooni/nettest.py index f09df73..acca335 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -1,5 +1,6 @@ import os import re +import time from twisted.internet import defer, reactor from twisted.trial.runner import filenameToModule

1 0

[ooni-probe/master] Place data files into proper sub-directory structure
by art＠torproject.org 19 Jun '13

19 Jun '13

commit 8ed046958dca07f8e7cf051ed3e6617b1ed3c6e1 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jun 6 18:15:31 2013 +0200 Place data files into proper sub-directory structure --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 6ebca7b..c0487b1 100644 --- a/setup.py +++ b/setup.py @@ -2,6 +2,7 @@ #-*- coding: utf-8 -*- import os +from os.path import join as pj import sys from distutils.core import setup @@ -16,13 +17,13 @@ dependency_links = [ 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' ] -files = [] +data_files = [] for root, dirs, file_names in os.walk('data/'): + files = [] for file_name in file_names: if not file_name.endswith('.pyc'): - files.append(os.path.join(root, file_name)) - -data_files = [('/usr/share/ooni/', files)] + files.append(pj(root, file_name)) + data_files.append([pj('/usr/share/ooni', root), files]) with open('requirements.txt') as f: for line in f:

1 0

[ooni-probe/master] Fix two minor bugs
by art＠torproject.org 19 Jun '13

19 Jun '13

commit af03b561539e48c3dc13cc76a8b03699757f80ed Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jun 13 12:56:35 2013 +0200 Fix two minor bugs --- ooni/oonicli.py | 2 +- ooni/tasks.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ooni/oonicli.py b/ooni/oonicli.py index c64710e..354cebc 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -159,7 +159,7 @@ def runWithDirector(): yaml_reporter = YAMLReporter(test_details) reporters = [yaml_reporter] - if collector and collector.startswith('httpo') \ + if collector and collector.startswith('httpo:') \ and (not (config.tor_state or config.tor.socks_port)): raise errors.TorNotRunning elif collector: diff --git a/ooni/tasks.py b/ooni/tasks.py index 428fdbf..89c2d5e 100644 --- a/ooni/tasks.py +++ b/ooni/tasks.py @@ -69,7 +69,7 @@ class TaskWithTimeout(BaseTask): def _timedOut(self): """Internal method for handling timeout failure""" - if not self._running.called: + if self._running and not self._running.called: self._running.cancel() self._failed(TaskTimedOut) @@ -92,6 +92,7 @@ class TaskWithTimeout(BaseTask): class Measurement(TaskWithTimeout): timeout = config.advanced.measurement_timeout + netTest = None def __init__(self, test_class, test_method, test_input): """

1 0

[ooni-probe/master] Fix bug in importing of geodata
by art＠torproject.org 19 Jun '13

19 Jun '13

commit f6c4dbbe817e8fc6dd4670108c508ce2918e9762 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jun 13 14:21:45 2013 +0200 Fix bug in importing of geodata --- ooni/nettest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index acca335..80c1965 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -8,7 +8,7 @@ from twisted.python import usage, reflect from ooni import geoip from ooni.tasks import Measurement -from ooni.utils import log, checkForRoot, geodata +from ooni.utils import log, checkForRoot from ooni import otime from ooni.settings import config

1 0

[ooni-probe/master] Run setup.py script as root
by art＠torproject.org 19 Jun '13

19 Jun '13

commit b3812e2748ea1c9553ac2400c12d9ec967ebbaf0 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jun 13 14:55:27 2013 +0200 Run setup.py script as root Install the stable pip, before upgrading --- Vagrantfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 52107e8..10ec592 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -113,14 +113,6 @@ end $script = <<SCRIPT apt-get -y install curl python-setuptools python-dev -echo "Updating to the latest version of PIP" -cd /tmp/ - -curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py -python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons - -sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 - echo "Installing Tor..." echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/source.list @@ -133,6 +125,14 @@ apt-get -y install deb.torproject.org-keyring tor tor-geoipdb apt-get -y install git-core python python-pip python-dev build-essential libdumbnet1 python-dumbnet python-libpcap python-pypcap python-dnspython python-virtualenv virtualenvwrapper tor tor-geoipdb libpcap-dev +echo "Updating to the latest version of PIP" +cd /tmp/ + +curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py +python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons + +sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 + cd /data/ooniprobe echo "Installing dependencies" @@ -140,7 +140,7 @@ pip install pyrex pip install -r requirements.txt echo "Installing ooniprobe" -python setup.py install +sudo python setup.py install echo "Fetching all inputs" cd /data/ooniprobe/inputs

1 0

[ooni-probe/master] Actually we are already root, no need for sudo
by art＠torproject.org 19 Jun '13

19 Jun '13

commit fad84ef936bfe825034c15c87a6ef5bfc5c079d5 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jun 13 14:56:59 2013 +0200 Actually we are already root, no need for sudo --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 10ec592..7a03508 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -131,7 +131,7 @@ cd /tmp/ curl -O https://raw.github.com/pypa/pip/master/contrib/get-pip.py python ./get-pip.py ## pip (>=1.3.0) is recommended for security reasons -sudo update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 +update-alternatives --install /usr/bin/pip pip /usr/local/bin/pip 0 cd /data/ooniprobe @@ -140,7 +140,7 @@ pip install pyrex pip install -r requirements.txt echo "Installing ooniprobe" -sudo python setup.py install +python setup.py install echo "Fetching all inputs" cd /data/ooniprobe/inputs

1 0

[ooni-probe/master] Add example on data_dir
by art＠torproject.org 19 Jun '13

19 Jun '13

commit 89fb6ce4ffaa95f4d7a3d1a010ef9827c6c04393 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jun 13 15:15:50 2013 +0200 Add example on data_dir --- data/ooniprobe.conf.sample | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index ca94c86..6eb7a5b 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -44,6 +44,8 @@ advanced: reporting_retries: 3 # How many reports to perform concurrently reporting_concurrency: 20 + # Specify here a custom data_dir path + data_dir: /usr/share/ooni/ tor: socks_port: 9050 #control_port: 9051

1 0

[ooni-probe/master] Fix bug that resulted in inconsistencies in test_id
by art＠torproject.org 19 Jun '13

19 Jun '13

commit eae2c1ec99fb231d169cda14375c4953be50ac44 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jun 14 19:44:07 2013 +0200 Fix bug that resulted in inconsistencies in test_id --- ooni/nettest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 80c1965..10eacd3 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -141,6 +141,9 @@ def getArguments(test_class): return arguments +def test_class_name_to_name(test_class_name): + return test_class_name.lower().replace(' ','_') + def getNetTestInformation(net_test_file): """ Returns a dict containing: @@ -156,7 +159,7 @@ def getNetTestInformation(net_test_file): """ test_class = getTestClassFromFile(net_test_file) - test_id = os.path.basename(net_test_file).replace('.py', '') + test_id = test_class_name_to_name(test_class.name) information = {'id': test_id, 'name': test_class.name, 'description': test_class.description, @@ -333,7 +336,7 @@ class NetTestLoader(object): """ test_class, _ = test_cases[0] self.testVersion = test_class.version - self.testName = test_class.name.lower().replace(' ','_') + self.testName = test_class_name_to_name(test_class.name) self.testCases = test_cases def checkOptions(self):

1 0

[ooni-probe/master] Update install
by art＠torproject.org 19 Jun '13

19 Jun '13

commit e2e8559582a2bae2a47f4ecf659be51b131804df Author: Arturo Filastò <hellais(a)gmail.com> Date: Sat Jun 15 16:09:17 2013 +0200 Update install --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index fe89f43..6da4680 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,22 @@ network data that will assist you with your endeavors! 0) [Install Vagrant](http://downloads.vagrantup.com/) +0.1) + +On OSX: + +If youd don't have it install homebrew http://mxcl.github.io/homebrew/ + +``` +brew install git +``` + +On debian/ubuntu: + +``` +sudo apt-get install git +``` + 1) Open a Terminal and run: ```

1 0

[ooni-probe/master] Fix #8353, catch error when OpenSSL not compiled with SSLv2 context.
by art＠torproject.org 19 Jun '13

19 Jun '13

commit abcb946b2d9bc9534b5e5649a3fe3a747a09f84f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Jun 15 04:12:50 2013 +0000 Fix #8353, catch error when OpenSSL not compiled with SSLv2 context. * Change code to fallback to testing TLSv1 (the default) instead, and display a message to the user that if they really wish to test SSLv2 handshakes that it will be necessary for them to recompile OpenSSL with SSLv2 support. --- nettests/experimental/tls_handshake.py | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 83b2868..5da2e8b 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -88,7 +88,12 @@ class SSLContextError(usage.UsageError): errors = { 'NO_CONTEXT': 'No SSL/TLS context chosen! Defaulting to TLSv1.', 'INCOMPATIBLE': str("Testing TLSv1 (option '--tls1') is incompatible " - + "with testing SSL ('--ssl2' and '--ssl3').") } + + "with testing SSL ('--ssl2' and '--ssl3')."), + 'MISSING_SSLV2': str("Your version of OpenSSL was compiled without " + + "support for SSLv2. This is normal on newer " + + "versions of OpenSSL, but it means that you " + + "will be unable to test SSLv2 handshakes " + + "without recompiling OpenSSL."), } def __init__(self, message): if message in self.errors.keys(): @@ -164,12 +169,22 @@ class HandshakeTest(nettest.NetTestCase): except SSLContextError as sce: log.err(sce.message) finally: log.msg('Defaulting to testing only TLSv1.') elif options['ssl2']: - if not options['ssl3']: - self.context = SSL.Context(SSL.SSLv2_METHOD) - else: - self.context = SSL.Context(SSL.SSLv23_METHOD) + try: + if not options['ssl3']: + context = SSL.Context(SSL.SSLv2_METHOD) + else: + context = SSL.Context(SSL.SSLv23_METHOD) + except ValueError as ve: + log.err(ve.message) + try: raise SSLContextError('MISSING_SSLV2') + except SSLContextError as sce: + log.err(sce.message) + log.msg("Falling back to testing only TLSv1.") + context = SSL.Context(SSL.TLSv1_METHOD) elif options['ssl3']: - self.context = SSL.Context(SSL.SSLv3_METHOD) + context = SSL.Context(SSL.SSLv3_METHOD) + ## finally, reset the context if the user's choice was okay: + if context: self.context = context ## if we weren't given a file with a list of ciphersuites to use, ## then use the firefox default list:

1 0