From: NancySu05 <su_nan@inspur.com>
Date: Tue, 13 Aug 2019 04:02:50 +0000 (+0800)
Subject: add bucket permission verify when copy obj
X-Git-Tag: v13.2.9~73^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa1035d2773b075462750b1f48ab4fd295db8c87;p=ceph.git

add bucket permission verify when copy obj

Signed-off-by: NancySu05 <su_nan@inspur.com>
(cherry picked from commit 6187e65f5b4ad74b70956e481468383c36b54541)

Conflicts:
	src/rgw/rgw_op.cc
- dest_bucket_policy.verify_permission() does not take "this" in mimic
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 158848eb3dc..b1687d84612 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4644,10 +4644,11 @@ int RGWCopyObj::verify_permission()
                                                         RGW_PERM_WRITE)){
         return -EACCES;
       }
+    } else if (! dest_bucket_policy.verify_permission(*s->auth.identity, s->perm_mask,
+                                                      RGW_PERM_WRITE)) {
+      return -EACCES;
     }
-  } else if (! dest_bucket_policy.verify_permission(*s->auth.identity, s->perm_mask,
-                                                    RGW_PERM_WRITE)) {
-    return -EACCES;
+
   }
 
   op_ret = init_dest_policy();