]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Fix verify_user_permission for user policy evaluation.
authorPritha Srivastava <prsrivas@redhat.com>
Mon, 19 Nov 2018 16:08:10 +0000 (21:38 +0530)
committerPritha Srivastava <prsrivas@redhat.com>
Fri, 30 Nov 2018 07:22:12 +0000 (12:52 +0530)
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
src/rgw/rgw_common.cc

index 3fabc0686d95c35cfaa3055d4c349c3709f17835..c9bdd3dca090deb21d8772be93ca56c1f0d4b29c 100644 (file)
@@ -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;
 }