From 14a66a98f17b6aee28d39fb91e606ba8c36ff1c4 Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Mon, 19 Jun 2023 13:51:44 +0200 Subject: [PATCH] add token to LinkAccessedEvent Signed-off-by: Christian Richter --- changelog/unreleased/add-token-to-linkAccessed-event.md | 7 +++++++ services/audit/pkg/types/conversion.go | 4 ++-- services/audit/pkg/types/messages.go | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 changelog/unreleased/add-token-to-linkAccessed-event.md diff --git a/changelog/unreleased/add-token-to-linkAccessed-event.md b/changelog/unreleased/add-token-to-linkAccessed-event.md new file mode 100644 index 0000000000..9a4018e64e --- /dev/null +++ b/changelog/unreleased/add-token-to-linkAccessed-event.md @@ -0,0 +1,7 @@ +Bugfix: Add token to LinkAccessedEvent + +We added the link token to the LinkAccessedEvent + +https://github.com/owncloud/ocis/pull/6554 +https://github.com/cs3org/reva/pull/3993 +https://github.com/owncloud/ocis/issues/3753 \ No newline at end of file diff --git a/services/audit/pkg/types/conversion.go b/services/audit/pkg/types/conversion.go index b4230cb29c..0794569274 100644 --- a/services/audit/pkg/types/conversion.go +++ b/services/audit/pkg/types/conversion.go @@ -202,7 +202,7 @@ func ReceivedShareUpdated(ev events.ReceivedShareUpdated) AuditEventReceivedShar // LinkAccessed converts a LinkAccessed event to an AuditEventLinkAccessed func LinkAccessed(ev events.LinkAccessed) AuditEventLinkAccessed { uid := ev.Sharer.OpaqueId - base := BasicAuditEvent(uid, formatTime(ev.CTime), MessageLinkAccessed(ev.ShareID.GetOpaqueId(), true), ActionLinkAccessed) + base := BasicAuditEvent(uid, formatTime(ev.CTime), MessageLinkAccessed(ev.Token, true), ActionLinkAccessed) return AuditEventLinkAccessed{ AuditEventSharing: SharingAuditEvent(ev.ShareID.GetOpaqueId(), ev.ItemID.OpaqueId, uid, base), ShareToken: ev.Token, @@ -215,7 +215,7 @@ func LinkAccessed(ev events.LinkAccessed) AuditEventLinkAccessed { // LinkAccessFailed converts a LinkAccessFailed event to an AuditEventLinkAccessed func LinkAccessFailed(ev events.LinkAccessFailed) AuditEventLinkAccessed { - base := BasicAuditEvent("", formatTime(ev.Timestamp), MessageLinkAccessed(ev.ShareID.GetOpaqueId(), false), ActionLinkAccessed) + base := BasicAuditEvent("", formatTime(ev.Timestamp), MessageLinkAccessed(ev.Token, false), ActionLinkAccessed) return AuditEventLinkAccessed{ AuditEventSharing: SharingAuditEvent(ev.ShareID.GetOpaqueId(), "", "", base), ShareToken: ev.Token, diff --git a/services/audit/pkg/types/messages.go b/services/audit/pkg/types/messages.go index 049e08f5bf..d8cb503d91 100644 --- a/services/audit/pkg/types/messages.go +++ b/services/audit/pkg/types/messages.go @@ -94,8 +94,8 @@ func MessageShareDeclined(userid, shareid, sharerid string) string { } // MessageLinkAccessed returns the human readable string that describes the action -func MessageLinkAccessed(linkid string, success bool) string { - return fmt.Sprintf("link '%s' was accessed. Success: %v", linkid, success) +func MessageLinkAccessed(token string, success bool) string { + return fmt.Sprintf("link with token '%s' was accessed. Success: %v", token, success) } // MessageContainerCreated returns the human readable string that describes the action