S3 - Encryption context header cannot be null #5089
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
The header should be base64 encoded string representing a string-string map. This requires us to create an empty map for the KMSEncryptionContext if no KMSEncryptionContext was passed in the config Signed-off-by: Alex Vest <alex.vest@nutmeg.com>
Signed-off-by: Alex Vest <alex.vest@nutmeg.com>
2 tasks
GiedriusS
previously approved these changes
Jan 25, 2022
added 2 commits
January 25, 2022 15:58
golangci lint was complaining Signed-off-by: Alex Vest <alex.vest@nutmeg.com>
Signed-off-by: Alex Vest <alex.vest@nutmeg.com>
auto-merge was automatically disabled
January 25, 2022 15:59
Head branch was pushed to by a user without write access
GiedriusS
approved these changes
Jan 26, 2022
Nicholaswang
pushed a commit
to Nicholaswang/thanos
that referenced
this pull request
Mar 6, 2022
* Encryption context header cannot be null The header should be base64 encoded string representing a string-string map. This requires us to create an empty map for the KMSEncryptionContext if no KMSEncryptionContext was passed in the config Signed-off-by: Alex Vest <alex.vest@nutmeg.com> * Add changes to changelog Signed-off-by: Alex Vest <alex.vest@nutmeg.com> * Add const for "localhost:80" golangci lint was complaining Signed-off-by: Alex Vest <alex.vest@nutmeg.com> * Docs formatting Signed-off-by: Alex Vest <alex.vest@nutmeg.com> Signed-off-by: Nicholaswang <wzhever@gmail.com>
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.
Changes
The
X-Amz-Server-Side-Encryption-Contextheader should be a base64 encoded string representing a string-stringmap. In the case that the KMSEncryptionContext was omitted from Objstore config when SSE-KMS was being used, a nil map was being used for the header value resulting in a value of
null. This is the issue that was causing #4245I have made a change such that if no KMSEncryptionContext was passed in the config an empty map is used instead so the header value is correctly set to
{}.Verification
I've extended an existing test case to cover my changes, additionally I tested this in practice as described in #4245 - A header value of
{}is acceptable to the AWS API.