diff options
Diffstat (limited to 'libmproxy/proxy')
| -rw-r--r-- | libmproxy/proxy/connection.py | 8 | ||||
| -rw-r--r-- | libmproxy/proxy/server.py | 24 |
2 files changed, 17 insertions, 15 deletions
diff --git a/libmproxy/proxy/connection.py b/libmproxy/proxy/connection.py index 07129d6a..d99ffa9b 100644 --- a/libmproxy/proxy/connection.py +++ b/libmproxy/proxy/connection.py @@ -3,7 +3,6 @@ import copy import os from netlib import tcp, certutils from .. import stateobject, utils -from .primitives import ProxyError class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject): @@ -156,11 +155,8 @@ class ServerConnection(tcp.TCPClient, stateobject.SimpleStateObject): path = os.path.join(clientcerts, self.address.host.encode("idna")) + ".pem" if os.path.exists(path): clientcert = path - try: - self.convert_to_ssl(cert=clientcert, sni=sni) - self.timestamp_ssl_setup = utils.timestamp() - except tcp.NetLibError, v: - raise ProxyError(400, repr(v)) + self.convert_to_ssl(cert=clientcert, sni=sni) + self.timestamp_ssl_setup = utils.timestamp() def finish(self): tcp.TCPClient.finish(self) diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 946a301a..092eae54 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -95,7 +95,7 @@ class ConnectionHandler: # Delegate handling to the protocol handler protocol_handler(self.conntype)(self).handle_messages() - except (ProxyError, tcp.NetLibError), e: + except ProxyError as e: protocol_handler(self.conntype)(self).handle_error(e) except Exception: import traceback, sys @@ -190,18 +190,24 @@ class ConnectionHandler: raise ProxyError(502, "No server connection.") if self.server_conn.ssl_established: raise ProxyError(502, "SSL to Server already established.") - self.server_conn.establish_ssl(self.config.clientcerts, self.sni) + try: + self.server_conn.establish_ssl(self.config.clientcerts, self.sni) + except tcp.NetLibError as v: + raise ProxyError(502, repr(v)) if client: if self.client_conn.ssl_established: raise ProxyError(502, "SSL to Client already established.") cert, key = self.find_cert() - self.client_conn.convert_to_ssl( - cert, key, - handle_sni=self.handle_sni, - cipher_list=self.config.ciphers, - dhparams=self.config.certstore.dhparams, - ca_file=self.config.ca_file - ) + try: + self.client_conn.convert_to_ssl( + cert, key, + handle_sni=self.handle_sni, + cipher_list=self.config.ciphers, + dhparams=self.config.certstore.dhparams, + ca_file=self.config.ca_file + ) + except tcp.NetLibError as v: + raise ProxyError(400, repr(v)) def server_reconnect(self): address = self.server_conn.address |