openstack/swift
Code Issues Proposed changes

Merge "py3: Fix non-ASCII multipart uploads"

Browse Source
This commit is contained in:
Zuul 2021-01-15 22:44:47 +00:00 committed by Gerrit Code Review
commit 951e0379e0
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swift/common/middleware/s3api/controllers/multi_upload.py
View File

@ -67,7 +67,7 @@ import time
import six
from swift.common.swob import Range, bytes_to_wsgi, normalize_etag
from swift.common.swob import Range, bytes_to_wsgi, normalize_etag, wsgi_to_str
from swift.common.utils import json, public, reiterate, md5
from swift.common.db import utf8encode
from swift.common.request_helpers import get_container_update_override_key
@ -674,7 +674,8 @@ class UploadController(Controller):
manifest.append({
'path': '/%s/%s/%s/%d' % (
container, req.object_name, upload_id, part_number),
wsgi_to_str(container), wsgi_to_str(req.object_name),
upload_id, part_number),
'etag': etag})
s3_etag_hasher.update(binascii.a2b_hex(etag))
except (XMLSyntaxError, DocumentInvalid):

46
test/unit/common/middleware/s3api/test_multi_upload.py
View File

@ -927,6 +927,52 @@ class TestS3ApiMultiUpload(S3ApiTestCase):
self.assertEqual(headers.get(h), override_etag)
self.assertEqual(headers.get('X-Object-Sysmeta-S3Api-Upload-Id'), 'X')
def test_object_multipart_upload_complete_non_ascii(self):
wsgi_snowman = '\xe2\x98\x83'
self.swift.register(
'HEAD', '/v1/AUTH_test/bucket+segments/%s/X' % wsgi_snowman,
swob.HTTPOk, {}, None)
self.swift.register('PUT', '/v1/AUTH_test/bucket/%s' % wsgi_snowman,
swob.HTTPCreated, {}, None)
self.swift.register(
'DELETE', '/v1/AUTH_test/bucket+segments/%s/X' % wsgi_snowman,
swob.HTTPOk, {}, None)
content_md5 = base64.b64encode(md5(
XML.encode('ascii'), usedforsecurity=False).digest())
req = Request.blank('/bucket/%s?uploadId=X' % wsgi_snowman,
environ={'REQUEST_METHOD': 'POST'},
headers={'Authorization': 'AWS test:tester:hmac',
'Date': self.get_date_header(),
'Content-MD5': content_md5, },
body=XML)
status, headers, body = self.call_s3api(req)
elem = fromstring(body, 'CompleteMultipartUploadResult')
self.assertNotIn('Etag', headers)
self.assertEqual(elem.find('ETag').text, S3_ETAG)
self.assertEqual(status.split()[0], '200')
self.assertEqual(self.swift.calls, [
# Bucket exists
('HEAD', '/v1/AUTH_test'),
('HEAD', '/v1/AUTH_test/bucket'),
# Upload marker exists
('HEAD', '/v1/AUTH_test/bucket+segments/%s/X' % wsgi_snowman),
# Create the SLO
('PUT', '/v1/AUTH_test/bucket/%s'
'?heartbeat=on&multipart-manifest=put' % wsgi_snowman),
# Delete the in-progress-upload marker
('DELETE', '/v1/AUTH_test/bucket+segments/%s/X' % wsgi_snowman)
])
self.assertEqual(json.loads(self.swift.req_bodies[-2]), [
{"path": u"/bucket+segments/\N{SNOWMAN}/X/1",
"etag": "0123456789abcdef0123456789abcdef"},
{"path": u"/bucket+segments/\N{SNOWMAN}/X/2",
"etag": "fedcba9876543210fedcba9876543210"},
])
def test_object_multipart_upload_retry_complete(self):
content_md5 = base64.b64encode(md5(
XML.encode('ascii'), usedforsecurity=False).digest())