darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-11 10:28:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changed logging way

Browse Source
This commit is contained in:
venusbb
2017-11-06 13:40:20 +00:00
parent f81b6e9d99
commit cae42fe862
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/authentication/auth.py
+27 -23
View File
@@ -47,44 +47,48 @@ def requires_no_auth():
def check_route_secret(): def check_route_secret():
# Check route of inbound sms (Experimental) # Check route of inbound sms (Experimental)
# Temporary custom header for route security # Custom header for route security
auth_error_msg = ''
if request.headers.get("X-Custom-Forwarder"): if request.headers.get("X-Custom-Forwarder"):
route_secret_key = request.headers.get("X-Custom-Forwarder") route_secret_key = request.headers.get("X-Custom-Forwarder")
if route_secret_key is None: if route_secret_key is None:
# Not blocking at the moment # Not blocking at the moment
# raise AuthError('invalid secret key', 403) # raise AuthError('invalid secret key', 403)
return auth_error_msg = auth_error_msg + 'invalid secret key, '
else:
key_1 = current_app.config.get('ROUTE_SECRET_KEY_1') key_1 = current_app.config.get('ROUTE_SECRET_KEY_1')
key_2 = current_app.config.get('ROUTE_SECRET_KEY_2') key_2 = current_app.config.get('ROUTE_SECRET_KEY_2')
if key_1 == '' and key_2 == '': if key_1 == '' and key_2 == '':
# Not blocking at the moment # Not blocking at the moment
# raise AuthError('X-Custom-Forwarder, no secret was set on server', 503) # raise AuthError('X-Custom-Forwarder, no secret was set on server', 503)
return auth_error_msg = auth_error_msg + 'no secret was set on server, '
else:
key_used = None key_used = None
route_allowed = False route_allowed = False
if route_secret_key == key_1: if route_secret_key == key_1:
key_used = 1 key_used = 1
route_allowed = True route_allowed = True
elif route_secret_key == key_2: elif route_secret_key == key_2:
key_used = 2 key_used = 2
route_allowed = True route_allowed = True
if not key_used:
# Not blocking at the moment
# raise AuthError('X-Custom-Forwarder, wrong secret', 403)
auth_error_msg = auth_error_msg + 'wrong secret'
current_app.logger.info({ current_app.logger.info({
'message': 'X-Custom-Forwarder key {} is used'.format(key_used), 'message': 'X-Custom-Forwarder',
'log_contents': { 'log_contents': {
'passed': route_allowed, 'passed': route_allowed,
'key_used': key_used,
'error': auth_error_msg
} }
}) })
if not key_used:
# Not blocking at the moment
# raise AuthError('X-Custom-Forwarder, wrong secret', 403)
return
return jsonify(key_used=key_used), 200 return jsonify(key_used=key_used), 200