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: v15.1.0~1693^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6187e65f5b4ad74b70956e481468383c36b54541;p=ceph-ci.git

add bucket permission verify when copy obj

Signed-off-by: NancySu05 <su_nan@inspur.com>
---

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