Files
seaweedfs/weed/s3api/s3api_iceberg_vended_session_test.go
T
ad89f003a5 s3: end a catalog-vended session with the access key it was vended for (#11945)
* s3: end a catalog-vended session with the access key it was vended for

A table credential the Iceberg catalog vends is a self-contained STS session:
it stays valid until it expires (an hour by default) even after the access key
that loaded the table is deleted or deactivated, or its identity is removed
or disabled. An operator revoking a leaked key cannot cut off the table
credentials that key already obtained.

Sessions are stateless JWTs, so there is no revocation list to consult. This
change follows the same pattern as role sessions, which are already refused
once their role's ID no longer matches (checkSessionRoleBinding): a vended
session carries the access key it was vended for (src_ak, recorded by the
previous change), and validateSTSSessionToken checks it against the identity
table held in memory. A session of provider iceberg-catalog that carries a
source key is refused (InvalidAccessKeyId, as for an unknown key) once its
identity is gone or disabled, or the key is no longer one of that identity's
active, unexpired credentials.

Scope:
- Only catalog-vended sessions are checked; web-identity, AssumeRole and
  every other STS session are validated as before.
- The vendor binds a session to the caller's key only when the caller is a
  stored identity holding that key. A caller that signed with another STS
  session's key, an OIDC user, or a request that recorded no key gets an
  unbound session, as today; binding it would refuse every request made with
  it. A session minted before this change carries no key and is unbound.
- The check is one map lookup under the read lock and a scan of one
  identity's keys (about 11 ns, 0 allocations, with 1,000 identities).

Tests (s3api_iceberg_vended_session_test.go) mint real sessions through the
catalog vendor and validate them the way a data-path request is validated:
deactivating, expiring or deleting key A ends A's session while the session
vended through key B on the same identity keeps working; disabling or
deleting the identity ends it; callers that are not a stored identity holding
the key get unbound sessions that keep working; other STS sessions are not
checked. The first two tests and the third fail without this change.

* s3: keep the vended-session key binding when the key dies before vend

vendedSessionKeyLive gated the binding, so a key revoked between the
request's authentication and the vend skipped it and minted an unbound
session that stayed usable until it expired. Every catalog auth path
pairs the identity name in context with the key that authenticated, so
a stored-identity principal always means the request signed with that
identity's own key. Bind whenever the principal is a stored identity: a
session bound to a now-dead key is refused on its first request, which
is what the binding is for.

* s3: gate the vended-session key binding on the authenticated caller type

lookupByIdentityName(principal) named only that some identity exists, not
that the request signed with a stored key: an STS session or OIDC principal
that collides with an identity name got a session bound to its temporary
key, which vendedSessionKeyLive then refused on every request. Verifiers
now record the verified key as a stored credential, and the vendor binds
only when that marker is present — keeping the binding even when the key
was revoked between authentication and the vend.

* s3: enforce the vended key binding under a dedicated claim

Sessions minted before the binding existed carry the caller's key in the
audit-only SourceAccessKeyId — including temporary STS keys that can never
resolve in the identity table. Enforcing on that field would end live table
credentials at upgrade; the binding now travels under BoundAccessKeyId,
leaving legacy sessions unbound as before.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* s3: bind vended sessions to a credential fingerprint

The key id alone cannot identify a credential: an operator can delete a
key and re-create it under the same id with a different secret, reviving
sessions minted for the original. Verifiers now record a fingerprint of
the secret at authentication; the session dies unless it still matches.

Generated with [Devin](https://devin.ai)

Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>

* s3: keep recording the caller's key on every catalog session

SourceAccessKeyId was unconditional audit metadata before the binding
existed; gating it on the stored-credential marker dropped the record
for callers that authenticated another way. With the binding under its
own claim there is no ambiguity left, so the field records the caller's
key again regardless of how it authenticated.

* s3: key the vended-session credential fingerprint with the signing key

The bound-credential fingerprint travels inside the vended session
token. As a plain SHA-256 of the secret it gave any token holder an
offline guessing oracle for weak secrets, and CodeQL flags it twice.

Store the verified secret in the request marker instead and HMAC it
with the STS signing key at vend and at validation. The claim can no
longer be mined, and the per-request auth path stops hashing secrets.

---------

Co-authored-by: Javier de la Torre <jatorre@lakehousebox.com>
Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com>
Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
2026-10-23 03:58:06 -07:00

235 lines
9.9 KiB
Go

package s3api
import (
"context"
"fmt"
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/seaweedfs/seaweedfs/weed/iam/integration"
"github.com/seaweedfs/seaweedfs/weed/iam/policy"
"github.com/seaweedfs/seaweedfs/weed/iam/sts"
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
"github.com/seaweedfs/seaweedfs/weed/s3api/s3err"
)
// vendingServer is an S3ApiServer whose catalog role trusts the vendor, with
// the identity of newSharedIdentityIAM (one identity, two keys).
func vendingServer(t *testing.T) *S3ApiServer {
t.Helper()
mgr := newTestIAMManager(t)
require.NoError(t, mgr.CreateRole(context.Background(), "", "IcebergTableAccess", &integration.RoleDefinition{
RoleName: "IcebergTableAccess",
TrustPolicy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{{
Effect: "Allow",
Principal: map[string]interface{}{"Federated": icebergVendedCredentialsProvider},
Action: []string{"sts:AssumeRoleWithCredentials"},
}},
},
}))
iam := newSharedIdentityIAM()
iam.SetIAMIntegration(NewS3IAMIntegration(mgr, ""))
s3a := &S3ApiServer{iam: iam}
s3a.SetIcebergCredentialRole("arn:aws:iam::role/IcebergTableAccess", 3600)
return s3a
}
// vend mints table credentials for principal as if its request had been
// signed with accessKey ("" for a request that recorded none); a non-empty
// secret marks the credential as a stored identity's, as a verifier would.
func vend(t *testing.T, s3a *S3ApiServer, principal, accessKey, secret string) *VendedCredentials {
t.Helper()
ctx := context.Background()
if accessKey != "" {
ctx = s3_constants.SetAccessKeyIdInContext(ctx, accessKey)
}
if secret != "" {
ctx = s3_constants.SetStoredAccessKeyIdInContext(ctx, accessKey, secret)
}
creds, err := s3a.VendTableCredentials(ctx, principal, "warehouse", "ns/t", false)
require.NoError(t, err)
require.NotNil(t, creds)
return creds
}
// use validates a vended session the way a data-path request carrying it is
// validated.
func use(t *testing.T, s3a *S3ApiServer, creds *VendedCredentials) s3err.ErrorCode {
t.Helper()
r, err := newTestRequest("GET", "https://example.com/warehouse/ns/t/data/f.parquet", 0, nil)
require.NoError(t, err)
_, _, errCode := s3a.iam.validateSTSSessionToken(r, creds.SessionToken, creds.AccessKeyID)
return errCode
}
func sessionInfo(t *testing.T, s3a *S3ApiServer, creds *VendedCredentials) *sts.SessionInfo {
t.Helper()
info, err := s3a.stsService().ValidateSessionToken(context.Background(), creds.SessionToken)
require.NoError(t, err)
return info
}
func TestVendedSessionEndsWithItsAccessKey(t *testing.T) {
s3a := vendingServer(t)
sessionA := vend(t, s3a, "shared-user", sharedKeyA, sharedSecretA)
sessionB := vend(t, s3a, "shared-user", sharedKeyB, sharedSecretB)
require.Equal(t, s3err.ErrNone, use(t, s3a, sessionA), "control: the session works while its key does")
require.Equal(t, s3err.ErrNone, use(t, s3a, sessionB))
identity := s3a.iam.nameToIdentity["shared-user"]
identity.Credentials[0].Status = iamAccessKeyStatusInactive
assert.Equal(t, s3err.ErrInvalidAccessKeyID, use(t, s3a, sessionA), "key A deactivated")
assert.Equal(t, s3err.ErrNone, use(t, s3a, sessionB), "the session vended through key B keeps working")
identity.Credentials[0].Status = iamAccessKeyStatusActive
assert.Equal(t, s3err.ErrNone, use(t, s3a, sessionA), "key A reactivated")
identity.Credentials[0].Expiration = time.Now().Add(-time.Minute).Unix()
assert.Equal(t, s3err.ErrInvalidAccessKeyID, use(t, s3a, sessionA), "key A expired")
identity.Credentials[0].Expiration = 0
identity.Credentials = identity.Credentials[1:]
assert.Equal(t, s3err.ErrInvalidAccessKeyID, use(t, s3a, sessionA), "key A deleted")
assert.Equal(t, s3err.ErrNone, use(t, s3a, sessionB), "the session vended through key B keeps working")
}
func TestVendedSessionEndsWithItsIdentity(t *testing.T) {
s3a := vendingServer(t)
session := vend(t, s3a, "shared-user", sharedKeyA, sharedSecretA)
require.Equal(t, s3err.ErrNone, use(t, s3a, session))
s3a.iam.nameToIdentity["shared-user"].Disabled = true
assert.Equal(t, s3err.ErrInvalidAccessKeyID, use(t, s3a, session), "identity disabled")
s3a.iam.nameToIdentity["shared-user"].Disabled = false
assert.Equal(t, s3err.ErrNone, use(t, s3a, session), "identity enabled again")
delete(s3a.iam.nameToIdentity, "shared-user")
assert.Equal(t, s3err.ErrInvalidAccessKeyID, use(t, s3a, session), "identity deleted")
}
// A caller that is not a stored identity (a caller signing with another STS
// session's key, an OIDC user, a request that recorded no key) still gets
// credentials, unbound as before: binding them would refuse every request
// made with them.
func TestVendedSessionIsBoundOnlyForAStoredIdentitysKey(t *testing.T) {
s3a := vendingServer(t)
control := sessionInfo(t, s3a, vend(t, s3a, "shared-user", sharedKeyA, sharedSecretA))
assert.Equal(t, sharedKeyA, control.SourceAccessKeyId, "control")
assert.Equal(t, sharedKeyA, control.BoundAccessKeyId, "control")
for _, tc := range []struct{ principal, key, why string }{
{"47ad4828c45b3f337bc3146081ba8f0f", "ASIATEMPORARYKEY0001", "an STS session's subject and temporary key"},
{"shared-user", "ASIATEMPORARYKEY0001", "an STS session whose subject names a stored identity"},
{"alice@example.com", "", "an OIDC user"},
{"shared-user", "", "no recorded key"},
} {
session := vend(t, s3a, tc.principal, tc.key, "")
info := sessionInfo(t, s3a, session)
assert.Equal(t, tc.key, info.SourceAccessKeyId, tc.why)
assert.Empty(t, info.BoundAccessKeyId, tc.why)
assert.Equal(t, s3err.ErrNone, use(t, s3a, session), tc.why)
}
}
// Tokens minted before the binding existed record the caller's key under the
// audit claim only. Validating them as bound would end live table credentials
// at upgrade — a chained STS caller's key can never resolve to a stored
// credential. They stay valid until expiry, as they always did.
func TestLegacyVendedSessionStaysUnbound(t *testing.T) {
iam := newSharedIdentityIAM()
iam.iamIntegration = &MockIAMIntegration{
validateSessionFunc: func(ctx context.Context, token string) (*sts.SessionInfo, error) {
return &sts.SessionInfo{
SessionId: "sid",
AssumedRoleUser: "arn:aws:sts::assumed-role/Reader/session",
Principal: "arn:aws:sts::assumed-role/Reader/session",
IdentityProvider: icebergVendedCredentialsProvider,
ExternalUserId: "someone-not-in-the-identity-table",
SourceAccessKeyId: "ASIATEMPORARYKEY0001",
Credentials: &sts.Credentials{AccessKeyId: "ASIALEGACY", SecretAccessKey: "secret"},
ExpiresAt: time.Now().Add(time.Hour),
}, nil
},
}
r, err := newTestRequest("GET", "https://example.com/bucket/f.parquet", 0, nil)
require.NoError(t, err)
_, _, errCode := iam.validateSTSSessionToken(r, "token", "ASIALEGACY")
assert.Equal(t, s3err.ErrNone, errCode)
}
// A key re-created under the same id with a different secret does not revive
// sessions bound to the deleted original: the fingerprint recorded at mint
// time no longer matches.
func TestRecreatedKeyDoesNotReviveVendedSession(t *testing.T) {
s3a := vendingServer(t)
session := vend(t, s3a, "shared-user", sharedKeyA, sharedSecretA)
require.Equal(t, s3err.ErrNone, use(t, s3a, session))
identity := s3a.iam.nameToIdentity["shared-user"]
identity.Credentials[0] = &Credential{AccessKey: sharedKeyA, SecretKey: "recreated-secret"}
assert.Equal(t, s3err.ErrInvalidAccessKeyID, use(t, s3a, session), "same id, different secret")
identity.Credentials[0] = &Credential{AccessKey: sharedKeyA, SecretKey: sharedSecretA}
assert.Equal(t, s3err.ErrNone, use(t, s3a, session), "the identical credential is indistinguishable")
}
// A session for a stored identity stays bound even when the key no longer
// resolves at vend time — revoked between the request's authentication and
// the vend, or held by a different identity now. The session dies on its
// first request instead of living unbound until it expires.
func TestVendedSessionStaysBoundWhenTheKeyIsGoneAtVend(t *testing.T) {
s3a := vendingServer(t)
identity := s3a.iam.nameToIdentity["shared-user"]
identity.Credentials = identity.Credentials[1:] // sharedKeyA revoked mid-request
session := vend(t, s3a, "shared-user", sharedKeyA, sharedSecretA)
assert.Equal(t, sharedKeyA, sessionInfo(t, s3a, session).SourceAccessKeyId, "still bound")
assert.Equal(t, s3err.ErrInvalidAccessKeyID, use(t, s3a, session), "the dead key's session is refused")
}
// Only sessions the catalog vended are bound; any other STS session (web
// identity, AssumeRole) is validated as before.
func TestOtherSessionsAreNotBoundToAKey(t *testing.T) {
iam := newSharedIdentityIAM()
iam.iamIntegration = &MockIAMIntegration{
validateSessionFunc: func(ctx context.Context, token string) (*sts.SessionInfo, error) {
return &sts.SessionInfo{
SessionId: "sid",
AssumedRoleUser: "arn:aws:sts::assumed-role/Reader/session",
Principal: "arn:aws:sts::assumed-role/Reader/session",
IdentityProvider: "oidc-provider",
ExternalUserId: "someone-not-in-the-identity-table",
SourceAccessKeyId: "AKIAGONE",
Credentials: &sts.Credentials{AccessKeyId: "ASIAWEBID", SecretAccessKey: "secret"},
ExpiresAt: time.Now().Add(time.Hour),
}, nil
},
}
r, err := newTestRequest("GET", "https://example.com/bucket/f.parquet", 0, nil)
require.NoError(t, err)
_, _, errCode := iam.validateSTSSessionToken(r, "token", "ASIAWEBID")
assert.Equal(t, s3err.ErrNone, errCode)
}
// The check on the request path is one read-locked map lookup and a scan of
// one identity's keys.
func BenchmarkVendedSessionKeyLive(b *testing.B) {
iam := newSharedIdentityIAM()
for i := 0; i < 1000; i++ {
name := fmt.Sprintf("user-%04d", i)
iam.nameToIdentity[name] = &Identity{Name: name, Credentials: []*Credential{{AccessKey: name}}}
}
b.ReportAllocs()
b.ResetTimer()
for i := 0; i < b.N; i++ {
if iam.vendedSessionKeyLive("shared-user", sharedKeyB, "") != s3err.ErrNone {
b.Fatal("refused")
}
}
}