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

Undo additions to the barrier encryption count if persisting those encryptions fails #29506

Merged
merged 2 commits into from
Feb 5, 2025
Merged

Undo additions to the barrier encryption count if persisting those encryptions fails #29506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2ac11b
Undo additions to the barrier encryption count if persisting those en…
sgmiller Feb 5, 2025
7e4cba8
changelog
sgmiller Feb 5, 2025
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
3 changes: 3 additions & 0 deletions changelog/29506.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
core: Fix bug when if failing to persist the barrier keyring to track encryption counts, the number of outstanding encryptions remains added to the count, overcounting encryptions.
```
2 changes: 2 additions & 0 deletions vault/barrier_aes_gcm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,6 +1281,8 @@ func (b *AESGCMBarrier) persistEncryptions(ctx context.Context) error {
newKeyring := b.keyring.Clone()
err := b.persistKeyringBestEffort(ctx, newKeyring)
if err != nil {
// because Keys are pointer addressed, we need to undo the update to the Encryption count here
activeKey.Encryptions -= uint64(newEncs)
return err
}
b.UnaccountedEncryptions.Sub(newEncs)
Expand Down
Loading