openstack/swift
Code Issues Proposed changes

encryption: Expose decrypted metadata via CORS

Browse Source 
Normally, the proxy object controller would be adding these, but when
encrypted, there won't be any headers in the x-object-meta-* namespace.

Closes-Bug: #1868045
Change-Id: I8e708a60ee63f679056300fc9d68227e46d605e8
This commit is contained in:
Tim Burke
2020-03-09 13:45:58 -07:00
committed by Tim Burke
parent 3bf7cf60b9
commit cd693e519e
3 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/functional/test_object.py
View File

@@ -1542,7 +1542,7 @@ class TestObject(unittest.TestCase):
def put_obj(url, token, parsed, conn, obj):
conn.request(
'PUT', '%s/%s/%s' % (parsed.path, self.container, obj),
'test', {'X-Auth-Token': token})
'test', {'X-Auth-Token': token, 'X-Object-Meta-Color': 'red'})
return check_response(conn)
def check_cors(url, token, parsed, conn,
@@ -1576,6 +1576,8 @@ class TestObject(unittest.TestCase):
headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEqual(headers.get('access-control-allow-origin'),
'*')
# Just a pre-flight; this doesn't show up yet
self.assertNotIn('access-control-expose-headers', headers)
resp = retry(check_cors,
'GET', 'cat', {'Origin': 'http://m.com'})
@@ -1583,6 +1585,8 @@ class TestObject(unittest.TestCase):
headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEqual(headers.get('access-control-allow-origin'),
'*')
self.assertIn('x-object-meta-color', headers.get(
'access-control-expose-headers').split(', '))
resp = retry(check_cors,
'GET', 'cat', {'Origin': 'http://m.com',
@@ -1591,6 +1595,8 @@ class TestObject(unittest.TestCase):
headers = dict((k.lower(), v) for k, v in resp.getheaders())
self.assertEqual(headers.get('access-control-allow-origin'),
'*')
self.assertIn('x-object-meta-color', headers.get(
'access-control-expose-headers').split(', '))
####################