From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Thu, 12 Oct 2017 09:42:01 +0000 (+0200)
Subject: rgw: support ExistingObjectTag in GetObjectAcl op
X-Git-Tag: v13.0.2~246^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e66c7ecbc89e7448eea97d347a2d29e7db66dd46;p=ceph.git

rgw: support ExistingObjectTag in GetObjectAcl op

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index c84bf73e6f19..8be04faf859c 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4623,10 +4623,10 @@ int RGWGetACLs::verify_permission()
 {
   bool perm;
   if (!s->object.empty()) {
-    perm = verify_object_permission(s,
-				    s->object.instance.empty() ?
-				    rgw::IAM::s3GetObjectAcl :
-				    rgw::IAM::s3GetObjectVersionAcl);
+    iam_action = s->object.instance.empty() ? rgw::IAM::s3GetObjectAcl : rgw::IAM::s3GetObjectVersionAcl;
+    rgw_obj obj = rgw_obj(s->bucket, s->object);
+    rgw_iam_add_existing_objtags(store, s, obj, iam_action);
+    perm = verify_object_permission(s, iam_action);
   } else {
     perm = verify_bucket_permission(s, rgw::IAM::s3GetBucketAcl);
   }