Skip to content
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

fix the signing config #336

Merged
merged 3 commits into from
Feb 26, 2025
Merged

fix the signing config #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37a7f3b
fix the signing config
TingDaoK Feb 26, 2025
3880d03
add test and lint
TingDaoK Feb 26, 2025
01c1b56
Add changelog
nateprewitt Feb 26, 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
5 changes: 5 additions & 0 deletions .changes/next-release/bugfix-awscrt-11663.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "bugfix",
"category": "``awscrt``",
"description": "Fix urlencoding issues for request signing with the awscrt."
}
10 changes: 9 additions & 1 deletion s3transfer/crt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,14 +895,22 @@ def _default_get_make_request_args(
) and accesspoint_arn_details['region'] == "":
# Configure our region to `*` to propogate in `x-amz-region-set`
# for multi-region support in MRAP accesspoints.
# use_double_uri_encode and should_normalize_uri_path are defaulted to be True
# But SDK already encoded the URI, and it's for S3, so set both to False
make_request_args['signing_config'] = AwsSigningConfig(
algorithm=AwsSigningAlgorithm.V4_ASYMMETRIC,
region="*",
use_double_uri_encode=False,
should_normalize_uri_path=False,
)
call_args.bucket = accesspoint_arn_details['resource_name']
elif is_s3express_bucket(call_args.bucket):
# use_double_uri_encode and should_normalize_uri_path are defaulted to be True
# But SDK already encoded the URI, and it's for S3, so set both to False
make_request_args['signing_config'] = AwsSigningConfig(
algorithm=AwsSigningAlgorithm.V4_S3EXPRESS
algorithm=AwsSigningAlgorithm.V4_S3EXPRESS,
use_double_uri_encode=False,
should_normalize_uri_path=False,
)
return make_request_args

Expand Down
12 changes: 12 additions & 0 deletions tests/functional/test_crt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@ def _assert_expected_s3express_request(
make_request_kwargs['signing_config'].algorithm,
awscrt.auth.AwsSigningAlgorithm.V4_S3EXPRESS,
)
self.assertFalse(
make_request_kwargs['signing_config'].use_double_uri_encode,
)
self.assertFalse(
make_request_kwargs['signing_config'].should_normalize_uri_path,
)

def _assert_expected_mrap_request(
self, make_request_kwargs, expected_http_method='GET'
Expand All @@ -179,6 +185,12 @@ def _assert_expected_mrap_request(
awscrt.auth.AwsSigningAlgorithm.V4_ASYMMETRIC,
)
self.assertEqual(make_request_kwargs['signing_config'].region, "*")
self.assertFalse(
make_request_kwargs['signing_config'].use_double_uri_encode,
)
self.assertFalse(
make_request_kwargs['signing_config'].should_normalize_uri_path,
)

def _assert_subscribers_called(self, expected_future=None):
self.assertTrue(self.record_subscriber.on_queued_called)
Expand Down
Loading