pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Properly consider malformed IPv6 domains as invalid.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2015-06-12 00:56:52 +01:00
parent a2852eb249
commit f3e31baf04
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
slixmpp/jid.py
View file

@ -30,6 +30,8 @@ ILLEGAL_CHARS = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r' + \
'\x1a\x1b\x1c\x1d\x1e\x1f' + \ '\x1a\x1b\x1c\x1d\x1e\x1f' + \
' !"#$%&\'()*+,./:;<=>?@[\\]^_`{|}~\x7f' ' !"#$%&\'()*+,./:;<=>?@[\\]^_`{|}~\x7f'
HAVE_INET_PTON = hasattr(socket, 'inet_pton')
#: The basic regex pattern that a JID must match in order to determine #: The basic regex pattern that a JID must match in order to determine
#: the local, domain, and resource parts. This regex does NOT do any #: the local, domain, and resource parts. This regex does NOT do any
#: validation, which requires application of nodeprep, resourceprep, etc. #: validation, which requires application of nodeprep, resourceprep, etc.
@ -199,10 +201,10 @@ def _validate_domain(domain):
pass pass
# Check if this is an IPv6 address # Check if this is an IPv6 address
if not ip_addr and hasattr(socket, 'inet_pton'): if not ip_addr and HAVE_INET_PTON and domain[0] == '[' and domain[-1] == ']':
try: try:
socket.inet_pton(socket.AF_INET6, domain.strip('[]')) ip = domain[1:-1]
domain = '[%s]' % domain.strip('[]') socket.inet_pton(socket.AF_INET6, ip)
ip_addr = True ip_addr = True
except (socket.error, ValueError): except (socket.error, ValueError):
pass pass