mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-08-12 09:37:02 +02:00
Code Issues Projects Releases Wiki Activity

Revert "Allow audit entries may contain forwarded to/from host info (#20689)" (#20732)

Browse Source 
This reverts commit 732dda34e7.
This commit is contained in:
Peter Wilson 2023-05-24 09:44:57 +01:00 committed by GitHub
parent 541f18eeb7
commit ee3847d954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
audit/format.go
View File

@ -92,9 +92,9 @@ func (f *AuditFormatter) FormatRequest(ctx context.Context, w io.Writer, config
reqType = "request" reqType = "request"
} }
reqEntry := &AuditRequestEntry{ reqEntry := &AuditRequestEntry{
Type: reqType, Type: reqType,
Error: errString, Error: errString,
ForwardedFrom: req.ForwardedFrom,
Auth: &AuditAuth{ Auth: &AuditAuth{
ClientToken: auth.ClientToken, ClientToken: auth.ClientToken,
Accessor: auth.Accessor, Accessor: auth.Accessor,
@ -297,9 +297,8 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
respType = "response" respType = "response"
} }
respEntry := &AuditResponseEntry{ respEntry := &AuditResponseEntry{
Type: respType, Type: respType,
Error: errString, Error: errString,
ForwardedTo: req.ForwardedTo,
Auth: &AuditAuth{ Auth: &AuditAuth{
ClientToken: auth.ClientToken, ClientToken: auth.ClientToken,
Accessor: auth.Accessor, Accessor: auth.Accessor,
@ -398,8 +397,6 @@ type AuditRequestEntry struct {
Auth *AuditAuth `json:"auth,omitempty"` Auth *AuditAuth `json:"auth,omitempty"`
Request *AuditRequest `json:"request,omitempty"` Request *AuditRequest `json:"request,omitempty"`
Error string `json:"error,omitempty"` Error string `json:"error,omitempty"`
// Populated in Enterprise when a request is forwarded
ForwardedFrom string `json:"forwarded_from,omitempty"`
} }
// AuditResponseEntry is the structure of a response audit log entry in Audit. // AuditResponseEntry is the structure of a response audit log entry in Audit.
@ -410,8 +407,6 @@ type AuditResponseEntry struct {
Request *AuditRequest `json:"request,omitempty"` Request *AuditRequest `json:"request,omitempty"`
Response *AuditResponse `json:"response,omitempty"` Response *AuditResponse `json:"response,omitempty"`
Error string `json:"error,omitempty"` Error string `json:"error,omitempty"`
// Populated in Enterprise when a request is forwarded
ForwardedTo string `json:"forwarded_to,omitempty"`
} }
type AuditRequest struct { type AuditRequest struct {

6
sdk/logical/request.go
View File

@ -243,12 +243,6 @@ type Request struct {
// InboundSSCToken is the token that arrives on an inbound request, supplied // InboundSSCToken is the token that arrives on an inbound request, supplied
// by the vault user. // by the vault user.
InboundSSCToken string InboundSSCToken string
// When a request has been forwarded, contains information of the host the request was forwarded 'from'
ForwardedFrom string `json:"forwarded_from,omitempty"`
// When a request has been forwarded, contains information of the host the request was forwarded 'to'
ForwardedTo string `json:"forwarded_to,omitempty"`
} }
// Clone returns a deep copy of the request by using copystructure // Clone returns a deep copy of the request by using copystructure