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

Encapsulate domain list in class

Browse Source 
Code shouldn’t be accessing this list directly; the class should provide
a sensible interface to the data.
This commit is contained in:
Chris Hill-Scott
2018-02-06 09:33:07 +00:00
parent 7c339b808e
commit 3e79ae1bfe
2 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/config.py
View File

@@ -69,39 +69,6 @@ class Config(object):
STATSD_HOST = "statsd.hostedgraphite.com"
STATSD_PORT = 8125
NOTIFY_ENVIRONMENT = 'development'
EMAIL_DOMAIN_REGEXES = [
r"gov\.uk",
r"mod\.uk",
r"mil\.uk",
r"ddc-mod\.org",
r"slc\.co\.uk",
r"gov\.scot",
r"parliament\.uk",
r"nhs\.uk",
r"nhs\.net",
r"police\.uk",
r"dclgdatamart\.co\.uk",
r"ucds\.email",
r"naturalengland\.org\.uk",
r"hmcts\.net",
r"scotent\.co\.uk",
r"assembly\.wales",
r"cjsm\.net",
r"cqc\.org\.uk",
r"bl\.uk",
r"stfc\.ac\.uk",
r"wmfs\.net",
r"bbsrc\.ac\.uk",
r"acas\.org\.uk",
r"gov\.wales",
r"biglotteryfund\.org\.uk",
r"marinemanagement\.org\.uk",
r"britishmuseum\.org",
r"derrystrabane\.com",
r"highwaysengland\.co\.uk",
]
LOGO_UPLOAD_BUCKET_NAME = 'public-logos-local'
ROUTE_SECRET_KEY_1 = os.environ.get('ROUTE_SECRET_KEY_1', '')
ROUTE_SECRET_KEY_2 = os.environ.get('ROUTE_SECRET_KEY_2', '')

34
app/utils.py
View File

@@ -438,9 +438,41 @@ class NotGovernmentDomain(Exception):
class GovernmentDomain:
domains = [
r"gov\.uk",
r"mod\.uk",
r"mil\.uk",
r"ddc-mod\.org",
r"slc\.co\.uk",
r"gov\.scot",
r"parliament\.uk",
r"nhs\.uk",
r"nhs\.net",
r"police\.uk",
r"dclgdatamart\.co\.uk",
r"ucds\.email",
r"naturalengland\.org\.uk",
r"hmcts\.net",
r"scotent\.co\.uk",
r"assembly\.wales",
r"cjsm\.net",
r"cqc\.org\.uk",
r"bl\.uk",
r"stfc\.ac\.uk",
r"wmfs\.net",
r"bbsrc\.ac\.uk",
r"acas\.org\.uk",
r"gov\.wales",
r"biglotteryfund\.org\.uk",
r"marinemanagement\.org\.uk",
r"britishmuseum\.org",
r"derrystrabane\.com",
r"highwaysengland\.co\.uk",
]
def __init__(self, email_address_or_domain):
for domain in current_app.config['EMAIL_DOMAIN_REGEXES']:
for domain in self.domains:
if re.search(
r"[\.|@]({})$".format(domain),
email_address_or_domain.lower()