Merge branch 'better-jid-errors' into 'master'
jid: Improve error reporting on IDNA validation failure See merge request poezio/slixmpp!170
This commit is contained in:
commit
9eb4462acc
1 changed files with 4 additions and 4 deletions
|
@ -133,15 +133,15 @@ def _validate_domain(domain: str):
|
|||
try:
|
||||
domain = idna(domain)
|
||||
except StringprepError:
|
||||
raise InvalidJID('idna validation failed')
|
||||
raise InvalidJID(f'idna validation failed: {domain}')
|
||||
|
||||
if ':' in domain:
|
||||
raise InvalidJID('Domain containing a port')
|
||||
raise InvalidJID(f'Domain containing a port: {domain}')
|
||||
for label in domain.split('.'):
|
||||
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]):
|
||||
raise InvalidJID('Domain started or ended with -')
|
||||
raise InvalidJID(f'Domain starting or ending with -: {domain}')
|
||||
|
||||
if not domain:
|
||||
raise InvalidJID('Domain must not be 0 bytes')
|
||||
|
|
Loading…
Reference in a new issue