Skip to content

Fix handling of SSE-C keys when copying unencrypted to encrypted objects or objects with different keys #9559

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 handling of SSE-C keys when copying unencrypted to encrypted objects or objects with different keys #9559

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
5 changes: 5 additions & 0 deletions .changes/next-release/bugfix-s3-83199.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"type": "bugfix",
"category": "``s3``",
"description": "Fix handling of SSE-C keys when copying unencrypted to encrypted objects or objects with different encryption keys"
}
18 changes: 10 additions & 8 deletions awscli/customizations/s3/subcommands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,16 +1481,18 @@ def _map_sse_c_params(self, request_parameters, paths_type):
# SSE-C key and algorithm. Note the reverse FileGenerator does
# not need any of these because it is used only for sync operations
# which only use ListObjects which does not require HeadObject.
RequestParamsMapper.map_head_object_params(
request_parameters['HeadObject'], self.parameters
)
if paths_type == 's3s3':
head_params = self.parameters.copy()
head_params['sse_c'] = self.parameters.get('sse_c_copy_source')
head_params['sse_c_key'] = self.parameters.get(
'sse_c_copy_source_key'
)
RequestParamsMapper.map_head_object_params(
request_parameters['HeadObject'], head_params
)
else:
RequestParamsMapper.map_head_object_params(
request_parameters['HeadObject'],
{
'sse_c': self.parameters.get('sse_c_copy_source'),
'sse_c_key': self.parameters.get('sse_c_copy_source_key'),
},
request_parameters['HeadObject'], self.parameters
)


Expand Down
96 changes: 96 additions & 0 deletions tests/functional/s3/test_cp_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,102 @@ def test_cp_with_sse_c_copy_source_fileb(self):
}
self.assertDictEqual(self.operations_called[1][1], expected_args)

def test_s3s3_cp_with_destination_sse_c(self):
"""S3->S3 copy with an unencrypted source and encrypted destination"""
self.parsed_responses = [
{
"AcceptRanges": "bytes",
"LastModified": "Tue, 12 Jul 2016 21:26:07 GMT",
"ContentLength": 4,
"ETag": '"d3b07384d113edec49eaa6238ad5ff00"',
"Metadata": {},
"ContentType": "binary/octet-stream",
},
{
"AcceptRanges": "bytes",
"Metadata": {},
"ContentType": "binary/octet-stream",
"ContentLength": 4,
"ETag": '"d3b07384d113edec49eaa6238ad5ff00"',
"LastModified": "Tue, 12 Jul 2016 21:26:07 GMT",
"Body": BytesIO(b'foo\n'),
},
{},
]
cmdline = (
'%s s3://bucket-one/key.txt s3://bucket/key.txt '
'--sse-c --sse-c-key foo' % self.prefix
)
self.run_cmd(cmdline, expected_rc=0)
self.assertEqual(len(self.operations_called), 2)
self.assertEqual(self.operations_called[0][0].name, 'HeadObject')
expected_head_args = {
'Bucket': 'bucket-one',
'Key': 'key.txt',
# don't expect to see SSE-c params for the source
}
self.assertDictEqual(self.operations_called[0][1], expected_head_args)

self.assertEqual(self.operations_called[1][0].name, 'CopyObject')
expected_copy_args = {
'Key': 'key.txt',
'Bucket': 'bucket',
'CopySource': {'Bucket': 'bucket-one', 'Key': 'key.txt'},
'SSECustomerAlgorithm': 'AES256',
'SSECustomerKey': 'foo',
}
self.assertDictEqual(self.operations_called[1][1], expected_copy_args)

def test_s3s3_cp_with_different_sse_c_keys(self):
"""S3->S3 copy with different SSE-C keys for source and destination"""
self.parsed_responses = [
{
"AcceptRanges": "bytes",
"LastModified": "Tue, 12 Jul 2016 21:26:07 GMT",
"ContentLength": 4,
"ETag": '"d3b07384d113edec49eaa6238ad5ff00"',
"Metadata": {},
"ContentType": "binary/octet-stream",
},
{
"AcceptRanges": "bytes",
"Metadata": {},
"ContentType": "binary/octet-stream",
"ContentLength": 4,
"ETag": '"d3b07384d113edec49eaa6238ad5ff00"',
"LastModified": "Tue, 12 Jul 2016 21:26:07 GMT",
"Body": BytesIO(b'foo\n'),
},
{},
]
cmdline = (
'%s s3://bucket-one/key.txt s3://bucket/key.txt '
'--sse-c-copy-source --sse-c-copy-source-key foo --sse-c --sse-c-key bar'
% self.prefix
)
self.run_cmd(cmdline, expected_rc=0)
self.assertEqual(len(self.operations_called), 2)
self.assertEqual(self.operations_called[0][0].name, 'HeadObject')
expected_head_args = {
'Bucket': 'bucket-one',
'Key': 'key.txt',
'SSECustomerAlgorithm': 'AES256',
'SSECustomerKey': 'foo',
}
self.assertDictEqual(self.operations_called[0][1], expected_head_args)

self.assertEqual(self.operations_called[1][0].name, 'CopyObject')
expected_copy_args = {
'Key': 'key.txt',
'Bucket': 'bucket',
'CopySource': {'Bucket': 'bucket-one', 'Key': 'key.txt'},
'SSECustomerAlgorithm': 'AES256',
'SSECustomerKey': 'bar',
'CopySourceSSECustomerAlgorithm': 'AES256',
'CopySourceSSECustomerKey': 'foo',
}
self.assertDictEqual(self.operations_called[1][1], expected_copy_args)

# Note ideally the kms sse with a key id would be integration tests
# However, you cannot delete kms keys so there would be no way to clean
# up the tests
Expand Down