From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 22 Jan 2018 13:44:40 +0000 (+0100)
Subject: rgw: rgw_op update has_conditional calls with new has_key
X-Git-Tag: v13.0.2~246^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de81a74c4729c8c2c5fa9f481a7a5025738a7575;p=ceph.git

rgw: rgw_op update has_conditional calls with new has_key

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

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 1958302465a..ccbfc1541be 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -743,7 +743,7 @@ int RGWGetObj::verify_permission()
     } else {
       action = rgw::IAM::s3GetObjectVersion;
     }
-    if (s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG))
+    if (s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG, true))
       rgw_iam_add_existing_objtags(store, s, obj, action);
   }
 
@@ -781,7 +781,7 @@ int RGWGetObjTags::verify_permission()
     rgw::IAM::s3GetObjectVersionTagging;
   // TODO since we are parsing the bl now anyway, we probably change
   // the send_response function to accept RGWObjTag instead of a bl
-  if (s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG)){
+  if (s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG, true)){
     rgw_obj obj = rgw_obj(s->bucket, s->object);
     rgw_iam_add_existing_objtags(store, s, obj, iam_action);
   }
@@ -827,7 +827,7 @@ int RGWPutObjTags::verify_permission()
     rgw::IAM::s3PutObjectTagging:
     rgw::IAM::s3PutObjectVersionTagging;
 
-  if(s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG)){
+  if(s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG, true)){
     auto obj = rgw_obj(s->bucket, s->object);
     rgw_iam_add_existing_objtags(store, s, obj, iam_action);
   }
@@ -870,7 +870,7 @@ int RGWDeleteObjTags::verify_permission()
       rgw::IAM::s3DeleteObjectTagging:
       rgw::IAM::s3DeleteObjectVersionTagging;
 
-    if (s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG)){
+    if (s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG, true)){
       auto obj = rgw_obj(s->bucket, s->object);
       rgw_iam_add_existing_objtags(store, s, obj, iam_action);
     }
@@ -4685,7 +4685,7 @@ int RGWGetACLs::verify_permission()
       rgw::IAM::s3GetObjectAcl :
       rgw::IAM::s3GetObjectVersionAcl;
 
-    if (s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG)){
+    if (s->iam_policy && s->iam_policy->has_conditional(S3_EXISTING_OBJTAG, true)){
       rgw_obj obj = rgw_obj(s->bucket, s->object);
       rgw_iam_add_existing_objtags(store, s, obj, iam_action);
     }