mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-07-30 03:53:18 +00:00
* fix(s3): preserve exact policy document in embedded IAM PutUserPolicy/GetUserPolicy (#9008) The embedded IAM implementation (used when IAM requests go through the S3 gateway) discarded the original policy document on PutUserPolicy, storing only the lossy ident.Actions representation. GetUserPolicy then reconstructed the document from these coarse-grained actions, producing wildcard-expanded actions (s3:GetObject → s3:Get*), duplicates, and collapsed resources (array → single string). PR #9009 fixed this in the standalone IAM server (weed/iamapi/) but the embedded IAM (weed/s3api/) — which is the code path most users hit — had the same bugs. Changes: - Add InlinePolicyStore optional interface to credential store, with implementations for FilerEtcStore (uses existing PoliciesCollection), MemoryStore, and PropagatingCredentialStore. - Embedded IAM PutUserPolicy now persists the original policy document via CredentialManager.PutUserInlinePolicy for lossless round-trips. - Embedded IAM GetUserPolicy first tries the stored inline policy; only falls back to lossy reconstruction from ident.Actions when no stored document exists (e.g. policies created before this fix). - Fix the fallback reconstruction: add action deduplication and preserve resource paths verbatim (no more spurious /* appending). - Update DeleteUserPolicy/ListUserPolicies to use stored inline policies. * fix(s3): address PR review feedback for embedded IAM inline policies - Validate PolicyName is non-empty in PutUserPolicy and DeleteUserPolicy - Add recomputeActions() to aggregate ident.Actions from ALL stored inline policies on put/delete, fixing the issue where a second PutUserPolicy would overwrite the first policy's enforcement - Log errors from GetUserInlinePolicy in the GetUserPolicy fallback instead of silently ignoring them - Add initialization guards to MemoryStore GetUserInlinePolicy and ListUserInlinePolicies for consistency with other read methods * fix(s3): make inline policy persistence fatal and propagate recompute errors Address second round of review feedback: - recomputeActions() now returns ([]string, error) so callers can distinguish store failures from "no stored policies" and abort the mutation on transient errors instead of silently falling back. - PutUserInlinePolicy and DeleteUserInlinePolicy failures are now fatal: the API call returns ServiceFailure instead of logging and continuing, keeping ident.Actions and stored policy state in sync. * chore: gofmt weed/s3api/iceberg/handlers_oauth.go Pre-existing formatting issue from #9017; fixes S3 Tables Format Check CI.
109 lines
3.5 KiB
Go
109 lines
3.5 KiB
Go
package memory
|
|
|
|
import (
|
|
"context"
|
|
"sync"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/credential"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/policy_engine"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
func init() {
|
|
credential.Stores = append(credential.Stores, &MemoryStore{})
|
|
}
|
|
|
|
// MemoryStore implements CredentialStore using in-memory storage
|
|
// This is primarily intended for testing purposes
|
|
type MemoryStore struct {
|
|
mu sync.RWMutex
|
|
users map[string]*iam_pb.Identity // username -> identity
|
|
accessKeys map[string]string // access_key -> username
|
|
serviceAccounts map[string]*iam_pb.ServiceAccount // id -> service_account
|
|
serviceAccountAccessKeys map[string]string // access_key -> id
|
|
policies map[string]policy_engine.PolicyDocument // policy_name -> policy_document
|
|
inlinePolicies map[string]map[string]policy_engine.PolicyDocument // username -> policy_name -> document
|
|
groups map[string]*iam_pb.Group // group_name -> group
|
|
initialized bool
|
|
}
|
|
|
|
func (store *MemoryStore) GetName() credential.CredentialStoreTypeName {
|
|
return credential.StoreTypeMemory
|
|
}
|
|
|
|
func (store *MemoryStore) Initialize(configuration util.Configuration, prefix string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if store.initialized {
|
|
return nil
|
|
}
|
|
|
|
store.users = make(map[string]*iam_pb.Identity)
|
|
store.accessKeys = make(map[string]string)
|
|
store.serviceAccounts = make(map[string]*iam_pb.ServiceAccount)
|
|
store.serviceAccountAccessKeys = make(map[string]string)
|
|
store.policies = make(map[string]policy_engine.PolicyDocument)
|
|
store.inlinePolicies = make(map[string]map[string]policy_engine.PolicyDocument)
|
|
store.groups = make(map[string]*iam_pb.Group)
|
|
store.initialized = true
|
|
|
|
return nil
|
|
}
|
|
|
|
func (store *MemoryStore) Shutdown() {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
store.users = nil
|
|
store.accessKeys = nil
|
|
store.serviceAccounts = nil
|
|
store.serviceAccountAccessKeys = nil
|
|
store.policies = nil
|
|
store.inlinePolicies = nil
|
|
store.groups = nil
|
|
store.initialized = false
|
|
}
|
|
|
|
// Reset clears all data in the store (useful for testing)
|
|
func (store *MemoryStore) Reset() {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if store.initialized {
|
|
store.users = make(map[string]*iam_pb.Identity)
|
|
store.accessKeys = make(map[string]string)
|
|
store.serviceAccounts = make(map[string]*iam_pb.ServiceAccount)
|
|
store.serviceAccountAccessKeys = make(map[string]string)
|
|
store.policies = make(map[string]policy_engine.PolicyDocument)
|
|
store.inlinePolicies = make(map[string]map[string]policy_engine.PolicyDocument)
|
|
store.groups = make(map[string]*iam_pb.Group)
|
|
}
|
|
}
|
|
|
|
// GetUserCount returns the number of users in the store (useful for testing)
|
|
func (store *MemoryStore) GetUserCount() int {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
return len(store.users)
|
|
}
|
|
|
|
// GetAccessKeyCount returns the number of access keys in the store (useful for testing)
|
|
func (store *MemoryStore) GetAccessKeyCount() int {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
return len(store.accessKeys)
|
|
}
|
|
func (store *MemoryStore) GetServiceAccountByAccessKey(ctx context.Context, accessKey string) (*iam_pb.ServiceAccount, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if id, ok := store.serviceAccountAccessKeys[accessKey]; ok {
|
|
return store.serviceAccounts[id], nil
|
|
}
|
|
return nil, credential.ErrAccessKeyNotFound
|
|
}
|