nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor styling fixes for domain name validator

Browse Source
This commit is contained in:
Sunil Mohan Adapa 2015-11-16 21:56:49 +05:30
parent e7fb549349
commit cc181c79c3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plinth/modules/config/config.py
View File

@ -60,11 +60,12 @@ class TrimmedCharField(forms.CharField):
return super(TrimmedCharField, self).clean(value) return super(TrimmedCharField, self).clean(value)
def domain_labelvalidator(domainname): def domain_label_validator(domainname):
"""Validating Domain Name Labels""" """Validate domain name labels."""
for label in domainname.split("."): for label in domainname.split('.'):
if not re.match(HOSTNAME_REGEX, label): if not re.match(HOSTNAME_REGEX, label):
raise ValidationError(ugettext_lazy('Invalid Domain Name')) raise ValidationError(_('Invalid domain name'))
class ConfigurationForm(forms.Form): class ConfigurationForm(forms.Form):
"""Main system configuration form""" """Main system configuration form"""
@ -101,7 +102,7 @@ class ConfigurationForm(forms.Form):
validators.RegexValidator( validators.RegexValidator(
r'^[a-zA-Z0-9]([-a-zA-Z0-9.]{,251}[a-zA-Z0-9])?$', r'^[a-zA-Z0-9]([-a-zA-Z0-9.]{,251}[a-zA-Z0-9])?$',
ugettext_lazy('Invalid domain name')), ugettext_lazy('Invalid domain name')),
domain_labelvalidator]) domain_label_validator])
def init(): def init():

1
plinth/modules/config/tests/test_config.py
View File

@ -47,7 +47,6 @@ class TestConfig(unittest.TestCase):
def test_domainname_field(self): def test_domainname_field(self):
"""Test that domainname field accepts only valid domainnames.""" """Test that domainname field accepts only valid domainnames."""
valid_domainnames = [ valid_domainnames = [
'', 'a', '0a', 'a0', 'AAA', '00', '0-0', 'example-hostname', '', 'a', '0a', 'a0', 'AAA', '00', '0-0', 'example-hostname',
'example', 'example.org', 'a.b.c.d', 'a-0.b-0.c-0', 'example', 'example.org', 'a.b.c.d', 'a-0.b-0.c-0',