From beecdcfa1fd0fa4587eec4c6d8e5bb2dc1f1b44b Mon Sep 17 00:00:00 2001 From: Pritha Srivastava Date: Fri, 20 Jul 2018 13:50:15 +0530 Subject: [PATCH] rgw: Changes according to session token format change. Signed-off-by: Pritha Srivastava --- src/rgw/rgw_rest_sts.cc | 2 +- src/rgw/rgw_sts.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_rest_sts.cc b/src/rgw/rgw_rest_sts.cc index ad918fab6ca..ef6ec70c9d3 100644 --- a/src/rgw/rgw_rest_sts.cc +++ b/src/rgw/rgw_rest_sts.cc @@ -100,7 +100,7 @@ void RGWSTSGetSessionToken::execute() return; } - STS::STSService sts(s->cct, store, s->user->user_id); + STS::STSService sts(s->cct, store, s->user->user_id, s->auth.identity.get()); STS::GetSessionTokenRequest req(duration, serialNumber, tokenCode); const auto& [ret, creds] = sts.getSessionToken(req); diff --git a/src/rgw/rgw_sts.cc b/src/rgw/rgw_sts.cc index 2a84d52a575..3abae7f3343 100644 --- a/src/rgw/rgw_sts.cc +++ b/src/rgw/rgw_sts.cc @@ -334,7 +334,9 @@ GetSessionTokenResponse STSService::getSessionToken(GetSessionTokenRequest& req) if (ret = cred.generateCredentials(cct, req.getDuration(), boost::none, - boost::none); ret < 0) { + boost::none, + user_id, + identity); ret < 0) { return make_tuple(ret, cred); } -- 2.47.3