
... so that eventlet.wsgi will include Connection: close headers on Expect: 100-continue error responses from s3api and make aws clients less unhappy. eventlet.wsgi likes to check for hasattr('__len__', resp) when setting connection close on expect-100 errors, but uses 'content-length' in headers when deciding on chunked-transfer. When we know the length we can support either interface. Also we can imporove s3api to return error responses with the content-length known. Change-Id: Ic504841714bd607cb9733b2de5126092a79c1094
152 lines
6.5 KiB
Python
152 lines
6.5 KiB
Python
# Copyright (c) 2014 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import unittest
|
|
|
|
from swift.common.swob import Response, Request
|
|
from swift.common.utils import HeaderKeyDict
|
|
from swift.common.middleware.catch_errors import CatchErrorMiddleware
|
|
from swift.common.middleware.s3api.s3response import S3Response, ErrorResponse
|
|
from swift.common.middleware.s3api.utils import sysmeta_prefix
|
|
|
|
|
|
class TestResponse(unittest.TestCase):
|
|
def test_from_swift_resp_slo(self):
|
|
for expected, header_vals in \
|
|
((True, ('true', '1')), (False, ('false', 'ugahhh', None))):
|
|
for val in header_vals:
|
|
resp = Response(headers={'X-Static-Large-Object': val,
|
|
'Etag': 'theetag'})
|
|
s3resp = S3Response.from_swift_resp(resp)
|
|
self.assertEqual(expected, s3resp.is_slo)
|
|
if s3resp.is_slo:
|
|
self.assertEqual('"theetag-N"', s3resp.headers['ETag'])
|
|
else:
|
|
self.assertEqual('"theetag"', s3resp.headers['ETag'])
|
|
|
|
def test_response_s3api_user_meta_headers(self):
|
|
resp = Response(headers={
|
|
'X-Object-Meta-Foo': 'Bar',
|
|
'X-Object-Meta-Non-\xdcnicode-Value': '\xff',
|
|
'X-Object-Meta-With=5FUnderscore': 'underscored',
|
|
'X-Object-Sysmeta-Baz': 'quux',
|
|
'Etag': 'unquoted',
|
|
'Content-type': 'text/plain',
|
|
'content-length': '0',
|
|
})
|
|
s3resp = S3Response.from_swift_resp(resp)
|
|
self.assertEqual(dict(s3resp.headers), {
|
|
'x-amz-meta-foo': 'Bar',
|
|
'x-amz-meta-non-\xdcnicode-value': '\xff',
|
|
'x-amz-meta-with_underscore': 'underscored',
|
|
'ETag': '"unquoted"',
|
|
'Content-Type': 'text/plain',
|
|
'Content-Length': '0',
|
|
})
|
|
|
|
def test_response_s3api_sysmeta_headers(self):
|
|
for _server_type in ('object', 'container'):
|
|
swift_headers = HeaderKeyDict(
|
|
{sysmeta_prefix(_server_type) + 'test': 'ok'})
|
|
resp = Response(headers=swift_headers)
|
|
s3resp = S3Response.from_swift_resp(resp)
|
|
self.assertEqual(swift_headers, s3resp.sysmeta_headers)
|
|
|
|
def test_response_s3api_sysmeta_headers_ignore_other_sysmeta(self):
|
|
for _server_type in ('object', 'container'):
|
|
swift_headers = HeaderKeyDict(
|
|
# sysmeta not leading sysmeta_prefix even including s3api word
|
|
{'x-%s-sysmeta-test-s3api' % _server_type: 'ok',
|
|
sysmeta_prefix(_server_type) + 'test': 'ok'})
|
|
resp = Response(headers=swift_headers)
|
|
s3resp = S3Response.from_swift_resp(resp)
|
|
expected_headers = HeaderKeyDict(
|
|
{sysmeta_prefix(_server_type) + 'test': 'ok'})
|
|
self.assertEqual(expected_headers, s3resp.sysmeta_headers)
|
|
self.assertIn('x-%s-sysmeta-test-s3api' % _server_type,
|
|
s3resp.sw_headers)
|
|
|
|
def test_response_s3api_sysmeta_from_swift3_sysmeta(self):
|
|
for _server_type in ('object', 'container'):
|
|
# swift could return older swift3 sysmeta
|
|
swift_headers = HeaderKeyDict(
|
|
{('x-%s-sysmeta-swift3-' % _server_type) + 'test': 'ok'})
|
|
resp = Response(headers=swift_headers)
|
|
s3resp = S3Response.from_swift_resp(resp)
|
|
expected_headers = HeaderKeyDict(
|
|
{sysmeta_prefix(_server_type) + 'test': 'ok'})
|
|
# but Response class should translates as s3api sysmeta
|
|
self.assertEqual(expected_headers, s3resp.sysmeta_headers)
|
|
|
|
def test_response_swift3_sysmeta_does_not_overwrite_s3api_sysmeta(self):
|
|
for _server_type in ('object', 'container'):
|
|
# same key name except sysmeta prefix
|
|
swift_headers = HeaderKeyDict(
|
|
{('x-%s-sysmeta-swift3-' % _server_type) + 'test': 'ng',
|
|
sysmeta_prefix(_server_type) + 'test': 'ok'})
|
|
resp = Response(headers=swift_headers)
|
|
s3resp = S3Response.from_swift_resp(resp)
|
|
expected_headers = HeaderKeyDict(
|
|
{sysmeta_prefix(_server_type) + 'test': 'ok'})
|
|
# but only s3api sysmeta remains in the response sysmeta_headers
|
|
self.assertEqual(expected_headers, s3resp.sysmeta_headers)
|
|
|
|
|
|
class DummyErrorResponse(ErrorResponse):
|
|
_status = "418 I'm a teapot"
|
|
|
|
|
|
class TestErrorResponse(unittest.TestCase):
|
|
def test_error_response(self):
|
|
resp = DummyErrorResponse(msg='my-msg', reason='my reason')
|
|
self.assertEqual("418 I'm a teapot", str(resp))
|
|
self.assertEqual("418 I'm a teapot", resp.status)
|
|
self.assertEqual(418, resp.status_int)
|
|
self.assertEqual('my reason', resp.reason)
|
|
self.assertEqual('DummyErrorResponse.my_reason', resp.summary)
|
|
self.assertEqual('418.DummyErrorResponse.my_reason', resp.metric_name)
|
|
self.assertEqual(
|
|
b"<?xml version='1.0' encoding='UTF-8'?>\n"
|
|
b"<Error>"
|
|
b"<Code>DummyErrorResponse</Code>"
|
|
b"<Message>my-msg</Message>"
|
|
b"</Error>",
|
|
resp.body)
|
|
|
|
def test_error_response_trans_id(self):
|
|
req = Request.blank('/bucket/object')
|
|
err = DummyErrorResponse(msg='my-msg', reason='my reason')
|
|
app = CatchErrorMiddleware(err, {})
|
|
with unittest.mock.patch(
|
|
'swift.common.middleware.catch_errors.generate_trans_id',
|
|
return_value='fake-trans-id'):
|
|
resp = req.get_response(app)
|
|
self.assertIn('swift.trans_id', req.environ)
|
|
self.assertEqual(418, resp.status_int)
|
|
self.assertIn('X-Trans-Id', resp.headers)
|
|
self.assertEqual(
|
|
b"<?xml version='1.0' encoding='UTF-8'?>\n"
|
|
b"<Error>"
|
|
b"<Code>DummyErrorResponse</Code>"
|
|
b"<Message>my-msg</Message>"
|
|
b"<RequestId>fake-trans-id</RequestId>"
|
|
b"</Error>",
|
|
resp.body)
|
|
self.assertEqual(146, int(resp.headers['Content-Length']))
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|