openstack/swift
Code Issues Proposed changes

Merge "Set swift_source more in versioned_writes"

Browse Source
This commit is contained in:
Zuul 2019-12-09 05:13:27 +00:00 committed by Gerrit Code Review
commit 5fa8ef2c56
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swift/common/middleware/versioned_writes.py
View File

@ -429,7 +429,7 @@ class VersionedWritesContext(WSGIContext):
# making any backend requests # making any backend requests
if 'swift.authorize' in req.environ: if 'swift.authorize' in req.environ:
container_info = get_container_info( container_info = get_container_info(
req.environ, self.app) req.environ, self.app, swift_source='VW')
req.acl = container_info.get('write_acl') req.acl = container_info.get('write_acl')
aresp = req.environ['swift.authorize'](req) aresp = req.environ['swift.authorize'](req)
if aresp: if aresp:
@ -570,7 +570,7 @@ class VersionedWritesContext(WSGIContext):
# making any backend requests # making any backend requests
if 'swift.authorize' in req.environ: if 'swift.authorize' in req.environ:
container_info = get_container_info( container_info = get_container_info(
req.environ, self.app) req.environ, self.app, swift_source='VW')
req.acl = container_info.get('write_acl') req.acl = container_info.get('write_acl')
aresp = req.environ['swift.authorize'](req) aresp = req.environ['swift.authorize'](req)
if aresp: if aresp:
@ -773,7 +773,7 @@ class VersionedWritesMiddleware(object):
resp = None resp = None
is_enabled = config_true_value(allow_versioned_writes) is_enabled = config_true_value(allow_versioned_writes)
container_info = get_container_info( container_info = get_container_info(
req.environ, self.app) req.environ, self.app, swift_source='VW')
# To maintain backwards compatibility, container version # To maintain backwards compatibility, container version
# location could be stored as sysmeta or not, need to check both. # location could be stored as sysmeta or not, need to check both.