From aa1035d2773b075462750b1f48ab4fd295db8c87 Mon Sep 17 00:00:00 2001 From: NancySu05 Date: Tue, 13 Aug 2019 12:02:50 +0800 Subject: [PATCH] add bucket permission verify when copy obj Signed-off-by: NancySu05 (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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 158848eb3dc45..b1687d846129c 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(); -- 2.39.5