mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-25 03:01:47 +00:00
* iamapi: route managed policies through credential manager (fixes #9518) CreatePolicy via the IAM API wrote straight to the filer /etc/iam/policies.json, ignoring any non-filer credential store. When credential.postgres was configured, policies created via the IAM API landed only in the filer while the Admin UI wrote to postgres, producing a split-brain where ListPolicies/GetPolicy never saw the Admin UI's policies and vice versa. GetPolicies/PutPolicies on IamS3ApiConfigure now load managed policies from credentialManager and persist Create/Update/Delete as a delta against the store. Inline user/group policies still live in the legacy policies.json file (no credential-store API for them yet). Pre-existing managed policies in the legacy file are merged on read so deployments don't lose data, and re-persisted to the store on the next write so the legacy file is drained over time. * credential: route IAM API inline policies through credential manager Extends the #9518 fix to user-inline and group-inline policies so the IAM API never writes the legacy /etc/iam/policies.json bundle directly. The previous patch only routed managed policies; this one finishes the job for the other two policy types. - Add GroupInlinePolicyStore + GroupInlinePoliciesLoader optional interfaces, mirroring the existing user-inline ones, and matching Put/Get/Delete/List/LoadAll wrappers on CredentialManager. - Implement group-inline storage in memory (new map), filer_etc (new field on PoliciesCollection, reusing the legacy file under policyMu), and postgres (new group_inline_policies table with ON DELETE CASCADE off the groups FK). - Wire the new methods through PropagatingCredentialStore so wrapped stores still delegate correctly. - IamS3ApiConfigure.PutPolicies now applies managed + user-inline + group-inline as deltas through the credential manager; the legacy /etc/iam/policies.json file is never written when a credential manager is wired up. GetPolicies still reads the legacy bundle once as a fallback so unmigrated data is picked up and re-persisted into the store on the next write. * credential: propagate SaveConfiguration writes to running S3 caches Postgres (and any non-filer) credential stores never fired the S3 IAM cache invalidation path on bulk identity / group updates. The PropagatingCredentialStore had explicit Put/Remove handlers for single-entity calls (CreateUser, PutPolicy, etc.) but inherited SaveConfiguration unchanged from the embedded store, so the bulk path the IAM API takes at the end of every handler was silent. Inline-policy changes recompute identity.Actions and persist via SaveConfiguration, so until restart the cached Actions on each S3 server stayed stale and authorization decisions used the pre-change view. Override SaveConfiguration to snapshot the prior user / group lists, delegate the save, then fan out PutIdentity / PutGroup for what's in the new config and RemoveIdentity / RemoveGroup for what got pruned. Reuses the existing SeaweedS3IamCache RPCs, no protobuf changes. * iamapi: drain legacy policies.json after authoritative credential-store writes Review pointed out a resurrection bug: GetPolicies still reads /etc/iam/policies.json as a one-way migration fallback, but PutPolicies in the credential-manager path never wrote that file, so legacy-only entries reappeared on the next read even after the IAM API "deleted" them. PutPolicies now overwrites the bundle with an empty {} after a successful credential-store write, unless the store is filer_etc (which owns the bundle as its own inline-policy backing — clearing it would wipe filer_etc's data). Also wraps the filer read, JSON unmarshal, and marshal errors with context per the other review comments.
284 lines
8.0 KiB
Go
284 lines
8.0 KiB
Go
package memory
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/s3api/policy_engine"
|
|
)
|
|
|
|
// GetPolicies retrieves all IAM policies from memory
|
|
func (store *MemoryStore) GetPolicies(ctx context.Context) (map[string]policy_engine.PolicyDocument, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
// Create a copy of the policies map to avoid mutation issues
|
|
policies := make(map[string]policy_engine.PolicyDocument)
|
|
for name, doc := range store.policies {
|
|
policies[name] = doc
|
|
}
|
|
|
|
return policies, nil
|
|
}
|
|
|
|
// ListPolicyNames returns all stored policy names.
|
|
func (store *MemoryStore) ListPolicyNames(ctx context.Context) ([]string, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
names := make([]string, 0, len(store.policies))
|
|
for name := range store.policies {
|
|
names = append(names, name)
|
|
}
|
|
|
|
return names, nil
|
|
}
|
|
|
|
// GetPolicy retrieves a specific IAM policy by name from memory
|
|
func (store *MemoryStore) GetPolicy(ctx context.Context, name string) (*policy_engine.PolicyDocument, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if policy, exists := store.policies[name]; exists {
|
|
return &policy, nil
|
|
}
|
|
|
|
return nil, nil // Policy not found
|
|
}
|
|
|
|
// CreatePolicy creates a new IAM policy in memory
|
|
func (store *MemoryStore) CreatePolicy(ctx context.Context, name string, document policy_engine.PolicyDocument) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
store.policies[name] = document
|
|
return nil
|
|
}
|
|
|
|
// UpdatePolicy updates an existing IAM policy in memory
|
|
func (store *MemoryStore) UpdatePolicy(ctx context.Context, name string, document policy_engine.PolicyDocument) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
store.policies[name] = document
|
|
return nil
|
|
}
|
|
|
|
// PutPolicy creates or updates an IAM policy in memory
|
|
func (store *MemoryStore) PutPolicy(ctx context.Context, name string, document policy_engine.PolicyDocument) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
store.policies[name] = document
|
|
return nil
|
|
}
|
|
|
|
// DeletePolicy deletes an IAM policy from memory
|
|
func (store *MemoryStore) DeletePolicy(ctx context.Context, name string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
delete(store.policies, name)
|
|
return nil
|
|
}
|
|
|
|
// PutUserInlinePolicy stores a per-user inline policy document.
|
|
func (store *MemoryStore) PutUserInlinePolicy(ctx context.Context, userName, policyName string, document policy_engine.PolicyDocument) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
if store.inlinePolicies[userName] == nil {
|
|
store.inlinePolicies[userName] = make(map[string]policy_engine.PolicyDocument)
|
|
}
|
|
store.inlinePolicies[userName][policyName] = document
|
|
return nil
|
|
}
|
|
|
|
// GetUserInlinePolicy retrieves a per-user inline policy document.
|
|
func (store *MemoryStore) GetUserInlinePolicy(ctx context.Context, userName, policyName string) (*policy_engine.PolicyDocument, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
if userPolicies := store.inlinePolicies[userName]; userPolicies != nil {
|
|
if doc, exists := userPolicies[policyName]; exists {
|
|
return &doc, nil
|
|
}
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// DeleteUserInlinePolicy removes a per-user inline policy document.
|
|
func (store *MemoryStore) DeleteUserInlinePolicy(ctx context.Context, userName, policyName string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
if userPolicies := store.inlinePolicies[userName]; userPolicies != nil {
|
|
delete(userPolicies, policyName)
|
|
if len(userPolicies) == 0 {
|
|
delete(store.inlinePolicies, userName)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ListUserInlinePolicies returns the names of all inline policies for a user.
|
|
func (store *MemoryStore) ListUserInlinePolicies(ctx context.Context, userName string) ([]string, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
userPolicies := store.inlinePolicies[userName]
|
|
names := make([]string, 0, len(userPolicies))
|
|
for name := range userPolicies {
|
|
names = append(names, name)
|
|
}
|
|
return names, nil
|
|
}
|
|
|
|
// LoadInlinePolicies returns all inline policies keyed by username then policy name.
|
|
func (store *MemoryStore) LoadInlinePolicies(ctx context.Context) (map[string]map[string]policy_engine.PolicyDocument, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
result := make(map[string]map[string]policy_engine.PolicyDocument, len(store.inlinePolicies))
|
|
for userName, userPolicies := range store.inlinePolicies {
|
|
copied := make(map[string]policy_engine.PolicyDocument, len(userPolicies))
|
|
for policyName, doc := range userPolicies {
|
|
copied[policyName] = doc
|
|
}
|
|
result[userName] = copied
|
|
}
|
|
return result, nil
|
|
}
|
|
|
|
// PutGroupInlinePolicy stores a per-group inline policy document.
|
|
func (store *MemoryStore) PutGroupInlinePolicy(ctx context.Context, groupName, policyName string, document policy_engine.PolicyDocument) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
if store.groupInlinePolicies[groupName] == nil {
|
|
store.groupInlinePolicies[groupName] = make(map[string]policy_engine.PolicyDocument)
|
|
}
|
|
store.groupInlinePolicies[groupName][policyName] = document
|
|
return nil
|
|
}
|
|
|
|
// GetGroupInlinePolicy retrieves a per-group inline policy document.
|
|
func (store *MemoryStore) GetGroupInlinePolicy(ctx context.Context, groupName, policyName string) (*policy_engine.PolicyDocument, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
if groupPolicies := store.groupInlinePolicies[groupName]; groupPolicies != nil {
|
|
if doc, exists := groupPolicies[policyName]; exists {
|
|
return &doc, nil
|
|
}
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// DeleteGroupInlinePolicy removes a per-group inline policy document.
|
|
func (store *MemoryStore) DeleteGroupInlinePolicy(ctx context.Context, groupName, policyName string) error {
|
|
store.mu.Lock()
|
|
defer store.mu.Unlock()
|
|
|
|
if !store.initialized {
|
|
return fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
if groupPolicies := store.groupInlinePolicies[groupName]; groupPolicies != nil {
|
|
delete(groupPolicies, policyName)
|
|
if len(groupPolicies) == 0 {
|
|
delete(store.groupInlinePolicies, groupName)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ListGroupInlinePolicies returns the names of all inline policies for a group.
|
|
func (store *MemoryStore) ListGroupInlinePolicies(ctx context.Context, groupName string) ([]string, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
groupPolicies := store.groupInlinePolicies[groupName]
|
|
names := make([]string, 0, len(groupPolicies))
|
|
for name := range groupPolicies {
|
|
names = append(names, name)
|
|
}
|
|
return names, nil
|
|
}
|
|
|
|
// LoadGroupInlinePolicies returns all group inline policies keyed by group name then policy name.
|
|
func (store *MemoryStore) LoadGroupInlinePolicies(ctx context.Context) (map[string]map[string]policy_engine.PolicyDocument, error) {
|
|
store.mu.RLock()
|
|
defer store.mu.RUnlock()
|
|
|
|
if !store.initialized {
|
|
return nil, fmt.Errorf("store not initialized")
|
|
}
|
|
|
|
result := make(map[string]map[string]policy_engine.PolicyDocument, len(store.groupInlinePolicies))
|
|
for groupName, groupPolicies := range store.groupInlinePolicies {
|
|
copied := make(map[string]policy_engine.PolicyDocument, len(groupPolicies))
|
|
for policyName, doc := range groupPolicies {
|
|
copied[policyName] = doc
|
|
}
|
|
result[groupName] = copied
|
|
}
|
|
return result, nil
|
|
}
|