]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
add bucket permission verify when copy obj 31089/head
authorNancySu05 <su_nan@inspur.com>
Tue, 13 Aug 2019 04:02:50 +0000 (12:02 +0800)
committerNathan Cutler <ncutler@suse.com>
Wed, 23 Oct 2019 13:58:35 +0000 (15:58 +0200)
Signed-off-by: NancySu05 <su_nan@inspur.com>
(cherry picked from commit 6187e65f5b4ad74b70956e481468383c36b54541)

src/rgw/rgw_op.cc

index a88f43853e39f9311810941320c74c887d0e731b..6da040b706ad7bdde72e50c10a6d4e77cfbd70d8 100644 (file)
@@ -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();