]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
add bucket permission verify when copy obj 31377/head
authorNancySu05 <su_nan@inspur.com>
Tue, 13 Aug 2019 04:02:50 +0000 (12:02 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 4 Nov 2019 18:07:44 +0000 (19:07 +0100)
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

src/rgw/rgw_op.cc

index 158848eb3dc456ee9ffd3af1ebeb3dd236d3ffe0..b1687d846129c06fe7e8dd05e8555658d99ea7a5 100644 (file)
@@ -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();