Interface out all action log data model operations
This will allow us to reimplement the logs data model against a non-database system in the near future
This commit is contained in:
parent
a156c91962
commit
b773a18ed8
26 changed files with 714 additions and 902 deletions
|
@ -6,6 +6,7 @@ from flask import Blueprint, jsonify, abort, request, make_response
|
|||
from jwt import get_unverified_header
|
||||
|
||||
from app import app
|
||||
from data.logs_model import logs_model
|
||||
from endpoints.keyserver.models_interface import ServiceKeyDoesNotExist
|
||||
from endpoints.keyserver.models_pre_oci import pre_oci_model as model
|
||||
from util.security import jwtutil
|
||||
|
@ -127,7 +128,7 @@ def put_service_key(service, kid):
|
|||
model.create_service_key('', kid, service, jwk, metadata, expiration_date,
|
||||
rotation_duration=rotation_duration)
|
||||
|
||||
model.log_action('service_key_create', request.remote_addr, metadata_dict={
|
||||
logs_model.log_action('service_key_create', ip=request.remote_addr, metadata={
|
||||
'kid': kid,
|
||||
'preshared': False,
|
||||
'service': service,
|
||||
|
@ -151,7 +152,7 @@ def put_service_key(service, kid):
|
|||
except ServiceKeyDoesNotExist:
|
||||
abort(404)
|
||||
|
||||
model.log_action('service_key_rotate', request.remote_addr, metadata_dict={
|
||||
logs_model.log_action('service_key_rotate', ip=request.remote_addr, metadata={
|
||||
'kid': kid,
|
||||
'signer_kid': signer_key.kid,
|
||||
'service': service,
|
||||
|
@ -187,7 +188,7 @@ def delete_service_key(service, kid):
|
|||
except ServiceKeyDoesNotExist:
|
||||
abort(404)
|
||||
|
||||
model.log_action('service_key_delete', request.remote_addr, metadata_dict={
|
||||
logs_model.log_action('service_key_delete', ip=request.remote_addr, metadata={
|
||||
'kid': kid,
|
||||
'signer_kid': signer_key.kid,
|
||||
'service': service,
|
||||
|
|
Reference in a new issue