Skip to content

Fix sse-c HeadObject headers for s3-s3 copy #8345

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

Open
wants to merge 1 commit into
base: v2
Choose a base branch
from
Open

Fix sse-c HeadObject headers for s3-s3 copy #8345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion awscli/customizations/s3/subscribers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def _get_head_object_response(self, future):
'Bucket': copy_source['Bucket'],
'Key': copy_source['Key'],
}
utils.RequestParamsMapper.map_head_object_params(
utils.RequestParamsMapper.map_head_object_params_with_copy_source_sse(
head_object_params, self._cli_params)
return self._client.head_object(**head_object_params)

Expand Down
12 changes: 12 additions & 0 deletions awscli/customizations/s3/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,12 @@ def map_head_object_params(cls, request_params, cli_params):
cls._set_sse_c_request_params(request_params, cli_params)
cls._set_request_payer_param(request_params, cli_params)

@classmethod
def map_head_object_params_with_copy_source_sse(cls, request_params, cli_params):
"""Map CLI params to HeadObject request params, considering the SSE-C header from the copy source"""
cls._set_sse_c_request_params_with_copy_source_sse(request_params, cli_params)
cls._set_request_payer_param(request_params, cli_params)

@classmethod
def map_create_multipart_upload_params(cls, request_params, cli_params):
"""Map CLI params to CreateMultipartUpload request params"""
Expand Down Expand Up @@ -618,6 +624,12 @@ def _set_sse_c_request_params(cls, request_params, cli_params):
request_params['SSECustomerAlgorithm'] = cli_params['sse_c']
request_params['SSECustomerKey'] = cli_params['sse_c_key']

@classmethod
def _set_sse_c_request_params_with_copy_source_sse(cls, request_params, cli_params):
if cli_params.get('sse_c_copy_source'):
request_params['SSECustomerAlgorithm'] = cli_params['sse_c_copy_source']
request_params['SSECustomerKey'] = cli_params['sse_c_copy_source_key']

@classmethod
def _set_sse_c_copy_source_request_params(cls, request_params, cli_params):
if cli_params.get('sse_c_copy_source'):
Expand Down