diff options
| author | Michael J. Bazzinotti <mbazzinotti@gmail.com> | 2015-12-28 15:20:45 -0500 |
|---|---|---|
| committer | Michael J. Bazzinotti <mbazzinotti@gmail.com> | 2015-12-28 15:20:45 -0500 |
| commit | 80690b79062c739fc8adfc725d39a68d4b65b43a (patch) | |
| tree | e80e05eff05a690a0c7d76ba36b46cb4329c631f /libmproxy/models | |
| parent | 6391b05ef1b92585765eb77e352921ec61b65020 (diff) | |
| download | mitmproxy-80690b79062c739fc8adfc725d39a68d4b65b43a.tar.gz mitmproxy-80690b79062c739fc8adfc725d39a68d4b65b43a.tar.bz2 mitmproxy-80690b79062c739fc8adfc725d39a68d4b65b43a.zip | |
[docs/libmproxy/test] Support single client-side cert file as argument to
--client-certs
Diffstat (limited to 'libmproxy/models')
| -rw-r--r-- | libmproxy/models/connections.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libmproxy/models/connections.py b/libmproxy/models/connections.py index 3aa522ea..0991955d 100644 --- a/libmproxy/models/connections.py +++ b/libmproxy/models/connections.py @@ -174,11 +174,14 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject): def establish_ssl(self, clientcerts, sni, **kwargs): clientcert = None if clientcerts: - path = os.path.join( - clientcerts, - self.address.host.encode("idna")) + ".pem" - if os.path.exists(path): - clientcert = path + if os.path.isfile(clientcerts): + clientcert = clientcerts + else: + path = os.path.join( + clientcerts, + self.address.host.encode("idna")) + ".pem" + if os.path.exists(path): + clientcert = path self.convert_to_ssl(cert=clientcert, sni=sni, **kwargs) self.sni = sni |