r4sas/py-i2phosts
1
0
Fork 0
mirror of https://github.com/r4sas/py-i2phosts synced 2025-01-22 20:44:55 +00:00
Code Issues Releases Wiki Activity

Move validation functions to separate module

Browse Source
This commit is contained in:
Hidden Z 2010-10-16 18:30:08 +00:00
parent 2529b6d6c3
commit 2769f0d4bc
2 changed files with 64 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
web/lib/validation.py Normal file
View File

@ -0,0 +1,58 @@
#!/usr/bin/env python2.6
import re
from django import forms
from web.postkey.models import i2phost
def validate_hostname(data):
"""
Here we do additional hostname validation as described in
http://www.i2p2.i2p/naming.html
"""
# convert hostname to lowercase
data = data.lower()
# Must end with '.i2p'.
if re.match(r'.*\.i2p$', data) == None:
raise forms.ValidationError('Hostname doesn\'t ends with .i2p')
# Base 32 hostnames (*.b32.i2p) are not allowed
if re.match(r'.*\.b32\.i2p$', data):
raise forms.ValidationError('Base 32 hostnames are not allowed')
# Must contain only [a-z] [0-9] '.' and '-'
h = re.match(r'([a-z0-9.-]+)\.i2p$', data)
if h == None:
raise forms.ValidationError('Illegal characters in hostname')
else:
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)
if re.search(r'(\.-)|(-\.)', namepart):
raise forms.ValidationError('Hostname contain ".-" or "-."')
# Must not contain '--' except in 'xn--' for IDN
if re.search(r'(?<!^xn)--', namepart):
raise forms.ValidationError('Hostname contain "--" and it\'s not an IDN')
# Certain hostnames reserved for project use are not allowed
if re.search(r'(^|\.)(proxy|router|console)$', namepart):
raise forms.ValidationError('Trying to use reserved hostname')
return data
def validate_b64hash(data, check_uniq=True):
"""
Base64 hash validation
"""
# Minimum key length 516 bytes
if len(data) < 516:
raise forms.ValidationError('Specified base64 hash are less than 516 bytes')
# base64-i2p
if re.match(r'[a-zA-Z0-9\-~]+AAAA$', data) == None:
raise forms.ValidationError('Invalid base64 hash')
if check_uniq == True:
# Avoid adding non-unique hashes
qs = i2phost.objects.filter(b64hash=data)
if qs.exists():
raise forms.ValidationError('Base64 hash must be unique')
return data

46
web/postkey/views.py
View File

@ -5,7 +5,8 @@ from django.forms import ModelForm
from django.template import RequestContext
from web.postkey.models import i2phost
import re
from web.lib.validation import validate_hostname
from web.lib.validation import validate_b64hash
class AddForm(ModelForm):
"""
@ -21,49 +22,14 @@ class AddForm(ModelForm):
'description': forms.Textarea(attrs={'rows': '2', 'cols': '72'})
}
def clean_name(self):
"""
Here we do additional hostname validation as described in
http://www.i2p2.i2p/naming.html
"""
"""Validate hostname"""
data = self.cleaned_data['name']
# convert hostname to lowercase
data = data.lower()
# Must end with '.i2p'.
if re.match(r'.*\.i2p$', data) == None:
raise forms.ValidationError('Hostname doesn\'t ends with .i2p')
# Base 32 hostnames (*.b32.i2p) are not allowed
if re.match(r'.*\.b32\.i2p$', data):
raise forms.ValidationError('Base 32 hostnames are not allowed')
# Must contain only [a-z] [0-9] '.' and '-'
h = re.match(r'([a-z0-9.-]+)\.i2p$', data)
if h == None:
raise forms.ValidationError('Illegal characters in hostname')
else:
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)
if re.search(r'(\.-)|(-\.)', namepart):
raise forms.ValidationError('Hostname contain ".-" or "-."')
# Must not contain '--' except in 'xn--' for IDN
if re.search(r'(?<!^xn)--', namepart):
raise forms.ValidationError('Hostname contain "--" and it\'s not an IDN')
# Certain hostnames reserved for project use are not allowed
if re.search(r'(^|\.)(proxy|router|console)$', namepart):
raise forms.ValidationError('Trying to use reserved hostname')
data = validate_hostname(data)
return data
def clean_b64hash(self):
"""
Base64 hash validation
"""
"""Validate base64 hash"""
data = self.cleaned_data['b64hash']
# Minimum key length 516 bytes
if len(data) < 516:
raise forms.ValidationError('Specified base64 hash are less than 516 bytes')
# base64-i2p
if re.match(r'[a-zA-Z0-9\-~]+AAAA$', data) == None:
raise forms.ValidationError('Invalid base64 hash')
data = validate_b64hash(data)
# Avoid adding non-unique hashes
qs = i2phost.objects.filter(b64hash=data)
if qs.exists():