From 1e4e332ef9040928cb0548097e879d8e9a57f3a2 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Tue, 2 Sep 2014 18:13:18 +0200 Subject: improve error handling --- libmproxy/proxy/connection.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libmproxy/proxy/connection.py') 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) -- cgit v1.2.3