mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-17 19:48:35 +02:00
* feat(s3/lifecycle): filer-backed cursor Persister FilerPersister persists per-shard cursor maps as JSON to /etc/s3/lifecycle/cursors/shard-NN.json via filer.SaveInsideFiler. One file per shard keeps Save atomic — the filer writes the entry in a single mutation, so a crash mid-write doesn't leak partial state. Pipeline.Run loads on start; the periodic checkpoint and graceful-shutdown save go through this implementation. A small FilerStore interface wraps the SeaweedFilerClient surface the persister needs, so tests inject an in-memory fake instead of mocking the full gRPC client. * refactor(s3/lifecycle): drop BlockerStore — durable cursor IS the block A frozen cursor doesn't advance, so the durable cursor (FilerPersister) encodes the blocked state on its own. On worker restart the reader re-encounters the poison event at MinTsNs, the dispatcher walks the same retry budget to BLOCKED, and the cursor freezes at the same EventTs. Other in-flight events between freeze tsNs and prior cursor positions self-resolve via NOOP_RESOLVED (STALE_IDENTITY) since the underlying objects were already deleted on the prior pass. Removed: - BlockerStore interface + InMemoryBlockerStore + BlockerRecord - Dispatcher.Blockers + Dispatcher.ReplayBlockers - the BlockerStore.Put call in handleBlocked - Pipeline.Blockers field + the ReplayBlockers call on startup Added a TestDispatchRestartReFreezesNaturally that pins the self-recovery property: a fresh Dispatcher with a fresh Cursor, fed the same poison event, reaches the same frozen state at the same EventTs without any durable blocker store. Operator visibility: a cursor whose MinTsNs hasn't advanced is the signal — surfaced via the durable cursor file. * refactor(filer): SaveInsideFiler accepts ctx ReadInsideFiler already takes ctx; SaveInsideFiler used context.Background() internally and silently dropped the caller's ctx. Symmetric API now; cancellation/deadlines propagate through LookupEntry / CreateEntry / UpdateEntry. Mechanical update of all callers — most pass context.Background() since the existing call sites have no ctx in scope. * fix(s3/lifecycle): deterministic order in cursor save Iterating Go maps yields random order, so json.Encode produced a different byte sequence on each save even when the state hadn't changed. Sort entries by (Bucket, ActionKind, RuleHash) before encoding so the on-disk file diffs cleanly. New test pins byte-identical output across two saves of the same map. * fix(s3/lifecycle): log reason when freezing cursor in handleBlocked handleBlocked dropped the reason via _ = reason with a comment claiming the caller logged it; none of the three callers do. A frozen cursor is the only surface where the operator finds out something stuck, so the reason has to land somewhere. glog.Warningf with shard, key, eventTs, and the original reason — same shape the rest of the package uses.
582 lines
16 KiB
Go
582 lines
16 KiB
Go
package filer_etc
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/credential"
|
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
)
|
|
|
|
const (
|
|
IamIdentitiesDirectory = "identities"
|
|
IamServiceAccountsDirectory = "service_accounts"
|
|
IamLegacyIdentityFile = "identity.json"
|
|
IamLegacyIdentityOldFile = "identity.json.old"
|
|
)
|
|
|
|
func (store *FilerEtcStore) LoadConfiguration(ctx context.Context) (*iam_pb.S3ApiConfiguration, error) {
|
|
s3cfg := &iam_pb.S3ApiConfiguration{}
|
|
|
|
// 1. Load from legacy single file (low priority)
|
|
content, foundLegacy, err := store.readInsideFiler(ctx, filer.IamConfigDirectory, IamLegacyIdentityFile)
|
|
if err != nil {
|
|
return s3cfg, err
|
|
}
|
|
if foundLegacy && len(content) > 0 {
|
|
if err := filer.ParseS3ConfigurationFromBytes(content, s3cfg); err != nil {
|
|
glog.Errorf("Failed to parse legacy IAM configuration: %v", err)
|
|
return s3cfg, err
|
|
}
|
|
}
|
|
|
|
// 2. Load from multi-file structure (high priority, overrides legacy details)
|
|
if _, err := store.loadFromMultiFile(ctx, s3cfg); err != nil {
|
|
return s3cfg, err
|
|
}
|
|
|
|
// 3. Load service accounts
|
|
if err := store.loadServiceAccountsFromMultiFile(ctx, s3cfg); err != nil {
|
|
return s3cfg, fmt.Errorf("failed to load service accounts: %w", err)
|
|
}
|
|
|
|
// 3b. Load groups
|
|
if err := store.loadGroupsFromMultiFile(ctx, s3cfg); err != nil {
|
|
return s3cfg, fmt.Errorf("failed to load groups: %w", err)
|
|
}
|
|
|
|
// 4. Perform migration if we loaded legacy config
|
|
// This ensures that all identities (including legacy ones) are written to individual files
|
|
// and the legacy file is renamed.
|
|
if foundLegacy {
|
|
if err := store.migrateToMultiFile(ctx, s3cfg); err != nil {
|
|
glog.Errorf("Failed to migrate IAM configuration to multi-file layout: %v", err)
|
|
return s3cfg, nil
|
|
}
|
|
}
|
|
|
|
return s3cfg, nil
|
|
}
|
|
|
|
func (store *FilerEtcStore) loadFromMultiFile(ctx context.Context, s3cfg *iam_pb.S3ApiConfiguration) (bool, error) {
|
|
var hasIdentities bool
|
|
|
|
// Helper to find existing identity index
|
|
findIdentity := func(name string) int {
|
|
for i, identity := range s3cfg.Identities {
|
|
if identity.Name == name {
|
|
return i
|
|
}
|
|
}
|
|
return -1
|
|
}
|
|
|
|
// 1. List identities
|
|
err := store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
dir := filer.IamConfigDirectory + "/" + IamIdentitiesDirectory
|
|
entries, err := listEntries(ctx, client, dir)
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
// If directory doesn't exist, it's not multi-file yet
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
for _, entry := range entries {
|
|
if entry.IsDirectory {
|
|
continue
|
|
}
|
|
hasIdentities = true
|
|
|
|
var content []byte
|
|
if len(entry.Content) > 0 {
|
|
content = entry.Content
|
|
} else {
|
|
c, err := filer.ReadInsideFiler(ctx, client, dir, entry.Name)
|
|
if err != nil {
|
|
glog.Warningf("Failed to read identity file %s: %v", entry.Name, err)
|
|
continue
|
|
}
|
|
content = c
|
|
}
|
|
|
|
if len(content) > 0 {
|
|
identity := &iam_pb.Identity{}
|
|
if err := json.Unmarshal(content, identity); err != nil {
|
|
glog.Warningf("Failed to unmarshal identity %s: %v", entry.Name, err)
|
|
continue
|
|
}
|
|
|
|
// Merge logic: Overwrite existing or Append
|
|
idx := findIdentity(identity.Name)
|
|
if idx != -1 {
|
|
s3cfg.Identities[idx] = identity
|
|
} else {
|
|
s3cfg.Identities = append(s3cfg.Identities, identity)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
|
|
return hasIdentities, nil
|
|
}
|
|
|
|
func (store *FilerEtcStore) migrateToMultiFile(ctx context.Context, s3cfg *iam_pb.S3ApiConfiguration) error {
|
|
glog.Infof("Migrating IAM configuration to multi-file layout...")
|
|
|
|
// 1. Save all identities
|
|
for _, identity := range s3cfg.Identities {
|
|
if err := store.saveIdentity(ctx, identity); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// 2. Save all service accounts
|
|
for _, sa := range s3cfg.ServiceAccounts {
|
|
if err := store.saveServiceAccount(ctx, sa); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// 3. Save all groups
|
|
for _, g := range s3cfg.Groups {
|
|
if err := store.saveGroup(ctx, g); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// 4. Rename legacy file
|
|
return store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
_, err := client.AtomicRenameEntry(ctx, &filer_pb.AtomicRenameEntryRequest{
|
|
OldDirectory: filer.IamConfigDirectory,
|
|
OldName: IamLegacyIdentityFile,
|
|
NewDirectory: filer.IamConfigDirectory,
|
|
NewName: IamLegacyIdentityOldFile,
|
|
})
|
|
return err
|
|
})
|
|
}
|
|
|
|
func (store *FilerEtcStore) SaveConfiguration(ctx context.Context, config *iam_pb.S3ApiConfiguration) error {
|
|
// 1. Save all identities
|
|
for _, identity := range config.Identities {
|
|
if err := store.saveIdentity(ctx, identity); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// 2. Save all service accounts
|
|
for _, sa := range config.ServiceAccounts {
|
|
if err := store.saveServiceAccount(ctx, sa); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// 2b. Save all groups
|
|
for _, g := range config.Groups {
|
|
if err := store.saveGroup(ctx, g); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// 3. Cleanup removed identities (Full Sync)
|
|
if err := store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
dir := filer.IamConfigDirectory + "/" + IamIdentitiesDirectory
|
|
entries, err := listEntries(ctx, client, dir)
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
validNames := make(map[string]bool)
|
|
for _, id := range config.Identities {
|
|
validNames[id.Name+".json"] = true
|
|
}
|
|
|
|
for _, entry := range entries {
|
|
if !entry.IsDirectory && !validNames[entry.Name] {
|
|
// Delete obsolete identity file
|
|
if _, err := client.DeleteEntry(ctx, &filer_pb.DeleteEntryRequest{
|
|
Directory: dir,
|
|
Name: entry.Name,
|
|
}); err != nil {
|
|
glog.Warningf("Failed to delete obsolete identity file %s: %v", entry.Name, err)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
|
|
// 4. Cleanup removed service accounts (Full Sync)
|
|
if err := store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
dir := filer.IamConfigDirectory + "/" + IamServiceAccountsDirectory
|
|
entries, err := listEntries(ctx, client, dir)
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
validNames := make(map[string]bool)
|
|
for _, sa := range config.ServiceAccounts {
|
|
validNames[sa.Id+".json"] = true
|
|
}
|
|
|
|
for _, entry := range entries {
|
|
if !entry.IsDirectory && !validNames[entry.Name] {
|
|
if _, err := client.DeleteEntry(ctx, &filer_pb.DeleteEntryRequest{
|
|
Directory: dir,
|
|
Name: entry.Name,
|
|
}); err != nil {
|
|
glog.Warningf("Failed to delete obsolete service account file %s: %v", entry.Name, err)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
|
|
// 5. Cleanup removed groups (Full Sync)
|
|
if err := store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
dir := filer.IamConfigDirectory + "/" + IamGroupsDirectory
|
|
entries, err := listEntries(ctx, client, dir)
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
validNames := make(map[string]bool)
|
|
for _, g := range config.Groups {
|
|
validNames[g.Name+".json"] = true
|
|
}
|
|
|
|
for _, entry := range entries {
|
|
if !entry.IsDirectory && !validNames[entry.Name] {
|
|
resp, err := client.DeleteEntry(ctx, &filer_pb.DeleteEntryRequest{
|
|
Directory: dir,
|
|
Name: entry.Name,
|
|
})
|
|
if err != nil {
|
|
glog.Warningf("Failed to delete obsolete group file %s: %v", entry.Name, err)
|
|
} else if resp != nil && resp.Error != "" {
|
|
glog.Warningf("Failed to delete obsolete group file %s: %s", entry.Name, resp.Error)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (store *FilerEtcStore) CreateUser(ctx context.Context, identity *iam_pb.Identity) error {
|
|
// Check if user exists (read specific file)
|
|
existing, err := store.GetUser(ctx, identity.Name)
|
|
if err == nil && existing != nil {
|
|
return credential.ErrUserAlreadyExists
|
|
}
|
|
return store.saveIdentity(ctx, identity)
|
|
}
|
|
|
|
func (store *FilerEtcStore) GetUser(ctx context.Context, username string) (*iam_pb.Identity, error) {
|
|
var identity *iam_pb.Identity
|
|
err := store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
data, err := filer.ReadInsideFiler(ctx, client, filer.IamConfigDirectory+"/"+IamIdentitiesDirectory, username+".json")
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
return err
|
|
}
|
|
if len(data) == 0 {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
identity = &iam_pb.Identity{}
|
|
return json.Unmarshal(data, identity)
|
|
})
|
|
return identity, err
|
|
}
|
|
|
|
func (store *FilerEtcStore) UpdateUser(ctx context.Context, username string, identity *iam_pb.Identity) error {
|
|
// Ensure user exists
|
|
if _, err := store.GetUser(ctx, username); err != nil {
|
|
return err
|
|
}
|
|
// If username changes, we need to delete old and create new. But usually UpdateUser keeps username unless renames are allowed.
|
|
// identity.Name vs username.
|
|
if username != identity.Name {
|
|
// Rename case
|
|
if err := store.DeleteUser(ctx, username); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return store.saveIdentity(ctx, identity)
|
|
}
|
|
|
|
func (store *FilerEtcStore) DeleteUser(ctx context.Context, username string) error {
|
|
// Verify existence first to return ErrUserNotFound if applicable
|
|
if _, err := store.GetUser(ctx, username); err != nil {
|
|
return err
|
|
}
|
|
|
|
return store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
_, err := client.DeleteEntry(ctx, &filer_pb.DeleteEntryRequest{
|
|
Directory: filer.IamConfigDirectory + "/" + IamIdentitiesDirectory,
|
|
Name: username + ".json",
|
|
})
|
|
if err != nil {
|
|
if strings.Contains(err.Error(), filer_pb.ErrNotFound.Error()) {
|
|
return credential.ErrUserNotFound
|
|
}
|
|
return err
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func (store *FilerEtcStore) ListUsers(ctx context.Context) ([]string, error) {
|
|
var usernames []string
|
|
err := store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
entries, err := listEntries(ctx, client, filer.IamConfigDirectory+"/"+IamIdentitiesDirectory)
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
for _, entry := range entries {
|
|
if !entry.IsDirectory && len(entry.Name) > 5 && entry.Name[len(entry.Name)-5:] == ".json" {
|
|
usernames = append(usernames, entry.Name[:len(entry.Name)-5])
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
return usernames, err
|
|
}
|
|
|
|
func (store *FilerEtcStore) GetUserByAccessKey(ctx context.Context, accessKey string) (*iam_pb.Identity, error) {
|
|
// Optimized: Iterate over identity files directly instead of loading full config.
|
|
// This avoids triggering migration side effects.
|
|
|
|
var foundIdentity *iam_pb.Identity
|
|
|
|
err := store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
dir := filer.IamConfigDirectory + "/" + IamIdentitiesDirectory
|
|
entries, err := listEntries(ctx, client, dir)
|
|
if err != nil {
|
|
// If not found, check legacy file? No, optimization requested to avoid side effects.
|
|
// If migration hasn't run, this will return empty/not found.
|
|
if err == filer_pb.ErrNotFound {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
for _, entry := range entries {
|
|
if entry.IsDirectory || !strings.HasSuffix(entry.Name, ".json") {
|
|
continue
|
|
}
|
|
|
|
// Read file content
|
|
var content []byte
|
|
if len(entry.Content) > 0 {
|
|
content = entry.Content
|
|
} else {
|
|
c, err := filer.ReadInsideFiler(ctx, client, dir, entry.Name)
|
|
if err != nil {
|
|
continue
|
|
}
|
|
content = c
|
|
}
|
|
|
|
if len(content) > 0 {
|
|
identity := &iam_pb.Identity{}
|
|
if err := json.Unmarshal(content, identity); err != nil {
|
|
continue
|
|
}
|
|
|
|
for _, cred := range identity.Credentials {
|
|
if cred.AccessKey == accessKey {
|
|
foundIdentity = identity
|
|
return nil // Found match, stop iteration
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if foundIdentity != nil {
|
|
return foundIdentity, nil
|
|
}
|
|
|
|
return nil, credential.ErrAccessKeyNotFound
|
|
}
|
|
|
|
func (store *FilerEtcStore) CreateAccessKey(ctx context.Context, username string, cred *iam_pb.Credential) error {
|
|
identity, err := store.GetUser(ctx, username)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, existing := range identity.Credentials {
|
|
if existing.AccessKey == cred.AccessKey {
|
|
return fmt.Errorf("access key %s already exists", cred.AccessKey)
|
|
}
|
|
}
|
|
|
|
identity.Credentials = append(identity.Credentials, cred)
|
|
return store.saveIdentity(ctx, identity)
|
|
}
|
|
|
|
func (store *FilerEtcStore) DeleteAccessKey(ctx context.Context, username string, accessKey string) error {
|
|
identity, err := store.GetUser(ctx, username)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
found := false
|
|
for i, cred := range identity.Credentials {
|
|
if cred.AccessKey == accessKey {
|
|
identity.Credentials = append(identity.Credentials[:i], identity.Credentials[i+1:]...)
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
|
|
if !found {
|
|
return credential.ErrAccessKeyNotFound
|
|
}
|
|
|
|
return store.saveIdentity(ctx, identity)
|
|
}
|
|
|
|
// Helpers
|
|
|
|
func (store *FilerEtcStore) saveIdentity(ctx context.Context, identity *iam_pb.Identity) error {
|
|
return store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
data, err := json.MarshalIndent(identity, "", " ")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return filer.SaveInsideFiler(context.Background(), client, filer.IamConfigDirectory+"/"+IamIdentitiesDirectory, identity.Name+".json", data)
|
|
})
|
|
}
|
|
|
|
func (store *FilerEtcStore) readInsideFiler(ctx context.Context, dir string, name string) ([]byte, bool, error) {
|
|
var content []byte
|
|
found := false
|
|
err := store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
|
|
c, err := filer.ReadInsideFiler(ctx, client, dir, name)
|
|
if err != nil {
|
|
if err == filer_pb.ErrNotFound {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
content = c
|
|
found = true
|
|
return nil
|
|
})
|
|
return content, found, err
|
|
}
|
|
|
|
func listEntries(ctx context.Context, client filer_pb.SeaweedFilerClient, dir string) ([]*filer_pb.Entry, error) {
|
|
var entries []*filer_pb.Entry
|
|
err := filer_pb.SeaweedList(ctx, client, dir, "", func(entry *filer_pb.Entry, isLast bool) error {
|
|
entries = append(entries, entry)
|
|
return nil
|
|
}, "", false, 100000)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return entries, nil
|
|
}
|
|
|
|
// AttachUserPolicy attaches a managed policy to a user by policy name
|
|
func (store *FilerEtcStore) AttachUserPolicy(ctx context.Context, username string, policyName string) error {
|
|
// Get user
|
|
identity, err := store.GetUser(ctx, username)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Verify policy exists
|
|
policy, err := store.GetPolicy(ctx, policyName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if policy == nil {
|
|
return credential.ErrPolicyNotFound
|
|
}
|
|
|
|
// Check if already attached
|
|
for _, p := range identity.PolicyNames {
|
|
if p == policyName {
|
|
return credential.ErrPolicyAlreadyAttached
|
|
}
|
|
}
|
|
|
|
identity.PolicyNames = append(identity.PolicyNames, policyName)
|
|
return store.saveIdentity(ctx, identity)
|
|
}
|
|
|
|
// DetachUserPolicy detaches a managed policy from a user
|
|
func (store *FilerEtcStore) DetachUserPolicy(ctx context.Context, username string, policyName string) error {
|
|
identity, err := store.GetUser(ctx, username)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
found := false
|
|
var newPolicies []string
|
|
for _, p := range identity.PolicyNames {
|
|
if p == policyName {
|
|
found = true
|
|
} else {
|
|
newPolicies = append(newPolicies, p)
|
|
}
|
|
}
|
|
|
|
if !found {
|
|
return credential.ErrPolicyNotAttached
|
|
}
|
|
|
|
identity.PolicyNames = newPolicies
|
|
return store.saveIdentity(ctx, identity)
|
|
}
|
|
|
|
// ListAttachedUserPolicies returns the list of policy names attached to a user
|
|
func (store *FilerEtcStore) ListAttachedUserPolicies(ctx context.Context, username string) ([]string, error) {
|
|
identity, err := store.GetUser(ctx, username)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return identity.PolicyNames, nil
|
|
}
|