x/swift3
Code Issues Proposed changes

Fix X-AMZ-ACL header is not applied

Browse Source 
Current swift generates wrong ACL header (e.g. HTTP_HTTP_Container-Read)
because it is based on old swift3 specification to apply the header to
an "enviroment" variable of eventlet. However, now we use the header property
of swift3.request.Request (also swift.common.swob.Request) which doesn't need "HTTP"
prefix for a given property key.

Change-Id: Ie62468ad144772537610adb359c75f46d460fc64
Closes-Bug: 1381548
This commit is contained in:
Kota Tsuyuzaki
2014-10-19 19:51:19 -07:00
parent 88ebdd3f41
commit 906cce614f
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
swift3/controllers/acl.py
View File

@@ -79,11 +79,11 @@ def swift_acl_translate(acl, group='', user='', xml=False):
that yet.
"""
swift_acl = {}
swift_acl['public-read'] = [['HTTP_X_CONTAINER_READ', '.r:*,.rlistings']]
swift_acl['public-read'] = [['X-Container-Read', '.r:*,.rlistings']]
# Swift does not support public write:
# https://answers.launchpad.net/swift/+question/169541
swift_acl['public-read-write'] = [['HTTP_X_CONTAINER_WRITE', '.r:*'],
['HTTP_X_CONTAINER_READ',
swift_acl['public-read-write'] = [['X-Container-Write', '.r:*'],
['X-Container-Read',
'.r:*,.rlistings']]
# TODO: if there's a way to get group and user, this should work for
@@ -91,8 +91,8 @@ def swift_acl_translate(acl, group='', user='', xml=False):
# swift_acl['private'] = \
# [['HTTP_X_CONTAINER_WRITE', group + ':' + user], \
# ['HTTP_X_CONTAINER_READ', group + ':' + user]]
swift_acl['private'] = [['HTTP_X_CONTAINER_WRITE', '.'],
['HTTP_X_CONTAINER_READ', '.']]
swift_acl['private'] = [['X-Container-Write', '.'],
['X-Container-Read', '.']]
if xml:
# We are working with XML and need to parse it
try: