Blame SOURCES/00255-Fix-ssl-module-parsing-of-GEN_RID-subject-alternative-name-fields-in-X.509-certs.patch

ae2451
ae2451
# HG changeset patch
ae2451
# User Christian Heimes <christian@python.org>
ae2451
# Date 1473197135 -7200
ae2451
# Node ID 74805fd9e7343649372d0b9c76b4490b2975a674
ae2451
# Parent  6f4f19217d9be12be7a9c86cf1e118b140564b4f
ae2451
Issue #27691: Fix ssl module's parsing of GEN_RID subject alternative name fields in X.509 certs.
ae2451
ae2451
diff --git a/Lib/test/allsans.pem b/Lib/test/allsans.pem
ae2451
new file mode 100644
ae2451
--- /dev/null
ae2451
+++ b/Lib/test/allsans.pem
ae2451
@@ -0,0 +1,37 @@
ae2451
+-----BEGIN PRIVATE KEY-----
ae2451
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOoy7/QOtTjQ0niE
ae2451
+6uDcTwtkC0R2Tvy1AjVnXohCntZfdzbTGDoYTgXSOLsP8A697jUiJ8VCePGH50xG
ae2451
+Z4DKnAF3a9O3a9nr2pLXb0iY3XOMv+YEBii7CfI+3oxFYgCl0sMgHzDD2ZTVYAsm
ae2451
+DWgLUVsE2gHEccRwrM2tPf2EgR+FAgMBAAECgYEA3qyfyYVSeTrTYxO93x6ZaVMu
ae2451
+A2IZp9zSxMQL9bKiI2GRj+cV2ebSCGbg2btFnD6qBor7FWsmYz+8g6FNN/9sY4az
ae2451
+61rMqMtQvLBe+7L8w70FeTze4qQ4Y1oQri0qD6tBWhDVlpnbI5Py9bkZKD67yVUk
ae2451
+elcEA/5x4PrYXkuqsAECQQD80NjT0mDvaY0JOOaQFSEpMv6QiUA8GGX8Xli7IoKb
ae2451
+tAolPG8rQBa+qSpcWfDMTrWw/aWHuMEEQoP/bVDH9W4FAkEA7SYQbBAKnojZ5A3G
ae2451
+kOHdV7aeivRQxQk/JN8Fb8oKB9Csvpv/BsuGxPKXHdhFa6CBTTsNRtHQw/szPo4l
ae2451
+xMIjgQJAPoMxqibR+0EBM6+TKzteSL6oPXsCnBl4Vk/J5vPgkbmR7KUl4+7j8N8J
ae2451
+b2554TrxKEN/w7CGYZRE6UrRd7ATNQJAWD7Yz41sli+wfPdPU2xo1BHljyl4wMk/
ae2451
+EPZYbI/PCbdyAH/F935WyQTIjNeEhZc1Zkq6FwdOWw8ns3hrv3rKgQJAHXv1BqUa
ae2451
+czGPIFxX2TNoqtcl6/En4vrxVB1wzsfzkkDAg98kBl7qsF+S3qujSzKikjeaVbI2
ae2451
+/CyWR2P3yLtOmA==
ae2451
+-----END PRIVATE KEY-----
ae2451
+-----BEGIN CERTIFICATE-----
ae2451
+MIIDcjCCAtugAwIBAgIJAN5dc9TOWjB7MA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNV
ae2451
+BAYTAlhZMRcwFQYDVQQHDA5DYXN0bGUgQW50aHJheDEjMCEGA1UECgwaUHl0aG9u
ae2451
+IFNvZnR3YXJlIEZvdW5kYXRpb24xEDAOBgNVBAMMB2FsbHNhbnMwHhcNMTYwODA1
ae2451
+MTAyMTExWhcNMjYwODAzMTAyMTExWjBdMQswCQYDVQQGEwJYWTEXMBUGA1UEBwwO
ae2451
+Q2FzdGxlIEFudGhyYXgxIzAhBgNVBAoMGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0
ae2451
+aW9uMRAwDgYDVQQDDAdhbGxzYW5zMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
ae2451
+gQDqMu/0DrU40NJ4hOrg3E8LZAtEdk78tQI1Z16IQp7WX3c20xg6GE4F0ji7D/AO
ae2451
+ve41IifFQnjxh+dMRmeAypwBd2vTt2vZ69qS129ImN1zjL/mBAYouwnyPt6MRWIA
ae2451
+pdLDIB8ww9mU1WALJg1oC1FbBNoBxHHEcKzNrT39hIEfhQIDAQABo4IBODCCATQw
ae2451
+ggEwBgNVHREEggEnMIIBI4IHYWxsc2Fuc6AeBgMqAwSgFwwVc29tZSBvdGhlciBp
ae2451
+ZGVudGlmaWVyoDUGBisGAQUCAqArMCmgEBsOS0VSQkVST1MuUkVBTE2hFTAToAMC
ae2451
+AQGhDDAKGwh1c2VybmFtZYEQdXNlckBleGFtcGxlLm9yZ4IPd3d3LmV4YW1wbGUu
ae2451
+b3JnpGcwZTELMAkGA1UEBhMCWFkxFzAVBgNVBAcMDkNhc3RsZSBBbnRocmF4MSMw
ae2451
+IQYDVQQKDBpQeXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEYMBYGA1UEAwwPZGly
ae2451
+bmFtZSBleGFtcGxlhhdodHRwczovL3d3dy5weXRob24ub3JnL4cEfwAAAYcQAAAA
ae2451
+AAAAAAAAAAAAAAAAAYgEKgMEBTANBgkqhkiG9w0BAQsFAAOBgQAy16h+F+nOmeiT
ae2451
+VWR0fc8F/j6FcadbLseAUaogcC15OGxCl4UYpLV88HBkABOoGCpP155qwWTwOrdG
ae2451
+iYPGJSusf1OnJEbvzFejZf6u078bPd9/ZL4VWLjv+FPGkjd+N+/OaqMvgj8Lu99f
ae2451
+3Y/C4S7YbHxxwff6C6l2Xli+q6gnuQ==
ae2451
+-----END CERTIFICATE-----
ae2451
diff --git a/Lib/test/make_ssl_certs.py b/Lib/test/make_ssl_certs.py
ae2451
--- a/Lib/test/make_ssl_certs.py
ae2451
+++ b/Lib/test/make_ssl_certs.py
ae2451
@@ -20,7 +20,28 @@ req_template = """
ae2451
     CN                     = {hostname}
ae2451
 
ae2451
     [req_x509_extensions]
ae2451
-    subjectAltName         = DNS:{hostname}
ae2451
+    subjectAltName         = @san
ae2451
+
ae2451
+    [san]
ae2451
+    DNS.1 = {hostname}
ae2451
+    {extra_san}
ae2451
+
ae2451
+    [dir_sect]
ae2451
+    C                      = XY
ae2451
+    L                      = Castle Anthrax
ae2451
+    O                      = Python Software Foundation
ae2451
+    CN                     = dirname example
ae2451
+
ae2451
+    [princ_name]
ae2451
+    realm = EXP:0, GeneralString:KERBEROS.REALM
ae2451
+    principal_name = EXP:1, SEQUENCE:principal_seq
ae2451
+
ae2451
+    [principal_seq]
ae2451
+    name_type = EXP:0, INTEGER:1
ae2451
+    name_string = EXP:1, SEQUENCE:principals
ae2451
+
ae2451
+    [principals]
ae2451
+    princ1 = GeneralString:username
ae2451
 
ae2451
     [ ca ]
ae2451
     default_ca      = CA_default
ae2451
@@ -67,7 +88,7 @@ req_template = """
ae2451
 
ae2451
 here = os.path.abspath(os.path.dirname(__file__))
ae2451
 
ae2451
-def make_cert_key(hostname, sign=False):
ae2451
+def make_cert_key(hostname, sign=False, extra_san=''):
ae2451
     print("creating cert for " + hostname)
ae2451
     tempnames = []
ae2451
     for i in range(3):
ae2451
@@ -75,8 +96,9 @@ def make_cert_key(hostname, sign=False):
ae2451
             tempnames.append(f.name)
ae2451
     req_file, cert_file, key_file = tempnames
ae2451
     try:
ae2451
+        req = req_template.format(hostname=hostname, extra_san=extra_san)
ae2451
         with open(req_file, 'w') as f:
ae2451
-            f.write(req_template.format(hostname=hostname))
ae2451
+            f.write(req)
ae2451
         args = ['req', '-new', '-days', '3650', '-nodes',
ae2451
                 '-newkey', 'rsa:1024', '-keyout', key_file,
ae2451
                 '-config', req_file]
ae2451
@@ -120,7 +142,7 @@ def make_ca():
ae2451
         f.write('unique_subject = no')
ae2451
 
ae2451
     with tempfile.NamedTemporaryFile("w") as t:
ae2451
-        t.write(req_template.format(hostname='our-ca-server'))
ae2451
+        t.write(req_template.format(hostname='our-ca-server', extra_san=''))
ae2451
         t.flush()
ae2451
         with tempfile.NamedTemporaryFile() as f:
ae2451
             args = ['req', '-new', '-days', '3650', '-extensions', 'v3_ca', '-nodes',
ae2451
@@ -171,6 +193,25 @@ if __name__ == '__main__':
ae2451
         f.write(key)
ae2451
         f.write(cert)
ae2451
 
ae2451
+    extra_san = [
ae2451
+        'otherName.1 = 1.2.3.4;UTF8:some other identifier',
ae2451
+        'otherName.2 = 1.3.6.1.5.2.2;SEQUENCE:princ_name',
ae2451
+        'email.1 = user@example.org',
ae2451
+        'DNS.2 = www.example.org',
ae2451
+        # GEN_X400
ae2451
+        'dirName.1 = dir_sect',
ae2451
+        # GEN_EDIPARTY
ae2451
+        'URI.1 = https://www.python.org/',
ae2451
+        'IP.1 = 127.0.0.1',
ae2451
+        'IP.2 = ::1',
ae2451
+        'RID.1 = 1.2.3.4.5',
ae2451
+    ]
ae2451
+
ae2451
+    cert, key = make_cert_key('allsans', extra_san='\n'.join(extra_san))
ae2451
+    with open('allsans.pem', 'w') as f:
ae2451
+        f.write(key)
ae2451
+        f.write(cert)
ae2451
+
ae2451
     unmake_ca()
ae2451
     print("\n\nPlease change the values in test_ssl.py, test_parse_cert function related to notAfter,notBefore and serialNumber")
ae2451
     check_call(['openssl','x509','-in','keycert.pem','-dates','-serial','-noout'])
ae2451
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
ae2451
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
ae2451
index fa59641..9d5816b 100644
ae2451
--- a/Lib/test/test_ssl.py
ae2451
+++ b/Lib/test/test_ssl.py
ae2451
@@ -57,6 +57,8 @@ CRLFILE = data_file("revocation.crl")
ae2451
 SIGNED_CERTFILE = data_file("keycert3.pem")
ae2451
 SIGNED_CERTFILE2 = data_file("keycert4.pem")
ae2451
 SIGNING_CA = data_file("pycacert.pem")
ae2451
+# cert with all kinds of subject alt names
ae2451
+ALLSANFILE = data_file("allsans.pem")
ae2451
 
ae2451
 SVN_PYTHON_ORG_ROOT_CERT = data_file("https_svn_python_org_root.pem")
ae2451
 
ae2451
@@ -236,6 +238,28 @@ class BasicSocketTests(unittest.TestCase):
ae2451
                          ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
ae2451
                         )
ae2451
 
ae2451
+    def test_parse_all_sans(self):
ae2451
+        p = ssl._ssl._test_decode_cert(ALLSANFILE)
ae2451
+        self.assertEqual(p['subjectAltName'],
ae2451
+            (
ae2451
+                ('DNS', 'allsans'),
ae2451
+                ('othername', '<unsupported>'),
ae2451
+                ('othername', '<unsupported>'),
ae2451
+                ('email', 'user@example.org'),
ae2451
+                ('DNS', 'www.example.org'),
ae2451
+                ('DirName',
ae2451
+                    ((('countryName', 'XY'),),
ae2451
+                    (('localityName', 'Castle Anthrax'),),
ae2451
+                    (('organizationName', 'Python Software Foundation'),),
ae2451
+                    (('commonName', 'dirname example'),))),
ae2451
+                ('URI', 'https://www.python.org/'),
ae2451
+                ('IP Address', '127.0.0.1'),
ae2451
+                ('IP Address', '0:0:0:0:0:0:0:1\n'),
ae2451
+                ('Registered ID', '1.2.3.4.5')
ae2451
+            )
ae2451
+        )
ae2451
+
ae2451
+
ae2451
     def test_DER_to_PEM(self):
ae2451
         with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
ae2451
             pem = f.read()
ae2451
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
ae2451
--- a/Modules/_ssl.c
ae2451
+++ b/Modules/_ssl.c
ae2451
@@ -953,6 +953,35 @@ static PyObject *
ae2451
                 PyTuple_SET_ITEM(t, 1, v);
ae2451
                 break;
ae2451
 
ae2451
+            case GEN_RID:
ae2451
+                t = PyTuple_New(2);
ae2451
+                if (t == NULL)
ae2451
+                    goto fail;
ae2451
+
ae2451
+                v = PyUnicode_FromString("Registered ID");
ae2451
+                if (v == NULL) {
ae2451
+                    Py_DECREF(t);
ae2451
+                    goto fail;
ae2451
+                }
ae2451
+                PyTuple_SET_ITEM(t, 0, v);
ae2451
+
ae2451
+                len = i2t_ASN1_OBJECT(buf, sizeof(buf)-1, name->d.rid);
ae2451
+                if (len < 0) {
ae2451
+                    Py_DECREF(t);
ae2451
+                    _setSSLError(NULL, 0, __FILE__, __LINE__);
ae2451
+                    goto fail;
ae2451
+                } else if (len >= (int)sizeof(buf)) {
ae2451
+                    v = PyUnicode_FromString("<INVALID>");
ae2451
+                } else {
ae2451
+                    v = PyUnicode_FromStringAndSize(buf, len);
ae2451
+                }
ae2451
+                if (v == NULL) {
ae2451
+                    Py_DECREF(t);
ae2451
+                    goto fail;
ae2451
+                }
ae2451
+                PyTuple_SET_ITEM(t, 1, v);
ae2451
+                break;
ae2451
+
ae2451
             default:
ae2451
                 /* for everything else, we use the OpenSSL print form */
ae2451
                 switch (gntype) {
ae2451
@@ -978,8 +1007,12 @@ static PyObject *
ae2451
                     goto fail;
ae2451
                 }
ae2451
                 vptr = strchr(buf, ':');
ae2451
-                if (vptr == NULL)
ae2451
+                if (vptr == NULL) {
ae2451
+                    PyErr_Format(PyExc_ValueError,
ae2451
+                                 "Invalid value %.200s",
ae2451
+                                 buf);
ae2451
                     goto fail;
ae2451
+                }
ae2451
                 t = PyTuple_New(2);
ae2451
                 if (t == NULL)
ae2451
                     goto fail;
ae2451