diff --git a/Lib/ssl.py b/Lib/ssl.py --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -108,9 +108,12 @@ class CertificateError(ValueError): pass -def _dnsname_to_pat(dn): +def _dnsname_to_pat(dn, max_wildcards=2): pats = [] for frag in dn.split(r'.'): + if frag.count('*') > max_wildcards: + raise CertificateError("too many wildcards in certificate name: " + + repr(dn)) if frag == '*': # When '*' is a fragment by itself, it matches a non-empty dotless # fragment. diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -326,6 +326,17 @@ class BasicSocketTests(unittest.TestCase self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') + # Issue #17980: avoid denials of service by refusing more than two + # wildcards in a fragment. + cert = {'subject': ((('commonName', 'a*b*c.com'),),)} + ok(cert, 'axxbxxc.com') + cert = {'subject': ((('commonName', 'a*b*c.*o*'),),)} + ok(cert, 'axxbxxc.com') + cert = {'subject': ((('commonName', 'a*b*c*.com'),),)} + with self.assertRaises(ssl.CertificateError) as cm: + ssl.match_hostname(cert, 'axxbxxc.com') + self.assertIn("too many wildcards", str(cm.exception)) + def test_server_side(self): # server_hostname doesn't work for server sockets ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)