]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: support ExistingObjectTag in GetObjectAcl op
authorAbhishek Lekshmanan <abhishek@suse.com>
Thu, 12 Oct 2017 09:42:01 +0000 (11:42 +0200)
committerAbhishek Lekshmanan <abhishek@suse.com>
Wed, 17 Jan 2018 10:28:56 +0000 (11:28 +0100)
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
src/rgw/rgw_op.cc

index c84bf73e6f196824e4c9f50d45305a64f4c0ad91..8be04faf859c3135ed2594f75a67546348169840 100644 (file)
@@ -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);
   }