scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-31 10:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Audit: Extracted SSCT related auditing code to formatter node (#25443)

Browse Source 
* Removed unneeded header tracking in log request/log response of audit broker, moved SSCT overwrite to entry formatter

* added changelog
This commit is contained in:
Peter Wilson
2024-02-15 20:02:58 +00:00
committed by GitHub
parent 0b5bd2dd3b
commit 83986f342b
3 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
audit/entry_formatter.go
View File

@@ -107,6 +107,13 @@ func (f *EntryFormatter) Process(ctx context.Context, e *eventlogger.Event) (*ev
data.Request.Headers = adjustedHeaders data.Request.Headers = adjustedHeaders
} }
// If the request contains a Server-Side Consistency Token (SSCT), and we
// have an auth response, overwrite the existing client token with the SSCT,
// so that the SSCT appears in the audit log for this entry.
if data.Request != nil && data.Request.InboundSSCToken != "" && data.Auth != nil {
data.Auth.ClientToken = data.Request.InboundSSCToken
}
var result []byte var result []byte
switch a.Subtype { switch a.Subtype {

3
changelog/25443.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
audit: Resolve potential race condition when auditing entries which use SSCT.
```

38
vault/audit_broker.go
View File

@@ -209,6 +209,9 @@ func (a *AuditBroker) GetHash(ctx context.Context, name string, input string) (s
// LogRequest is used to ensure all the audit backends have an opportunity to // LogRequest is used to ensure all the audit backends have an opportunity to
// log the given request and that *at least one* succeeds. // log the given request and that *at least one* succeeds.
func (a *AuditBroker) LogRequest(ctx context.Context, in *logical.LogInput) (ret error) { func (a *AuditBroker) LogRequest(ctx context.Context, in *logical.LogInput) (ret error) {
a.RLock()
defer a.RUnlock()
// If no backends are registered then we have no devices to log the request. // If no backends are registered then we have no devices to log the request.
if len(a.backends) < 1 { if len(a.backends) < 1 {
return nil return nil
@@ -216,19 +219,6 @@ func (a *AuditBroker) LogRequest(ctx context.Context, in *logical.LogInput) (ret
defer metrics.MeasureSince([]string{"audit", "log_request"}, time.Now()) defer metrics.MeasureSince([]string{"audit", "log_request"}, time.Now())
a.RLock()
defer a.RUnlock()
if in.Request.InboundSSCToken != "" {
if in.Auth != nil {
reqAuthToken := in.Auth.ClientToken
in.Auth.ClientToken = in.Request.InboundSSCToken
defer func() {
in.Auth.ClientToken = reqAuthToken
}()
}
}
var retErr *multierror.Error var retErr *multierror.Error
defer func() { defer func() {
@@ -245,11 +235,6 @@ func (a *AuditBroker) LogRequest(ctx context.Context, in *logical.LogInput) (ret
metrics.IncrCounter([]string{"audit", "log_request_failure"}, failure) metrics.IncrCounter([]string{"audit", "log_request_failure"}, failure)
}() }()
headers := in.Request.Headers
defer func() {
in.Request.Headers = headers
}()
e, err := audit.NewEvent(audit.RequestType) e, err := audit.NewEvent(audit.RequestType)
if err != nil { if err != nil {
retErr = multierror.Append(retErr, err) retErr = multierror.Append(retErr, err)
@@ -299,6 +284,9 @@ func (a *AuditBroker) LogRequest(ctx context.Context, in *logical.LogInput) (ret
// LogResponse is used to ensure all the audit backends have an opportunity to // LogResponse is used to ensure all the audit backends have an opportunity to
// log the given response and that *at least one* succeeds. // log the given response and that *at least one* succeeds.
func (a *AuditBroker) LogResponse(ctx context.Context, in *logical.LogInput) (ret error) { func (a *AuditBroker) LogResponse(ctx context.Context, in *logical.LogInput) (ret error) {
a.RLock()
defer a.RUnlock()
// If no backends are registered then we have no devices to send audit entries to. // If no backends are registered then we have no devices to send audit entries to.
if len(a.backends) < 1 { if len(a.backends) < 1 {
return nil return nil
@@ -306,15 +294,6 @@ func (a *AuditBroker) LogResponse(ctx context.Context, in *logical.LogInput) (re
defer metrics.MeasureSince([]string{"audit", "log_response"}, time.Now()) defer metrics.MeasureSince([]string{"audit", "log_response"}, time.Now())
a.RLock()
defer a.RUnlock()
if in.Request.InboundSSCToken != "" && in.Auth != nil {
reqAuthToken := in.Auth.ClientToken
in.Auth.ClientToken = in.Request.InboundSSCToken
defer func() { in.Auth.ClientToken = reqAuthToken }()
}
var retErr *multierror.Error var retErr *multierror.Error
defer func() { defer func() {
@@ -331,11 +310,6 @@ func (a *AuditBroker) LogResponse(ctx context.Context, in *logical.LogInput) (re
metrics.IncrCounter([]string{"audit", "log_response_failure"}, failure) metrics.IncrCounter([]string{"audit", "log_response_failure"}, failure)
}() }()
headers := in.Request.Headers
defer func() {
in.Request.Headers = headers
}()
e, err := audit.NewEvent(audit.ResponseType) e, err := audit.NewEvent(audit.ResponseType)
if err != nil { if err != nil {
retErr = multierror.Append(retErr, err) retErr = multierror.Append(retErr, err)