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

[oonib/master] Add $ to the end of regexps that should have it
by art＠torproject.org 23 Apr '14

23 Apr '14

commit a17e817117daf7a5aaad4dc63a74df2da2fa1a89 Author: Taylor Hornby <havoc(a)defuse.ca> Date: Thu Mar 27 14:30:26 2014 -0600 Add $ to the end of regexps that should have it --- bin/archive_oonib_reports | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/archive_oonib_reports b/bin/archive_oonib_reports index 3c238af..7d5ecfd 100755 --- a/bin/archive_oonib_reports +++ b/bin/archive_oonib_reports @@ -50,13 +50,13 @@ def validate_fields(fields): # or not we should support > 2 character CC if fields['probe_cc'] is None: fields['probe_cc'] = default_probe_cc - if not re.match('[A-Z\?]{2,4}', fields['probe_cc'].upper()): + if not re.match('[A-Z\?]{2,4}$', fields['probe_cc'].upper()): raise InvalidReportField('probe_cc') # check report ASN if fields['probe_asn'] is None: fields['probe_asn'] = 'AS0' - if not re.match('^AS[0-9]{1,10}', fields['probe_asn'].upper()): + if not re.match('^AS[0-9]{1,10}$', fields['probe_asn'].upper()): raise InvalidReportField('probe_asn') # check report timestamp

1 0

[oonib/master] Handle writing exceptions that don't have log_exception attribute
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 168a7c9b9f5c0699009d8ef6eea0078c2a6a19cc Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 21 19:37:10 2014 +0200 Handle writing exceptions that don't have log_exception attribute --- oonib/handlers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/oonib/handlers.py b/oonib/handlers.py index 2231a2a..20c831b 100644 --- a/oonib/handlers.py +++ b/oonib/handlers.py @@ -6,8 +6,10 @@ from cyclone import web class OONIBHandler(web.RequestHandler): def write_error(self, status_code, exception=None, **kw): self.set_status(status_code) - if exception: + if hasattr(exception, 'log_message'): self.write({'error': exception.log_message}) + else: + self.write({'error': 'error'}) def write(self, chunk): """

1 0

[oonib/master] Remove unused duplicate of updateKnownHelpers
by art＠torproject.org 23 Apr '14

23 Apr '14

commit f9fd863c1707497a0fa8486b239aa97177c94502 Author: Taylor Hornby <havoc(a)defuse.ca> Date: Thu Mar 27 11:17:01 2014 -0600 Remove unused duplicate of updateKnownHelpers --- oonib/bouncer/handlers.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index 38ac1f5..47fee26 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -115,19 +115,6 @@ class BouncerQueryHandler(OONIBHandler): def initialize(self): self.bouncer = Bouncer() - def updateKnownHelpers(self): - with open(config.main.bouncer_file) as f: - bouncerFile = yaml.safe_load(f) - for collectorName, helpers in bouncerFile['collector'].items(): - for helperName, helperAddress in helpers['test-helper'].items(): - if helperName not in self.knownHelpers.keys(): - self.knownHelpers[helperName] = [] - - self.knownHelpers[helperName].append({ - 'collector-name': collectorName, - 'helper-address': helperAddress - }) - def post(self): try: query = json.loads(self.request.body)

1 0

[oonib/master] Make the CC regexp also more accurate
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 40930004c23163d0c38423026bd4e14e9942846d Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Mar 27 22:10:07 2014 +0100 Make the CC regexp also more accurate --- bin/archive_oonib_reports | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/archive_oonib_reports b/bin/archive_oonib_reports index 7d5ecfd..ba4d473 100755 --- a/bin/archive_oonib_reports +++ b/bin/archive_oonib_reports @@ -50,7 +50,7 @@ def validate_fields(fields): # or not we should support > 2 character CC if fields['probe_cc'] is None: fields['probe_cc'] = default_probe_cc - if not re.match('[A-Z\?]{2,4}$', fields['probe_cc'].upper()): + if not re.match('^[A-Z\?]{2,4}$', fields['probe_cc'].upper()): raise InvalidReportField('probe_cc') # check report ASN

1 0

[oonib/master] Apply the correct regular expression to the test helper key.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 882095a92a9fe4123529ee05e1beaa5e2a9e4bed Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Mar 27 22:13:57 2014 +0100 Apply the correct regular expression to the test helper key. Fixes #37 --- oonib/report/handlers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index dea5326..9e9e8ca 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -99,6 +99,7 @@ def parseNewReportRequest(request): version_string = re.compile("[0-9A-Za-z_\-\.]+$") name = re.compile("[a-zA-Z0-9_\- ]+$") probe_asn = re.compile("AS[0-9]+$") + test_helper = re.compile("[A-Za-z0-9_\-]+$") expected_request = { 'software_name': name, @@ -125,8 +126,8 @@ def parseNewReportRequest(request): raise InvalidRequestField(k) try: - test_helper = parsed_request['test_helper'] - if not re.match(regexp, str(test_helper)): + requested_test_helper = parsed_request['test_helper'] + if not re.match(test_helper, str(requested_test_helper)): raise InvalidRequestField('test_helper') except KeyError: pass

1 0

[oonib/master] Load the bouncer file just once. The previous code read it twice, which could create inconsistent datastructures if the file got edited at the wrong time.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit afb5dd4da67a684ba3f5630a8a9945592c56b221 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:24:44 2014 -0700 Load the bouncer file just once. The previous code read it twice, which could create inconsistent datastructures if the file got edited at the wrong time. --- oonib/bouncer/handlers.py | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index 0ff103e..2c7a1fe 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -7,33 +7,31 @@ from oonib.config import config class Bouncer(object): def __init__(self): - self.knownHelpers = {} - self.updateKnownHelpers() - self.updateKnownCollectors() + with open(config.main.bouncer_file) as f: + bouncerFile = yaml.safe_load(f) + self.updateKnownHelpers(bouncerFile) + self.updateKnownCollectors(bouncerFile) - def updateKnownCollectors(self): + def updateKnownCollectors(self, bouncerFile): """ - Returns the list of all known collectors + Initialize the list of all known collectors """ self.knownCollectors = [] - with open(config.main.bouncer_file) as f: - bouncerFile = yaml.safe_load(f) - for collectorName, helpers in bouncerFile['collector'].items(): - if collectorName not in self.knownCollectors: - self.knownCollectors.append(collectorName) + for collectorName, helpers in bouncerFile['collector'].items(): + if collectorName not in self.knownCollectors: + self.knownCollectors.append(collectorName) - def updateKnownHelpers(self): - with open(config.main.bouncer_file) as f: - bouncerFile = yaml.safe_load(f) - for collectorName, helpers in bouncerFile['collector'].items(): - for helperName, helperAddress in helpers['test-helper'].items(): - if helperName not in self.knownHelpers.keys(): - self.knownHelpers[helperName] = [] - - self.knownHelpers[helperName].append({ - 'collector-name': collectorName, - 'helper-address': helperAddress - }) + def updateKnownHelpers(self, bouncerFile): + self.knownHelpers = {} + for collectorName, helpers in bouncerFile['collector'].items(): + for helperName, helperAddress in helpers['test-helper'].items(): + if helperName not in self.knownHelpers.keys(): + self.knownHelpers[helperName] = [] + + self.knownHelpers[helperName].append({ + 'collector-name': collectorName, + 'helper-address': helperAddress + }) def getHelperAddresses(self, helper_name): """

1 0

[oonib/master] fix 'false midnight' bug (https://lwn.net/Articles/590299/ for an explanation)
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 443df222c023b4b737582037649a24460a2834d3 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 10:49:40 2014 -0700 fix 'false midnight' bug (https://lwn.net/Articles/590299/ for an explanation) --- oonib/otime.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/otime.py b/oonib/otime.py index 84758eb..e38089b 100644 --- a/oonib/otime.py +++ b/oonib/otime.py @@ -82,7 +82,7 @@ def timestamp(t=None): If not specified will default to the current time in UTC. """ - if not t: + if t is None: t = datetime.utcnow() ISO8601 = "%Y-%m-%dT%H%M%SZ" return t.strftime(ISO8601)

1 0

[oonib/master] Check version semantically instead of by string (the old code answers wrong for '0.10.0').
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 480b19722b918abdfaae0d4e694e829a77c2a7a4 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 10:58:20 2014 -0700 Check version semantically instead of by string (the old code answers wrong for '0.10.0'). --- oonib/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/runner.py b/oonib/runner.py index 57b0b9f..10bcf65 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -28,7 +28,7 @@ from oonib import oonibackend from oonib import log from txtorcon import __version__ as txtorcon_version -if txtorcon_version < '0.9.0': +if tuple(map(int, txtorcon_version.split('.'))) < (0,9,0): """ Fix for bug in txtorcon versions < 0.9.0 where TCPHiddenServiceEndpoint listens on all interfaces by default.

1 0

[oonib/master] Fix: old code could raise a KeyError because choices[c] preceded the if c in choices
by art＠torproject.org 23 Apr '14

23 Apr '14

commit e9e4701794b40ac2e7fdc97a3d71189820634b06 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:08:41 2014 -0700 Fix: old code could raise a KeyError because choices[c] preceded the if c in choices --- oonib/bouncer/handlers.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index 47fee26..0ff103e 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -95,14 +95,13 @@ class Bouncer(object): choices = self.getHelperAddresses(helper_name) for item in response.values(): c = item['collector'] - h = choices[c] - if c in choices.keys(): + if c in choices: break # Or default to a random selection else: - c,h = random.choice(choices.items()) + c = random.choice(choices) - response[helper_name] = {'collector': c, 'address': h} + response[helper_name] = {'collector': c, 'address': choices[c]} except e.TestHelperNotFound: response = {'error': 'test-helper-not-found'}

1 0

[oonib/master] Export ssl_helpers. (Or was it meant to be left out?)
by art＠torproject.org 23 Apr '14

23 Apr '14

commit bf6aa6024200724cc79b219f5dd2cc491932b297 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:26:31 2014 -0700 Export ssl_helpers. (Or was it meant to be left out?) --- oonib/testhelpers/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oonib/testhelpers/__init__.py b/oonib/testhelpers/__init__.py index 4dbb547..3a0e438 100644 --- a/oonib/testhelpers/__init__.py +++ b/oonib/testhelpers/__init__.py @@ -1,5 +1,6 @@ from . import dns_helpers from . import http_helpers +from . import ssl_helpers from . import tcp_helpers -__all__ = ['dns_helpers', 'http_helpers', 'tcp_helpers'] +__all__ = ['dns_helpers', 'http_helpers', 'ssl_helpers', 'tcp_helpers']

1 0