Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on site domain FQDN lookup with referrer.

Browse Source
This commit is contained in:
Scott Idem
2022-02-07 16:24:27 -05:00
parent 02a8948ee4
commit 74727c2d77
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/routers/site_domain.py
View File

@@ -85,7 +85,7 @@ async def lookup_site_domain_obj(
exclude_none: bool = True, exclude_none: bool = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
data = {} data = {}
@@ -98,6 +98,7 @@ async def lookup_site_domain_obj(
referrer = referer referrer = referer
data['required_referrer'] = referer data['required_referrer'] = referer
data['required_refer'] = referer data['required_refer'] = referer
log.info(f'Looking up site domain with FQDN: {fqdn}; Access Key {access_key}; Referrer: {referrer}')
log.debug(data) log.debug(data)
if access_key and referrer: if access_key and referrer:
@@ -119,18 +120,6 @@ async def lookup_site_domain_obj(
AND (site_domain.required_referrer IS NULL OR site_domain.required_referrer = '') AND (site_domain.required_referrer IS NULL OR site_domain.required_referrer = '')
""" """
# if access_key:
# #sql_access_key_referrer = 'AND site_domain.domain_access_key = :domain_access_key'
# sql_access_key_referrer = """
# AND (site_domain.domain_access_key = :domain_access_key AND (site_domain.required_referrer IS NULL OR site_domain.required_referrer = ''))
# OR (site_domain.domain_access_key = :domain_access_key AND site_domain.required_referrer = :required_referrer)
# """
# else:
# sql_access_key_referrer = 'AND site_domain.domain_access_key IS NULL'
# #if referrer:
# # sql_referrer = 'AND site_domain.required_referrer = :required_referrer'
sql = f""" sql = f"""
SELECT *, site_enable_from AS 'enable_from', site_enable_to AS 'enable_to' SELECT *, site_enable_from AS 'enable_from', site_enable_to AS 'enable_to'
FROM `v_site_domain` AS site_domain FROM `v_site_domain` AS site_domain
@@ -142,7 +131,6 @@ async def lookup_site_domain_obj(
# NOTE: This need to broken out into a methods function for site and or site_domain # NOTE: This need to broken out into a methods function for site and or site_domain
if site_domain_obj_result := sql_select(data=data, sql=sql): if site_domain_obj_result := sql_select(data=data, sql=sql):
log.info('')
if isinstance(site_domain_obj_result, dict): if isinstance(site_domain_obj_result, dict):
log.info('Got a site domain result') log.info('Got a site domain result')
try: try: