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

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

23 Apr '14

commit cebaa01fe3eb8e47f3f1ac47524cf358380ec9b7 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] remove unused (and confusing) global
by art＠torproject.org 23 Apr '14

23 Apr '14

commit d61784b8bad62d5be71975db2359b784db7b7dcb Author: Darius Bacon <darius(a)wry.me> Date: Tue Apr 15 16:30:54 2014 -0700 remove unused (and confusing) global --- oonib/config.py | 1 - 1 file changed, 1 deletion(-) diff --git a/oonib/config.py b/oonib/config.py index afe3091..1388e6b 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -46,6 +46,5 @@ class Config(object): check_path(self.main.deck_dir, e.InvalidDeckDirectory) backend_version = __version__ -reports = {} config = Config()

1 0

[oonib/master] a more-direct test
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 304d8a5d5d86f51af40b8fd4af7e628afcba156c Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 11:55:38 2014 -0700 a more-direct test --- oonib/bouncer/handlers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index 2c7a1fe..0980262 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -123,9 +123,7 @@ class BouncerQueryHandler(OONIBHandler): except KeyError: raise e.TestHelpersKeyMissing - try: - assert isinstance(requested_helpers, list) - except AssertionError: + if not isinstance(requested_helpers, list): raise e.InvalidRequest response = self.bouncer.filterHelperAddresses(requested_helpers)

1 0

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

23 Apr '14

commit 486f8e147df22f59dcb1db091d79949150719743 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 11:46:32 2014 -0700 remove duplicate import --- oonib/options.py | 1 - 1 file changed, 1 deletion(-) diff --git a/oonib/options.py b/oonib/options.py index 7acdc23..d5c87b3 100644 --- a/oonib/options.py +++ b/oonib/options.py @@ -1,6 +1,5 @@ from twisted.python import usage from twisted.python.runtime import platformType -from twisted.python import usage if platformType == "win32": from twisted.scripts._twistw import ServerOptions

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 e3fe7ae7b44e9a1e2ac473588efdb3591332db42 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] tighter try/except/with blocks
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 9302045df0bce7689e06fb2fa868fd093f70b866 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:13:34 2014 -0700 tighter try/except/with blocks --- oonib/input/handlers.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/oonib/input/handlers.py b/oonib/input/handlers.py index fce7451..33bec55 100644 --- a/oonib/input/handlers.py +++ b/oonib/input/handlers.py @@ -11,23 +11,27 @@ class InputDescHandler(OONIBHandler): def get(self, inputID): bn = os.path.basename(inputID) + ".desc" try: - with open(os.path.join(config.main.input_dir, bn)) as f: - response = {} - inputDesc = yaml.safe_load(f) - for k in ['name', 'description', 'version', 'author', 'date']: - response[k] = inputDesc[k] - response['id'] = inputID - self.write(response) + f = open(os.path.join(config.main.input_dir, bn)) except IOError: log.err("No Input Descriptor found for id %s" % inputID) self.set_status(404) self.write({'error': 'missing-input'}) + return + with f: + inputDesc = yaml.safe_load(f) - except Exception, e: - log.exception(e) - log.err("Invalid Input Descriptor found for id %s" % inputID) - self.set_status(500) - self.write({'error': 'invalid-input-descriptor'}) + response = {'id': inputID} + for k in ['name', 'description', 'version', 'author', 'date']: + try: + response[k] = inputDesc[k] + except Exception, e: # XXX this should probably be KeyError + log.exception(e) + log.err("Invalid Input Descriptor found for id %s" % inputID) + self.set_status(500) + self.write({'error': 'invalid-input-descriptor'}) + return + + self.write(response) class InputListHandler(OONIBHandler): def get(self):

1 0

[oonib/master] remove overbroad try/except
by art＠torproject.org 23 Apr '14

23 Apr '14

commit ac2f6a42f71d828cc6dad18bbd7f9573d14f2732 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:21:02 2014 -0700 remove overbroad try/except --- 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 9e9e8ca..f1fec4a 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -250,10 +250,7 @@ class NewReportHandlerFile(OONIBHandler, UpdateReportMixin): software_version = str(report_data['software_version']) probe_asn = str(report_data['probe_asn']) - try: - probe_cc = str(report_data['probe_cc']) - except: - probe_cc = 'ZZ' + probe_cc = str(report_data.get('probe_cc', 'ZZ')) self.testName = str(report_data['test_name']) self.testVersion = str(report_data['test_version'])

1 0

[oonib/master] move write() out of the scope of an IOError catch clause not meant for it
by art＠torproject.org 23 Apr '14

23 Apr '14

commit b4eb149099b64bcfccc8a8f2fd0c5008c74a4fe0 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:00:10 2014 -0700 move write() out of the scope of an IOError catch clause not meant for it --- oonib/deck/handlers.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/oonib/deck/handlers.py b/oonib/deck/handlers.py index 44ff24f..8f30bfd 100644 --- a/oonib/deck/handlers.py +++ b/oonib/deck/handlers.py @@ -21,16 +21,15 @@ class DeckDescHandler(OONIBHandler): deckDesc = yaml.safe_load(f) for k in ['name', 'description', 'version', 'author', 'date']: response[k] = deckDesc[k] - self.write(response) - except IOError: log.err("Deck %s missing" % deckID) raise e.MissingDeck - except KeyError: log.err("Deck %s missing required keys!" % deckID) raise e.MissingDeckKeys + self.write(response) + class DeckListHandler(OONIBHandler): def get(self): if not config.main.deck_dir:

1 0

[oonib/master] tighter try/except/with blocks
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 112a7e2655f2ec2ea94670361c094dcaa51b85f5 Author: Darius Bacon <darius(a)wry.me> Date: Wed Apr 16 12:06:12 2014 -0700 tighter try/except/with blocks --- oonib/deck/handlers.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/oonib/deck/handlers.py b/oonib/deck/handlers.py index 8f30bfd..b9589b0 100644 --- a/oonib/deck/handlers.py +++ b/oonib/deck/handlers.py @@ -16,18 +16,20 @@ class DeckDescHandler(OONIBHandler): # against matching a certain pattern in the handler. bn = os.path.basename(deckID + '.desc') try: - with open(os.path.join(config.main.deck_dir, bn)) as f: - response = {} - deckDesc = yaml.safe_load(f) - for k in ['name', 'description', 'version', 'author', 'date']: - response[k] = deckDesc[k] + f = open(os.path.join(config.main.deck_dir, bn)) except IOError: log.err("Deck %s missing" % deckID) raise e.MissingDeck - except KeyError: - log.err("Deck %s missing required keys!" % deckID) - raise e.MissingDeckKeys + with f: + deckDesc = yaml.safe_load(f) + response = {} + for k in ['name', 'description', 'version', 'author', 'date']: + try: + response[k] = deckDesc[k] + except KeyError: + log.err("Deck %s missing required keys!" % deckID) + raise e.MissingDeckKeys self.write(response) class DeckListHandler(OONIBHandler):

1 0

[oonib/master] Fix bug introduce in previous PR.
by art＠torproject.org 23 Apr '14

23 Apr '14

commit 540e30528ddce5dabbb76240d5cbcdfe780c631a Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Apr 21 19:23:59 2014 +0200 Fix bug introduce in previous PR. --- oonib/bouncer/handlers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index 0980262..0a5b51f 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -97,7 +97,7 @@ class Bouncer(object): break # Or default to a random selection else: - c = random.choice(choices) + c = random.choice(choices.keys()) response[helper_name] = {'collector': c, 'address': choices[c]}

1 0