]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #35612 from pritha-srivastava/wip-sts-role-min-duration
authorMatt Benjamin <mbenjamin@redhat.com>
Thu, 29 Oct 2020 11:57:50 +0000 (07:57 -0400)
committerGitHub <noreply@github.com>
Thu, 29 Oct 2020 11:57:50 +0000 (07:57 -0400)
rgw/sts: Adding a configurable rgw_sts_min_session_duration

1  2 
src/common/legacy_config_opts.h
src/common/options.cc
src/rgw/rgw_sts.cc
src/rgw/rgw_sts.h

Simple merge
Simple merge
index 40c0fb7ea9a575468a9ba0977d84a8fae2444844,c851bcbb6ed7494a3ee46353d981c55a701a1475..6d8f2060ddba1f26f39bfe02edcc434bb4c1f864
@@@ -177,8 -174,9 +177,9 @@@ AssumeRoleRequestBase::AssumeRoleReques
                                                const string& iamPolicy,
                                                const string& roleArn,
                                                const string& roleSessionName)
 -  : iamPolicy(iamPolicy), roleArn(roleArn), roleSessionName(roleSessionName)
 +  : cct(cct), iamPolicy(iamPolicy), roleArn(roleArn), roleSessionName(roleSessionName)
  {
+   MIN_DURATION_IN_SECS = cct->_conf->rgw_sts_min_session_duration;
    if (duration.empty()) {
      this->duration = DEFAULT_DURATION_IN_SECS;
    } else {
index e283e18a02296c5670917a39816b009de30ae4b1,9f1fe12bcec00a0c907f406478d10a0a81cba1b0..c10b35f212a8039107c850c733e120bae2712b2e
@@@ -20,8 -19,8 +19,9 @@@ protected
    static constexpr uint64_t MAX_ROLE_ARN_SIZE = 2048;
    static constexpr uint64_t MIN_ROLE_SESSION_SIZE = 2;
    static constexpr uint64_t MAX_ROLE_SESSION_SIZE = 64;
+   uint64_t MIN_DURATION_IN_SECS;
    uint64_t MAX_DURATION_IN_SECS;
 +  CephContext* cct;
    uint64_t duration;
    string err_msg;
    string iamPolicy;