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

Transit: fix race in the key update api responses #28839

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

stevendpclark
Copy link
Contributor

Description

  • The key update API would release the lock a little too early after it persisted the update so the reference could be updated when it was preparing the response to the caller across updates and/or key rotations
  • The storage updates were okay, just the response back to the caller of the update might see a mixture of different updates

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.

@stevendpclark stevendpclark added secret/transit backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/1.18.x backport/ent/1.17.x+ent Changes are backported to 1.17.x+ent labels Nov 5, 2024
@stevendpclark stevendpclark added this to the 1.18.2 milestone Nov 5, 2024
@stevendpclark stevendpclark self-assigned this Nov 5, 2024
@stevendpclark stevendpclark requested a review from a team as a code owner November 5, 2024 18:47
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Nov 5, 2024
@stevendpclark stevendpclark force-pushed the stevendpclark/vault-23977-fix-concurrency branch from 437eae0 to 83e663b Compare November 5, 2024 18:49
Copy link

github-actions bot commented Nov 5, 2024

CI Results:
All Go tests succeeded! ✅

Copy link

github-actions bot commented Nov 5, 2024

Build Results:
All builds succeeded! ✅

@stevendpclark stevendpclark force-pushed the stevendpclark/vault-23977-fix-concurrency branch from 94c852e to 7a6d045 Compare November 5, 2024 18:54
 - The key update API would release the lock a little too early
   after it persisted the update so the reference could be updated
   when it was preparing the response to the caller across updates
   and/or key rotations
 - The storage updates were okay, just the response back to the caller
   of the update might see a mixture of different updates
@stevendpclark stevendpclark force-pushed the stevendpclark/vault-23977-fix-concurrency branch from 7a6d045 to a9bcc23 Compare November 5, 2024 18:56
Copy link
Contributor

@kitography kitography left a comment

Choose a reason for hiding this comment

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

That makes sense to me 👍

@stevendpclark stevendpclark merged commit 752bb08 into main Nov 5, 2024
91 checks passed
@stevendpclark stevendpclark deleted the stevendpclark/vault-23977-fix-concurrency branch November 5, 2024 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/ent/1.17.x+ent Changes are backported to 1.17.x+ent backport/1.18.x hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed secret/transit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants