From 1a1f3a0b94e575981cb568c4f8db2f383ab5314f Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 21 Feb 2024 14:04:43 -0500 Subject: [PATCH] rgw/acl: always fill in DisplayName for account owners/grants Signed-off-by: Casey Bodley --- src/rgw/rgw_acl_s3.cc | 7 +++++-- src/rgw/rgw_auth.cc | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_acl_s3.cc b/src/rgw/rgw_acl_s3.cc index 37d7142c001..133a7afd2c9 100644 --- a/src/rgw/rgw_acl_s3.cc +++ b/src/rgw/rgw_acl_s3.cc @@ -315,8 +315,11 @@ static int read_owner_display_name(const DoutPrefixProvider* dpp, RGWAccountInfo info; rgw::sal::Attrs attrs; RGWObjVersionTracker objv; - // don't use account names in acls. just verify that the account exists - return driver->load_account_by_id(dpp, y, account_id, info, attrs, objv); + int r = driver->load_account_by_id(dpp, y, account_id, info, attrs, objv); + if (r >= 0) { + name = info.name; + } + return r; }), owner); } diff --git a/src/rgw/rgw_auth.cc b/src/rgw/rgw_auth.cc index dc662c7b905..f8673a771c8 100644 --- a/src/rgw/rgw_auth.cc +++ b/src/rgw/rgw_auth.cc @@ -134,8 +134,8 @@ transform_old_authinfo(CephContext* const cct, owner.id.emplace(account_id); } else { owner.id = id; - owner.display_name = display_name; } + owner.display_name = display_name; return owner; } @@ -847,8 +847,8 @@ ACLOwner rgw::auth::LocalApplier::get_aclowner() const owner.id = user_info.account_id; } else { owner.id = user_info.user_id; - owner.display_name = user_info.display_name; } + owner.display_name = user_info.display_name; return owner; } -- 2.39.5