From 29fece3545cc1df404a25eec46706b16f893a5df Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 29 Sep 2016 17:43:00 -0700 Subject: [PATCH] rgw: rgw_obj_key use adjustment in multipart copy part This fixes a case where objects start with double underscore. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_op.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 37f419197b04..16c6280a652e 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -2489,8 +2489,7 @@ int RGWPutObj::verify_permission() RGWAccessControlPolicy cs_policy(s->cct); map cs_attrs; rgw_bucket cs_bucket(copy_source_bucket_info.bucket); - rgw_obj_key cs_object(copy_source_object_name); - rgw_obj cs_obj(cs_bucket, cs_object); + rgw_obj_key cs_object(copy_source_object_name, copy_source_version_id); /* check source object permissions */ if (read_policy(store, s, copy_source_bucket_info, cs_attrs, &cs_policy, cs_bucket, cs_object) < 0) { @@ -2715,8 +2714,9 @@ int RGWPutObj::get_data(const off_t fst, const off_t lst, bufferlist& bl) new_ofs = fst; new_end = lst; - rgw_obj_key obj_key(copy_source_object_name); - rgw_obj obj(copy_source_bucket_info.bucket, obj_key); + rgw_obj_key obj_key(copy_source_object_name, copy_source_version_id); + rgw_obj obj(copy_source_bucket_info.bucket, obj_key.name); + obj.set_instance(obj_key.instance); RGWRados::Object op_target(store, copy_source_bucket_info, *static_cast(s->obj_ctx), obj); RGWRados::Object::Read read_op(&op_target); -- 2.47.3