]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Changes according to session token format change.
authorPritha Srivastava <prsrivas@redhat.com>
Fri, 20 Jul 2018 08:20:15 +0000 (13:50 +0530)
committerPritha Srivastava <prsrivas@redhat.com>
Fri, 21 Sep 2018 05:39:33 +0000 (11:09 +0530)
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
src/rgw/rgw_rest_sts.cc
src/rgw/rgw_sts.cc

index ad918fab6cadd89fb83c584cb7ca9773ceba51b8..ef6ec70c9d3e6efabb1abd1883dadbfc8b3ce8a4 100644 (file)
@@ -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);
index 2a84d52a575d629d9aa3beae8ee9d499308a5586..3abae7f3343dce884d768ec3e9547d8dfd6bb0a4 100644 (file)
@@ -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);
   }