nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-06-03 10:50:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved form validation (only request domain/user/pass if gnudip is selected to allow empty params on update URL), and stripped single qoutes from empty values to avoid showing them when form is loaded

Browse Source
This commit is contained in:
Daniel Steglich 2015-03-09 23:32:13 +01:00
parent c59fcf0d29
commit 2782406cae
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plinth/modules/dynamicdns/dynamicdns.py
View File

@ -137,12 +137,14 @@ class ConfigureForm(forms.Form):
dynamicdns_domain = TrimmedCharField(
label=_('Domain Name'),
help_text=_('Example: hostname.sds-ip.de'),
required=False,
validators=[
validators.RegexValidator(r'^[\w-]{1,63}(\.[\w-]{1,63})*$',
_('Invalid domain name'))])
dynamicdns_user = TrimmedCharField(
label=_('Username'),
required=False,
help_text=_(hlp_user))
dynamicdns_secret = TrimmedCharField(
@ -164,6 +166,8 @@ class ConfigureForm(forms.Form):
cleaned_data = super(ConfigureForm, self).clean()
dynamicdns_secret = cleaned_data.get('dynamicdns_secret')
dynamicdns_update_url = cleaned_data.get('dynamicdns_update_url')
dynamicdns_user = cleaned_data.get('dynamicdns_user')
dynamicdns_domain = cleaned_data.get('dynamicdns_domain')
dynamicdns_server = cleaned_data.get('dynamicdns_server')
service_type = cleaned_data.get('service_type')
old_dynamicdns_secret = self.initial['dynamicdns_secret']
@ -181,8 +185,15 @@ class ConfigureForm(forms.Form):
a GnuDIP Server')
LOGGER.info('no server address given')
if dynamicdns_server and not dynamicdns_user:
raise forms.ValidationError('please give GnuDIP username')
if dynamicdns_server and not dynamicdns_domain:
raise forms.ValidationError('please give GnuDIP domain')
"""check if a password was set before or a password is set now"""
if not dynamicdns_secret and not old_dynamicdns_secret:
if (dynamicdns_server and not dynamicdns_secret
and not old_dynamicdns_secret):
raise forms.ValidationError('please give a password')
LOGGER.info('no password given')
@ -247,7 +258,7 @@ def get_status():
if details[1] == 'disabled':
status['dynamicdns_server'] = ''
else:
status['dynamicdns_server'] = details[1]
status['dynamicdns_server'] = details[1].replace("'", "")
else:
status['dynamicdns_server'] = ''
@ -256,6 +267,7 @@ def get_status():
status['dynamicdns_domain'] = ''
else:
status['dynamicdns_domain'] = details[2]
status['dynamicdns_domain'] = details[2].replace("'", "")
else:
status['dynamicdns_domain'] = ''
@ -263,7 +275,7 @@ def get_status():
if details[3] == 'disabled':
status['dynamicdns_user'] = ''
else:
status['dynamicdns_user'] = details[3]
status['dynamicdns_user'] = details[3].replace("'", "")
else:
status['dynamicdns_user'] = ''
@ -271,7 +283,7 @@ def get_status():
if details[4] == 'disabled':
status['dynamicdns_secret'] = ''
else:
status['dynamicdns_secret'] = details[4]
status['dynamicdns_secret'] = details[4].replace("'", "")
else:
status['dynamicdns_secret'] = ''
@ -279,7 +291,7 @@ def get_status():
if details[5] == 'disabled':
status['dynamicdns_ipurl'] = ''
else:
status['dynamicdns_ipurl'] = details[5]
status['dynamicdns_ipurl'] = details[5].replace("'", "")
else:
status['dynamicdns_ipurl'] = ''
@ -287,7 +299,7 @@ def get_status():
if details[6] == 'disabled':
status['dynamicdns_update_url'] = ''
else:
status['dynamicdns_update_url'] = details[6]
status['dynamicdns_update_url'] = details[6].replace("'", "")
else:
status['dynamicdns_update_url'] = ''