fix access logs and add request method

This commit is contained in:
dandds 2019-03-22 11:48:59 -04:00
parent 746a5834c1
commit 601ca1c655
2 changed files with 7 additions and 4 deletions

View File

@ -34,16 +34,16 @@ def user_can_access_decorator(permission, message=None, exception=None):
try: try:
check_access(permission, message, exception, *args, **kwargs) check_access(permission, message, exception, *args, **kwargs)
app.logger.info( app.logger.info(
"[access] User {} accessed {}".format( "[access] User {} accessed {} {}".format(
g.current_user.id, g.current_user.dod_id, request.path g.current_user.id, request.method, request.path
) )
) )
return f(*args, **kwargs) return f(*args, **kwargs)
except UnauthorizedError as err: except UnauthorizedError as err:
app.logger.warning( app.logger.warning(
"[access] User {} denied access to {}".format( "[access] User {} denied access {} {}".format(
g.current_user.id, g.current_user.dod_id, request.path g.current_user.id, request.method, request.path
) )
) )

View File

@ -176,6 +176,7 @@ def test_user_can_access_decorator_logs_access(
_do_something() _do_something()
assert len(mock_logger.messages) == 1 assert len(mock_logger.messages) == 1
assert "accessed" in mock_logger.messages[0] assert "accessed" in mock_logger.messages[0]
assert "GET" in mock_logger.messages[0]
def _unauthorized(*a, **k): def _unauthorized(*a, **k):
raise UnauthorizedError(user, "do something") raise UnauthorizedError(user, "do something")
@ -183,5 +184,7 @@ def test_user_can_access_decorator_logs_access(
monkeypatch.setattr("atst.domain.authz.decorator.check_access", _unauthorized) monkeypatch.setattr("atst.domain.authz.decorator.check_access", _unauthorized)
with pytest.raises(UnauthorizedError): with pytest.raises(UnauthorizedError):
_do_something() _do_something()
assert len(mock_logger.messages) == 2 assert len(mock_logger.messages) == 2
assert "denied access" in mock_logger.messages[1] assert "denied access" in mock_logger.messages[1]
assert "GET" in mock_logger.messages[1]