From: Pritha Srivastava <prsrivas@redhat.com>
Date: Mon, 19 Nov 2018 16:08:10 +0000 (+0530)
Subject: rgw: Fix verify_user_permission for user policy evaluation.
X-Git-Tag: v14.1.0~510^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=565f99bc9c3251906544b938e96ef90b84ca4f6a;p=ceph.git

rgw: Fix verify_user_permission for user policy evaluation.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 3fabc0686d95..c9bdd3dca090 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -1113,6 +1113,10 @@ bool verify_user_permission(const DoutPrefixProvider* dpp,
     return false;
   }
 
+  if (usr_policy_res == Effect::Allow) {
+    return true;
+  }
+
   if (op == rgw::IAM::s3CreateBucket || op == rgw::IAM::s3ListAllMyBuckets) {
     auto perm = op_to_perm(op);
 
@@ -1122,9 +1126,7 @@ bool verify_user_permission(const DoutPrefixProvider* dpp,
   if (usr_policy_res == Effect::Pass) {
     return false;
   }
-  else if (usr_policy_res == Effect::Allow) {
-    return true;
-  }
+
   return false;
 }