##// END OF EJS Templates
fixed tests and missing replacements from 5f1850e4712a
fixed tests and missing replacements from 5f1850e4712a

File last commit:

r3415:b8f929bf beta
r3415:b8f929bf beta
Show More
validators.py
809 lines | 29.0 KiB | text/x-python | PythonLexer
Added rewritten validators module + tests
r2466 """
Set of generic validators
"""
import os
import re
import formencode
import logging
#538 form for permissions can handle multiple users at once
r2759 from collections import defaultdict
Added rewritten validators module + tests
r2466 from pylons.i18n.translation import _
from webhelpers.pylonslib.secure_form import authentication_token
from formencode.validators import (
added more validations when opening pull request...
r2711 UnicodeString, OneOf, Int, Number, Regex, Email, Bool, StringBoolean, Set,
Added UserIpMap interface for allowed IP addresses and IP restriction access...
r3125 NotEmpty, IPAddress, CIDR
Added rewritten validators module + tests
r2466 )
#538 form for permissions can handle multiple users at once
r2759 from rhodecode.lib.compat import OrderedSet
IP restrictions now also enabled for IPv6
r3212 from rhodecode.lib import ipaddr
Added rewritten validators module + tests
r2466 from rhodecode.lib.utils import repo_name_slug
Changed v.Set validation into our own that actually raises exceptions on missing values....
r2719 from rhodecode.model.db import RepoGroup, Repository, UsersGroup, User,\
ChangesetStatus
Added rewritten validators module + tests
r2466 from rhodecode.lib.exceptions import LdapImportError
from rhodecode.config.routing import ADMIN_PREFIX
move permission check of write access to repo groups inside a form....
r3372 from rhodecode.lib.auth import HasReposGroupPermissionAny, HasPermissionAny
Changed v.Set validation into our own that actually raises exceptions on missing values....
r2719
Added rewritten validators module + tests
r2466 # silence warnings and pylint
Changed v.Set validation into our own that actually raises exceptions on missing values....
r2719 UnicodeString, OneOf, Int, Number, Regex, Email, Bool, StringBoolean, Set, \
Added UserIpMap interface for allowed IP addresses and IP restriction access...
r3125 NotEmpty, IPAddress, CIDR
Added rewritten validators module + tests
r2466
log = logging.getLogger(__name__)
Changed v.Set validation into our own that actually raises exceptions on missing values....
r2719 class UniqueList(formencode.FancyValidator):
"""
Unique List !
"""
messages = dict(
empty=_('Value cannot be an empty list'),
missing_value=_('Value cannot be an empty list'),
)
def _to_python(self, value, state):
if isinstance(value, list):
return value
elif isinstance(value, set):
return list(value)
elif isinstance(value, tuple):
return list(value)
elif value is None:
return []
else:
return [value]
def empty_value(self, value):
return []
Added rewritten validators module + tests
r2466 class StateObj(object):
"""
this is needed to translate the messages using _() in validators
"""
_ = staticmethod(_)
def M(self, key, state=None, **kwargs):
"""
returns string from self.message based on given key,
passed kw params are used to substitute %(named)s params inside
translated strings
:param msg:
:param state:
"""
if state is None:
state = StateObj()
else:
state._ = staticmethod(_)
#inject validator into state object
return self.message(key, state, **kwargs)
def ValidUsername(edit=False, old_data={}):
class _validator(formencode.validators.FancyValidator):
messages = {
'username_exists': _(u'Username "%(username)s" already exists'),
'system_invalid_username':
_(u'Username "%(username)s" is forbidden'),
'invalid_username':
_(u'Username may only contain alphanumeric characters '
'underscores, periods or dashes and must begin with '
'alphanumeric character')
}
def validate_python(self, value, state):
if value in ['default', 'new_user']:
msg = M(self, 'system_invalid_username', state, username=value)
raise formencode.Invalid(msg, value, state)
#check if user is unique
old_un = None
if edit:
old_un = User.get(old_data.get('user_id')).username
if old_un != value or not edit:
if User.get_by_username(value, case_insensitive=True):
msg = M(self, 'username_exists', state, username=value)
raise formencode.Invalid(msg, value, state)
Mads Kiilerich
make email validation regexp match the error description - single letter is ok
r3186 if re.match(r'^[a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]*$', value) is None:
Added rewritten validators module + tests
r2466 msg = M(self, 'invalid_username', state)
raise formencode.Invalid(msg, value, state)
return _validator
def ValidRepoUser():
class _validator(formencode.validators.FancyValidator):
messages = {
'invalid_username': _(u'Username %(username)s is not valid')
}
def validate_python(self, value, state):
try:
User.query().filter(User.active == True)\
.filter(User.username == value).one()
except Exception:
msg = M(self, 'invalid_username', state, username=value)
raise formencode.Invalid(msg, value, state,
error_dict=dict(username=msg)
)
return _validator
def ValidUsersGroup(edit=False, old_data={}):
class _validator(formencode.validators.FancyValidator):
messages = {
fixed tests and missing replacements from 5f1850e4712a
r3415 'invalid_group': _(u'Invalid user group name'),
Added rewritten validators module + tests
r2466 'group_exist': _(u'Users group "%(usersgroup)s" already exists'),
'invalid_usersgroup_name':
fixed tests and missing replacements from 5f1850e4712a
r3415 _(u'user group name may only contain alphanumeric '
Added rewritten validators module + tests
r2466 'characters underscores, periods or dashes and must begin '
'with alphanumeric character')
}
def validate_python(self, value, state):
if value in ['default']:
msg = M(self, 'invalid_group', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(users_group_name=msg)
)
#check if group is unique
old_ugname = None
if edit:
old_id = old_data.get('users_group_id')
old_ugname = UsersGroup.get(old_id).users_group_name
if old_ugname != value or not edit:
is_existing_group = UsersGroup.get_by_group_name(value,
case_insensitive=True)
if is_existing_group:
msg = M(self, 'group_exist', state, usersgroup=value)
raise formencode.Invalid(msg, value, state,
error_dict=dict(users_group_name=msg)
)
if re.match(r'^[a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+$', value) is None:
msg = M(self, 'invalid_usersgroup_name', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(users_group_name=msg)
)
return _validator
def ValidReposGroup(edit=False, old_data={}):
class _validator(formencode.validators.FancyValidator):
messages = {
'group_parent_id': _(u'Cannot assign this group as parent'),
'group_exists': _(u'Group "%(group_name)s" already exists'),
'repo_exists':
_(u'Repository with name "%(group_name)s" already exists')
}
def validate_python(self, value, state):
# TODO WRITE VALIDATIONS
group_name = value.get('group_name')
group_parent_id = value.get('group_parent_id')
# slugify repo group just in case :)
slug = repo_name_slug(group_name)
# check for parent of self
parent_of_self = lambda: (
old_data['group_id'] == int(group_parent_id)
if group_parent_id else False
)
if edit and parent_of_self():
msg = M(self, 'group_parent_id', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(group_parent_id=msg)
)
old_gname = None
if edit:
old_gname = RepoGroup.get(old_data.get('group_id')).group_name
if old_gname != group_name or not edit:
# check group
gr = RepoGroup.query()\
.filter(RepoGroup.group_name == slug)\
.filter(RepoGroup.group_parent_id == group_parent_id)\
.scalar()
if gr:
msg = M(self, 'group_exists', state, group_name=slug)
raise formencode.Invalid(msg, value, state,
error_dict=dict(group_name=msg)
)
# check for same repo
repo = Repository.query()\
.filter(Repository.repo_name == slug)\
.scalar()
if repo:
msg = M(self, 'repo_exists', state, group_name=slug)
raise formencode.Invalid(msg, value, state,
error_dict=dict(group_name=msg)
)
return _validator
def ValidPassword():
class _validator(formencode.validators.FancyValidator):
messages = {
'invalid_password':
_(u'Invalid characters (non-ascii) in password')
}
def validate_python(self, value, state):
try:
(value or '').decode('ascii')
except UnicodeError:
msg = M(self, 'invalid_password', state)
raise formencode.Invalid(msg, value, state,)
return _validator
def ValidPasswordsMatch():
class _validator(formencode.validators.FancyValidator):
messages = {
'password_mismatch': _(u'Passwords do not match'),
}
def validate_python(self, value, state):
pass_val = value.get('password') or value.get('new_password')
if pass_val != value['password_confirmation']:
msg = M(self, 'password_mismatch', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(password_confirmation=msg)
)
return _validator
def ValidAuth():
class _validator(formencode.validators.FancyValidator):
messages = {
'invalid_password': _(u'invalid password'),
'invalid_username': _(u'invalid user name'),
'disabled_account': _(u'Your account is disabled')
}
def validate_python(self, value, state):
Added validation into user email map
r2479 from rhodecode.lib.auth import authenticate
Added rewritten validators module + tests
r2466 password = value['password']
username = value['username']
if not authenticate(username, password):
user = User.get_by_username(username)
if user and user.active is False:
log.warning('user %s is disabled' % username)
msg = M(self, 'disabled_account', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(username=msg)
)
else:
log.warning('user %s failed to authenticate' % username)
msg = M(self, 'invalid_username', state)
msg2 = M(self, 'invalid_password', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(username=msg, password=msg2)
)
return _validator
def ValidAuthToken():
class _validator(formencode.validators.FancyValidator):
messages = {
'invalid_token': _(u'Token mismatch')
}
def validate_python(self, value, state):
if value != authentication_token():
msg = M(self, 'invalid_token', state)
raise formencode.Invalid(msg, value, state)
return _validator
def ValidRepoName(edit=False, old_data={}):
class _validator(formencode.validators.FancyValidator):
messages = {
'invalid_repo_name':
_(u'Repository name %(repo)s is disallowed'),
'repository_exists':
_(u'Repository named %(repo)s already exists'),
'repository_in_group_exists': _(u'Repository "%(repo)s" already '
'exists in group "%(group)s"'),
'same_group_exists': _(u'Repositories group with name "%(repo)s" '
'already exists')
}
def _to_python(self, value, state):
repo_name = repo_name_slug(value.get('repo_name', ''))
repo_group = value.get('repo_group')
if repo_group:
gr = RepoGroup.get(repo_group)
group_path = gr.full_path
group_name = gr.group_name
# value needs to be aware of group name in order to check
# db key This is an actual just the name to store in the
# database
repo_name_full = group_path + RepoGroup.url_sep() + repo_name
else:
group_name = group_path = ''
repo_name_full = repo_name
value['repo_name'] = repo_name
value['repo_name_full'] = repo_name_full
value['group_path'] = group_path
value['group_name'] = group_name
return value
def validate_python(self, value, state):
repo_name = value.get('repo_name')
repo_name_full = value.get('repo_name_full')
group_path = value.get('group_path')
group_name = value.get('group_name')
if repo_name in [ADMIN_PREFIX, '']:
msg = M(self, 'invalid_repo_name', state, repo=repo_name)
raise formencode.Invalid(msg, value, state,
error_dict=dict(repo_name=msg)
)
rename = old_data.get('repo_name') != repo_name_full
create = not edit
if rename or create:
if group_path != '':
if Repository.get_by_repo_name(repo_name_full):
msg = M(self, 'repository_in_group_exists', state,
repo=repo_name, group=group_name)
raise formencode.Invalid(msg, value, state,
error_dict=dict(repo_name=msg)
)
elif RepoGroup.get_by_group_name(repo_name_full):
msg = M(self, 'same_group_exists', state,
repo=repo_name)
raise formencode.Invalid(msg, value, state,
error_dict=dict(repo_name=msg)
)
elif Repository.get_by_repo_name(repo_name_full):
msg = M(self, 'repository_exists', state,
repo=repo_name)
raise formencode.Invalid(msg, value, state,
error_dict=dict(repo_name=msg)
)
return value
return _validator
def ValidForkName(*args, **kwargs):
return ValidRepoName(*args, **kwargs)
def SlugifyName():
class _validator(formencode.validators.FancyValidator):
def _to_python(self, value, state):
return repo_name_slug(value)
def validate_python(self, value, state):
pass
return _validator
def ValidCloneUri():
from rhodecode.lib.utils import make_ui
domruf
remove redundant logic
r2701 def url_handler(repo_type, url, ui=None):
Added rewritten validators module + tests
r2466 if repo_type == 'hg':
Fixed validators for remote repos...
r2706 from rhodecode.lib.vcs.backends.hg.repository import MercurialRepository
from mercurial.httppeer import httppeer
if url.startswith('http'):
## initially check if it's at least the proper URL
## or does it pass basic auth
MercurialRepository._check_url(url)
Added optional flag to make_ui to not clean sqlalchemy Session....
r2717 httppeer(ui, url)._capabilities()
domruf
remove redundant logic
r2701 elif url.startswith('svn+http'):
from hgsubversion.svnrepo import svnremoterepo
Added optional flag to make_ui to not clean sqlalchemy Session....
r2717 svnremoterepo(ui, url).capabilities
Fixed validators for remote repos...
r2706 elif url.startswith('git+http'):
raise NotImplementedError()
Added rewritten validators module + tests
r2466 elif repo_type == 'git':
Fixed validators for remote repos...
r2706 from rhodecode.lib.vcs.backends.git.repository import GitRepository
if url.startswith('http'):
## initially check if it's at least the proper URL
## or does it pass basic auth
GitRepository._check_url(url)
elif url.startswith('svn+http'):
raise NotImplementedError()
elif url.startswith('hg+http'):
raise NotImplementedError()
Added rewritten validators module + tests
r2466
class _validator(formencode.validators.FancyValidator):
messages = {
'clone_uri': _(u'invalid clone url'),
'invalid_clone_uri': _(u'Invalid clone url, provide a '
domruf
allow cloning with hgsubversion (reimplementing pull request 46)...
r2700 'valid clone http(s)/svn+http(s) url')
Added rewritten validators module + tests
r2466 }
def validate_python(self, value, state):
repo_type = value.get('repo_type')
url = value.get('clone_uri')
if not url:
pass
domruf
remove redundant logic
r2701 else:
Added rewritten validators module + tests
r2466 try:
Added optional flag to make_ui to not clean sqlalchemy Session....
r2717 url_handler(repo_type, url, make_ui('db', clear_session=False))
Added rewritten validators module + tests
r2466 except Exception:
log.exception('Url validation failed')
msg = M(self, 'clone_uri')
raise formencode.Invalid(msg, value, state,
error_dict=dict(clone_uri=msg)
)
return _validator
def ValidForkType(old_data={}):
class _validator(formencode.validators.FancyValidator):
messages = {
'invalid_fork_type': _(u'Fork have to be the same type as parent')
}
def validate_python(self, value, state):
if old_data['repo_type'] != value:
msg = M(self, 'invalid_fork_type', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(repo_type=msg)
)
return _validator
Implemented permissions for writing to repo...
r2835 def CanWriteGroup():
class _validator(formencode.validators.FancyValidator):
messages = {
'permission_denied': _(u"You don't have permissions "
move permission check of write access to repo groups inside a form....
r3372 "to create repository in this group"),
'permission_denied_root': _(u"no permission to create repository "
"in root location")
Implemented permissions for writing to repo...
r2835 }
move permission check of write access to repo groups inside a form....
r3372 def _to_python(self, value, state):
Group management delegation:...
r3222 #root location
if value in [-1, "-1"]:
return None
return value
Implemented permissions for writing to repo...
r2835 def validate_python(self, value, state):
gr = RepoGroup.get(value)
Group management delegation:...
r3222 gr_name = gr.group_name if gr else None # None means ROOT location
val = HasReposGroupPermissionAny('group.write', 'group.admin')
move permission check of write access to repo groups inside a form....
r3372 can_create_repos = HasPermissionAny('hg.admin', 'hg.create.repository')
Group management delegation:...
r3222 forbidden = not val(gr_name, 'can write into group validator')
#parent group need to be existing
if gr and forbidden:
Implemented permissions for writing to repo...
r2835 msg = M(self, 'permission_denied', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(repo_type=msg)
)
move permission check of write access to repo groups inside a form....
r3372 ## check if we can write to root location !
elif gr is None and can_create_repos() is False:
msg = M(self, 'permission_denied_root', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(repo_type=msg)
)
Implemented permissions for writing to repo...
r2835 return _validator
Group management delegation:...
r3222 def CanCreateGroup(can_create_in_root=False):
class _validator(formencode.validators.FancyValidator):
messages = {
'permission_denied': _(u"You don't have permissions "
"to create a group in this location")
}
def to_python(self, value, state):
#root location
if value in [-1, "-1"]:
return None
return value
def validate_python(self, value, state):
gr = RepoGroup.get(value)
gr_name = gr.group_name if gr else None # None means ROOT location
if can_create_in_root and gr is None:
#we can create in root, we're fine no validations required
return
forbidden_in_root = gr is None and can_create_in_root is False
val = HasReposGroupPermissionAny('group.admin')
forbidden = not val(gr_name, 'can create group validator')
if forbidden_in_root or forbidden:
msg = M(self, 'permission_denied', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(group_parent_id=msg)
)
return _validator
Added rewritten validators module + tests
r2466 def ValidPerms(type_='repo'):
if type_ == 'group':
EMPTY_PERM = 'group.none'
elif type_ == 'repo':
EMPTY_PERM = 'repository.none'
class _validator(formencode.validators.FancyValidator):
messages = {
'perm_new_member_name':
fixed tests and missing replacements from 5f1850e4712a
r3415 _(u'This username or user group name is not valid')
Added rewritten validators module + tests
r2466 }
def to_python(self, value, state):
#538 form for permissions can handle multiple users at once
r2759 perms_update = OrderedSet()
perms_new = OrderedSet()
Added rewritten validators module + tests
r2466 # build a list of permission to update and new permission to create
#538 form for permissions can handle multiple users at once
r2759
#CLEAN OUT ORG VALUE FROM NEW MEMBERS, and group them using
new_perms_group = defaultdict(dict)
for k, v in value.copy().iteritems():
Added rewritten validators module + tests
r2466 if k.startswith('perm_new_member'):
#538 form for permissions can handle multiple users at once
r2759 del value[k]
_type, part = k.split('perm_new_member_')
args = part.split('_')
if len(args) == 1:
new_perms_group[args[0]]['perm'] = v
elif len(args) == 2:
_key, pos = args
new_perms_group[pos][_key] = v
Added rewritten validators module + tests
r2466
#538 form for permissions can handle multiple users at once
r2759 # fill new permissions in order of how they were added
for k in sorted(map(int, new_perms_group.keys())):
perm_dict = new_perms_group[str(k)]
Permissions on group can be set in recursive mode setting defined permission to all children...
r2820 new_member = perm_dict.get('name')
new_perm = perm_dict.get('perm')
new_type = perm_dict.get('type')
#538 form for permissions can handle multiple users at once
r2759 if new_member and new_perm and new_type:
perms_new.add((new_member, new_perm, new_type))
for k, v in value.iteritems():
if k.startswith('u_perm_') or k.startswith('g_perm_'):
Added rewritten validators module + tests
r2466 member = k[7:]
t = {'u': 'user',
'g': 'users_group'
}[k[0]]
if member == 'default':
fix private flag switching default permission
r3217 if value.get('repo_private'):
Added rewritten validators module + tests
r2466 # set none for default when updating to
# private repo
v = EMPTY_PERM
#538 form for permissions can handle multiple users at once
r2759 perms_update.add((member, v, t))
added test for setting repo as private which should set perm => None for default user
r3219 #always set NONE when private flag is set
if value.get('repo_private'):
perms_update.add(('default', EMPTY_PERM, 'user'))
Added rewritten validators module + tests
r2466
#538 form for permissions can handle multiple users at once
r2759 value['perms_updates'] = list(perms_update)
value['perms_new'] = list(perms_new)
Added rewritten validators module + tests
r2466
# update permissions
for k, v, t in perms_new:
try:
if t is 'user':
self.user_db = User.query()\
.filter(User.active == True)\
.filter(User.username == k).one()
if t is 'users_group':
self.user_db = UsersGroup.query()\
.filter(UsersGroup.users_group_active == True)\
.filter(UsersGroup.users_group_name == k).one()
except Exception:
log.exception('Updated permission failed')
msg = M(self, 'perm_new_member_type', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(perm_new_member_name=msg)
)
return value
return _validator
def ValidSettings():
class _validator(formencode.validators.FancyValidator):
def _to_python(self, value, state):
white space cleanup
r3149 # settings form for users that are not admin
Fixed some issues with edit form...
r3089 # can't edit certain parameters, it's extra backup if they mangle
# with forms
forbidden_params = [
'user', 'repo_type', 'repo_enable_locking',
'repo_enable_downloads', 'repo_enable_statistics'
]
for param in forbidden_params:
if param in value:
del value[param]
Added rewritten validators module + tests
r2466 return value
def validate_python(self, value, state):
pass
return _validator
def ValidPath():
class _validator(formencode.validators.FancyValidator):
messages = {
'invalid_path': _(u'This is not a valid path')
}
def validate_python(self, value, state):
if not os.path.isdir(value):
msg = M(self, 'invalid_path', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(paths_root_path=msg)
)
return _validator
def UniqSystemEmail(old_data={}):
class _validator(formencode.validators.FancyValidator):
messages = {
'email_taken': _(u'This e-mail address is already taken')
}
def _to_python(self, value, state):
return value.lower()
def validate_python(self, value, state):
if (old_data.get('email') or '').lower() != value:
user = User.get_by_email(value, case_insensitive=True)
if user:
msg = M(self, 'email_taken', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(email=msg)
)
return _validator
def ValidSystemEmail():
class _validator(formencode.validators.FancyValidator):
messages = {
'non_existing_email': _(u'e-mail "%(email)s" does not exist.')
}
def _to_python(self, value, state):
return value.lower()
def validate_python(self, value, state):
user = User.get_by_email(value, case_insensitive=True)
if user is None:
msg = M(self, 'non_existing_email', state, email=value)
raise formencode.Invalid(msg, value, state,
error_dict=dict(email=msg)
)
return _validator
def LdapLibValidator():
class _validator(formencode.validators.FancyValidator):
messages = {
}
def validate_python(self, value, state):
try:
import ldap
ldap # pyflakes silence !
except ImportError:
raise LdapImportError()
return _validator
def AttrLoginValidator():
class _validator(formencode.validators.FancyValidator):
messages = {
'invalid_cn':
_(u'The LDAP Login attribute of the CN must be specified - '
'this is the name of the attribute that is equivalent '
'to "username"')
}
def validate_python(self, value, state):
if not value or not isinstance(value, (str, unicode)):
msg = M(self, 'invalid_cn', state)
raise formencode.Invalid(msg, value, state,
error_dict=dict(ldap_attr_login=msg)
)
return _validator
Changed v.Set validation into our own that actually raises exceptions on missing values....
r2719
Fixed #585, checks for status of revision where to strict, and made opening pull request with those revision impossible due to previosly set status....
r2893 def NotReviewedRevisions(repo_id):
Changed v.Set validation into our own that actually raises exceptions on missing values....
r2719 class _validator(formencode.validators.FancyValidator):
messages = {
'rev_already_reviewed':
_(u'Revisions %(revs)s are already part of pull request '
'or have set status')
}
def validate_python(self, value, state):
# check revisions if they are not reviewed, or a part of another
# pull request
statuses = ChangesetStatus.query()\
Fixed #585, checks for status of revision where to strict, and made opening pull request with those revision impossible due to previosly set status....
r2893 .filter(ChangesetStatus.revision.in_(value))\
.filter(ChangesetStatus.repo_id == repo_id)\
.all()
Changed v.Set validation into our own that actually raises exceptions on missing values....
r2719 errors = []
for cs in statuses:
if cs.pull_request_id:
errors.append(['pull_req', cs.revision[:12]])
elif cs.status:
errors.append(['status', cs.revision[:12]])
if errors:
revs = ','.join([x[1] for x in errors])
msg = M(self, 'rev_already_reviewed', state, revs=revs)
raise formencode.Invalid(msg, value, state,
error_dict=dict(revisions=revs)
)
return _validator
Added UserIpMap interface for allowed IP addresses and IP restriction access...
r3125
def ValidIp():
class _validator(CIDR):
messages = dict(
IP restrictions now also enabled for IPv6
r3212 badFormat=_('Please enter a valid IPv4 or IpV6 address'),
Added UserIpMap interface for allowed IP addresses and IP restriction access...
r3125 illegalBits=_('The network size (bits) must be within the range'
' of 0-32 (not %(bits)r)'))
IP restrictions now also enabled for IPv6
r3212 def to_python(self, value, state):
v = super(_validator, self).to_python(value, state)
v = v.strip()
net = ipaddr.IPNetwork(address=v)
if isinstance(net, ipaddr.IPv4Network):
#if IPv4 doesn't end with a mask, add /32
if '/' not in value:
v += '/32'
if isinstance(net, ipaddr.IPv6Network):
#if IPv6 doesn't end with a mask, add /128
if '/' not in value:
v += '/128'
return v
Added UserIpMap interface for allowed IP addresses and IP restriction access...
r3125 def validate_python(self, value, state):
try:
IP restrictions now also enabled for IPv6
r3212 addr = value.strip()
#this raises an ValueError if address is not IpV4 or IpV6
ipaddr.IPNetwork(address=addr)
Added UserIpMap interface for allowed IP addresses and IP restriction access...
r3125 except ValueError:
raise formencode.Invalid(self.message('badFormat', state),
value, state)
return _validator
repository extra fields implementation...
r3308
def FieldKey():
class _validator(formencode.validators.FancyValidator):
messages = dict(
badFormat=_('Key name can only consist of letters, '
'underscore, dash or numbers'),)
def validate_python(self, value, state):
if not re.match('[a-zA-Z0-9_-]+$', value):
raise formencode.Invalid(self.message('badFormat', state),
value, state)
return _validator