From 11fb21719179f243b9f2a069cba42c1d7f3722c0 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Fri, 10 Jun 2016 11:14:23 +1200
Subject: Fix a crash when pathoc connections fail

Use the new handler to tidy this up.
---
 pathod/pathoc.py         | 127 +++++++++++++++++++++++------------------------
 pathod/pathoc_cmdline.py |   1 -
 2 files changed, 62 insertions(+), 66 deletions(-)

diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index 88405698..def6cfcf 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -291,47 +291,43 @@ class Pathoc(tcp.TCPClient):
         if self.use_http2 and not self.ssl:
             raise NotImplementedError("HTTP2 without SSL is not supported.")
 
-        try:
-            ret = tcp.TCPClient.connect(self)
-            if connect_to:
-                self.http_connect(connect_to)
+        ret = tcp.TCPClient.connect(self)
+        if connect_to:
+            self.http_connect(connect_to)
 
-            self.sslinfo = None
-            if self.ssl:
-                try:
-                    alpn_protos = [b'http/1.1']
-                    if self.use_http2:
-                        alpn_protos.append(b'h2')
-
-                    self.convert_to_ssl(
-                        sni=self.sni,
-                        cert=self.clientcert,
-                        method=self.ssl_version,
-                        options=self.ssl_options,
-                        cipher_list=self.ciphers,
-                        alpn_protos=alpn_protos
-                    )
-                except TlsException as v:
-                    raise PathocError(str(v))
-
-                self.sslinfo = SSLInfo(
-                    self.connection.get_peer_cert_chain(),
-                    self.get_current_cipher(),
-                    self.get_alpn_proto_negotiated()
+        self.sslinfo = None
+        if self.ssl:
+            try:
+                alpn_protos = [b'http/1.1']
+                if self.use_http2:
+                    alpn_protos.append(b'h2')
+
+                self.convert_to_ssl(
+                    sni=self.sni,
+                    cert=self.clientcert,
+                    method=self.ssl_version,
+                    options=self.ssl_options,
+                    cipher_list=self.ciphers,
+                    alpn_protos=alpn_protos
                 )
-                if showssl:
-                    print(str(self.sslinfo), file=fp)
+            except TlsException as v:
+                raise PathocError(str(v))
 
-                if self.use_http2:
-                    self.protocol.check_alpn()
-                    if not self.http2_skip_connection_preface:
-                        self.protocol.perform_client_connection_preface()
-
-            if self.timeout:
-                self.settimeout(self.timeout)
-        except Exception:
-            self.close()
-            raise
+            self.sslinfo = SSLInfo(
+                self.connection.get_peer_cert_chain(),
+                self.get_current_cipher(),
+                self.get_alpn_proto_negotiated()
+            )
+            if showssl:
+                print(str(self.sslinfo), file=fp)
+
+            if self.use_http2:
+                self.protocol.check_alpn()
+                if not self.http2_skip_connection_preface:
+                    self.protocol.perform_client_connection_preface()
+
+        if self.timeout:
+            self.settimeout(self.timeout)
         return ret
 
     def stop(self):
@@ -511,39 +507,40 @@ def main(args):  # pragma: no cover
             )
             trycount = 0
             try:
-                p.connect(args.connect_to, args.showssl)
+                with p.connect(args.connect_to, args.showssl):
+                    for spec in playlist:
+                        if args.explain or args.memo:
+                            spec = spec.freeze(p.settings)
+                        if args.memo:
+                            h = hashlib.sha256(spec.spec()).digest()
+                            if h not in memo:
+                                trycount = 0
+                                memo.add(h)
+                            else:
+                                trycount += 1
+                                if trycount > args.memolimit:
+                                    print("Memo limit exceeded...", file=sys.stderr)
+                                    return
+                                else:
+                                    continue
+                        try:
+                            ret = p.request(spec)
+                            if ret and args.oneshot:
+                                return
+                            # We consume the queue when we can, so it doesn't build up.
+                            for i_ in p.wait(timeout=0, finish=False):
+                                pass
+                        except NetlibException:
+                            break
+                    for i_ in p.wait(timeout=0.01, finish=True):
+                        pass
             except TcpException as v:
                 print(str(v), file=sys.stderr)
                 continue
             except PathocError as v:
                 print(str(v), file=sys.stderr)
                 sys.exit(1)
-            for spec in playlist:
-                if args.explain or args.memo:
-                    spec = spec.freeze(p.settings)
-                if args.memo:
-                    h = hashlib.sha256(spec.spec()).digest()
-                    if h not in memo:
-                        trycount = 0
-                        memo.add(h)
-                    else:
-                        trycount += 1
-                        if trycount > args.memolimit:
-                            print("Memo limit exceeded...", file=sys.stderr)
-                            return
-                        else:
-                            continue
-                try:
-                    ret = p.request(spec)
-                    if ret and args.oneshot:
-                        return
-                    # We consume the queue when we can, so it doesn't build up.
-                    for i_ in p.wait(timeout=0, finish=False):
-                        pass
-                except NetlibException:
-                    break
-            for i_ in p.wait(timeout=0.01, finish=True):
-                pass
+
     except KeyboardInterrupt:
         pass
     if p:
diff --git a/pathod/pathoc_cmdline.py b/pathod/pathoc_cmdline.py
index a9603c40..1f438cd7 100644
--- a/pathod/pathoc_cmdline.py
+++ b/pathod/pathoc_cmdline.py
@@ -218,7 +218,6 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr):
             print(v.marked(), file=stderr)
             sys.exit(1)
     args.requests = reqs
-
     return args
 
 
-- 
cgit v1.2.3