aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_tcp.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-05-13 08:48:21 +1200
committerAldo Cortesi <aldo@nullcube.com>2013-05-13 08:48:21 +1200
commit7f0aa415e1ab95ed6b27a760cc9aa8ff4ee85080 (patch)
treecc935ae95c1a4621dd21827d09d1593e533cdd30 /test/test_tcp.py
parent9c13224353eefbb6b1824ded20846036b07c558f (diff)
downloadmitmproxy-7f0aa415e1ab95ed6b27a760cc9aa8ff4ee85080.tar.gz
mitmproxy-7f0aa415e1ab95ed6b27a760cc9aa8ff4ee85080.tar.bz2
mitmproxy-7f0aa415e1ab95ed6b27a760cc9aa8ff4ee85080.zip
Add a request_client_cert argument to server SSL conversion.
By default, we now do not request the client cert. We're supposed to be able to do this with no negative effects - if the client has no cert to present, we're notified and proceed as usual. Unfortunately, Android seems to have a bug (tested on 4.2.2) - when an Android client is asked to present a certificate it does not have, it hangs up, which is frankly bogus. Some time down the track we may be able to make the proper behaviour the default again, but until then we're conservative.
Diffstat (limited to 'test/test_tcp.py')
-rw-r--r--test/test_tcp.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/test/test_tcp.py b/test/test_tcp.py
index de14ab25..318d2abc 100644
--- a/test/test_tcp.py
+++ b/test/test_tcp.py
@@ -111,6 +111,7 @@ class TestServerSSL(test.ServerTestBase):
ssl = dict(
cert = tutils.test_data.path("data/server.crt"),
key = tutils.test_data.path("data/server.key"),
+ request_client_cert = False,
v3_only = False
)
def test_echo(self):
@@ -131,6 +132,7 @@ class TestSSLv3Only(test.ServerTestBase):
ssl = dict(
cert = tutils.test_data.path("data/server.crt"),
key = tutils.test_data.path("data/server.key"),
+ request_client_cert = False,
v3_only = True
)
def test_failure(self):
@@ -144,6 +146,7 @@ class TestSSLClientCert(test.ServerTestBase):
ssl = dict(
cert = tutils.test_data.path("data/server.crt"),
key = tutils.test_data.path("data/server.key"),
+ request_client_cert = True,
v3_only = False
)
def test_clientcert(self):
@@ -167,6 +170,7 @@ class TestSNI(test.ServerTestBase):
ssl = dict(
cert = tutils.test_data.path("data/server.crt"),
key = tutils.test_data.path("data/server.key"),
+ request_client_cert = False,
v3_only = False
)
def test_echo(self):
@@ -181,6 +185,7 @@ class TestSSLDisconnect(test.ServerTestBase):
ssl = dict(
cert = tutils.test_data.path("data/server.crt"),
key = tutils.test_data.path("data/server.key"),
+ request_client_cert = False,
v3_only = False
)
def test_echo(self):
@@ -228,6 +233,7 @@ class TestSSLTimeOut(test.ServerTestBase):
ssl = dict(
cert = tutils.test_data.path("data/server.crt"),
key = tutils.test_data.path("data/server.key"),
+ request_client_cert = False,
v3_only = False
)
def test_timeout_client(self):