seba
/
dnmgmt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add $ marker to validation regexes 

..else they won't match the whole string.
This commit is contained in:
Sebastian Lohff 2018-06-17 19:48:36 +02:00
parent ac3e676e45
commit 8a162acee3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
whoisdb/validators.py
View File

@ -14,7 +14,7 @@ import ipaddress
@deconstructible @deconstructible
class HandleValidator(validators.RegexValidator): class HandleValidator(validators.RegexValidator):
regex = r'^(?:[A-Z]+[0-9]*(-[A-Z]+)|AUTO)' regex = r'^(?:[A-Z]+[0-9]*(-[A-Z]+)|AUTO)$'
message = _( message = _(
'Enter a valid handle (all uppercase)' 'Enter a valid handle (all uppercase)'
) )
@ -26,7 +26,7 @@ class HandleValidatorWithSuffix(validators.RegexValidator):
flags = re.ASCII if six.PY3 else 0 flags = re.ASCII if six.PY3 else 0
def __init__(self, suffix): def __init__(self, suffix):
self.regex = r'^(?:[A-Z]+[0-9]*-%s|AUTO)' % re.escape(suffix) self.regex = r'^(?:[A-Z]+[0-9]*-%s|AUTO)$' % re.escape(suffix)
self.message = _( self.message = _(
'Enter a valid handle with suffix %s (all uppercase), e.g. FOO3-%s' % (suffix, suffix) 'Enter a valid handle with suffix %s (all uppercase), e.g. FOO3-%s' % (suffix, suffix)
) )