Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(logs): improve signed URL data metrics log by adding client_id … #1130

Merged
merged 5 commits into from
Jan 19, 2024
Merged

chore(logs): improve signed URL data metrics log by adding client_id … #1130

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6f91c9
chore(logs): improve signed URL data metrics log by adding client_id …
Avantol13 Dec 15, 2023
b16a9f5
Update indexd.py
Avantol13 Dec 19, 2023
837baf6
Update indexd.py
Avantol13 Jan 2, 2024
e73f76e
Update indexd.py
Avantol13 Jan 17, 2024
b700937
Merge branch 'master' into chore/logs
Avantol13 Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions fence/blueprints/data/indexd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,14 @@ def get_signed_url_for_file(
_log_signed_url_data_info(
indexed_file=indexed_file,
user_sub=flask.g.audit_data.get("sub", ""),
client_id=_get_client_id(),
requested_protocol=requested_protocol
)

return {"url": signed_url}


def _log_signed_url_data_info(indexed_file, user_sub, requested_protocol):
def _log_signed_url_data_info(indexed_file, user_sub, client_id, requested_protocol):
size_in_kibibytes = (indexed_file.index_document.get("size") or 0) / 1024
acl = indexed_file.index_document.get("acl")
authz = indexed_file.index_document.get("authz")
Expand All @@ -192,10 +193,21 @@ def _log_signed_url_data_info(indexed_file, user_sub, requested_protocol):
break

logger.info(
f"Signed URL Generated. size_in_kibibytes={size_in_kibibytes} acl={acl} authz={authz} bucket={bucket} user_sub={user_sub}"
f"Signed URL Generated. size_in_kibibytes={size_in_kibibytes} "
f"acl={acl} authz={authz} bucket={bucket} user_sub={user_sub} client_id={client_id}"
k-burt-uch marked this conversation as resolved.
Show resolved Hide resolved
)


def _get_client_id():
client_id = ""

try:
client_id = current_token.get("azp") or ""
except Exception as exc:
pass

return client_id

def prepare_presigned_url_audit_log(protocol, indexed_file):
"""
Store in `flask.g.audit_data` the data needed to record an audit log.
Expand Down
Loading