mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-06 16:17:01 +00:00
Chris LuandGitHub
d50889002b
* shell: add s3.iam.*, s3.config.show, s3.user.provision; hide legacy commands Add import/export, configuration summary, and a convenience provisioning command: - s3.iam.export: dump full IAM state as JSON (stdout or file) - s3.iam.import: replace IAM state from a JSON file - s3.config.show: human-readable summary (users, policies, service accounts, groups with status and counts) - s3.user.provision: one-step user+policy+credentials creation for common readonly/readwrite/admin roles Hide legacy commands from help listing: - s3.configure: still works but hidden from help output - s3.bucket.access: still works but hidden from help output Both hidden commands remain fully functional for existing scripts. Also adds a Hidden command tag and filters it from printGenericHelp. * shell: address review feedback for s3.iam.*, s3.config.show, s3.user.provision - Simplify joinMax using strings.Join - Fix rolePolicies: remove s3:ListBucket from object-level actions (already covered by bucket-level statement) - Fix admin role: grant s3:* on bucket resource too - Return flag parse errors instead of swallowing them * shell: address missed review feedback for PR 3 - s3.iam.import: require -force flag for destructive IAM overwrite - s3.config.show: add nil guard for resp.Configuration - s3.user.provision: check if user exists before creating policy - s3.user.provision: reject wildcard bucket names (* ?) * shell: distinguish NotFound from transient errors in provision, use %w wrapping - s3.user.provision: check gRPC status code on GetUser error — only proceed on NotFound, abort on transient/network errors - s3.iam.import: use %w for error wrapping to preserve error chains, wrap PutConfiguration error with context * shell: remove duplicate joinMax after PR 8954 merge command_s3_helpers.go defined joinMax which is already in command_s3_user_list.go from the merged PR 8954. * shell: restrict export file permissions, rollback policy on user create failure - s3.iam.export: use os.OpenFile with mode 0600 instead of os.Create to protect exported credentials from other users - s3.user.provision: rollback the created policy if CreateUser fails, with a warning if the rollback itself fails
89 lines
2.4 KiB
Go
89 lines
2.4 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
"google.golang.org/grpc"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandS3IAMImport{})
|
|
}
|
|
|
|
type commandS3IAMImport struct {
|
|
}
|
|
|
|
func (c *commandS3IAMImport) Name() string {
|
|
return "s3.iam.import"
|
|
}
|
|
|
|
func (c *commandS3IAMImport) Help() string {
|
|
return `import S3 IAM configuration from a JSON file
|
|
|
|
s3.iam.import -file backup.json -force
|
|
|
|
Replaces the entire IAM configuration (users, credentials, policies,
|
|
service accounts, groups) with the contents of the file.
|
|
|
|
Requires -force to confirm, since this overwrites the current configuration.
|
|
`
|
|
}
|
|
|
|
func (c *commandS3IAMImport) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandS3IAMImport) Do(args []string, commandEnv *CommandEnv, writer io.Writer) error {
|
|
f := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
file := f.String("file", "", "input JSON file")
|
|
force := f.Bool("force", false, "confirm overwrite of the entire IAM configuration")
|
|
if err := f.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
if *file == "" {
|
|
return fmt.Errorf("-file is required")
|
|
}
|
|
if !*force {
|
|
return fmt.Errorf("this overwrites the entire IAM configuration; use -force to confirm")
|
|
}
|
|
|
|
data, err := os.ReadFile(*file)
|
|
if err != nil {
|
|
return fmt.Errorf("read file: %w", err)
|
|
}
|
|
|
|
config := &iam_pb.S3ApiConfiguration{}
|
|
if err := filer.ParseS3ConfigurationFromBytes(data, config); err != nil {
|
|
return fmt.Errorf("parse configuration: %w", err)
|
|
}
|
|
|
|
err = pb.WithGrpcClient(false, 0, func(conn *grpc.ClientConn) error {
|
|
client := iam_pb.NewSeaweedIdentityAccessManagementClient(conn)
|
|
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
|
|
defer cancel()
|
|
_, err := client.PutConfiguration(ctx, &iam_pb.PutConfigurationRequest{
|
|
Configuration: config,
|
|
})
|
|
return err
|
|
}, commandEnv.option.FilerAddress.ToGrpcAddress(), false, commandEnv.option.GrpcDialOption)
|
|
if err != nil {
|
|
return fmt.Errorf("put IAM configuration: %w", err)
|
|
}
|
|
|
|
fmt.Fprintf(writer, "Imported IAM configuration from %s\n", *file)
|
|
fmt.Fprintf(writer, " Users: %d\n", len(config.Identities))
|
|
fmt.Fprintf(writer, " Policies: %d\n", len(config.Policies))
|
|
fmt.Fprintf(writer, " Service Accounts: %d\n", len(config.ServiceAccounts))
|
|
fmt.Fprintf(writer, " Groups: %d\n", len(config.Groups))
|
|
return nil
|
|
}
|