Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Matt Scott 2023-03-24 19:42:45 -04:00
commit 7b91804a8e
No known key found for this signature in database
GPG Key ID: A9A0AFFC0E079001

View File

@ -460,10 +460,8 @@ def apikey_auth(f):
if auth_header: if auth_header:
try: try:
apikey_val = str(base64.b64decode(auth_header), 'utf-8') apikey_val = str(base64.b64decode(auth_header), 'utf-8')
except binascii.Error as e: except (binascii.Error, UnicodeDecodeError) as e:
current_app.logger.error( current_app.logger.error('Invalid base64-encoded X-API-KEY. Error {0}'.format(e))
'Invalid base64-encoded of credential. Error {0}'.format(
e))
abort(401) abort(401)
except TypeError as e: except TypeError as e:
current_app.logger.error('Error: {0}'.format(e)) current_app.logger.error('Error: {0}'.format(e))