From 9297c6d430df9cf80ade905cdd9b649d69c6ea46 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 14 Dec 2017 17:12:26 +0000 Subject: [PATCH] log user agents on api call auth. this'll be useful for trying to figure out which services are using what --- app/authentication/auth.py | 6 +++++- app/v2/errors.py | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/authentication/auth.py b/app/authentication/auth.py index cee69b9a6..d68582da7 100644 --- a/app/authentication/auth.py +++ b/app/authentication/auth.py @@ -93,7 +93,11 @@ def requires_auth(): g.service_id = api_key.service_id _request_ctx_stack.top.authenticated_service = service _request_ctx_stack.top.api_user = api_key - current_app.logger.info('Succesful login for service {} with api key {}'.format(service.id, api_key.id)) + current_app.logger.info('Succesful login for service {} with api key {}, using client'.format( + service.id, + api_key.id, + request.headers.get('User-Agent') + )) return else: # service has API keys, but none matching the one the user provided diff --git a/app/v2/errors.py b/app/v2/errors.py index 2cf4b878f..a70d61d53 100644 --- a/app/v2/errors.py +++ b/app/v2/errors.py @@ -1,8 +1,10 @@ import json -from flask import jsonify, current_app + +from flask import jsonify, current_app, request from jsonschema import ValidationError from sqlalchemy.exc import DataError from sqlalchemy.orm.exc import NoResultFound + from app.authentication.auth import AuthError from app.errors import InvalidRequest @@ -79,7 +81,7 @@ def register_errors(blueprint): @blueprint.errorhandler(AuthError) def auth_error(error): - current_app.logger.info('API AuthError: {}'.format(error)) + current_app.logger.info('API AuthError, client: {} error: {}'.format(request.headers.get('User-Agent'), error)) return jsonify(error.to_dict_v2()), error.code @blueprint.errorhandler(Exception)