mirror of
https://github.com/pgsty/minio.git
synced 2026-11-10 01:31:52 +03:00
9f9398a1a3
Batch authorization evaluates the submitter's mapped policies from one IAM cache revision. It took the cache write lock for the whole evaluation and performed the lazy loads it needed under that lock: the mapping of a user whose policies come from a group is never cached, so every authorization of such a submitter (and of an LDAP or STS parent user) read storage twice with the write lock held, and an evicted policy document was read under it too. While a read lasted, every reader of the cache waited: request authentication (GetUser, CheckKey) and PolicyDBGet on the whole node. An expire job authorizes each version several times, so a large job with a group-mapped submitter serialized node authentication behind IAM storage latency, and a mapping load had no deadline at all. batchPolicySnapshot now holds the store's writer mutex and the cache read lock, and releases the read lock around each storage read, as MergePolicies releases the cache lock around a document load. The writer mutex still excludes cache writers, so the mapping and the documents of one evaluation still come from one revision; the read lock is enough because the batch path writes nothing to the cache except lazily loaded mappings, which the request path stores under the read lock as well, and taking the write lock back after each read would have made readers queue behind it. Each read is bounded by the job's context and the same 5s MergePolicies grants a document load. Concurrent reads of the group fallback release the lock once and take it back after the last. policyDBGet and policyDBGetGroups take the loads they need through the iamMappingLoader interface, which *IAMStoreSys satisfies unchanged. Unreadable policies still end the attempt as unavailable, and the error classification is unchanged. TestBatchAuthorizeSlowLoadKeepsCachedAuthorizationAvailable holds the lazy load of a group-mapped user's mapping, and of an evicted document, and requires that GetUser and IsAllowed of a cached user return within a second and that a load ends with the job's context. Before this change both cases timed out on the blocked cache. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Signed-off-by: Feng Ruohang <rh@vonng.com>
160 lines
5.6 KiB
Go
160 lines
5.6 KiB
Go
// Copyright (c) 2026 PGSTY
|
|
// SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/pgsty/silo-pkg/v3/policy"
|
|
"github.com/puzpuzpuz/xsync/v3"
|
|
)
|
|
|
|
// batchBlockedIAMStore holds the lazy load of one user's policy mapping, or
|
|
// of one policy document, until released or until the load's context ends.
|
|
type batchBlockedIAMStore struct {
|
|
IAMStorageAPI
|
|
mapping string // access key whose mapping load blocks
|
|
doc string // policy whose document load blocks
|
|
started chan struct{}
|
|
release chan struct{}
|
|
once sync.Once
|
|
}
|
|
|
|
func (s *batchBlockedIAMStore) block(ctx context.Context) error {
|
|
s.once.Do(func() { close(s.started) })
|
|
select {
|
|
case <-s.release:
|
|
return nil
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
}
|
|
}
|
|
|
|
func (s *batchBlockedIAMStore) loadMappedPolicy(ctx context.Context, name string, userType IAMUserType, isGroup bool, m *xsync.MapOf[string, MappedPolicy]) error {
|
|
if name == s.mapping && !isGroup {
|
|
if err := s.block(ctx); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return s.IAMStorageAPI.loadMappedPolicy(ctx, name, userType, isGroup, m)
|
|
}
|
|
|
|
func (s *batchBlockedIAMStore) loadPolicyDoc(ctx context.Context, name string, out map[string]PolicyDoc) error {
|
|
if name == s.doc {
|
|
if err := s.block(ctx); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return s.IAMStorageAPI.loadPolicyDoc(ctx, name, out)
|
|
}
|
|
|
|
// The batch path and the request path share one IAM cache. A lazy load that
|
|
// batch authorization needs, of a mapping that is never cached (a user whose
|
|
// policies come from a group) or of an evicted policy document, must not
|
|
// hold request authentication and cached authorization while storage is
|
|
// slow, and must end at the deadline of the job's context.
|
|
func TestBatchAuthorizeSlowLoadKeepsCachedAuthorizationAvailable(t *testing.T) {
|
|
for _, tc := range []struct {
|
|
name string
|
|
// submitter returns the submitter whose authorization lazily loads,
|
|
// and arranges for blocked to hold that load.
|
|
submitter func(t *testing.T, f *batchAuthzFixture, blocked *batchBlockedIAMStore) *batchJobSubmitter
|
|
}{
|
|
{"mapping", func(t *testing.T, f *batchAuthzFixture, blocked *batchBlockedIAMStore) *batchJobSubmitter {
|
|
// No mapping of the user itself is stored, so every lookup of
|
|
// its policies reads storage before it falls back to the group.
|
|
cred := iamAdminUser(f.ctx, t, f.sys, "snapshot-group-user", "")
|
|
_, err := f.sys.AddUsersToGroup(f.ctx, "snapshot-group", []string{cred.AccessKey})
|
|
mustIAM(t, err)
|
|
_, err = f.sys.PolicyDBSet(f.ctx, "snapshot-group", "snapshot-full", regUser, true)
|
|
mustIAM(t, err)
|
|
blocked.mapping = cred.AccessKey
|
|
sub, err := newBatchJobSubmitter(cred)
|
|
mustIAM(t, err)
|
|
return sub
|
|
}},
|
|
{"document", func(t *testing.T, f *batchAuthzFixture, blocked *batchBlockedIAMStore) *batchJobSubmitter {
|
|
batchAuthzPolicy(f.ctx, t, f.sys, "snapshot-evicted", batchAuthzFullAccess)
|
|
cred := iamAdminUser(f.ctx, t, f.sys, "snapshot-doc-user", "snapshot-evicted")
|
|
cache := f.sys.store.lock()
|
|
delete(cache.iamPolicyDocsMap, "snapshot-evicted")
|
|
f.sys.store.unlock()
|
|
blocked.doc = "snapshot-evicted"
|
|
sub, err := newBatchJobSubmitter(cred)
|
|
mustIAM(t, err)
|
|
return sub
|
|
}},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
f := newBatchAuthzFixture(t)
|
|
batchAuthzPolicy(f.ctx, t, f.sys, "snapshot-full", batchAuthzFullAccess)
|
|
cached := iamAdminUser(f.ctx, t, f.sys, "snapshot-cached-user", "snapshot-full")
|
|
store := f.sys.store
|
|
original := store.IAMStorageAPI
|
|
blocked := &batchBlockedIAMStore{IAMStorageAPI: original, started: make(chan struct{}), release: make(chan struct{})}
|
|
sub := tc.submitter(t, f, blocked)
|
|
req := batchAuthzRequest{action: policy.GetObjectAction, bucket: f.bucket, object: "key", versionID: mustGetUUID()}
|
|
if err := sub.authorize(f.ctx, req); err != nil {
|
|
t.Fatalf("control: %v", err)
|
|
}
|
|
store.IAMStorageAPI = blocked
|
|
var wg sync.WaitGroup
|
|
var once sync.Once
|
|
unblock := func() { once.Do(func() { close(blocked.release) }) }
|
|
t.Cleanup(func() { unblock(); wg.Wait(); store.IAMStorageAPI = original })
|
|
|
|
slowDone := make(chan error, 1)
|
|
wg.Go(func() { slowDone <- sub.authorize(f.ctx, req) })
|
|
select {
|
|
case <-blocked.started:
|
|
case <-time.After(5 * time.Second):
|
|
t.Fatal("the lazy load did not start")
|
|
}
|
|
cachedDone := make(chan bool, 2)
|
|
wg.Go(func() {
|
|
_, ok := f.sys.GetUser(f.ctx, cached.AccessKey)
|
|
cachedDone <- ok
|
|
})
|
|
wg.Go(func() {
|
|
cachedDone <- f.sys.IsAllowed(policy.Args{AccountName: cached.AccessKey, Action: policy.GetObjectAction, BucketName: f.bucket, ObjectName: "key"})
|
|
})
|
|
for range 2 {
|
|
select {
|
|
case ok := <-cachedDone:
|
|
if !ok {
|
|
t.Fatal("cached authentication or authorization was rejected")
|
|
}
|
|
case <-time.After(time.Second):
|
|
t.Fatal("a slow IAM load during batch authorization blocked cached authentication")
|
|
}
|
|
}
|
|
unblock()
|
|
if err := <-slowDone; err != nil {
|
|
t.Fatalf("authorization after the load completed: %v", err)
|
|
}
|
|
|
|
// A load that does not return ends with the job's context, as an
|
|
// unavailable dependency, not with the storage layer's patience.
|
|
blocked.release = make(chan struct{})
|
|
once = sync.Once{}
|
|
unblock = func() { once.Do(func() { close(blocked.release) }) }
|
|
ctx, cancel := context.WithTimeout(f.ctx, 200*time.Millisecond)
|
|
defer cancel()
|
|
deadlineDone := make(chan error, 1)
|
|
wg.Go(func() { deadlineDone <- sub.authorize(ctx, req) })
|
|
select {
|
|
case err := <-deadlineDone:
|
|
if !isBatchJobUnavailable(err) {
|
|
t.Fatalf("a load that ended with the job's context: %v", err)
|
|
}
|
|
case <-time.After(3 * time.Second):
|
|
t.Fatal("a lazy load outlived the job's context")
|
|
}
|
|
})
|
|
}
|
|
}
|