aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/ssl_support.py
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2013-07-15 12:35:21 -0700
committerToshio Kuratomi <toshio@fedoraproject.org>2013-07-15 12:35:21 -0700
commit7ddd872c63a9465340eadae59868d85ac1d43e67 (patch)
treece1ec65107aeb5cc84f7b996de4f6e0379b2e573 /setuptools/ssl_support.py
parentbae650322899670688e66ff7167cbf1ab34d8dd0 (diff)
downloadexternal_python_setuptools-7ddd872c63a9465340eadae59868d85ac1d43e67.tar.gz
external_python_setuptools-7ddd872c63a9465340eadae59868d85ac1d43e67.tar.bz2
external_python_setuptools-7ddd872c63a9465340eadae59868d85ac1d43e67.zip
Fix backported ssl_match_hostname for http://bugs.python.org/issue17980
Diffstat (limited to 'setuptools/ssl_support.py')
-rw-r--r--setuptools/ssl_support.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 2aec655a..f8a780a9 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -88,9 +88,16 @@ except ImportError:
class CertificateError(ValueError):
pass
- def _dnsname_to_pat(dn):
+ def _dnsname_to_pat(dn, max_wildcards=1):
pats = []
for frag in dn.split(r'.'):
+ if frag.count('*') > max_wildcards:
+ # Issue #17980: avoid denials of service by refusing more
+ # than one wildcard per fragment. A survery of established
+ # policy among SSL implementations showed it to be a
+ # reasonable choice.
+ raise CertificateError(
+ "too many wildcards in certificate DNS name: " + repr(dn))
if frag == '*':
# When '*' is a fragment by itself, it matches a non-empty dotless
# fragment.