aboutsummaryrefslogtreecommitdiffstats
path: root/test/netlib
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-08-01 14:44:16 +1200
committerGitHub <noreply@github.com>2016-08-01 14:44:16 +1200
commitca0eab0f05dc46a9f77b277ab43da0a16ebcb0ac (patch)
treeb8d838fc44a44b52e9bc5394f23dfd6e4e55e70b /test/netlib
parentca2e33887610c7a25b35d93808248d0a98030acc (diff)
parentf54b302a591ea887392a841e8e68a402f773b324 (diff)
downloadmitmproxy-ca0eab0f05dc46a9f77b277ab43da0a16ebcb0ac.tar.gz
mitmproxy-ca0eab0f05dc46a9f77b277ab43da0a16ebcb0ac.tar.bz2
mitmproxy-ca0eab0f05dc46a9f77b277ab43da0a16ebcb0ac.zip
Merge pull request #1447 from mitmproxy/secure-by-default
Verify upstream certificates by default
Diffstat (limited to 'test/netlib')
-rw-r--r--test/netlib/test_tcp.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/netlib/test_tcp.py b/test/netlib/test_tcp.py
index 273427d5..dc2f4e7e 100644
--- a/test/netlib/test_tcp.py
+++ b/test/netlib/test_tcp.py
@@ -213,7 +213,7 @@ class TestSSLUpstreamCertVerificationWBadServerCert(tservers.ServerTestBase):
# Verification errors should be saved even if connection isn't aborted
# aborted
- assert c.ssl_verification_error is not None
+ assert c.ssl_verification_error
testval = b"echo!\n"
c.wfile.write(testval)
@@ -226,7 +226,7 @@ class TestSSLUpstreamCertVerificationWBadServerCert(tservers.ServerTestBase):
c.convert_to_ssl(verify_options=SSL.VERIFY_NONE)
# Verification errors should be saved even if connection isn't aborted
- assert c.ssl_verification_error is not None
+ assert c.ssl_verification_error
testval = b"echo!\n"
c.wfile.write(testval)
@@ -243,11 +243,11 @@ class TestSSLUpstreamCertVerificationWBadServerCert(tservers.ServerTestBase):
ca_pemfile=tutils.test_data.path("data/verificationcerts/trusted-root.crt")
)
- assert c.ssl_verification_error is not None
+ assert c.ssl_verification_error
# Unknown issuing certificate authority for first certificate
- assert c.ssl_verification_error['errno'] == 18
- assert c.ssl_verification_error['depth'] == 0
+ assert "errno: 18" in str(c.ssl_verification_error)
+ assert "depth: 0" in str(c.ssl_verification_error)
class TestSSLUpstreamCertVerificationWBadHostname(tservers.ServerTestBase):
@@ -276,7 +276,7 @@ class TestSSLUpstreamCertVerificationWBadHostname(tservers.ServerTestBase):
verify_options=SSL.VERIFY_PEER,
ca_pemfile=tutils.test_data.path("data/verificationcerts/trusted-root.crt")
)
- assert c.ssl_verification_error is not None
+ assert c.ssl_verification_error
class TestSSLUpstreamCertVerificationWValidCertChain(tservers.ServerTestBase):