From 99fbd02dcd809a9df163be9334e12ab8e0b381f7 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 27 Apr 2023 09:56:53 -0400 Subject: [PATCH] rgw/s3: ListObjectsV2 returns correct object owners Fixes: https://tracker.ceph.com/issues/59471 Signed-off-by: Casey Bodley (cherry picked from commit 0761607ef11bce3bc879358903d34802bb90f7cf) --- src/rgw/rgw_rest_s3.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index da84c7cb8087f..0b997f30b10e2 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -1972,7 +1972,7 @@ void RGWListBucket_ObjStore_S3v2::send_versioned_response() s->formatter->dump_string("StorageClass", storage_class.c_str()); } if (fetchOwner == true) { - dump_owner(s, s->user->get_id(), s->user->get_display_name()); + dump_owner(s, rgw_user(iter->meta.owner), iter->meta.owner_display_name); } s->formatter->close_section(); } @@ -2051,7 +2051,7 @@ void RGWListBucket_ObjStore_S3v2::send_response() auto& storage_class = rgw_placement_rule::get_canonical_storage_class(iter->meta.storage_class); s->formatter->dump_string("StorageClass", storage_class.c_str()); if (fetchOwner == true) { - dump_owner(s, s->user->get_id(), s->user->get_display_name()); + dump_owner(s, rgw_user(iter->meta.owner), iter->meta.owner_display_name); } if (s->system_request) { s->formatter->dump_string("RgwxTag", iter->tag); -- 2.39.5