fix(s3): Handle x-id for s3:DeleteObjects#3937
Merged
Conversation
pandomic
commented
Apr 27, 2021
| return is_delete_keys(request, path, bucket_name) | ||
| # Temporary fix until moto supports x-id and DeleteObjects (#3931) | ||
| query = self._get_querystring(request.url) | ||
| is_delete_keys_v3 = (query and ('delete' in query) and get_safe(query, '$.x-id.0') == 'DeleteObjects') |
Member
Author
There was a problem hiding this comment.
Maybe simply leave just get_safe(query, '$.x-id.0') == 'DeleteObjects', since it's very unlikely to receive non-delete request with x-id=DeleteObjects 🤔
Member
|
Looks great, thanks @pandomic ! 👍 (Regarding your comment - I think what we have is good, better stay on the safe side..) |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
As reported by @arciisine in #3931 AWS has introduced
x-idquery parameter in their requests (just to say, I couldn't find any documentation). This makesDeleteObjectsrequest look like the following:This request is bypassed by moto (since DeleteObjects is unsupported) and our
s3_response_is_delete_keyssince underlyingis_delete_keysis making a full string check for/?delete, whereas the path now includesx-idquery parameter.