diff options
| author | Zuul <zuul@review.opendev.org> | 2021-03-31 09:41:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-03-31 09:41:40 +0000 |
| commit | d04f1690794e34c913c1c52e639263ce591a5bd6 (patch) | |
| tree | 935a79a9fe823fa82b9126fe5fd7d5a7776fa250 /swift/common/middleware/s3api/s3request.py | |
| parent | bed368154a00124cbd6001ba3b25d1bcf5a328a1 (diff) | |
| parent | d022781bc614dba68d9b1122815fb52267ebd17e (diff) | |
| download | swift-d04f1690794e34c913c1c52e639263ce591a5bd6.tar.gz | |
Merge "s3api: Transfer REMOTE_USER when using s3_acl"
Diffstat (limited to 'swift/common/middleware/s3api/s3request.py')
| -rw-r--r-- | swift/common/middleware/s3api/s3request.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/swift/common/middleware/s3api/s3request.py b/swift/common/middleware/s3api/s3request.py index 1f411dbc7..17d50a696 100644 --- a/swift/common/middleware/s3api/s3request.py +++ b/swift/common/middleware/s3api/s3request.py @@ -1548,6 +1548,8 @@ class S3AclRequest(S3Request): sw_req.environ.get('swift.authorize', lambda req: None)(sw_req) self.environ['swift_owner'] = sw_req.environ.get('swift_owner', False) + if 'REMOTE_USER' in sw_req.environ: + self.environ['REMOTE_USER'] = sw_req.environ['REMOTE_USER'] # Need to skip S3 authorization on subsequent requests to prevent # overwriting the account in PATH_INFO |