mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-18 04:20:53 +02:00
* feat(iam): STS web-identity AWS-fidelity polish - OIDC discovery via .well-known/openid-configuration; falls back to /.well-known/jwks.json when discovery is absent. Reject discovery docs whose issuer claim does not match the configured issuer to defend against issuer-substitution. - ComputeParentUser derives a stable per-identity hash from (sub, iss). Surface as aws:userid in the request context and as a parent_user claim in the session JWT so per-user state survives token rotation. - Per-role MaxSessionDuration (3600..43200) clamps requested DurationSeconds before the STS service applies its own caps. - Tighten RoleSessionName to the AWS contract: 2..64 chars from [\w+=,.@-]. - Populate PackedPolicySize in AssumeRole / AssumeRoleWithWebIdentity / AssumeRoleWithLDAPIdentity responses as a percentage of the 2048-byte inline session policy budget. * fix(iam): leave omitted DurationSeconds nil so STS default applies capDurationByRole was substituting the role's MaxSessionDuration when the caller omitted DurationSeconds entirely. AWS returns the configured default (typically 1 hour) in that case, not the role's upper bound — a 12h MaxSessionDuration shouldn't silently make every no-duration assume-role mint a 12h session. Return nil when requested is nil; let the downstream calculateSessionDuration in the STS service apply its TokenDuration default. The role-max upper bound still clamps when the request arrives with a concrete value above the cap. Addresses gemini high-priority review on PR #9318. * fix(iam): synchronize OIDCProvider JWKS cache fields jwksCache, jwksFetchedAt, resolvedJWKSUri, and discoveryFailed are mutated lazily on the first token-validate call and refreshed afterwards on TTL expiry. Multiple S3 requests can land here in parallel, so the writes were racing against subsequent reads on every other goroutine. resolvedJWKSUri/discoveryFailed inherited the same un-protected pattern when discovery shipped. Add sync.RWMutex; getPublicKey takes the read lock for the common cache-hit path and promotes to the write lock for misses + refreshes. fetchJWKSLocked / resolveJWKSUriLocked assume the write lock is held by the caller; fetchJWKS keeps the test-friendly entry point that acquires the lock itself. Addresses gemini high-priority review on PR #9318. * fix(iam): trim trailing slash + retry discovery after transient failure Two OIDC discovery edge cases reviewers flagged: 1. Issuer comparison was sensitive to trailing slashes. resolveJWKSUri trims them when building the discovery URL, but the doc.Issuer ↔ p.config.Issuer check did not, so an IDP whose issuer claim drops or adds the slash relative to the configured value would be falsely rejected. Trim a single trailing slash on each side before comparing. 2. discoveryFailed flipped to true on any error and stayed there for the process lifetime. A transient 5xx at startup permanently locked the provider into the /.well-known/jwks.json fallback. Reset the flag at the top of fetchJWKSLocked when no URI has been cached yet, so each JWKS refresh (typically once per TTL = 1h) reattempts discovery. Successful discovery remains cached via resolvedJWKSUri so we don't pay the discovery RTT on every refresh. Addresses gemini security-medium + medium reviews on PR #9318. * fix(iam): require non-empty issuer in OIDC discovery doc The previous "doc.Issuer != "" && ..." guard let a discovery document that omitted the issuer field bypass the issuer-mismatch check entirely, letting the doc steer fetchJWKS at any URL it provided. OIDC Discovery 1.0 §3 mandates the issuer field; treat missing as a hard failure same as mismatched. Trailing-slash equivalence still applies. Adds TestDiscoveryRejectsMissingIssuer alongside the existing TestDiscoveryRejectsIssuerMismatch via a new omitDiscoveryIssuer toggle on fakeIDP. * feat(iam): OIDC provider store + read-only IAM API Add OIDCProviderRecord — the persisted, IAM-managed view of an OIDC identity provider — and an OIDCProviderStore interface with memory and filer implementations mirroring the existing role-store pattern. The store is hydrated at boot from the static STS.Providers list so the new IAM API surfaces the same set the STS service already validates against. Two read-only actions land now: - ListOpenIDConnectProviders -> ARN-only list, AWS-shape XML. - GetOpenIDConnectProvider -> URL, ClientIDList, ThumbprintList, Tags, CreateDate. Mutations (Create/Delete/Add-Remove ClientID/Update Thumbprint), multiple client_ids per provider, and TLS thumbprint pinning come in Phase 2b. * fix(iam): preserve CreatedAt across boots + paginate ListProviders Two medium-priority issues gemini flagged on the read-only IAM API: 1. The static-config bootstrap was setting CreatedAt = time.Now() on every server start, so the IAM GetOpenIDConnectProvider response's CreateDate shifted on each restart even when backed by a persistent store. Look up the existing record via GetProviderByARN first and preserve its CreatedAt; only the UpdatedAt advances. 2. FilerOIDCProviderStore.ListProviders had a hardcoded Limit: 1000 that silently truncated above that. Stream-paginate via StartFromFileName, returning io.EOF naturally and surfacing all other errors instead of swallowing them. Addresses two gemini medium reviews on PR #9319.
200 lines
5.5 KiB
Go
200 lines
5.5 KiB
Go
package integration
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func newRecord(arn, url string) *OIDCProviderRecord {
|
|
now := time.Now()
|
|
return &OIDCProviderRecord{
|
|
ARN: arn,
|
|
URL: url,
|
|
ClientIDs: []string{"sts.amazonaws.com"},
|
|
CreatedAt: now,
|
|
UpdatedAt: now,
|
|
}
|
|
}
|
|
|
|
func TestMemoryStoreCRUD(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := NewMemoryOIDCProviderStore()
|
|
|
|
rec := newRecord(
|
|
"arn:aws:iam::123:oidc-provider/token.actions.githubusercontent.com",
|
|
"https://token.actions.githubusercontent.com",
|
|
)
|
|
|
|
// Store + Get round-trip preserves the record.
|
|
if err := store.StoreProvider(ctx, "", rec); err != nil {
|
|
t.Fatalf("StoreProvider: %v", err)
|
|
}
|
|
got, err := store.GetProviderByARN(ctx, "", rec.ARN)
|
|
if err != nil {
|
|
t.Fatalf("GetProviderByARN: %v", err)
|
|
}
|
|
if got.URL != rec.URL {
|
|
t.Fatalf("URL mismatch: got=%s want=%s", got.URL, rec.URL)
|
|
}
|
|
|
|
// Mutate the returned copy and verify the store wasn't affected.
|
|
got.ClientIDs[0] = "tampered"
|
|
again, _ := store.GetProviderByARN(ctx, "", rec.ARN)
|
|
if again.ClientIDs[0] == "tampered" {
|
|
t.Fatal("store handed out a shared slice; mutations leaked back")
|
|
}
|
|
|
|
// List returns the entry.
|
|
all, err := store.ListProviders(ctx, "")
|
|
if err != nil {
|
|
t.Fatalf("ListProviders: %v", err)
|
|
}
|
|
if len(all) != 1 || all[0].ARN != rec.ARN {
|
|
t.Fatalf("ListProviders unexpected result: %+v", all)
|
|
}
|
|
|
|
// Delete -> Get returns not found.
|
|
if err := store.DeleteProvider(ctx, "", rec.ARN); err != nil {
|
|
t.Fatalf("DeleteProvider: %v", err)
|
|
}
|
|
if _, err := store.GetProviderByARN(ctx, "", rec.ARN); err == nil {
|
|
t.Fatal("expected not-found after delete")
|
|
}
|
|
// Delete is idempotent.
|
|
if err := store.DeleteProvider(ctx, "", rec.ARN); err != nil {
|
|
t.Fatalf("idempotent delete should succeed: %v", err)
|
|
}
|
|
}
|
|
|
|
func TestMemoryStoreGetByIssuerNormalizesHost(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := NewMemoryOIDCProviderStore()
|
|
|
|
rec := newRecord(
|
|
"arn:aws:iam::123:oidc-provider/token.actions.githubusercontent.com",
|
|
"https://Token.Actions.GithubUserContent.com/", // mixed case + trailing slash
|
|
)
|
|
if err := store.StoreProvider(ctx, "", rec); err != nil {
|
|
t.Fatalf("StoreProvider: %v", err)
|
|
}
|
|
|
|
cases := []string{
|
|
"https://token.actions.githubusercontent.com",
|
|
"https://token.actions.githubusercontent.com/",
|
|
"https://TOKEN.actions.GITHUBUSERCONTENT.com",
|
|
}
|
|
for _, want := range cases {
|
|
got, err := store.GetProviderByIssuer(ctx, "", want)
|
|
if err != nil {
|
|
t.Errorf("issuer %q: GetProviderByIssuer: %v", want, err)
|
|
continue
|
|
}
|
|
if got.ARN != rec.ARN {
|
|
t.Errorf("issuer %q: ARN mismatch: got=%s", want, got.ARN)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestMemoryStoreGetByIssuerMissing(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := NewMemoryOIDCProviderStore()
|
|
_, err := store.GetProviderByIssuer(ctx, "", "https://other.example/")
|
|
if err == nil {
|
|
t.Fatal("expected error for unregistered issuer")
|
|
}
|
|
}
|
|
|
|
func TestDeriveOIDCProviderARN(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
accountID string
|
|
issuer string
|
|
want string
|
|
}{
|
|
{
|
|
name: "google",
|
|
accountID: "111122223333",
|
|
issuer: "https://accounts.google.com",
|
|
want: "arn:aws:iam::111122223333:oidc-provider/accounts.google.com",
|
|
},
|
|
{
|
|
name: "EKS with path",
|
|
accountID: "999999999999",
|
|
issuer: "https://oidc.eks.us-west-2.amazonaws.com/id/EXAMPLED",
|
|
want: "arn:aws:iam::999999999999:oidc-provider/oidc.eks.us-west-2.amazonaws.com/id/EXAMPLED",
|
|
},
|
|
{
|
|
name: "uppercase host normalized",
|
|
accountID: "111122223333",
|
|
issuer: "https://Accounts.Google.com",
|
|
want: "arn:aws:iam::111122223333:oidc-provider/accounts.google.com",
|
|
},
|
|
{
|
|
name: "trailing slash trimmed",
|
|
accountID: "111122223333",
|
|
issuer: "https://accounts.google.com/",
|
|
want: "arn:aws:iam::111122223333:oidc-provider/accounts.google.com",
|
|
},
|
|
{
|
|
name: "empty account allowed",
|
|
accountID: "",
|
|
issuer: "https://accounts.google.com",
|
|
want: "arn:aws:iam:::oidc-provider/accounts.google.com",
|
|
},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
got, err := DeriveOIDCProviderARN(tc.accountID, tc.issuer)
|
|
if err != nil {
|
|
t.Fatalf("err: %v", err)
|
|
}
|
|
if got != tc.want {
|
|
t.Fatalf("got=%s want=%s", got, tc.want)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestDeriveOIDCProviderARNRejectsBadInput(t *testing.T) {
|
|
cases := []string{"", "not a url", "http://"}
|
|
for _, in := range cases {
|
|
if _, err := DeriveOIDCProviderARN("123", in); err == nil {
|
|
t.Errorf("expected error for input %q", in)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestStoreRejectsEmptyARN(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := NewMemoryOIDCProviderStore()
|
|
rec := newRecord("", "https://issuer/")
|
|
if err := store.StoreProvider(ctx, "", rec); err == nil {
|
|
t.Fatal("expected error storing record with empty ARN")
|
|
}
|
|
}
|
|
|
|
func TestStoreRejectsNil(t *testing.T) {
|
|
ctx := context.Background()
|
|
store := NewMemoryOIDCProviderStore()
|
|
if err := store.StoreProvider(ctx, "", nil); err == nil {
|
|
t.Fatal("expected error storing nil record")
|
|
}
|
|
}
|
|
|
|
func TestNormalizeIssuerRejectsEmpty(t *testing.T) {
|
|
if got := normalizeIssuer(""); got != "" {
|
|
t.Fatalf("empty issuer should normalize to empty, got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestNormalizeIssuerHandlesNonURL(t *testing.T) {
|
|
// Defense in depth: even when issuer is junk, normalize doesn't panic and
|
|
// at least lowercases the input.
|
|
got := normalizeIssuer("Some Random String/")
|
|
if !strings.Contains(got, "some random") {
|
|
t.Fatalf("normalize should lowercase non-URL input, got %q", got)
|
|
}
|
|
}
|