Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-22 15:37:45 +00:00
Code Issues Projects Releases Wiki Activity

Adapt for new request_client_cert option in netlib.

Browse Source
This commit is contained in:
Aldo Cortesi 2013-05-13 09:08:24 +12:00
parent bc88930fb7
commit 11cc48ca25
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/test_server.py
View File

@ -1,7 +1,7 @@
import socket, time import socket, time
import mock import mock
from netlib import tcp, http_auth, http from netlib import tcp, http_auth, http
from libpathod import pathoc from libpathod import pathoc, pathod
import tutils, tservers import tutils, tservers
from libmproxy import flow, proxy from libmproxy import flow, proxy
@ -173,6 +173,7 @@ class TestHTTPConnectSSLError(tservers.HTTPProxTest):
class TestHTTPS(tservers.HTTPProxTest, CommonMixin): class TestHTTPS(tservers.HTTPProxTest, CommonMixin):
ssl = True ssl = True
ssloptions = pathod.SSLOptions(request_client_cert=True)
clientcerts = True clientcerts = True
def test_clientcert(self): def test_clientcert(self):
f = self.pathod("304") f = self.pathod("304")

5
test/tservers.py
View File

@ -69,6 +69,7 @@ class ProxyThread(threading.Thread):
class ProxTestBase: class ProxTestBase:
# Test Configuration # Test Configuration
ssl = None ssl = None
ssloptions = False
clientcerts = False clientcerts = False
certfile = None certfile = None
no_upstream_cert = False no_upstream_cert = False
@ -77,8 +78,8 @@ class ProxTestBase:
@classmethod @classmethod
def setupAll(cls): def setupAll(cls):
cls.tqueue = Queue.Queue() cls.tqueue = Queue.Queue()
cls.server = libpathod.test.Daemon(ssl=cls.ssl) cls.server = libpathod.test.Daemon(ssl=cls.ssl, ssloptions=cls.ssloptions)
cls.server2 = libpathod.test.Daemon(ssl=cls.ssl) cls.server2 = libpathod.test.Daemon(ssl=cls.ssl, ssloptions=cls.ssloptions)
pconf = cls.get_proxy_config() pconf = cls.get_proxy_config()
config = proxy.ProxyConfig( config = proxy.ProxyConfig(
no_upstream_cert = cls.no_upstream_cert, no_upstream_cert = cls.no_upstream_cert,