Merge pull request #309 from hairesis/master

Push #306 to master branch.

s3tests_boto3/functional/__init__.py

@@ -176,8 +176,11 @@ def setup():
     try:
         config.main_kms_keyid = cfg.get('s3 main',"kms_keyid")
     except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-        config.main_kms_keyid = None
-        pass
+        config.main_kms_keyid = 'testkey-1'
+    try:
+        config.main_kms_keyid2 = cfg.get('s3 main',"kms_keyid2")
+    except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
+        config.main_kms_keyid2 = 'testkey-2'
 
     try:
         config.main_api_name = cfg.get('s3 main',"api_name")
@@ -363,6 +366,9 @@ def get_main_api_name():
 def get_main_kms_keyid():
     return config.main_kms_keyid
 
+def get_secondary_kms_keyid():
+    return config.main_kms_keyid2
+
 def get_alt_aws_access_key():
     return config.alt_access_key
 

s3tests_boto3/functional/test_s3.py

@@ -67,6 +67,7 @@ from . import (
     get_buckets_list,
     get_objects_list,
     get_main_kms_keyid,
+    get_secondary_kms_keyid,
     nuke_prefixed_buckets,
     )
 
@@ -4435,7 +4436,6 @@ def test_bucket_acl_canned_publicreadwrite():
 
     display_name = get_main_display_name()
     user_id = get_main_user_id()
-    
     grants = response['Grants']
     check_grants(
         grants,
@@ -9821,52 +9821,22 @@ def _test_sse_kms_customer_write(file_size, key_id = 'testkey-1'):
     eq(body, data)
 
 
-@attr(resource='object')
-@attr(method='put')
-@attr(operation='Test SSE-KMS encrypted transfer 1 byte')
-@attr(assertion='success')
-@attr('encryption')
-def test_sse_kms_transfer_1b():
-    _test_sse_kms_customer_write(1)
 
 
-@attr(resource='object')
-@attr(method='put')
-@attr(operation='Test SSE-KMS encrypted transfer 1KB')
-@attr(assertion='success')
-@attr('encryption')
-def test_sse_kms_transfer_1kb():
-    _test_sse_kms_customer_write(1024)
 
 
-@attr(resource='object')
-@attr(method='put')
-@attr(operation='Test SSE-KMS encrypted transfer 1MB')
-@attr(assertion='success')
-@attr('encryption')
-def test_sse_kms_transfer_1MB():
-    _test_sse_kms_customer_write(1024*1024)
-
-
-@attr(resource='object')
-@attr(method='put')
-@attr(operation='Test SSE-KMS encrypted transfer 13 bytes')
-@attr(assertion='success')
-@attr('encryption')
-def test_sse_kms_transfer_13b():
-    _test_sse_kms_customer_write(13)
-
 @attr(resource='object')
 @attr(method='head')
 @attr(operation='Test SSE-KMS encrypted does perform head properly')
 @attr(assertion='success')
 @attr('encryption')
 def test_sse_kms_method_head():
+    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     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': kms_keyid
     }
     data = 'A'*1000
     key = 'testobj'
@@ -9877,7 +9847,7 @@ def test_sse_kms_method_head():
 
     response = client.head_object(Bucket=bucket_name, Key=key)
     eq(response['ResponseMetadata']['HTTPHeaders']['x-amz-server-side-encryption'], 'aws:kms')
-    eq(response['ResponseMetadata']['HTTPHeaders']['x-amz-server-side-encryption-aws-kms-key-id'], 'testkey-1')
+    eq(response['ResponseMetadata']['HTTPHeaders']['x-amz-server-side-encryption-aws-kms-key-id'], kms_keyid)
 
     lf = (lambda **kwargs: kwargs['params']['headers'].update(sse_kms_client_headers))
     client.meta.events.register('before-call.s3.HeadObject', lf)
@@ -9891,11 +9861,12 @@ def test_sse_kms_method_head():
 @attr(assertion='operation success')
 @attr('encryption')
 def test_sse_kms_present():
+    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     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': kms_keyid
     }
     data = 'A'*100
     key = 'testobj'
@@ -9955,6 +9926,7 @@ def test_sse_kms_not_declared():
 @attr(assertion='successful')
 @attr('encryption')
 def test_sse_kms_multipart_upload():
+    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     key = "multipart_enc"
@@ -9963,7 +9935,7 @@ def test_sse_kms_multipart_upload():
     metadata = {'foo': 'bar'}
     enc_headers = {
         'x-amz-server-side-encryption': 'aws:kms',
-        'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-2',
+        'x-amz-server-side-encryption-aws-kms-key-id': kms_keyid,
         'Content-Type': content_type
     }
     resend_parts = []
@@ -10004,6 +9976,8 @@ def test_sse_kms_multipart_upload():
 @attr(assertion='successful')
 @attr('encryption')
 def test_sse_kms_multipart_invalid_chunks_1():
+    kms_keyid = get_main_kms_keyid()
+    kms_keyid2 = get_secondary_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     key = "multipart_enc"
@@ -10012,12 +9986,12 @@ def test_sse_kms_multipart_invalid_chunks_1():
     metadata = {'foo': 'bar'}
     init_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': kms_keyid,
         'Content-Type': content_type
     }
     part_headers = {
         'x-amz-server-side-encryption': 'aws:kms',
-        'x-amz-server-side-encryption-aws-kms-key-id': 'testkey-2'
+        'x-amz-server-side-encryption-aws-kms-key-id': kms_keyid2
     }
     resend_parts = []
 
@@ -10032,6 +10006,7 @@ def test_sse_kms_multipart_invalid_chunks_1():
 @attr(assertion='successful')
 @attr('encryption')
 def test_sse_kms_multipart_invalid_chunks_2():
+    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
     key = "multipart_enc"
@@ -10040,7 +10015,7 @@ def test_sse_kms_multipart_invalid_chunks_2():
     metadata = {'foo': 'bar'}
     init_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': kms_keyid,
         'Content-Type': content_type
     }
     part_headers = {
@@ -10053,12 +10028,14 @@ def test_sse_kms_multipart_invalid_chunks_2():
             init_headers=init_headers, part_headers=part_headers, metadata=metadata,
             resend_parts=resend_parts)
 
+
 @attr(resource='object')
 @attr(method='post')
 @attr(operation='authenticated KMS browser based upload via POST request')
 @attr(assertion='succeeds and returns written data')
 @attr('encryption')
 def test_sse_kms_post_object_authenticated_request():
+    kms_keyid = get_main_kms_keyid()
     bucket_name = get_new_bucket()
     client = get_client()
 
@@ -10090,7 +10067,7 @@ def test_sse_kms_post_object_authenticated_request():
     ("acl" , "private"),("signature" , signature),("policy" , policy),\
     ("Content-Type" , "text/plain"),
     ('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', kms_keyid), \
     ('file', ('bar'))])
 
     r = requests.post(url, files = payload)
@@ -10105,7 +10082,7 @@ def test_sse_kms_post_object_authenticated_request():
 @attr(operation='Test SSE-KMS encrypted transfer 1 byte')
 @attr(assertion='success')
 @attr('encryption')
-def test_sse_kms_barb_transfer_1b():
+def test_sse_kms_transfer_1b():
     kms_keyid = get_main_kms_keyid()
     if kms_keyid is None:
         raise SkipTest
@@ -10117,7 +10094,7 @@ def test_sse_kms_barb_transfer_1b():
 @attr(operation='Test SSE-KMS encrypted transfer 1KB')
 @attr(assertion='success')
 @attr('encryption')
-def test_sse_kms_barb_transfer_1kb():
+def test_sse_kms_transfer_1kb():
     kms_keyid = get_main_kms_keyid()
     if kms_keyid is None:
         raise SkipTest
@@ -10129,7 +10106,7 @@ def test_sse_kms_barb_transfer_1kb():
 @attr(operation='Test SSE-KMS encrypted transfer 1MB')
 @attr(assertion='success')
 @attr('encryption')
-def test_sse_kms_barb_transfer_1MB():
+def test_sse_kms_transfer_1MB():
     kms_keyid = get_main_kms_keyid()
     if kms_keyid is None:
         raise SkipTest
@@ -10141,7 +10118,7 @@ def test_sse_kms_barb_transfer_1MB():
 @attr(operation='Test SSE-KMS encrypted transfer 13 bytes')
 @attr(assertion='success')
 @attr('encryption')
-def test_sse_kms_barb_transfer_13b():
+def test_sse_kms_transfer_13b():
     kms_keyid = get_main_kms_keyid()
     if kms_keyid is None:
         raise SkipTest