Skip to content

fix pre-signed URL with JS SDK, enable test_presigned_url_v4_x_amz_in_qs #12164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2025
Merged

fix pre-signed URL with JS SDK, enable test_presigned_url_v4_x_amz_in_qs #12164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7256576
fix pre-signed URL with JS SDK, enable test_presigned_url_v4_x_amz_in_qs
bentsku Jan 22, 2025
0e5a983
add checks for modifying checksum
bentsku Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion localstack-core/localstack/services/s3/presigned_url.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,11 @@ def _get_signed_headers_and_filtered_query_string(
# specially in the old JS SDK v2
headers.add(qs_param_low, qs_value)
else:
query_args_to_headers[qs_param_low] = qs_value
# The JS SDK is adding the `x-amz-checksum-crc32` header to query parameters, even though it cannot
# know in advance the actual checksum. Those are ignored by AWS, if they're not put in the
# SignedHeaders
if not qs_param_low.startswith("x-amz-checksum-"):
query_args_to_headers[qs_param_low] = qs_value

new_query_args[qs_parameter] = qs_value

Expand Down
17 changes: 15 additions & 2 deletions tests/aws/services/s3/test_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7486,7 +7486,6 @@ def test_presigned_url_signature_authentication_multi_part(
assert response.content == data

@pytest.mark.skipif(condition=TEST_S3_IMAGE, reason="Lambda not enabled in S3 image")
@pytest.mark.skip(reason="flaky")
@markers.aws.validated
def test_presigned_url_v4_x_amz_in_qs(
self,
Expand Down Expand Up @@ -7544,6 +7543,8 @@ def test_presigned_url_v4_x_amz_in_qs(
# assert that the Javascript SDK hoists it in the URL, unlike Boto
assert StorageClass.STANDARD in presigned_url
assert "bar-complicated-no-random" in presigned_url
# the JS SDK also adds a default checksum now even for pre-signed URLs
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Default checksum wow

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I still don't understand how this made it into prod 😄

assert "x-amz-checksum-crc32=AAAAAA%3D%3D" in presigned_url

# missing Content-MD5
response = requests.put(presigned_url, verify=False, data=b"123456")
Expand All @@ -7559,8 +7560,20 @@ def test_presigned_url_v4_x_amz_in_qs(
)
assert response.status_code == 200

# assert that the checksum-crc-32 value is still validated and important for the signature
bad_presigned_url = presigned_url.replace("crc32=AAAAAA%3D%3D", "crc32=BBBBBB%3D%3D")
response = requests.put(
bad_presigned_url,
data=b"123456",
verify=False,
headers={"Content-MD5": "4QrcOUm6Wau+VuBX8g+IPg=="},
)
assert response.status_code == 403

# verify that we properly saved the data
head_object = aws_client.s3.head_object(Bucket=function_name, Key=object_key)
head_object = aws_client.s3.head_object(
Bucket=function_name, Key=object_key, ChecksumMode="ENABLED"
)
snapshot.match("head-object", head_object)

@pytest.mark.skipif(condition=TEST_S3_IMAGE, reason="Lambda not enabled in S3 image")
Expand Down
2 changes: 1 addition & 1 deletion tests/aws/services/s3/test_s3.snapshot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11773,7 +11773,7 @@
}
},
"tests/aws/services/s3/test_s3.py::TestS3PresignedUrl::test_presigned_url_v4_x_amz_in_qs": {
"recorded-date": "21-01-2025, 18:25:21",
"recorded-date": "22-01-2025, 18:21:12",
"recorded-content": {
"head-object": {
"AcceptRanges": "bytes",
Expand Down
2 changes: 1 addition & 1 deletion tests/aws/services/s3/test_s3.validation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@
"last_validated_date": "2025-01-21T18:25:34+00:00"
},
"tests/aws/services/s3/test_s3.py::TestS3PresignedUrl::test_presigned_url_v4_x_amz_in_qs": {
"last_validated_date": "2025-01-21T18:25:21+00:00"
"last_validated_date": "2025-01-22T18:21:12+00:00"
},
"tests/aws/services/s3/test_s3.py::TestS3PresignedUrl::test_presigned_url_with_different_user_credentials": {
"last_validated_date": "2025-01-21T18:23:55+00:00"
Expand Down
Loading