aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-01 19:24:36 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-01 19:24:36 +0200
commitf1c8b47b1eb153d448061c0ddce21030c31af2b7 (patch)
tree529949dc40052291460b485142330932cf51819a
parent2f0d6507292a27d647179fac9c45bbfa0f19b97e (diff)
downloadmitmproxy-f1c8b47b1eb153d448061c0ddce21030c31af2b7.tar.gz
mitmproxy-f1c8b47b1eb153d448061c0ddce21030c31af2b7.tar.bz2
mitmproxy-f1c8b47b1eb153d448061c0ddce21030c31af2b7.zip
better tls error messages, fix #672
-rw-r--r--libmproxy/protocol/tls.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py
index 2646ec4f..a8dc8bb2 100644
--- a/libmproxy/protocol/tls.py
+++ b/libmproxy/protocol/tls.py
@@ -259,9 +259,17 @@ class TlsLayer(Layer):
(tls_cert_err['depth'], tls_cert_err['errno']),
"error")
self.log("Aborting connection attempt", "error")
- raise ProtocolException("Cannot establish TLS with server: %s" % repr(e), e)
+ raise ProtocolException("Cannot establish TLS with {address} (sni: {sni}): {e}".format(
+ address=repr(self.server_conn.address),
+ sni=self.sni_for_server_connection,
+ e=repr(e),
+ ), e)
except NetLibError as e:
- raise ProtocolException("Cannot establish TLS with server: %s" % repr(e), e)
+ raise ProtocolException("Cannot establish TLS with {address} (sni: {sni}): {e}".format(
+ address=repr(self.server_conn.address),
+ sni=self.sni_for_server_connection,
+ e=repr(e),
+ ), e)
self.log("ALPN selected by server: %s" % self.alpn_for_client_connection, "debug")