aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael J. Bazzinotti <mbazzinotti@gmail.com>2015-12-28 15:20:45 -0500
committerMichael J. Bazzinotti <mbazzinotti@gmail.com>2015-12-28 15:20:45 -0500
commit80690b79062c739fc8adfc725d39a68d4b65b43a (patch)
treee80e05eff05a690a0c7d76ba36b46cb4329c631f /test
parent6391b05ef1b92585765eb77e352921ec61b65020 (diff)
downloadmitmproxy-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 'test')
-rw-r--r--test/test_proxy.py6
-rw-r--r--test/test_server.py9
2 files changed, 14 insertions, 1 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py
index b3e7258a..a0530c79 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -1,3 +1,4 @@
+import os
import mock
from OpenSSL import SSL
@@ -99,8 +100,11 @@ class TestProcessProxyOptions:
def test_client_certs(self):
with tutils.tmpdir() as cadir:
self.assert_noerr("--client-certs", cadir)
+ self.assert_noerr(
+ "--client-certs",
+ os.path.join(tutils.test_data.path("data/clientcert"), "client.pem"))
self.assert_err(
- "directory does not exist",
+ "not a file or directory",
"--client-certs",
"nonexistent")
diff --git a/test/test_server.py b/test/test_server.py
index e48e46fe..09cfa381 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -1,3 +1,4 @@
+import os
import socket
import time
from OpenSSL import SSL
@@ -316,6 +317,14 @@ class TestHTTPS(tservers.HTTPProxTest, CommonMixin, TcpMixin):
clientcerts = True
def test_clientcert(self):
+ self.config.clientcerts = os.path.join(
+ tutils.test_data.path("data/clientcert"), "client.pem")
+ f = self.pathod("304")
+ assert f.status_code == 304
+ assert self.server.last_log()["request"]["clientcert"]["keyinfo"]
+
+ def test_clientcerts(self):
+ self.config.clientcerts = tutils.test_data.path("data/clientcert")
f = self.pathod("304")
assert f.status_code == 304
assert self.server.last_log()["request"]["clientcert"]["keyinfo"]