From 33deec9a770cf92695f423212288608907fd82a9 Mon Sep 17 00:00:00 2001 From: Adam Kupczyk Date: Fri, 16 Sep 2016 17:37:15 +0200 Subject: [PATCH] A bit more test for kms Signed-off-by: Adam Kupczyk --- s3tests/functional/test_s3.py | 62 +++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 3 deletions(-) diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py index 3f3f5f5..bf9baa5 100644 --- a/s3tests/functional/test_s3.py +++ b/s3tests/functional/test_s3.py @@ -7921,7 +7921,7 @@ def test_encryption_sse_c_post_object_authenticated_request(): eq(got, 'bar') -def _test_sse_kms_customer_write(file_size): +def _test_sse_kms_customer_write(file_size, key_id = 'testkey-1'): """ Tests Create a file of A's, use it to set_contents_from_file. Create a file of B's, use it to re-set_contents_from_file. @@ -7930,7 +7930,7 @@ def _test_sse_kms_customer_write(file_size): bucket = get_new_bucket() sse_kms_client_headers = { 'x-amz-server-side-encryption': 'aws:kms', - 'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-1' + 'x-amz-server-side-encryption-aws-kms-key-id': key_id } key = bucket.new_key('testobj') data = 'A'*file_size @@ -8071,7 +8071,7 @@ def test_sse_kms_multipart_upload(): eq(result.get('x-rgw-object-count', 1), 1) eq(result.get('x-rgw-bytes-used', 30 * 1024 * 1024), 30 * 1024 * 1024) - + k = bucket.get_key(key) eq(k.metadata['foo'], 'bar') eq(k.content_type, content_type) @@ -8179,3 +8179,59 @@ def test_sse_kms_post_object_authenticated_request(): key = bucket.get_key("foo.txt") got = key.get_contents_as_string(headers=get_headers) eq(got, 'bar') + +keyid = "d8f40c6d-1c2c-4314-b435-4ef445c6971f" +@attr(resource='object') +@attr(method='put') +@attr(operation='Test SSE-KMS encrypted transfer 1 byte') +@attr(assertion='success') +@attr('encryption') +def test_sse_kms_barb_transfer_1b(): + _test_sse_kms_customer_write(48, key_id = keyid) + + +@attr(resource='object') +@attr(method='put') +@attr(operation='Test SSE-KMS encrypted transfer 1KB') +@attr(assertion='success') +@attr('encryption') +def test_sse_kms_barb_transfer_1kb(): + _test_sse_kms_customer_write(1024, key_id = keyid) + + +@attr(resource='object') +@attr(method='put') +@attr(operation='Test SSE-KMS encrypted transfer 1MB') +@attr(assertion='success') +@attr('encryption') +def test_sse_kms_barb_transfer_1MB(): + _test_sse_kms_customer_write(1024*1024, key_id = keyid) + + +@attr(resource='object') +@attr(method='put') +@attr(operation='Test SSE-KMS encrypted transfer 13 bytes') +@attr(assertion='success') +@attr('encryption') +def test_sse_kms_barb_transfer_13b(): + _test_sse_kms_customer_write(13, key_id = keyid) + + +@attr(resource='object') +@attr(method='put') +@attr(operation='data write from file (w/100-Continue)') +@attr(assertion='succeeds and returns written data') +@attr('stress') +def test_object_write_file_prrr(): + # boto Key.set_contents_from_file / .send_file uses Expect: + # 100-Continue, so this test exercises that (though a bit too + # subtly) + bucket = get_new_bucket() + for rozmiar in range(1,1000,1): + key = bucket.new_key('plikus') + data = StringIO('bar') + dataarr = [random.randint(0,255) for _ in xrange(rozmiar)] + data = "".join( chr( val ) for val in dataarr ) + key.set_contents_from_string(data) + got = key.get_contents_as_string() + eq(got, data)