summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-07-15 16:36:08 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-07-15 16:36:08 -0400
commite97b2fa79458ac6f14c71e9f923a41727e4375ae (patch)
tree4329324061f0d1bc671d378bd9807c390f9e2f1f
parent15b5b526ba4c6502a827069aead546b77ac3d4a7 (diff)
parent7ddd872c63a9465340eadae59868d85ac1d43e67 (diff)
downloadpython-setuptools-git-e97b2fa79458ac6f14c71e9f923a41727e4375ae.tar.gz
Merge github pull request
-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.