changeset:   69875:1b37827984ba
parent:      69873:8fc801ca9ea1
parent:      69874:d4c2a99d1bad
user:        Antoine Pitrou <solipsis@pitrou.net>
date:        Fri May 06 15:20:55 2011 +0200
files:       Lib/ssl.py Lib/test/test_ssl.py Misc/ACKS Misc/NEWS
description:
Issue #12000: When a SSL certificate has a subjectAltName without any
dNSName entry, ssl.match_hostname() should use the subject's commonName.
Patch by Nicolas Bareil.


diff -r 8fc801ca9ea1 -r 1b37827984ba Lib/ssl.py
--- a/Lib/ssl.py	Fri May 06 15:01:41 2011 +0300
+++ b/Lib/ssl.py	Fri May 06 15:20:55 2011 +0200
@@ -122,8 +122,9 @@
             if _dnsname_to_pat(value).match(hostname):
                 return
             dnsnames.append(value)
-    if not san:
-        # The subject is only checked when subjectAltName is empty
+    if not dnsnames:
+        # The subject is only checked when there is no dNSName entry
+        # in subjectAltName
         for sub in cert.get('subject', ()):
             for key, value in sub:
                 # XXX according to RFC 2818, the most specific Common Name
diff -r 8fc801ca9ea1 -r 1b37827984ba Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py	Fri May 06 15:01:41 2011 +0300
+++ b/Lib/test/test_ssl.py	Fri May 06 15:20:55 2011 +0200
@@ -277,6 +277,24 @@
                             (('organizationName', 'Google Inc'),))}
         fail(cert, 'mail.google.com')
 
+        # No DNS entry in subjectAltName but a commonName
+        cert = {'notAfter': 'Dec 18 23:59:59 2099 GMT',
+                'subject': ((('countryName', 'US'),),
+                            (('stateOrProvinceName', 'California'),),
+                            (('localityName', 'Mountain View'),),
+                            (('commonName', 'mail.google.com'),)),
+                'subjectAltName': (('othername', 'blabla'), )}
+        ok(cert, 'mail.google.com')
+
+        # No DNS entry subjectAltName and no commonName
+        cert = {'notAfter': 'Dec 18 23:59:59 2099 GMT',
+                'subject': ((('countryName', 'US'),),
+                            (('stateOrProvinceName', 'California'),),
+                            (('localityName', 'Mountain View'),),
+                            (('organizationName', 'Google Inc'),)),
+                'subjectAltName': (('othername', 'blabla'),)}
+        fail(cert, 'google.com')
+
         # Empty cert / no cert
         self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com')
         self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com')
diff -r 8fc801ca9ea1 -r 1b37827984ba Misc/ACKS
--- a/Misc/ACKS	Fri May 06 15:01:41 2011 +0300
+++ b/Misc/ACKS	Fri May 06 15:20:55 2011 +0200
@@ -50,6 +50,7 @@
 Jeff Balogh
 Matt Bandy
 Michael J. Barber
+Nicolas Bareil
 Chris Barker
 Nick Barnes
 Quentin Barnes
diff -r 8fc801ca9ea1 -r 1b37827984ba Misc/NEWS
--- a/Misc/NEWS	Fri May 06 15:01:41 2011 +0300
+++ b/Misc/NEWS	Fri May 06 15:20:55 2011 +0200
@@ -140,6 +140,10 @@
 Library
 -------
 
+- Issue #12000: When a SSL certificate has a subjectAltName without any
+  dNSName entry, ssl.match_hostname() should use the subject's commonName.
+  Patch by Nicolas Bareil.
+
 - Issue #10775: assertRaises, assertRaisesRegex, assertWarns, and
   assertWarnsRegex now accept a keyword argument 'msg' when used as context
   managers.  Initial patch by Winston Ewert.