From b061da67cb4410b576b2865f511c024654d700b1 Mon Sep 17 00:00:00 2001
From: NancySu05 <su_nan@inspur.com>
Date: Tue, 13 Aug 2019 12:02:50 +0800
Subject: [PATCH] add bucket permission verify when copy obj

Signed-off-by: NancySu05 <su_nan@inspur.com>
(cherry picked from commit 6187e65f5b4ad74b70956e481468383c36b54541)
---
 src/rgw/rgw_op.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index a88f43853e39..6da040b706ad 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -4810,10 +4810,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();
-- 
2.47.3