fix: concurrency issue in getDerivedPrimitive #2480
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There is a situation where getDerivedPrimitive can be called concurrently, and two separate keys will be created. This fixes that issue.
Open
wesbillman
approved these changes
Aug 22, 2024
| @@ -100,8 +101,7 @@ type KMSEncryptor struct { | |||
| root keyset.Handle | |||
| kekAEAD tink.AEAD | |||
| encryptedKeyset []byte | |||
| cachedDerivedMu sync.RWMutex | |||
| cachedDerived map[SubKey]tink.AEAD | |||
| cachedDerived *mutex.Mutex[map[SubKey]tink.AEAD] | |||
There was a problem hiding this comment.
I def read this tink.AEAD as "think ahead"
Comment on lines
+11
to
+15
| // var m mutex.Mutex[*string] | ||
| // s := m.Lock() | ||
| // defer m.Unlock() | ||
| // *s = "hello" | ||
| type Mutex[T any] struct { |
There was a problem hiding this comment.
Nice, this seems handy! I was going to ask why no use xsync, but this is more generic it seems.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There is a situation where getDerivedPrimitive can be called concurrently, and two separate keys will be created. This fixes that issue.
Also added a type-safe Mutex type.