mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-14 05:41:29 +00:00
d123a2768b
* shell: add s3.accesskey.*, s3.anonymous.*, s3.serviceaccount.* commands Add credential, anonymous access, and service account management commands: Access key commands: - s3.accesskey.create: add credentials to an existing user - s3.accesskey.list: list access keys for a user (key ID + status) - s3.accesskey.delete: remove a specific access key - s3.accesskey.rotate: atomic create-new + delete-old key rotation Anonymous access commands: - s3.anonymous.set: set/remove public access on a bucket - s3.anonymous.get: show anonymous access for a bucket - s3.anonymous.list: list all buckets with anonymous access Service account commands: - s3.serviceaccount.create: create with optional action subset and expiry - s3.serviceaccount.list: tabular listing, optionally filtered by parent - s3.serviceaccount.show: detailed view of a service account - s3.serviceaccount.delete: remove a service account These replace the credential and anonymous portions of the monolithic s3.configure and s3.bucket.access commands. * shell: address review feedback for s3.accesskey.*, s3.anonymous.*, s3.serviceaccount.* - Return flag parse errors instead of swallowing them (all commands) - Add action validation in s3.anonymous.set (Read, Write, List, Tagging, Admin) - Fix s3.serviceaccount.create output: note to use list for server-assigned ID since CreateServiceAccountResponse does not return the ID * shell: fix bucket matching and action validation in s3.anonymous.* - Use SplitN instead of HasSuffix for bucket name matching to avoid false positives when one bucket name is a suffix of another - Make action validation case-insensitive with canonical normalization * shell: fix nil panics, dedup actions, validate service account actions - Fix nil-pointer panic in getOrCreateAnonymousUser when GetUser returns err==nil with nil Identity (status.FromError(nil) returns nil status) - Add nil Identity guards in s3.anonymous.get and s3.anonymous.list - Deduplicate action values in s3.anonymous.set (e.g. -access Read,Read) - Add action validation in s3.serviceaccount.create with case normalization * shell: dedup actions and reject negative expiry in s3.serviceaccount.create - Deduplicate -actions values (e.g. Read,read,Read produces one entry) - Reject negative -expiry values instead of silently treating as no expiration
97 lines
2.7 KiB
Go
97 lines
2.7 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/iam"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
"google.golang.org/grpc"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandS3AccessKeyCreate{})
|
|
}
|
|
|
|
type commandS3AccessKeyCreate struct {
|
|
}
|
|
|
|
func (c *commandS3AccessKeyCreate) Name() string {
|
|
return "s3.accesskey.create"
|
|
}
|
|
|
|
func (c *commandS3AccessKeyCreate) Help() string {
|
|
return `create an additional access key for an S3 IAM user
|
|
|
|
s3.accesskey.create -user <username>
|
|
s3.accesskey.create -user <username> -access_key <key> -secret_key <secret>
|
|
|
|
Generates a new credential pair for an existing user. If -access_key and
|
|
-secret_key are omitted, they are generated automatically.
|
|
`
|
|
}
|
|
|
|
func (c *commandS3AccessKeyCreate) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandS3AccessKeyCreate) Do(args []string, commandEnv *CommandEnv, writer io.Writer) error {
|
|
f := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
user := f.String("user", "", "user name")
|
|
accessKey := f.String("access_key", "", "access key (generated if omitted)")
|
|
secretKey := f.String("secret_key", "", "secret key (generated if omitted)")
|
|
if err := f.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
if *user == "" {
|
|
return fmt.Errorf("-user is required")
|
|
}
|
|
|
|
ak := *accessKey
|
|
sk := *secretKey
|
|
|
|
if ak == "" && sk == "" {
|
|
var err error
|
|
ak, err = iam.GenerateRandomString(iam.AccessKeyIdLength, iam.CharsetUpper)
|
|
if err != nil {
|
|
return fmt.Errorf("generate access key: %v", err)
|
|
}
|
|
sk, err = iam.GenerateSecretAccessKey()
|
|
if err != nil {
|
|
return fmt.Errorf("generate secret key: %v", err)
|
|
}
|
|
} else if ak == "" || sk == "" {
|
|
return fmt.Errorf("both -access_key and -secret_key must be provided together, or omit both to auto-generate")
|
|
}
|
|
|
|
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.CreateAccessKey(ctx, &iam_pb.CreateAccessKeyRequest{
|
|
Username: *user,
|
|
Credential: &iam_pb.Credential{
|
|
AccessKey: ak,
|
|
SecretKey: sk,
|
|
Status: iam.AccessKeyStatusActive,
|
|
},
|
|
})
|
|
return err
|
|
}, commandEnv.option.FilerAddress.ToGrpcAddress(), false, commandEnv.option.GrpcDialOption)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Fprintf(writer, "Created access key for user %q\n", *user)
|
|
fmt.Fprintf(writer, "Access Key: %s\n", ak)
|
|
fmt.Fprintf(writer, "Secret Key: %s\n", sk)
|
|
fmt.Fprintln(writer)
|
|
fmt.Fprintln(writer, "Save these credentials - the secret key cannot be retrieved later.")
|
|
return nil
|
|
}
|