January 2014 - tor-commits - lists.torproject.org

[oonib/master] Merge pull request #17 from TheTorProject/feature/use_tor_2.4.17-rc
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 0f288f1158d25fc6beeff189b4285beaad477c3f Merge: 639e23d 6ebc021 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Sep 11 04:53:12 2013 -0700 Merge pull request #17 from TheTorProject/feature/use_tor_2.4.17-rc Update Tor to 0.2.4.17-rc scripts/build_tor2web_tor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[oonib/master] Fix a few typos in Vagrantfile
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 39ad5bcd821e17f6ae9ed32e03559d176d471528 Author: Johannes Fürmann <johannes(a)weltraumpflege.org> Date: Wed Sep 11 14:08:44 2013 +0200 Fix a few typos in Vagrantfile --- Vagrantfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 33b89ba..347ad34 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -111,6 +111,7 @@ Vagrant.configure("2") do |config| end $setup_script = <<SCRIPT +apt-get update apt-get -y install curl python-setuptools python-dev libsqlite3-dev echo "Updating to the latest version of PIP" @@ -132,13 +133,13 @@ mkvirtualenv -a $PWD --unzip-setuptools --setuptools --no-site-packages oonib echo "Installing Tor..." -echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/source.list +echo "deb http://deb.torproject.org/torproject.org precise main" >> /etc/apt/sources.list gpg --keyserver keys.gnupg.net --recv 886DDD89 gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - apt-get update -apt-get install deb.torproject.org-keyring tor tor-geoipdb +apt-get -y install deb.torproject.org-keyring tor tor-geoipdb cd /data/oonib

1 0

[oonib/master] Merge pull request #18 from waaaaargh/master
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 0d05897a9d7bae01a18253a8cbcc4727b8c2afb1 Merge: 0f288f1 39ad5bc Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Sep 11 05:18:05 2013 -0700 Merge pull request #18 from waaaaargh/master Fix a few typos in Vagrantfile Vagrantfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[oonib/master] bump to v1.0.0-rc4
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 0d2a3a0ffa997d6a6f9b34dd4a588c60339d4ffa Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Sep 11 14:19:12 2013 +0200 bump to v1.0.0-rc4 --- oonib/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index 4473fd8..b5ae531 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -3,7 +3,7 @@ In here we shall keep track of all variables and objects that should be instantiated only once and be common to pieces of GLBackend code. """ -__version__ = '1.0.0-rc2' +__version__ = '1.0.0-rc4' __all__ = ['Storage', 'randomStr']

1 0

[oonib/master] Use the same TorConfig for bouncer and collector
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 97fc5a294356cca2d520803063a6dd8bbf5958b8 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 11 19:14:26 2013 +0200 Use the same TorConfig for bouncer and collector The TorConfig object must be the same or else only the last instance is used. --- oonib/runner.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/oonib/runner.py b/oonib/runner.py index d03aa33..aa4c360 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -37,13 +37,12 @@ def txSetupFailed(failure): log.err("Setup failed") log.exception(failure) -def setupCollector(tor_process_protocol, datadir): +def setupCollector(tor_process_protocol, datadir, torconfig): def setup_complete(port): #XXX: drop some other noise about what API are available on this machine print("Exposed collector Tor hidden service on httpo://%s" % port.onion_uri) - torconfig = TorConfig(tor_process_protocol.tor_protocol) public_port = 80 # XXX there is currently a bug in txtorcon that prevents data_dir from # being passed properly. Details on the bug can be found here: @@ -60,13 +59,12 @@ def setupCollector(tor_process_protocol, datadir): return tor_process_protocol -def setupBouncer(tor_process_protocol, datadir): +def setupBouncer(tor_process_protocol, datadir, torconfig): def setup_complete(port): #XXX: drop some other noise about what API are available on this machine print("Exposed bouncer Tor hidden service on httpo://%s" % port.onion_uri) - torconfig = TorConfig(tor_process_protocol.tor_protocol) public_port = 80 hs_endpoint = TCPHiddenServiceEndpoint(reactor, torconfig, public_port, @@ -105,9 +103,9 @@ def startTor(): progress_updates=updates) else: d = launch_tor(torconfig, reactor, progress_updates=updates) - d.addCallback(setupCollector, datadir) + d.addCallback(setupCollector, datadir, torconfig) if ooniBouncer: - d.addCallback(setupBouncer, datadir) + d.addCallback(setupBouncer, datadir, torconfig) d.addErrback(txSetupFailed) if platformType == "win32":

1 0

[oonib/master] Merge pull request #19 from TheTorProject/fix/use_same_torconfig_for_collector_and_bouncer
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 362a360d2950571de14cb63b5289147274629fbe Merge: 0d2a3a0 74e16a6 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Sep 12 01:31:00 2013 -0700 Merge pull request #19 from TheTorProject/fix/use_same_torconfig_for_collector_and_bouncer Use the same TorConfig for bouncer and collector oonib/api.py | 4 ++-- oonib/runner.py | 53 ++++++++++++++--------------------------------------- 2 files changed, 16 insertions(+), 41 deletions(-)

1 0

[oonib/master] Refactor oonib runner
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 74e16a6bde76f8fe3c0a41069303e62eb552e380 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Sep 11 21:07:44 2013 +0200 Refactor oonib runner --- oonib/api.py | 4 ++-- oonib/runner.py | 51 ++++++++++++++------------------------------------- 2 files changed, 16 insertions(+), 39 deletions(-) diff --git a/oonib/api.py b/oonib/api.py index f2c48be..8b7ad4e 100644 --- a/oonib/api.py +++ b/oonib/api.py @@ -22,6 +22,6 @@ if config.main.policy_file: ooniBackendAPI += policyAPI if config.main.bouncer_file: - ooniBouncer = web.Application(bouncerAPI, debug=True) + ooniBouncer = web.Application(bouncerAPI, debug=True, name='bouncer') -ooniBackend = web.Application(ooniBackendAPI, debug=True) +ooniBackend = web.Application(ooniBackendAPI, debug=True, name='collector') diff --git a/oonib/runner.py b/oonib/runner.py index aa4c360..04e5310 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -37,44 +37,21 @@ def txSetupFailed(failure): log.err("Setup failed") log.exception(failure) -def setupCollector(tor_process_protocol, datadir, torconfig): +def setupHSEndpoint(tor_process_protocol, torconfig, endpoint): + endpointName = endpoint.settings['name'] def setup_complete(port): - #XXX: drop some other noise about what API are available on this machine - print("Exposed collector Tor hidden service on httpo://%s" - % port.onion_uri) + print("Exposed %s Tor hidden service on httpo://%s" % (endpointName, + port.onion_uri)) public_port = 80 - # XXX there is currently a bug in txtorcon that prevents data_dir from - # being passed properly. Details on the bug can be found here: - # https://github.com/meejah/txtorcon/pull/22 - - #XXX: set up the various API endpoints, if configured and enabled - #XXX: also set up a separate keyed hidden service for collectors to push their status to, if the bouncer is enabled hs_endpoint = TCPHiddenServiceEndpoint(reactor, torconfig, public_port, - data_dir=os.path.join(datadir, 'collector')) - d = hs_endpoint.listen(ooniBackend) - + data_dir=os.path.join(torconfig.DataDirectory, endpointName)) + d = hs_endpoint.listen(endpoint) d.addCallback(setup_complete) d.addErrback(txSetupFailed) + return d - return tor_process_protocol - -def setupBouncer(tor_process_protocol, datadir, torconfig): - def setup_complete(port): - #XXX: drop some other noise about what API are available on this machine - print("Exposed bouncer Tor hidden service on httpo://%s" - % port.onion_uri) - - public_port = 80 - - hs_endpoint = TCPHiddenServiceEndpoint(reactor, torconfig, public_port, - data_dir=os.path.join(datadir, 'bouncer')) - - d = hs_endpoint.listen(ooniBouncer) - d.addCallback(setup_complete) - d.addErrback(txSetupFailed) - -def startTor(): +def startTor(torconfig): def updates(prog, tag, summary): print("%d%%: %s" % (prog, summary)) @@ -83,7 +60,6 @@ def startTor(): os.makedirs(tempfile.gettempdir()) _temp_dir = tempfile.mkdtemp() - torconfig = TorConfig() torconfig.SocksPort = config.main.socks_port if config.main.tor2webmode: torconfig.Tor2webMode = 1 @@ -103,10 +79,7 @@ def startTor(): progress_updates=updates) else: d = launch_tor(torconfig, reactor, progress_updates=updates) - d.addCallback(setupCollector, datadir, torconfig) - if ooniBouncer: - d.addCallback(setupBouncer, datadir, torconfig) - d.addErrback(txSetupFailed) + return d if platformType == "win32": from twisted.scripts._twistw import WindowsApplicationRunner @@ -127,7 +100,11 @@ else: # This is our addition. The rest is taken from # twisted/scripts/_twistd_unix.py 12.2.0 if config.main.tor_hidden_service: - startTor() + torconfig = TorConfig() + d = startTor(torconfig) + d.addCallback(setupHSEndpoint, torconfig, ooniBackend) + if ooniBouncer: + d.addCallback(setupHSEndpoint, torconfig, ooniBouncer) else: if ooniBouncer: reactor.listenTCP(8888, ooniBouncer, interface="127.0.0.1")

1 0

[oonib/master] Skip policy check if not specified
by art＠torproject.org 31 Jan '14

31 Jan '14

commit bdacf8d6bd390ba9b1386d2c7c735ee28a14861b Author: aagbsn <aagbsn(a)extc.org> Date: Thu Sep 12 15:00:42 2013 +0200 Skip policy check if not specified --- oonib/policy/handlers.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index 9b92403..abce0b3 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -13,11 +13,16 @@ class Policy(object): def __init__(self): with open(config.main.policy_file) as f: p = yaml.safe_load(f) - self.nettest = list(p['nettest']) - self.input = list(p['input']) + self.input = self.nettest = [] + if 'nettest' in p.keys(): + self.nettest = list(p['nettest']) + if 'input' in p.keys(): + self.input = list(p['input']) def validateInputHash(self, input_hash): valid = False + if not self.input: + valid = True for i in self.input: if input_hash == i['id']: valid = True @@ -28,6 +33,8 @@ class Policy(object): def validateNettest(self, nettest_name): # XXX add support for version checking too. valid = False + if self.nettest: + valid = True for nt in self.nettest: if nettest_name == nt['name']: valid = True

1 0

[oonib/master] Merge pull request #21 from TheTorProject/fix/skip_policy_check_if_none_present
by art＠torproject.org 31 Jan '14

31 Jan '14

commit 7ea5687fc406a2d4a525a9b56862bc6c8bbe36ab Merge: 362a360 bdacf8d Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Sep 12 07:05:41 2013 -0700 Merge pull request #21 from TheTorProject/fix/skip_policy_check_if_none_present Skip policy check if not specified oonib/policy/handlers.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[oonib/master] Fix bug in parsing probe_asn number
by art＠torproject.org 31 Jan '14

31 Jan '14

commit ad1a62e67cf2703fe469dcfa1a10b799b545029c Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 27 11:46:32 2013 +0100 Fix bug in parsing probe_asn number --- oonib/report/handlers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 0c727ef..82f38b3 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -59,7 +59,7 @@ def parseNewReportRequest(request): } parsed_request = json.loads(request) - if not parsed_request['probe_asn']: + if 'probe_asn' not in parsed_request or not parsed_request['probe_asn']: parsed_request['probe_asn'] = 'AS0' for k, regexp in expected_request.items(): @@ -181,9 +181,9 @@ class NewReportHandlerFile(OONIBHandler): # XXX here we should validate and sanitize the request try: report_data = parseNewReportRequest(self.request.body) - except InvalidRequestField, exc: + except InvalidRequestField as exc: raise e.InvalidRequestField(exc) - except MissingField, exc: + except MissingField as exc: raise e.MissingRequestField(exc) log.debug("Parsed this data %s" % report_data)

1 0