Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

S3: Fix Signature calculation for requests that contain a querystring (#5949)

Browse Source
This commit is contained in:
Bert Blommers 2023-02-20 19:48:59 -01:00 committed by GitHub
parent db9654a059
commit d001f6a226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/core/responses.py
View File

@ -130,10 +130,14 @@ class ActionAuthenticatorMixin(object):
ActionAuthenticatorMixin.request_count ActionAuthenticatorMixin.request_count
>= settings.INITIAL_NO_AUTH_ACTION_COUNT >= settings.INITIAL_NO_AUTH_ACTION_COUNT
): ):
parsed_url = urlparse(self.uri) # type: ignore[attr-defined]
path = parsed_url.path
if parsed_url.query:
path += "?" + parsed_url.query
iam_request = iam_request_cls( iam_request = iam_request_cls(
account_id=self.current_account, # type: ignore[attr-defined] account_id=self.current_account, # type: ignore[attr-defined]
method=self.method, # type: ignore[attr-defined] method=self.method, # type: ignore[attr-defined]
path=self.path, # type: ignore[attr-defined] path=path,
data=self.data, # type: ignore[attr-defined] data=self.data, # type: ignore[attr-defined]
headers=self.headers, # type: ignore[attr-defined] headers=self.headers, # type: ignore[attr-defined]
) )

5
tests/test_s3/test_s3_auth.py
View File

@ -52,6 +52,11 @@ def test_head_bucket_with_correct_credentials():
aws_secret_access_key=iam_keys["SecretAccessKey"], aws_secret_access_key=iam_keys["SecretAccessKey"],
) )
# Verify we can make calls that contain a querystring
# Specifically, verify that we are able to build/match the AWS signature for a URL with a querystring
s3.get_bucket_location(Bucket="mock_bucket")
s3.list_objects_v2(Bucket="mock_bucket")
@set_initial_no_auth_action_count(4) @set_initial_no_auth_action_count(4)
@mock_s3 @mock_s3