]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix sts get_session_token always failed because of wrong
authoryuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
Fri, 15 Jan 2021 00:44:03 +0000 (08:44 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 9 Mar 2021 17:56:49 +0000 (18:56 +0100)
check

fix https://tracker.ceph.com/issues/48883

Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
(cherry picked from commit bf9c66e16dfc704c3471f42d9f6b9b1682f9969e)

Conflicts:
src/rgw/rgw_rest_sts.cc
d6af250bff08d54cd37121666c26b475d5d2cf52 was not backported

src/rgw/rgw_rest_sts.cc

index 729c61e2e515f19350342bcbb9e59f2a7abf5627..e23fd10da59d2628464efc331914af89d68f2f83 100644 (file)
@@ -412,8 +412,9 @@ int RGWSTSGetSessionToken::get_params()
     }
 
     if (duration_in_secs < STS::GetSessionTokenRequest::getMinDuration() ||
-            duration_in_secs > s->cct->_conf->rgw_sts_max_session_duration)
+            duration_in_secs > s->cct->_conf->rgw_sts_max_session_duration) {
       return -EINVAL;
+    }
   }
 
   return 0;