mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-05-14 05:41:29 +00:00
* 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
145 lines
3.9 KiB
Go
145 lines
3.9 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
)
|
|
|
|
const anonymousUserName = "anonymous"
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandS3AnonymousSet{})
|
|
}
|
|
|
|
type commandS3AnonymousSet struct {
|
|
}
|
|
|
|
func (c *commandS3AnonymousSet) Name() string {
|
|
return "s3.anonymous.set"
|
|
}
|
|
|
|
func (c *commandS3AnonymousSet) Help() string {
|
|
return `set anonymous (public) access on a bucket
|
|
|
|
s3.anonymous.set -bucket <bucket_name> -access Read,List
|
|
s3.anonymous.set -bucket <bucket_name> -access none
|
|
|
|
Supported actions: Read, Write, List, Tagging, Admin
|
|
Use "none" to remove all anonymous access for the bucket.
|
|
|
|
This manages the special "anonymous" user's actions. It does not
|
|
use IAM policies — it sets legacy per-bucket actions directly.
|
|
`
|
|
}
|
|
|
|
func (c *commandS3AnonymousSet) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandS3AnonymousSet) Do(args []string, commandEnv *CommandEnv, writer io.Writer) error {
|
|
f := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
bucket := f.String("bucket", "", "bucket name")
|
|
access := f.String("access", "", "comma-separated actions: Read,Write,List,Tagging,Admin or none")
|
|
if err := f.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
if *bucket == "" {
|
|
return fmt.Errorf("-bucket is required")
|
|
}
|
|
if *access == "" {
|
|
return fmt.Errorf("-access is required")
|
|
}
|
|
|
|
return 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()
|
|
|
|
// Get or create anonymous user
|
|
identity, isNew, err := getOrCreateAnonymousUser(ctx, client)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Remove existing actions for this bucket
|
|
var kept []string
|
|
for _, a := range identity.Actions {
|
|
parts := strings.SplitN(a, ":", 2)
|
|
if len(parts) != 2 || parts[1] != *bucket {
|
|
kept = append(kept, a)
|
|
}
|
|
}
|
|
|
|
// Add new actions unless "none"
|
|
canonicalActions := map[string]string{
|
|
"read": "Read", "write": "Write", "list": "List",
|
|
"tagging": "Tagging", "admin": "Admin",
|
|
}
|
|
if strings.ToLower(strings.TrimSpace(*access)) != "none" {
|
|
seen := make(map[string]struct{})
|
|
for _, action := range strings.Split(*access, ",") {
|
|
action = strings.TrimSpace(action)
|
|
if action != "" {
|
|
canonical, ok := canonicalActions[strings.ToLower(action)]
|
|
if !ok {
|
|
return fmt.Errorf("invalid action %q: supported actions are Read, Write, List, Tagging, Admin", action)
|
|
}
|
|
if _, dup := seen[canonical]; dup {
|
|
continue
|
|
}
|
|
seen[canonical] = struct{}{}
|
|
kept = append(kept, canonical+":"+*bucket)
|
|
}
|
|
}
|
|
}
|
|
|
|
identity.Actions = kept
|
|
|
|
if isNew {
|
|
_, err = client.CreateUser(ctx, &iam_pb.CreateUserRequest{Identity: identity})
|
|
} else {
|
|
_, err = client.UpdateUser(ctx, &iam_pb.UpdateUserRequest{
|
|
Username: anonymousUserName,
|
|
Identity: identity,
|
|
})
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Fprintf(writer, "Set anonymous access on bucket %q to: %s\n", *bucket, *access)
|
|
return nil
|
|
}, commandEnv.option.FilerAddress.ToGrpcAddress(), false, commandEnv.option.GrpcDialOption)
|
|
}
|
|
|
|
func getOrCreateAnonymousUser(ctx context.Context, client iam_pb.SeaweedIdentityAccessManagementClient) (*iam_pb.Identity, bool, error) {
|
|
resp, err := client.GetUser(ctx, &iam_pb.GetUserRequest{Username: anonymousUserName})
|
|
if err == nil {
|
|
if resp.Identity == nil {
|
|
return nil, false, fmt.Errorf("anonymous user returned nil identity")
|
|
}
|
|
return resp.Identity, false, nil
|
|
}
|
|
|
|
st, ok := status.FromError(err)
|
|
if ok && st != nil && st.Code() == codes.NotFound {
|
|
return &iam_pb.Identity{
|
|
Name: anonymousUserName,
|
|
Actions: []string{},
|
|
}, true, nil
|
|
}
|
|
|
|
return nil, false, fmt.Errorf("failed to get anonymous user: %w", err)
|
|
}
|