cwinfo/powerdns-admin
4
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2025-06-14 12:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add the extra chars as an option

Browse Source
This commit is contained in:
Jérôme BECOT
2021-12-01 14:35:05 +01:00
parent a3c50828a6
commit eb13b37e09
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
powerdnsadmin/models/account.py
View File

@ -34,8 +34,12 @@ class Account(db.Model):
self.API_EXTENDED_URL = utils.pdns_api_extended_uri(self.PDNS_VERSION)
if self.name is not None:
if Setting().get('account_name_extra_chars'):
char_list = "abcdefghijklmnopqrstuvwxyz0123456789_-."
else:
char_list = "abcdefghijklmnopqrstuvwxyz0123456789"
self.name = ''.join(c for c in self.name.lower()
if c in "abcdefghijklmnopqrstuvwxyz0123456789_-")
if c in char_list)
def __repr__(self):
return '<Account {0}r>'.format(self.name)

11
powerdnsadmin/models/setting.py
View File

@ -192,7 +192,8 @@ class Setting(db.Model):
'custom_css': '',
'otp_force': False,
'max_history_records': 1000,
'deny_domain_override': False
'deny_domain_override': False,
'account_name_extra_chars': False
}
def __init__(self, id=None, name=None, value=None):
@ -273,15 +274,15 @@ class Setting(db.Model):
def get(self, setting):
if setting in self.defaults:
if setting.upper() in current_app.config:
result = current_app.config[setting.upper()]
else:
result = self.query.filter(Setting.name == setting).first()
if result is not None:
if hasattr(result,'value'):
result = result.value
result = result.value
return strtobool(result) if result in [
'True', 'False'
] else result
@ -289,7 +290,7 @@ class Setting(db.Model):
return self.defaults[setting]
else:
current_app.logger.error('Unknown setting queried: {0}'.format(setting))
def get_records_allow_to_edit(self):
return list(
set(self.get_forward_records_allow_to_edit() +