From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 20 Apr 2023 13:25:49 +0000 (-0400)
Subject: rgw/sts: AssumeRole no longer writes to user metadata
X-Git-Tag: v16.2.15~86^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f7a3af26d87f0fdcd52a19ff1373e9536782165;p=ceph.git

rgw/sts: AssumeRole no longer writes to user metadata

`storeARN()` was storing the role's ARN in `RGWUserInfo::assumed_role_arn`,
but that field was unused

Fixes: https://tracker.ceph.com/issues/59495

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2f60200bf69b0814ce7d1ae7d217d5c37f99f80e)

Conflicts:
	src/rgw/rgw_sts.cc (different storeARN signature)
	src/rgw/rgw_sts.h (different storeARN signature)
---

diff --git a/src/rgw/rgw_sts.cc b/src/rgw/rgw_sts.cc
index f46d100354f..22e067e0d77 100644
--- a/src/rgw/rgw_sts.cc
+++ b/src/rgw/rgw_sts.cc
@@ -316,24 +316,6 @@ std::tuple<int, RGWRole> STSService::getRoleInfo(const DoutPrefixProvider *dpp,
   }
 }
 
-int STSService::storeARN(const DoutPrefixProvider *dpp, string& arn, optional_yield y)
-{
-  int ret = 0;
-  RGWUserInfo info;
-  if (ret = rgw_get_user_info_by_uid(dpp, store->ctl()->user, user_id, info, y); ret < 0) {
-    return -ERR_NO_SUCH_ENTITY;
-  }
-
-  info.assumed_role_arn = arn;
-
-  RGWObjVersionTracker objv_tracker;
-  if (ret = rgw_store_user_info(dpp, store->ctl()->user, info, &info, &objv_tracker, real_time(),
-				false, y); ret < 0) {
-    return -ERR_INTERNAL_ERROR;
-  }
-  return ret;
-}
-
 AssumeRoleWithWebIdentityResponse STSService::assumeRoleWithWebIdentity(AssumeRoleWithWebIdentityRequest& req)
 {
   AssumeRoleWithWebIdentityResponse response;
@@ -445,13 +427,6 @@ AssumeRoleResponse STSService::assumeRole(const DoutPrefixProvider *dpp,
     return response;
   }
 
-  //Save ARN with the user
-  string arn = response.user.getARN();
-  response.retCode = storeARN(dpp, arn, y);
-  if (response.retCode < 0) {
-    return response;
-  }
-
   response.retCode = 0;
   return response;
 }
diff --git a/src/rgw/rgw_sts.h b/src/rgw/rgw_sts.h
index aca9e24d10d..d0326404ee8 100644
--- a/src/rgw/rgw_sts.h
+++ b/src/rgw/rgw_sts.h
@@ -238,7 +238,6 @@ class STSService {
   rgw_user user_id;
   RGWRole role;
   rgw::auth::Identity* identity;
-  int storeARN(const DoutPrefixProvider *dpp, string& arn, optional_yield y);
 public:
   STSService() = default;
   STSService(CephContext* cct, rgw::sal::RGWRadosStore *store, rgw_user user_id,