mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-20 03:13:53 +01:00
s3: honor configured session bounds on AssumeRole and LDAP identity (#11478)
* sts: export CalculateSessionDuration Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * s3: honor configured session bounds on AssumeRole and LDAP identity prepareSTSCredentials hardcoded a one-hour session when the caller omitted DurationSeconds, so sts.tokenDuration was ignored and sts.maxSessionLength only clamped explicit requests: asking for 3600s against a 20m ceiling was rejected while omitting the parameter was granted a full hour (#11473). The two affected handlers now use the same default-then-cap calculation as AssumeRoleWithWebIdentity. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * iam: keep MaxSessionDuration through role store copies copyRoleDefinition rebuilt RoleDefinition field by field and dropped MaxSessionDuration, so memory-backed role stores silently discarded the per-role session bound on every write and read (devin on #11478). Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * sts: apply per-role MaxSessionDuration to resolved session durations Review follow-up on #11478 (devin): the role bound only ever applied to explicit DurationSeconds values — an omitted duration resolved to the configured default and sailed past a shorter role max on every assume path. - capDurationByRole now resolves min(requested||tokenDuration, roleMax), so AssumeRoleWithWebIdentity and AssumeRoleWithCredentials cap defaults the same way they cap explicit values. - prepareSTSCredentials caps the calculated duration at the named role's MaxSessionDuration, covering the AssumeRole and LDAP handlers; self-assumption has no role definition to consult. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * iam: keep MaxSessionDuration through the cached role store genericCopyRoleDefinition drops MaxSessionDuration the same way copyRoleDefinition did, so the cached filer role store reads back a zero maximum and every downstream duration cap is skipped (greptile on #11478). Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * sts: only materialize defaults that pass session duration validation Review follow-up on #11478 (greptile): materializing an omitted DurationSeconds into an explicit value could exceed the service's own input bound (a configured tokenDuration above maxSessionLength) and turn a previously working request into a validation error. capDurationByRole now leaves nil anything the service can resolve better itself, clamps a tightened default at maxSessionLengthSeconds, and floors a role bound below 900s to the tightest issuable value. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
ab95d58b7c
commit
2864bc0fe8
8 files changed
+161
-42
No files matched your search
+21
-3
@@ -834,12 +834,30 @@ func (h *STSHandlers) handleGetFederationToken(w http.ResponseWriter, r *http.Re
|
||||
func (h *STSHandlers) prepareSTSCredentials(ctx context.Context, roleArn, roleSessionName string,
|
||||
durationSeconds *int64, sessionPolicy string, modifyClaims func(*sts.STSSessionClaims)) (STSCredentials, *AssumedRoleUser, error) {
|
||||
|
||||
// Calculate duration
|
||||
duration := time.Hour // Default 1 hour
|
||||
if durationSeconds != nil {
|
||||
duration := time.Hour
|
||||
if h.stsService != nil && h.stsService.Config != nil {
|
||||
duration = h.stsService.CalculateSessionDuration(durationSeconds)
|
||||
} else if durationSeconds != nil {
|
||||
duration = time.Duration(*durationSeconds) * time.Second
|
||||
}
|
||||
|
||||
// A named role's MaxSessionDuration bounds the resolved duration the same
|
||||
// way capDurationByRole does on the SDK paths; self-assumption has no role
|
||||
// definition to consult.
|
||||
if h.iam != nil && h.iam.iamIntegration != nil {
|
||||
if roleName := utils.ExtractRoleNameFromArn(roleArn); roleName != "" {
|
||||
if provider, ok := h.iam.iamIntegration.(IAMManagerProvider); ok {
|
||||
if mgr := provider.GetIAMManager(); mgr != nil {
|
||||
if roleDef, roleErr := mgr.GetRole(ctx, roleName); roleErr == nil && roleDef.MaxSessionDuration > 0 {
|
||||
if roleMax := time.Duration(roleDef.MaxSessionDuration) * time.Second; duration > roleMax {
|
||||
duration = roleMax
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Generate session ID
|
||||
sessionId, err := sts.GenerateSessionId()
|
||||
if err != nil {
|
||||
|
||||
@@ -241,3 +241,64 @@ func newTestSTSIntegrationManager(t *testing.T) *integration.IAMManager {
|
||||
require.NoError(t, manager.Initialize(config, func() string { return "" }))
|
||||
return manager
|
||||
}
|
||||
|
||||
// AssumeRole derives its session length from the same default-then-cap rule as
|
||||
// the service layer (#11473): an omitted DurationSeconds yields TokenDuration,
|
||||
// and either path is capped at MaxSessionLength.
|
||||
func TestPrepareSTSCredentialsHonorsConfiguredDurations(t *testing.T) {
|
||||
stsService := sts.NewSTSService()
|
||||
require.NoError(t, stsService.Initialize(&sts.STSConfig{
|
||||
TokenDuration: sts.FlexibleDuration{Duration: 15 * time.Minute},
|
||||
MaxSessionLength: sts.FlexibleDuration{Duration: 20 * time.Minute},
|
||||
Issuer: "test-issuer",
|
||||
SigningKey: []byte("test-signing-key-at-least-32-bytes-long-for-security"),
|
||||
}))
|
||||
stsHandlers := NewSTSHandlers(stsService, nil)
|
||||
roleArn := fmt.Sprintf("arn:aws:iam::%s:role/test-role", defaultAccountID)
|
||||
|
||||
expiresIn := func(durationSeconds *int64) time.Duration {
|
||||
stsCreds, _, err := stsHandlers.prepareSTSCredentials(context.Background(), roleArn, "test-session", durationSeconds, "", nil)
|
||||
require.NoError(t, err)
|
||||
exp, err := time.Parse(time.RFC3339, stsCreds.Expiration)
|
||||
require.NoError(t, err)
|
||||
return time.Until(exp)
|
||||
}
|
||||
|
||||
oneHour := int64(3600)
|
||||
assert.InDelta(t, (15 * time.Minute).Seconds(), expiresIn(nil).Seconds(), 60)
|
||||
assert.InDelta(t, (20 * time.Minute).Seconds(), expiresIn(&oneHour).Seconds(), 60)
|
||||
}
|
||||
|
||||
// A named role's MaxSessionDuration bounds the session however DurationSeconds
|
||||
// was resolved, matching the SDK paths' capDurationByRole.
|
||||
func TestPrepareSTSCredentialsCapsAtRoleMaxDuration(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
manager := newTestSTSIntegrationManager(t)
|
||||
require.NoError(t, manager.CreateRole(ctx, "", "ShortLivedRole", &integration.RoleDefinition{
|
||||
RoleName: "ShortLivedRole",
|
||||
MaxSessionDuration: 3600,
|
||||
}))
|
||||
|
||||
stsService := sts.NewSTSService()
|
||||
require.NoError(t, stsService.Initialize(&sts.STSConfig{
|
||||
TokenDuration: sts.FlexibleDuration{Duration: 2 * time.Hour},
|
||||
MaxSessionLength: sts.FlexibleDuration{Duration: 12 * time.Hour},
|
||||
Issuer: "test-issuer",
|
||||
SigningKey: []byte("test-signing-key-at-least-32-bytes-long-for-security"),
|
||||
}))
|
||||
iam := &IdentityAccessManagement{iamIntegration: NewS3IAMIntegration(manager, "")}
|
||||
stsHandlers := NewSTSHandlers(stsService, iam)
|
||||
roleArn := fmt.Sprintf("arn:aws:iam::%s:role/ShortLivedRole", defaultAccountID)
|
||||
|
||||
expiresIn := func(durationSeconds *int64) time.Duration {
|
||||
stsCreds, _, err := stsHandlers.prepareSTSCredentials(ctx, roleArn, "test-session", durationSeconds, "", nil)
|
||||
require.NoError(t, err)
|
||||
exp, err := time.Parse(time.RFC3339, stsCreds.Expiration)
|
||||
require.NoError(t, err)
|
||||
return time.Until(exp)
|
||||
}
|
||||
|
||||
twoHours := int64(7200)
|
||||
assert.InDelta(t, float64(3600), expiresIn(nil).Seconds(), 60, "omitted duration resolves to the 2h default but the role caps it at 1h")
|
||||
assert.InDelta(t, float64(3600), expiresIn(&twoHours).Seconds(), 60, "explicit duration above the role max is capped")
|
||||
}
|
||||
Reference in new issue
Block a user