Pipe MountPoint to audit logs (hashicorp#20411) (hashicorp#20413)

* MountPoint piped to audit logs --------- Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
fopina · Apr 28, 2023 · afc3a90 · afc3a90
1 parent 268655c
commit afc3a90
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/audit/format.go b/audit/format.go
@@ -114,6 +114,7 @@ func (f *AuditFormatter) FormatRequest(ctx context.Context, w io.Writer, config
 			ClientToken:         req.ClientToken,
 			ClientTokenAccessor: req.ClientTokenAccessor,
 			Operation:           req.Operation,
+			MountPoint:          req.MountPoint,
 			MountType:           req.MountType,
 			MountAccessor:       req.MountAccessor,
 			Namespace: &AuditNamespace{
@@ -313,6 +314,7 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
 			ClientTokenAccessor: req.ClientTokenAccessor,
 			ClientID:            req.ClientID,
 			Operation:           req.Operation,
+			MountPoint:          req.MountPoint,
 			MountType:           req.MountType,
 			MountAccessor:       req.MountAccessor,
 			Namespace: &AuditNamespace{
@@ -330,6 +332,7 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
 		},
 
 		Response: &AuditResponse{
+			MountPoint:    req.MountPoint,
 			MountType:     req.MountType,
 			MountAccessor: req.MountAccessor,
 			Auth:          respAuth,
@@ -394,6 +397,7 @@ type AuditRequest struct {
 	ClientID                      string                 `json:"client_id,omitempty"`
 	ReplicationCluster            string                 `json:"replication_cluster,omitempty"`
 	Operation                     logical.Operation      `json:"operation,omitempty"`
+	MountPoint                    string                 `json:"mount_point,omitempty"`
 	MountType                     string                 `json:"mount_type,omitempty"`
 	MountAccessor                 string                 `json:"mount_accessor,omitempty"`
 	ClientToken                   string                 `json:"client_token,omitempty"`
@@ -411,6 +415,7 @@ type AuditRequest struct {
 
 type AuditResponse struct {
 	Auth          *AuditAuth             `json:"auth,omitempty"`
+	MountPoint    string                 `json:"mount_point,omitempty"`
 	MountType     string                 `json:"mount_type,omitempty"`
 	MountAccessor string                 `json:"mount_accessor,omitempty"`
 	Secret        *AuditSecret           `json:"secret,omitempty"`

diff --git a/changelog/20411.txt b/changelog/20411.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+audit: add a `mount_point` field to audit requests and response entries
+```