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

Merge branch 'better-jid-errors' into 'master'

Browse source 
jid: Improve error reporting on IDNA validation failure

See merge request poezio/slixmpp!170
This commit is contained in:
mathieui 2022-02-04 23:07:51 +01:00
commit 9eb4462acc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
slixmpp/jid.py
View file

@ -133,15 +133,15 @@ def _validate_domain(domain: str):
try: try:
domain = idna(domain) domain = idna(domain)
except StringprepError: except StringprepError:
raise InvalidJID('idna validation failed') raise InvalidJID(f'idna validation failed: {domain}')
if ':' in domain: if ':' in domain:
raise InvalidJID('Domain containing a port') raise InvalidJID(f'Domain containing a port: {domain}')
for label in domain.split('.'): for label in domain.split('.'):
if not label: if not label:
raise InvalidJID('Domain containing too many dots') raise InvalidJID(f'Domain containing too many dots: {domain}')
if '-' in (label[0], label[-1]): if '-' in (label[0], label[-1]):
raise InvalidJID('Domain started or ended with -') raise InvalidJID(f'Domain starting or ending with -: {domain}')
if not domain: if not domain:
raise InvalidJID('Domain must not be 0 bytes') raise InvalidJID('Domain must not be 0 bytes')