diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-08 16:08:57 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-11 20:32:13 +0200 |
| commit | 026330a3b014f24f095b839b29186036854de3bc (patch) | |
| tree | c5770ef28332b61f56b5435136e8dcd95340ed1d /libmproxy/protocol2/rawtcp.py | |
| parent | 314e0f5839fcd4a1c35323f61938b207232de287 (diff) | |
| download | mitmproxy-026330a3b014f24f095b839b29186036854de3bc.tar.gz mitmproxy-026330a3b014f24f095b839b29186036854de3bc.tar.bz2 mitmproxy-026330a3b014f24f095b839b29186036854de3bc.zip | |
cleaner Exceptions, ssl -> tls, upstream proxy mode
Diffstat (limited to 'libmproxy/protocol2/rawtcp.py')
| -rw-r--r-- | libmproxy/protocol2/rawtcp.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libmproxy/protocol2/rawtcp.py b/libmproxy/protocol2/rawtcp.py index 39e48e24..608a53e3 100644 --- a/libmproxy/protocol2/rawtcp.py +++ b/libmproxy/protocol2/rawtcp.py @@ -1,4 +1,6 @@ from __future__ import (absolute_import, print_function, division) +import OpenSSL +from ..exceptions import ProtocolException from ..protocol.tcp import TCPHandler from .layer import Layer from .messages import Connect @@ -8,7 +10,11 @@ class TcpLayer(Layer): def __call__(self): yield Connect() tcp_handler = TCPHandler(self) - tcp_handler.handle_messages() + try: + tcp_handler.handle_messages() + except OpenSSL.SSL.Error as e: + raise ProtocolException("SSL error: %s" % repr(e), e) + def establish_server_connection(self): pass |