avoid TLS/SSL ambiguity for Cert class

mitmproxy/addons/cut.py

@@ -43,7 +43,7 @@ def extract(cut: str, f: flow.Flow) -> typing.Union[str, bytes]:
                 return part
             elif isinstance(part, bool):
                 return "true" if part else "false"
-            elif isinstance(part, certs.SSLCert):
+            elif isinstance(part, certs.Cert):
                 return part.to_pem().decode("ascii")
         current = part
     return str(current or "")

mitmproxy/certs.py

@@ -112,7 +112,7 @@ def dummy_cert(privkey, cacert, commonname, sans):
             [OpenSSL.crypto.X509Extension(b"subjectAltName", False, ss)])
     cert.set_pubkey(cacert.get_pubkey())
     cert.sign(privkey, "sha256")
-    return SSLCert(cert)
+    return Cert(cert)
 
 
 class CertStoreEntry:
@@ -249,7 +249,7 @@ def create_store(path, basename, o=None, cn=None, expiry=DEFAULT_EXP):
     def add_cert_file(self, spec: str, path: str) -> None:
         with open(path, "rb") as f:
             raw = f.read()
-        cert = SSLCert(
+        cert = Cert(
             OpenSSL.crypto.load_certificate(
                 OpenSSL.crypto.FILETYPE_PEM,
                 raw))
@@ -345,7 +345,7 @@ class _GeneralNames(univ.SequenceOf):
         constraint.ValueSizeConstraint(1, 1024)
 
 
-class SSLCert(serializable.Serializable):
+class Cert(serializable.Serializable):
 
     def __init__(self, cert):
         """

mitmproxy/connections.py

@@ -87,8 +87,8 @@ def __hash__(self):
         id=str,
         address=tuple,
         tls_established=bool,
-        clientcert=certs.SSLCert,
-        mitmcert=certs.SSLCert,
+        clientcert=certs.Cert,
+        mitmcert=certs.Cert,
         timestamp_start=float,
         timestamp_tls_setup=float,
         timestamp_end=float,
@@ -215,7 +215,7 @@ def __hash__(self):
         ip_address=tuple,
         source_address=tuple,
         tls_established=bool,
-        cert=certs.SSLCert,
+        cert=certs.Cert,
         sni=str,
         alpn_proto_negotiated=bytes,
         tls_version=str,

mitmproxy/io/compat.py

@@ -161,8 +161,8 @@ def convert_5_6(data):
     data["server_conn"]["tls_established"] = data["server_conn"].pop("ssl_established")
     data["server_conn"]["timestamp_tls_setup"] = data["server_conn"].pop("timestamp_ssl_setup")
     if data["server_conn"]["via"]:
-        data["server_conn"]["via"]["tls_established"] = data["server_conn"]["via"].pop("ssl_established", None)
-        data["server_conn"]["via"]["timestamp_tls_setup"] = data["server_conn"]["via"].pop("timestamp_ssl_setup", None)
+        data["server_conn"]["via"]["tls_established"] = data["server_conn"]["via"].pop("ssl_established")
+        data["server_conn"]["via"]["timestamp_tls_setup"] = data["server_conn"]["via"].pop("timestamp_ssl_setup")
     return data
 
 

mitmproxy/net/tcp.py

@@ -400,11 +400,11 @@ def convert_to_tls(self, sni=None, alpn_protos=None, **sslctx_kwargs):
             else:
                 raise exceptions.TlsException("SSL handshake error: %s" % repr(v))
 
-        self.cert = certs.SSLCert(self.connection.get_peer_certificate())
+        self.cert = certs.Cert(self.connection.get_peer_certificate())
 
         # Keep all server certificates in a list
         for i in self.connection.get_peer_cert_chain():
-            self.server_certs.append(certs.SSLCert(i))
+            self.server_certs.append(certs.Cert(i))
 
         self.tls_established = True
         self.rfile.set_descriptor(self.connection)
@@ -510,7 +510,7 @@ def convert_to_tls(self, cert, key, **sslctx_kwargs):
         self.tls_established = True
         cert = self.connection.get_peer_certificate()
         if cert:
-            self.clientcert = certs.SSLCert(cert)
+            self.clientcert = certs.Cert(cert)
         self.rfile.set_descriptor(self.connection)
         self.wfile.set_descriptor(self.connection)
 

mitmproxy/net/tls.py

@@ -213,7 +213,7 @@ def verify_callback(
     ) -> bool:
         if is_cert_verified and depth == 0:
             # Verify hostname of leaf certificate.
-            cert = certs.SSLCert(x509)
+            cert = certs.Cert(x509)
             try:
                 crt = dict(
                     subjectAltName=[("DNS", x.decode("ascii", "strict")) for x in cert.altnames]
@@ -270,17 +270,17 @@ def verify_callback(
 
 
 def create_server_context(
-        cert: typing.Union[certs.SSLCert, str],
+        cert: typing.Union[certs.Cert, str],
         key: SSL.PKey,
         handle_sni: typing.Optional[typing.Callable[[SSL.Connection], None]] = None,
         request_client_cert: bool = False,
         chain_file=None,
         dhparams=None,
-        extra_chain_certs: typing.Iterable[certs.SSLCert] = None,
+        extra_chain_certs: typing.Iterable[certs.Cert] = None,
         **sslctx_kwargs
 ) -> SSL.Context:
     """
-        cert: A certs.SSLCert object or the path to a certificate
+        cert: A certs.Cert object or the path to a certificate
         chain file.
 
         handle_sni: SNI handler, should take a connection object. Server
@@ -321,7 +321,7 @@ def accept_all(
     )
 
     context.use_privatekey(key)
-    if isinstance(cert, certs.SSLCert):
+    if isinstance(cert, certs.Cert):
         context.use_certificate(cert.x509)
     else:
         context.use_certificate_chain_file(cert)

pathod/pathoc.py

@@ -79,7 +79,7 @@ def __str__(self):
             }
             t = types.get(pk.type(), "Uknown")
             parts.append("\tPubkey: %s bit %s" % (pk.bits(), t))
-            s = certs.SSLCert(i)
+            s = certs.Cert(i)
             if s.altnames:
                 parts.append("\tSANs: %s" % " ".join(strutils.always_str(n, "utf8") for n in s.altnames))
         return "\n".join(parts)

test/mitmproxy/addons/test_cut.py

@@ -55,7 +55,7 @@ def test_extract():
 
     with open(tutils.test_data.path("mitmproxy/net/data/text_cert"), "rb") as f:
         d = f.read()
-    c1 = certs.SSLCert.from_pem(d)
+    c1 = certs.Cert.from_pem(d)
     tf.server_conn.cert = c1
     assert "CERTIFICATE" in cut.extract("server_conn.cert", tf)
 

test/mitmproxy/proxy/test_server.py

@@ -143,9 +143,9 @@ def test_ignore(self):
 
         # Test that we get the original SSL cert
         if self.ssl:
-            i_cert = certs.SSLCert(i.sslinfo.certchain[0])
-            i2_cert = certs.SSLCert(i2.sslinfo.certchain[0])
-            n_cert = certs.SSLCert(n.sslinfo.certchain[0])
+            i_cert = certs.Cert(i.sslinfo.certchain[0])
+            i2_cert = certs.Cert(i2.sslinfo.certchain[0])
+            n_cert = certs.Cert(n.sslinfo.certchain[0])
 
             assert i_cert == i2_cert
             assert i_cert != n_cert
@@ -188,9 +188,9 @@ def test_tcp(self):
 
         # Test that we get the original SSL cert
         if self.ssl:
-            i_cert = certs.SSLCert(i.sslinfo.certchain[0])
-            i2_cert = certs.SSLCert(i2.sslinfo.certchain[0])
-            n_cert = certs.SSLCert(n.sslinfo.certchain[0])
+            i_cert = certs.Cert(i.sslinfo.certchain[0])
+            i2_cert = certs.Cert(i2.sslinfo.certchain[0])
+            n_cert = certs.Cert(n.sslinfo.certchain[0])
 
             assert i_cert == i2_cert
             assert i_cert != n_cert
@@ -1149,7 +1149,7 @@ class AddUpstreamCertsToClientChainMixin:
     def test_add_upstream_certs_to_client_chain(self):
         with open(self.servercert, "rb") as f:
             d = f.read()
-        upstreamCert = certs.SSLCert.from_pem(d)
+        upstreamCert = certs.Cert.from_pem(d)
         p = self.pathoc()
         with p.connect():
             upstream_cert_found_in_client_chain = False

test/mitmproxy/test_certs.py

@@ -136,18 +136,18 @@ def test_with_ca(self, tmpdir):
         assert r.altnames == []
 
 
-class TestSSLCert:
+class TestCert:
 
     def test_simple(self):
         with open(tutils.test_data.path("mitmproxy/net/data/text_cert"), "rb") as f:
             d = f.read()
-        c1 = certs.SSLCert.from_pem(d)
+        c1 = certs.Cert.from_pem(d)
         assert c1.cn == b"google.com"
         assert len(c1.altnames) == 436
 
         with open(tutils.test_data.path("mitmproxy/net/data/text_cert_2"), "rb") as f:
             d = f.read()
-        c2 = certs.SSLCert.from_pem(d)
+        c2 = certs.Cert.from_pem(d)
         assert c2.cn == b"www.inode.co.nz"
         assert len(c2.altnames) == 2
         assert c2.digest("sha1")
@@ -165,20 +165,20 @@ def test_simple(self):
     def test_err_broken_sans(self):
         with open(tutils.test_data.path("mitmproxy/net/data/text_cert_weird1"), "rb") as f:
             d = f.read()
-        c = certs.SSLCert.from_pem(d)
+        c = certs.Cert.from_pem(d)
         # This breaks unless we ignore a decoding error.
         assert c.altnames is not None
 
     def test_der(self):
         with open(tutils.test_data.path("mitmproxy/net/data/dercert"), "rb") as f:
             d = f.read()
-        s = certs.SSLCert.from_der(d)
+        s = certs.Cert.from_der(d)
         assert s.cn
 
     def test_state(self):
         with open(tutils.test_data.path("mitmproxy/net/data/text_cert"), "rb") as f:
             d = f.read()
-        c = certs.SSLCert.from_pem(d)
+        c = certs.Cert.from_pem(d)
 
         c.get_state()
         c2 = c.copy()
@@ -188,6 +188,6 @@ def test_state(self):
         assert c == c2
         assert c is not c2
 
-        x = certs.SSLCert('')
+        x = certs.Cert('')
         x.set_state(a)
         assert x == c