Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add backend type to audit logs #9167

Merged
merged 14 commits into from
Jun 16, 2020
Merged

Add backend type to audit logs #9167

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
de6ef7f
Add backend type fileld
sgmiller Jun 5, 2020
374031c
Merge remote-tracking branch 'origin/master' into audit-add-backend-type
sgmiller Jun 8, 2020
2b91f3d
Add backend type to audit logs
sgmiller Jun 8, 2020
f6105be
Rename to MountType
sgmiller Jun 8, 2020
90151f7
More rename...
sgmiller Jun 8, 2020
8339575
Update vendored sdk for some reason
sgmiller Jun 8, 2020
2447d8e
Merge remote-tracking branch 'origin/master' into audit-add-backend-type
sgmiller Jun 8, 2020
8167bc2
Add MountType to requests also
sgmiller Jun 15, 2020
033e557
Merge remote-tracking branch 'origin/master' into audit-add-backend-type
sgmiller Jun 15, 2020
d4b3c4b
Use MountType field from Request, negating the need for modifying Log…
sgmiller Jun 15, 2020
63a7b91
Bump go.mod
sgmiller Jun 15, 2020
e7d34c8
Accept go.mod sdk change
sgmiller Jun 15, 2020
fac0854
Merge remote-tracking branch 'origin/master' into audit-add-backend-type
sgmiller Jun 15, 2020
ed08f08
Merge branch 'master' into audit-add-backend-type
sgmiller Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions audit/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ func (f *AuditFormatter) FormatRequest(ctx context.Context, w io.Writer, config
ClientToken: req.ClientToken,
ClientTokenAccessor: req.ClientTokenAccessor,
Operation: req.Operation,
MountType: req.MountType,
Namespace: &AuditNamespace{
ID: ns.ID,
Path: ns.Path,
Expand Down Expand Up @@ -275,6 +276,7 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
ClientToken: req.ClientToken,
ClientTokenAccessor: req.ClientTokenAccessor,
Operation: req.Operation,
MountType: req.MountType,
Namespace: &AuditNamespace{
ID: ns.ID,
Path: ns.Path,
Expand All @@ -289,13 +291,14 @@ func (f *AuditFormatter) FormatResponse(ctx context.Context, w io.Writer, config
},

Response: &AuditResponse{
Auth: respAuth,
Secret: respSecret,
Data: resp.Data,
Warnings: resp.Warnings,
Redirect: resp.Redirect,
WrapInfo: respWrapInfo,
Headers: resp.Headers,
MountType: in.MountType,
Auth: respAuth,
Secret: respSecret,
Data: resp.Data,
Warnings: resp.Warnings,
Redirect: resp.Redirect,
WrapInfo: respWrapInfo,
Headers: resp.Headers,
},
}

Expand Down Expand Up @@ -336,6 +339,7 @@ type AuditRequest struct {
ID string `json:"id,omitempty"`
ReplicationCluster string `json:"replication_cluster,omitempty"`
Operation logical.Operation `json:"operation,omitempty"`
MountType string `json:"mount_type,omitempty"`
ClientToken string `json:"client_token,omitempty"`
ClientTokenAccessor string `json:"client_token_accessor,omitempty"`
Namespace *AuditNamespace `json:"namespace,omitempty"`
Expand All @@ -349,13 +353,14 @@ type AuditRequest struct {
}

type AuditResponse struct {
Auth *AuditAuth `json:"auth,omitempty"`
Secret *AuditSecret `json:"secret,omitempty"`
Data map[string]interface{} `json:"data,omitempty"`
Warnings []string `json:"warnings,omitempty"`
Redirect string `json:"redirect,omitempty"`
WrapInfo *AuditResponseWrapInfo `json:"wrap_info,omitempty"`
Headers map[string][]string `json:"headers,omitempty"`
Auth *AuditAuth `json:"auth,omitempty"`
MountType string `json:"mount_type,omitempty"`
Secret *AuditSecret `json:"secret,omitempty"`
Data map[string]interface{} `json:"data,omitempty"`
Warnings []string `json:"warnings,omitempty"`
Redirect string `json:"redirect,omitempty"`
WrapInfo *AuditResponseWrapInfo `json:"wrap_info,omitempty"`
Headers map[string][]string `json:"headers,omitempty"`
}

type AuditAuth struct {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ require (
github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.1.2
github.com/hashicorp/vault-plugin-secrets-openldap v0.1.3
github.com/hashicorp/vault/api v1.0.5-0.20200519221902-385fac77e20f
github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267
github.com/hashicorp/vault/sdk v0.1.14-0.20200608185844-f6105bead862
github.com/influxdata/influxdb v0.0.0-20190411212539-d24b7ba8c4c4
github.com/jcmturner/gokrb5/v8 v8.0.0
github.com/jefferai/isbadcipher v0.0.0-20190226160619-51d2077c035f
Expand Down
1 change: 1 addition & 0 deletions sdk/logical/audit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ type LogInput struct {
Auth *Auth
Request *Request
Response *Response
MountType string
OuterErr error
NonHMACReqDataKeys []string
NonHMACRespDataKeys []string
Expand Down
1 change: 1 addition & 0 deletions vault/request_handling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,7 @@ func (c *Core) handleCancelableRequest(ctx context.Context, ns *namespace.Namesp
Auth: auth,
Request: req,
Response: auditResp,
MountType: entry.Type,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, just to note what we said in our offline conversation, this now seems unnecessary because we get the MountType from Request instead.

OuterErr: err,
NonHMACReqDataKeys: nonHMACReqDataKeys,
NonHMACRespDataKeys: nonHMACRespDataKeys,
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/hashicorp/vault/sdk/logical/audit.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.