darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-05 14:00:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to use a cleaner and lean regex

Browse Source
This commit is contained in:
Imdad Ahad
2016-10-28 10:45:05 +01:00
parent cd3a8bf533
commit 5ecdbb8596
5 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/utils.py
View File

@@ -203,7 +203,7 @@ def get_help_argument():
return request.args.get('help') if request.args.get('help') in ('1', '2', '3') else None
def user_in_whitelist(email_address):
valid_domains = current_app.config.get('EMAIL_DOMAIN_REGEXES', [])
email_regex = "[^\@^\s]+@([^@^\\.^\\s]+\.)*({})$".format("|".join(valid_domains))
return bool(re.match(email_regex, email_address))
def is_gov_user(email_address):
valid_domains = current_app.config['EMAIL_DOMAIN_REGEXES']
email_regex = "[.|@]({})$".format("|".join(valid_domains))
return bool(re.search(email_regex, email_address.lower()))