diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_server.py | 24 | ||||
| -rw-r--r-- | test/mitmproxy/tservers.py | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py index a2d1a578..26e53e8a 100644 --- a/test/mitmproxy/test_server.py +++ b/test/mitmproxy/test_server.py @@ -1001,7 +1001,7 @@ class TestProxyChainingSSLReconnect(tservers.HTTPUpstreamProxyTest): assert self.chain[1].tmaster.state.flow_count() == 2 -class AddServerCertsToClientChainMixin: +class AddUpstreamCertsToClientChainMixin: ssl = True servercert = tutils.test_data.path("data/trusted-server.crt") @@ -1012,30 +1012,30 @@ class AddServerCertsToClientChainMixin: ] ) - def test_add_server_certs_to_client_chain(self): + def test_add_upstream_certs_to_client_chain(self): with open(self.servercert, "rb") as f: d = f.read() - c1 = SSLCert.from_pem(d) + upstreamCert = SSLCert.from_pem(d) p = self.pathoc() - server_cert_found_in_client_chain = False - for cert in p.server_certs: - if cert.digest('sha256') == c1.digest('sha256'): - server_cert_found_in_client_chain = True + upstream_cert_found_in_client_chain = False + for receivedCert in p.server_certs: + if receivedCert.digest('sha256') == upstreamCert.digest('sha256'): + upstream_cert_found_in_client_chain = True break - assert(server_cert_found_in_client_chain == self.add_server_certs_to_client_chain) + assert(upstream_cert_found_in_client_chain == self.add_upstream_certs_to_client_chain) -class TestHTTPSAddServerCertsToClientChainTrue(AddServerCertsToClientChainMixin, tservers.HTTPProxyTest): +class TestHTTPSAddUpstreamCertsToClientChainTrue(AddUpstreamCertsToClientChainMixin, tservers.HTTPProxyTest): """ If --add-server-certs-to-client-chain is True, then the client should receive the upstream server's certificates """ - add_server_certs_to_client_chain = True + add_upstream_certs_to_client_chain = True -class TestHTTPSAddServerCertsToClientChainFalse(AddServerCertsToClientChainMixin, tservers.HTTPProxyTest): +class TestHTTPSAddUpstreamCertsToClientChainFalse(AddUpstreamCertsToClientChainMixin, tservers.HTTPProxyTest): """ If --add-server-certs-to-client-chain is False, then the client should not receive the upstream server's certificates """ - add_server_certs_to_client_chain = False + add_upstream_certs_to_client_chain = False diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py index cabd8e1f..4fa519cc 100644 --- a/test/mitmproxy/tservers.py +++ b/test/mitmproxy/tservers.py @@ -86,7 +86,7 @@ class ProxyTestBase(object): no_upstream_cert = False authenticator = None masterclass = TestMaster - add_server_certs_to_client_chain = False + add_upstream_certs_to_client_chain = False @classmethod def setup_class(cls): @@ -130,7 +130,7 @@ class ProxyTestBase(object): no_upstream_cert = cls.no_upstream_cert, cadir = cls.cadir, authenticator = cls.authenticator, - add_server_certs_to_client_chain = cls.add_server_certs_to_client_chain, + add_upstream_certs_to_client_chain = cls.add_upstream_certs_to_client_chain, ) |