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

[oonib/master] Most of the body of this doesn't need to be in the scope of the 'with'. (This comes up in lots of the other 'with's in this codebase.)
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 67788384562254bbf8a8b6f1edaf7812cf2d83fa Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:37:31 2014 -0700 Most of the body of this doesn't need to be in the scope of the 'with'. (This comes up in lots of the other 'with's in this codebase.) --- oonib/policy/handlers.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index ac12c00..7f753b0 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -14,11 +14,11 @@ class Policy(object): def __init__(self): with open(config.main.policy_file) as f: p = yaml.safe_load(f) - self.input = self.nettest = [] - if 'nettest' in p.keys(): - self.nettest = list(p['nettest']) - if 'input' in p.keys(): - 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

1 0

[oonib/master] simpler methods in Storage
by art＠torproject.org 23 Apr '14

23 Apr '14

commit f5001bdebb0395b0817144c1d05a8466ac067714 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:14:51 2014 -0700 simpler methods in Storage --- oonib/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index be102df..ee1946b 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -28,10 +28,7 @@ class Storage(dict): None """ def __getattr__(self, key): - try: - return self[key] - except KeyError, k: - return None + return self.get(key) def __setattr__(self, key, value): self[key] = value @@ -49,8 +46,7 @@ class Storage(dict): return dict(self) def __setstate__(self, value): - for (k, v) in value.items(): - self[k] = v + self.update(value.items()) def randomStr(length, num=True): """

1 0

[oonib/master] Merge pull request #41 from darius/master
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 207e4b078e8ce2fbda38c5840b6c899c8a8b0e6a Merge: d4fe193 3af2732 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Mar 31 14:28:56 2014 +0200 Merge pull request #41 from darius/master Miscellaneous cleanups oonib/bouncer/handlers.py | 49 +++++++++++++++++++---------------------- oonib/otime.py | 2 +- oonib/policy/handlers.py | 21 +++++++----------- oonib/runner.py | 2 +- oonib/testhelpers/__init__.py | 3 ++- 5 files changed, 35 insertions(+), 42 deletions(-)

1 0

[oonib/master] If p is a dictionary (as I assume) then you don't need the .keys().
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 3af27326a39046ad8397fb92a4b5ee398418096b Author: Darius Bacon <darius(a)wry.me> Date: Fri Mar 28 11:41:11 2014 -0700 If p is a dictionary (as I assume) then you don't need the .keys(). --- oonib/policy/handlers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index b0c1aa5..cbf1c08 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -16,9 +16,9 @@ class Policy(object): p = yaml.safe_load(f) self.input = [] self.nettest = [] - if 'nettest' in p.keys(): + if 'nettest' in p: self.nettest = list(p['nettest']) - if 'input' in p.keys(): + if 'input' in p: self.input = list(p['input']) def validateInputHash(self, input_hash):

1 0

[oonib/master] clearer check_paths()
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 562649ffe895025bc579314b4f19a8f31c944464 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:11:03 2014 -0700 clearer check_paths() --- oonib/config.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/oonib/config.py b/oonib/config.py index 956fcc1..6fea660 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -39,15 +39,13 @@ class Config(object): self.check_paths() def check_paths(self): - if not self.main.report_dir or not os.path.isdir(self.main.report_dir): - raise e.InvalidReportDirectory(self.main.report_dir) - if not self.main.archive_dir or not os.path.isdir(self.main.archive_dir): - raise e.InvalidArchiveDirectory(self.main.archive_dir) - - if self.main.input_dir and not os.path.isdir(self.main.input_dir): - raise e.InvalidInputDirectory(self.main.input_dir) - if self.main.deck_dir and not os.path.isdir(self.main.deck_dir): - raise e.InvalidDeckDirectory(self.main.deck_dir) + def check_path(directory, complaint): + if not (directory and os.path.isdir(directory)): + raise complaint(directory) + check_path(self.main.report_dir, e.InvalidReportDirectory) + check_path(self.main.archive_dir, e.InvalidArchiveDirectory) + check_path(self.main.input_dir, e.InvalidInputDirectory) + check_path(self.main.deck_dir, e.InvalidDeckDirectory) backend_version = __version__ reports = {}

1 0

[oonib/master] try/except is not needed here
by art＠torproject.org 23 Apr '14

23 Apr '14

commit c543fee5b416af54604c3d356f6b5bb058860405 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:22:42 2014 -0700 try/except is not needed here --- oonib/report/handlers.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index f1fec4a..34aa8d9 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -305,10 +305,7 @@ class NewReportHandlerFile(OONIBHandler, UpdateReportMixin): 'report_id': report_id } - try: - requested_helper = report_data['test_helper'] - except KeyError: - requested_helper = None + requested_helper = report_data.get('test_helper') if requested_helper: try:

1 0

[oonib/master] note missing import
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 238ea56a4ecc9e255a73d29848d9d86dd910b7ef Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 11:49:11 2014 -0700 note missing import --- oonib/runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/runner.py b/oonib/runner.py index 10bcf65..fb5d090 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -35,7 +35,7 @@ if tuple(map(int, txtorcon_version.split('.'))) < (0,9,0): """ def create_listener(self, proto): self._update_onion(self.hiddenservice.dir) - self.tcp_endpoint = TCP4ServerEndpoint(self.reactor, self.listen_port, + self.tcp_endpoint = TCP4ServerEndpoint(self.reactor, self.listen_port, # XXX missing import -- has this code ever been tested? interface='127.0.0.1') d = self.tcp_endpoint.listen(self.protocolfactory) d.addCallback(self._add_attributes).addErrback(self._retry_local_port)

1 0

[oonib/master] simpler Config.load()
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 01c410b21020932179b3d62a73268f1132067ba5 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:24:56 2014 -0700 simpler Config.load() --- oonib/config.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/oonib/config.py b/oonib/config.py index 6fea660..afe3091 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -23,19 +23,17 @@ class Config(object): raise e.ConfigFileNotSpecified try: - with open(self.opts['config']) as f: + with open(config_file) as f: configuration = yaml.safe_load(f) except IOError: - raise e.ConfigFileDoesNotExist(self.opts['config']) + raise e.ConfigFileDoesNotExist(config_file) + + self.main = Storage(configuration['main'].items()) - self.main = Storage() - for k, v in configuration['main'].items(): - self.main[k] = v self.helpers = Storage() for name, helper in configuration['helpers'].items(): - self.helpers[name] = Storage() - for k, v in helper.items(): - self.helpers[name][k] = v + self.helpers[name] = Storage(helper.items()) + self.check_paths() def check_paths(self):

1 0

[oonib/master] clearer logic by eliminating checking_first_packet and bringing assignments to the same variable closer together
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 6ce07ebd9c2261d4dc069c52baa02bad965564a6 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 11:40:28 2014 -0700 clearer logic by eliminating checking_first_packet and bringing assignments to the same variable closer together --- oonib/daphn3.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/oonib/daphn3.py b/oonib/daphn3.py index 01f241e..9c5f290 100644 --- a/oonib/daphn3.py +++ b/oonib/daphn3.py @@ -17,13 +17,6 @@ def read_pcap(filename): packets = rdpcap(filename) - checking_first_packet = True - client_ip_addr = None - server_ip_addr = None - - ssl_packets = [] - messages = [] - """ pcap assumptions: @@ -42,21 +35,23 @@ def read_pcap(filename): Minimally validate the pcap and also find out what's the client and server IP addresses. """ - for packet in packets: - if checking_first_packet: + ssl_packets = [] + client_ip_addr = None + server_ip_addr = None + for i, packet in enumerate(packets): + if i == 0: client_ip_addr = packet[IP].src - checking_first_packet = False - else: - if packet[IP].src != client_ip_addr: - server_ip_addr = packet[IP].src + elif packet[IP].src != client_ip_addr: + server_ip_addr = packet[IP].src try: - if (packet[Raw]): + if packet[Raw]: ssl_packets.append(packet) except IndexError: pass """Form our list.""" + messages = [] for packet in ssl_packets: if packet[IP].src == client_ip_addr: messages.append({"client": str(packet[Raw])})

1 0

[oonib/master] fix doctest (python -m doctest __init__.py was failing)
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 9c14a5dd6651b4237d541b564d567474348fb9a2 Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:19:44 2014 -0700 fix doctest (python -m doctest __init__.py was failing) --- oonib/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index ee1946b..ac17bef 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -25,7 +25,6 @@ class Storage(dict): 2 >>> del o.a >>> o.a - None """ def __getattr__(self, key): return self.get(key)

1 0