Change BulkDecrypt to not rely on type tests #9373
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
pgavlin
reviewed
Apr 8, 2022
Comment on lines
+196
to
+231
| func (c *mapDecrypter) BulkDecrypt(ciphertexts []string) (map[string]string, error) { | ||
| // Loop and find the entries that are already cached, then BulkDecrypt the rest | ||
| secretMap := map[string]string{} | ||
| var toDecrypt []string | ||
| if c.cache == nil { | ||
| // Don't bother searching for the cached subset if the cache is nil | ||
| toDecrypt = ciphertexts | ||
| } else { | ||
| toDecrypt = make([]string, 0) | ||
| for _, ct := range ciphertexts { | ||
| if plaintext, ok := c.cache[ct]; ok { | ||
| secretMap[ct] = plaintext | ||
| } else { | ||
| toDecrypt = append(toDecrypt, ct) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // try and bulk decrypt the rest | ||
| decrypted, err := c.decrypter.BulkDecrypt(toDecrypt) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // And add them to the cache | ||
| if c.cache == nil { | ||
| c.cache = make(map[string]string) | ||
| } | ||
|
|
||
| for ct, pt := range decrypted { | ||
| secretMap[ct] = pt | ||
| c.cache[ct] = pt | ||
| } | ||
|
|
||
| return secretMap, nil | ||
| } |
There was a problem hiding this comment.
I think current data flow is such that no this will never be hit, but it was pretty easy to write and means we won't trip up on a bad method if we refactor things slightly in the future that cause it to start being hit.
pgavlin
approved these changes
Apr 8, 2022
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.
Description
BulkDecryptonly made use of the bulk decryption if theDecrypterpassed in was itself aBulkDecrypter. Only theserviceCrypterimplemented this interface but most of the time it's wrapped with acachingCrypter.Rather than just adding BulkDecrypt to
cachingCrypterI've just moved it to theDecrypterinterface and ensured that every implementation either does something efficient if it can, or callsDefaultBulkDecryptto just loop over 1-by-1.Fixes #9350
Checklist