From 69a25fbb094ce3009ac7822cc077e1b9ab778db4 Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 23 Jan 2024 11:48:11 +1100 Subject: [PATCH] add username to secret retrieve audit log --- controllers/retrieveSecrets.go | 2 +- models/user.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/retrieveSecrets.go b/controllers/retrieveSecrets.go index 942e29a..701a477 100644 --- a/controllers/retrieveSecrets.go +++ b/controllers/retrieveSecrets.go @@ -161,7 +161,7 @@ func retrieveSpecifiedSecret(s *models.Secret, c *gin.Context) { UserId: UserId, SecretId: results[i].SecretId, IpAddress: c.ClientIP(), - EventText: fmt.Sprintf("Retrieved Secret Id %d", results[i].SecretId), + EventText: fmt.Sprintf("User %s retrieved Secret Id %d", results[0].UserName, results[i].SecretId), } a.AuditLogAdd() } diff --git a/models/user.go b/models/user.go index 2233e11..6f525c1 100644 --- a/models/user.go +++ b/models/user.go @@ -408,7 +408,7 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) { // join users, groups and permissions rows, err := db.Queryx(` - SELECT users.UserId, users.GroupId, + SELECT users.UserId, users.GroupId, users.UserName, permissions.SafeId, permissions.ReadOnly, safes.SafeName FROM users INNER JOIN groups ON users.GroupId = groups.GroupId INNER JOIN permissions ON groups.GroupId = permissions.GroupId