cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-09 23:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add regex matching for group/account description

Browse Source
This commit is contained in:
Erik Weber 2020-07-03 10:55:06 +02:00
parent 25db119d02
commit e993422106
No known key found for this signature in database
GPG Key ID: 05843120A7BB49E4
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
powerdnsadmin/routes/index.py
View File

@ -299,7 +299,19 @@ def login():
if description_value in group_info: if description_value in group_info:
group_description = group_info[description_value] group_description = group_info[description_value]
# Do regex search if enabled # Do regex search if enabled for group description
description_pattern = Setting().get('azure_group_accounts_description_re')
if description_pattern != '':
current_app.logger.info('Matching group description {} against regex {}'.format(group_description, description_pattern))
matches = re.match(description_pattern,group_description)
if matches:
current_app.logger.info('Group {} matched regexp'.format(group_description))
group_description = matches.group(0)
else:
# Regexp didn't match, continue to next iteration
next
# Do regex search if enabled for group name
pattern = Setting().get('azure_group_accounts_name_re') pattern = Setting().get('azure_group_accounts_name_re')
if pattern != '': if pattern != '':
current_app.logger.info('Matching group name {} against regex {}'.format(group_name, pattern)) current_app.logger.info('Matching group name {} against regex {}'.format(group_name, pattern))
@ -310,6 +322,7 @@ def login():
else: else:
# Regexp didn't match, continue to next iteration # Regexp didn't match, continue to next iteration
next next
account = Account() account = Account()
account_id = account.get_id_by_name(account_name=group_name) account_id = account.get_id_by_name(account_name=group_name)