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

[oonib/master] Merge branch 'fix/regexp_end_match'
by art＠torproject.org 23 Apr '14

23 Apr '14

commit e4311c634fcb4d0ad66b0d74ef3fa96192669244 Merge: 3a9dc15 9958da2 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Mar 27 22:10:41 2014 +0100 Merge branch 'fix/regexp_end_match' * fix/regexp_end_match: Make the CC regexp also more accurate Add $ to the end of regexps that should have it bin/archive_oonib_reports | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

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 d4fe193e86f9982546b648da1432db132ae77f5f 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] fix 'false midnight' bug (https://lwn.net/Articles/590299/ for an explanation)
by art＠torproject.org 23 Apr '14

23 Apr '14

commit d7b6cb2a2d6e4ea1d206ec870635544ee22cd488 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 d588abacd02722a39a46b96e0ad0ef62542d75e1 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 3cb4394c9c4e8d20fd1068bbd0c75ab907999fdf 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] 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 4c483d5bedba1d74795048d54b0f3eebd21d07d4 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] Make validateNettest work like validateInputHash. Previously the code was clearly redundant and thus probably wrong.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit b8b81deba021d5f103e50e3cf2c259234ce79bad Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:33:03 2014 -0700 Make validateNettest work like validateInputHash. Previously the code was clearly redundant and thus probably wrong. --- oonib/policy/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index 913aeb1..83a7f24 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -34,7 +34,7 @@ class Policy(object): def validateNettest(self, nettest_name): # XXX add support for version checking too. valid = False - if self.nettest: + if not self.nettest: valid = True for nt in self.nettest: if nettest_name == nt['name']:

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 0af1b10491623ab74a0c6977d3f03772fbb4ec35 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

[oonib/master] More-direct code for validateNettest, as long as I'm messing with it. You could do the same to validateInputHash.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit ae549520175fd0f764143954faa5ce299435251d Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:36:00 2014 -0700 More-direct code for validateNettest, as long as I'm messing with it. You could do the same to validateInputHash. --- oonib/policy/handlers.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index 83a7f24..ac12c00 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -33,15 +33,9 @@ class Policy(object): def validateNettest(self, nettest_name): # XXX add support for version checking too. - valid = False - if not self.nettest: - valid = True - for nt in self.nettest: - if nettest_name == nt['name']: - valid = True - break - if not valid: - raise e.InvalidNettestName + if self.nettest: + if not any(nt['name'] == nettest_name for nt in self.nettest): + raise e.InvalidNettestName class PolicyHandler(OONIBHandler): def initialize(self):

1 0

[oonib/master] Avoid the possibility of accidentally sharing the same mutable list for self.input and self.nettest.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 2b8081ef8de3efe6434fe67a4e7e16ecde7abb11 Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:40:08 2014 -0700 Avoid the possibility of accidentally sharing the same mutable list for self.input and self.nettest. --- oonib/policy/handlers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index 7f753b0..b0c1aa5 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -14,7 +14,8 @@ class Policy(object): def __init__(self): with open(config.main.policy_file) as f: p = yaml.safe_load(f) - self.input = self.nettest = [] + self.input = [] + self.nettest = [] if 'nettest' in p.keys(): self.nettest = list(p['nettest']) if 'input' in p.keys():

1 0