r4sas/py-i2phosts
1
0
Fork 0
mirror of https://github.com/r4sas/py-i2phosts synced 2025-01-10 23:08:23 +00:00
Code Issues Releases Wiki Activity

validation.py: bugfix: look for '..' in a whole hostname, not in namepart only

Browse Source
This commit is contained in:
Hidden Z 2010-10-22 17:15:59 +00:00
parent 573efddf8b
commit 01e01b98fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/lib/validation.py
View File

@ -19,15 +19,15 @@ def validate_hostname(data):
# Base 32 hostnames (*.b32.i2p) are not allowed # Base 32 hostnames (*.b32.i2p) are not allowed
if re.match(r'.*\.b32\.i2p$', data): if re.match(r'.*\.b32\.i2p$', data):
raise forms.ValidationError('Base 32 hostnames are not allowed') raise forms.ValidationError('Base 32 hostnames are not allowed')
# Must not contain '..'
if re.search(r'\.\.', data):
raise forms.ValidationError('".." in hostname')
# Must contain only [a-z] [0-9] '.' and '-' # Must contain only [a-z] [0-9] '.' and '-'
h = re.match(r'([a-z0-9.-]+)\.i2p$', data) h = re.match(r'([a-z0-9.-]+)\.i2p$', data)
if h == None: if h == None:
raise forms.ValidationError('Illegal characters in hostname') raise forms.ValidationError('Illegal characters in hostname')
else: else:
namepart = h.groups()[0] namepart = h.groups()[0]
# Must not contain '..'
if re.search(r'\.\.', namepart):
raise forms.ValidationError('".." in hostname')
# Must not contain '.-' or '-.' (as of 0.6.1.33) # Must not contain '.-' or '-.' (as of 0.6.1.33)
if re.search(r'(\.-)|(-\.)', namepart): if re.search(r'(\.-)|(-\.)', namepart):
raise forms.ValidationError('Hostname contain ".-" or "-."') raise forms.ValidationError('Hostname contain ".-" or "-."')