mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-13 21:31:32 +00:00
294f7c3d04
* shell: expand `~` in local file path arguments The weed shell parses commands itself instead of going through an OS shell, so a path like `~/Downloads/foo.meta` was passed verbatim to `os.Open`, which fails because no `~` directory exists. Users had to spell out absolute home paths in every command. Add an `expandHomeDir` helper that resolves a leading `~` or `~/...` to the user's home directory, and run user-supplied local file paths in the affected shell commands through it: fs.meta.load (positional file) fs.meta.save (-o) fs.meta.changeVolumeId (-mapping) s3.iam.export (-file) s3.iam.import (-file) s3.policy (-file) s3tables.bucket (-file) s3tables.table (-file, -metadata) volume.fsck (-tempPath) Filer-namespace path flags (`-dir`, `-path`, `-locationPrefix`, etc.) are unaffected; they live in the filer, not on the local FS. * shell: reuse util.ResolvePath instead of a new helper util.ResolvePath already does tilde expansion; drop the local expandHomeDir helper and route every shell call site through it.
90 lines
2.5 KiB
Go
90 lines
2.5 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"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
"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 -apply
|
|
|
|
Replaces the entire IAM configuration (users, credentials, policies,
|
|
service accounts, groups) with the contents of the file.
|
|
|
|
Requires -apply 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")
|
|
apply := f.Bool("apply", 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 !*apply {
|
|
return fmt.Errorf("this overwrites the entire IAM configuration; use -apply to confirm")
|
|
}
|
|
|
|
data, err := os.ReadFile(util.ResolvePath(*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
|
|
}
|