From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Tue, 8 Aug 2017 14:17:34 +0000 (+0200)
Subject: RGW: IAM: support s3:x-amz-acl conditional for PutACLs
X-Git-Tag: v13.0.2~246^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47f10fec1beb442b58803194cbb819971d560e36;p=ceph.git

RGW: IAM: support s3:x-amz-acl conditional for PutACLs

Support string-like s3:x-amz-acl conditional  for PutACL request. We're
still to support lists for this

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 9bfe60c323e6..f8bdf28c38c4 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4619,6 +4619,11 @@ void RGWGetACLs::execute()
 int RGWPutACLs::verify_permission()
 {
   bool perm;
+
+  if (!s->canned_acl.empty()){
+    rgw_add_to_iam_environment(s->env, "s3:x-amz-acl", s->canned_acl);
+  }
+
   if (!s->object.empty()) {
     perm = verify_object_permission(s,
 				    s->object.instance.empty() ?