diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-02 18:13:18 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-02 18:13:18 +0200 |
| commit | 1e4e332ef9040928cb0548097e879d8e9a57f3a2 (patch) | |
| tree | 683623e7801511a561afe521ab4c6b864c387f0a /libmproxy/proxy/connection.py | |
| parent | 1a41c15c039f871d5da85b6ce17e4f3006c4374a (diff) | |
| download | mitmproxy-1e4e332ef9040928cb0548097e879d8e9a57f3a2.tar.gz mitmproxy-1e4e332ef9040928cb0548097e879d8e9a57f3a2.tar.bz2 mitmproxy-1e4e332ef9040928cb0548097e879d8e9a57f3a2.zip | |
improve error handling
Diffstat (limited to 'libmproxy/proxy/connection.py')
| -rw-r--r-- | libmproxy/proxy/connection.py | 8 |
1 files changed, 2 insertions, 6 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) |