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.

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

VAULT-30108: Include User-Agent header in audit requests by default #28596

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

ccapurso
Copy link
Contributor

@ccapurso ccapurso commented Oct 4, 2024

Description

This PR adds the User-Agent as a default header in audit request entries. As with other request headers, this will not be hashed by default. One can override this and choose to HMAC the value via the /sys/config/auditing/request-headers/:name endpoint.

TODO only if you're a HashiCorp employee

  • Backport Labels: If this PR is in the ENT repo and needs to be backported, backport
    to N, N-1, and N-2, using the backport/ent/x.x.x+ent labels. If this PR is in the CE repo, you should only backport to N, using the backport/x.x.x label, not the enterprise labels.
    • If this fixes a critical security vulnerability or severity 1 bug, it will also need to be backported to the current LTS versions of Vault. To ensure this, use all available enterprise labels.
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Oct 4, 2024
Copy link

github-actions bot commented Oct 4, 2024

CI Results:
All Go tests succeeded! ✅

@ccapurso ccapurso added this to the 1.19.0-rc milestone Oct 4, 2024
@ccapurso ccapurso marked this pull request as ready for review October 4, 2024 18:59
@ccapurso ccapurso requested a review from a team as a code owner October 4, 2024 18:59
Copy link
Contributor

@VioletHynes VioletHynes left a comment

Choose a reason for hiding this comment

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

This is awesome! Glad it worked out so well, and love the new test stuff. Just some small nits that aren't required, but would be nice :)

@@ -254,9 +254,11 @@ func TestAuditedHeadersConfig_ApplyConfig(t *testing.T) {
t.Fatal(err)
}

const hmacPrefix = "hmac-sha256:"
Copy link
Contributor

Choose a reason for hiding this comment

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

Love this little clean up :)

@@ -175,6 +175,7 @@ func (a *HeadersConfig) DefaultHeaders() map[string]*headerSettings {
return map[string]*headerSettings{
correlationID: {},
xCorrelationID: {},
"user-agent": {},
Copy link
Contributor

Choose a reason for hiding this comment

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

Huh, just one line of code! Awesome :D

err := json.Unmarshal(scanner.Bytes(), &entry)
require.NoError(t, err)

request := entry["request"].(map[string]interface{})
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: would be nice to have an ok here and require.True it

request := entry["request"].(map[string]interface{})

// test probe will not have headers set
if request["path"].(string) != "sys/audit/test" {
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: would be nice to ensure we get ok from the type assertion

Copy link

github-actions bot commented Oct 4, 2024

Build Results:
All builds succeeded! ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants