Set Content-Type with s3api metadata updates.

Code Issues Proposed changes

S3 supports two metadata operations on object copy: COPY and REPLACE.
When using REPLACE, the Content-Type should be set to the one supplied
by the caller. When using COPY, the existing object's Content-Type value
is used.
Change-Id: Ic7c6278dedef308c9219eb45751abfa5655f144f
Closes-Bug: #1828907

This commit is contained in:

Timur Alperovich

2019年05月13日 18:38:24 -07:00

committed by Tim Burke

parent 032cf3b3b4

commit 8b64381371

4 changed files with 3 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1
doc/s3api/conf/ceph-known-failures-keystone.yaml

View File

@@ -42,7 +42,6 @@ ceph_s3:

s3tests.functional.test_s3.test_object_acl_xml_writeacp:{status:KNOWN}

s3tests.functional.test_s3.test_object_copy_canned_acl:{status:KNOWN}

s3tests.functional.test_s3.test_object_copy_not_owned_object_bucket:{status:KNOWN}

s3tests.functional.test_s3.test_object_copy_replacing_metadata:{status:KNOWN}

s3tests.functional.test_s3.test_object_giveaway:{status:KNOWN}

s3tests.functional.test_s3.test_object_header_acl_grants:{status:KNOWN}

s3tests.functional.test_s3.test_object_raw_get:{status:KNOWN}

1
doc/s3api/conf/ceph-known-failures-tempauth.yaml

View File

@@ -23,7 +23,6 @@ ceph_s3:

s3tests.functional.test_s3.test_logging_toggle:{status:KNOWN}

s3tests.functional.test_s3.test_multipart_resend_first_finishes_last:{status:KNOWN}

s3tests.functional.test_s3.test_object_copy_canned_acl:{status:KNOWN}

s3tests.functional.test_s3.test_object_copy_replacing_metadata:{status:KNOWN}

s3tests.functional.test_s3.test_object_header_acl_grants:{status:KNOWN}

s3tests.functional.test_s3.test_object_raw_get:{status:KNOWN}

s3tests.functional.test_s3.test_object_raw_get_bucket_acl:{status:KNOWN}

3
swift/common/middleware/s3api/s3request.py

View File

@@ -1111,14 +1111,13 @@ class S3Request(swob.Request):

env['HTTP_X_COPY_FROM'] = env['HTTP_X_AMZ_COPY_SOURCE']

del env['HTTP_X_AMZ_COPY_SOURCE']

env['CONTENT_LENGTH'] = '0'

# Content type cannot be modified on COPY

env.pop('CONTENT_TYPE', None)

if env.pop('HTTP_X_AMZ_METADATA_DIRECTIVE', None) == 'REPLACE':

env['HTTP_X_FRESH_METADATA'] = 'True'

else:

copy_exclude_headers = ('HTTP_CONTENT_DISPOSITION',

'HTTP_CONTENT_ENCODING',

'HTTP_CONTENT_LANGUAGE',

'CONTENT_TYPE',

'HTTP_EXPIRES',

'HTTP_CACHE_CONTROL',

'HTTP_X_ROBOTS_TAG')

4
test/unit/common/middleware/s3api/test_obj.py

View File

@@ -697,8 +697,7 @@ class TestS3ApiObj(S3ApiTestCase):

self.assertEqual(headers['Content-Disposition'], 'how are you')

self.assertEqual(headers['Content-Encoding'], 'good and you')

self.assertEqual(headers['Content-Language'], 'great')

# Content-Type can't be set during an S3 copy operation

self.assertIsNone(headers.get('Content-Type'))

self.assertEqual(headers['Content-Type'], 'so')

self.assertEqual(headers['Expires'], 'yeah')

self.assertEqual(headers['X-Robots-Tag'], 'bye')

@@ -1187,5 +1186,6 @@ class TestS3ApiObjNonUTC(TestS3ApiObj):

os.environ['TZ'] = self.orig_tz

time.tzset()

if __name__ == '__main__':

unittest.main()