openstack/aodh
Code Issues Proposed changes

fix swift middleware parsing

Browse Source 
swift middleware is incorrectly stripping out 'HTTP_' headers. This
patch fixes this.

Change-Id: I866d08badd32c83f72f05d113acc684fc40c501d
Closes-Bug: #1394453
This commit is contained in:
gordon chung 2014-11-24 10:28:45 -05:00
parent 1c88f83f82
commit 6417139b83
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/objectstore/swift_middleware.py
View File

@ -150,7 +150,7 @@ class CeilometerMiddleware(object):
headers = {} headers = {}
for header in env: for header in env:
if header.startswith('HTTP_') and env[header]: if header.startswith('HTTP_') and env[header]:
key = header.strip('HTTP_') key = header[5:]
if isinstance(env[header], six.text_type): if isinstance(env[header], six.text_type):
headers[key] = env[header].encode('utf-8') headers[key] = env[header].encode('utf-8')
else: else:

9
ceilometer/tests/objectstore/test_swift_middleware.py
View File

@ -224,19 +224,20 @@ class TestSwiftMiddleware(tests_base.BaseTestCase):
def test_metadata_headers(self): def test_metadata_headers(self):
app = swift_middleware.CeilometerMiddleware(FakeApp(), { app = swift_middleware.CeilometerMiddleware(FakeApp(), {
'metadata_headers': 'X_VAR1, x-var2, x-var3' 'metadata_headers': 'X_VAR1, x-var2, x-var3, token'
}) })
req = FakeRequest('/1.0/account/container', req = FakeRequest('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'}, environ={'REQUEST_METHOD': 'GET'},
headers={'X_VAR1': 'value1', headers={'X_VAR1': 'value1',
'X_VAR2': 'value2'}) 'X_VAR2': 'value2',
'TOKEN': 'token'})
list(app(req.environ, self.start_response)) list(app(req.environ, self.start_response))
samples = self.pipeline_manager.pipelines[0].samples samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(2, len(samples)) self.assertEqual(2, len(samples))
data = samples[0] data = samples[0]
http_headers = [k for k in data.resource_metadata.keys() http_headers = [k for k in data.resource_metadata.keys()
if k.startswith('http_header_')] if k.startswith('http_header_')]
self.assertEqual(2, len(http_headers)) self.assertEqual(3, len(http_headers))
self.assertEqual('1.0', data.resource_metadata['version']) self.assertEqual('1.0', data.resource_metadata['version'])
self.assertEqual('container', data.resource_metadata['container']) self.assertEqual('container', data.resource_metadata['container'])
self.assertIsNone(data.resource_metadata['object']) self.assertIsNone(data.resource_metadata['object'])
@ -244,6 +245,8 @@ class TestSwiftMiddleware(tests_base.BaseTestCase):
data.resource_metadata['http_header_x_var1']) data.resource_metadata['http_header_x_var1'])
self.assertEqual('value2', self.assertEqual('value2',
data.resource_metadata['http_header_x_var2']) data.resource_metadata['http_header_x_var2'])
self.assertEqual('token',
data.resource_metadata['http_header_token'])
self.assertFalse('http_header_x_var3' in data.resource_metadata) self.assertFalse('http_header_x_var3' in data.resource_metadata)
def test_metadata_headers_unicode(self): def test_metadata_headers_unicode(self):