diff options
Diffstat (limited to 'libmproxy/protocol')
-rw-r--r-- | libmproxy/protocol/base.py | 11 | ||||
-rw-r--r-- | libmproxy/protocol/http.py | 2 | ||||
-rw-r--r-- | libmproxy/protocol/rawtcp.py | 2 | ||||
-rw-r--r-- | libmproxy/protocol/tls.py | 11 |
4 files changed, 18 insertions, 8 deletions
diff --git a/libmproxy/protocol/base.py b/libmproxy/protocol/base.py index 6793d3df..b92aeea1 100644 --- a/libmproxy/protocol/base.py +++ b/libmproxy/protocol/base.py @@ -1,6 +1,8 @@ from __future__ import (absolute_import, print_function, division) -import six import sys + +import six + from netlib import tcp from ..models import ServerConnection from ..exceptions import ProtocolException @@ -176,8 +178,11 @@ class ServerConnectionMixin(object): except tcp.NetLibError as e: six.reraise( ProtocolException, - ProtocolException("Server connection to %s failed: %s" % - (repr(self.server_conn.address), e), e), + ProtocolException( + "Server connection to {} failed: {}".format( + repr(self.server_conn.address), str(e) + ) + ), sys.exc_info()[2] ) diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index 636b72f4..3a415320 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -397,7 +397,7 @@ class HttpLayer(Layer): if isinstance(e, ProtocolException): six.reraise(ProtocolException, e, sys.exc_info()[2]) else: - six.reraise(ProtocolException, ProtocolException("Error in HTTP connection: %s" % repr(e), e), sys.exc_info()[2]) + six.reraise(ProtocolException, ProtocolException("Error in HTTP connection: %s" % repr(e)), sys.exc_info()[2]) finally: flow.live = False diff --git a/libmproxy/protocol/rawtcp.py b/libmproxy/protocol/rawtcp.py index 8a597a15..9b155412 100644 --- a/libmproxy/protocol/rawtcp.py +++ b/libmproxy/protocol/rawtcp.py @@ -67,6 +67,6 @@ class RawTCPLayer(Layer): except (socket.error, NetLibError, SSL.Error) as e: six.reraise( ProtocolException, - ProtocolException("TCP connection closed unexpectedly: {}".format(repr(e)), e), + ProtocolException("TCP connection closed unexpectedly: {}".format(repr(e))), sys.exc_info()[2] ) diff --git a/libmproxy/protocol/tls.py b/libmproxy/protocol/tls.py index 1164681c..4f7c9300 100644 --- a/libmproxy/protocol/tls.py +++ b/libmproxy/protocol/tls.py @@ -416,7 +416,12 @@ class TlsLayer(Layer): except NetLibError as e: six.reraise( ClientHandshakeException, - ClientHandshakeException("Cannot establish TLS with client: %s" % repr(e), e), + ClientHandshakeException( + "Cannot establish TLS with client (sni: {sni}): {e}".format( + sni=self.client_sni, e=repr(e) + ), + self.client_sni or repr(self.server_conn.address) + ), sys.exc_info()[2] ) @@ -473,7 +478,7 @@ class TlsLayer(Layer): address=repr(self.server_conn.address), sni=self.sni_for_server_connection, e=repr(e), - ), e), + )), sys.exc_info()[2] ) except NetLibError as e: @@ -483,7 +488,7 @@ class TlsLayer(Layer): address=repr(self.server_conn.address), sni=self.sni_for_server_connection, e=repr(e), - ), e), + )), sys.exc_info()[2] ) |