mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-06-13 23:36:45 +03:00
Chris Lu
45bf3ad058
* shell: add s3.user.* and s3.policy.attach|detach commands Add focused IAM shell commands following a noun-verb model: - s3.user.create: create user with auto-generated or explicit credentials - s3.user.list: tabular listing with status, policies, key count - s3.user.show: detailed user view (status, source, policies, credentials) - s3.user.delete: delete a user - s3.user.enable: enable a disabled user - s3.user.disable: disable a user (preserves credentials and policies) - s3.policy.attach: attach a named policy to a user - s3.policy.detach: detach a policy from a user These commands are thin wrappers over the existing IAM gRPC service, producing human-readable output instead of raw protobuf text. This is part of a larger effort to replace the monolithic s3.configure command with a composable set of single-purpose commands. * shell: address review feedback for s3.user.* and s3.policy.attach|detach - Return flag parse errors instead of swallowing them (all commands) - Use GetConfiguration instead of N+1 GetUser calls in s3.user.list - Add nil check for resp.Identity in s3.user.show - Fix GetPolicy error masking in s3.policy.attach (wrap original error) - Simplify joinMax using strings.Join * shell: add nil identity guards and wrap gRPC errors - Add nil check for resp.Identity in policy_attach, policy_detach, user_enable, user_disable - Wrap GetUser errors with user context for better diagnostics
91 lines
2.1 KiB
Go
91 lines
2.1 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
"google.golang.org/grpc"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandS3PolicyDetach{})
|
|
}
|
|
|
|
type commandS3PolicyDetach struct {
|
|
}
|
|
|
|
func (c *commandS3PolicyDetach) Name() string {
|
|
return "s3.policy.detach"
|
|
}
|
|
|
|
func (c *commandS3PolicyDetach) Help() string {
|
|
return `detach a policy from an S3 IAM user
|
|
|
|
s3.policy.detach -policy <policy_name> -user <username>
|
|
`
|
|
}
|
|
|
|
func (c *commandS3PolicyDetach) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandS3PolicyDetach) Do(args []string, commandEnv *CommandEnv, writer io.Writer) error {
|
|
f := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
policy := f.String("policy", "", "policy name")
|
|
user := f.String("user", "", "user name")
|
|
if err := f.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
if *policy == "" {
|
|
return fmt.Errorf("-policy is required")
|
|
}
|
|
if *user == "" {
|
|
return fmt.Errorf("-user 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()
|
|
|
|
resp, err := client.GetUser(ctx, &iam_pb.GetUserRequest{Username: *user})
|
|
if err != nil {
|
|
return fmt.Errorf("get user %q: %w", *user, err)
|
|
}
|
|
if resp.Identity == nil {
|
|
return fmt.Errorf("user %q returned empty identity", *user)
|
|
}
|
|
|
|
found := false
|
|
var kept []string
|
|
for _, p := range resp.Identity.PolicyNames {
|
|
if p == *policy {
|
|
found = true
|
|
} else {
|
|
kept = append(kept, p)
|
|
}
|
|
}
|
|
if !found {
|
|
return fmt.Errorf("policy %q is not attached to user %q", *policy, *user)
|
|
}
|
|
|
|
resp.Identity.PolicyNames = kept
|
|
_, err = client.UpdateUser(ctx, &iam_pb.UpdateUserRequest{
|
|
Username: *user,
|
|
Identity: resp.Identity,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
fmt.Fprintf(writer, "Detached policy %q from user %q\n", *policy, *user)
|
|
return nil
|
|
}, commandEnv.option.FilerAddress.ToGrpcAddress(), false, commandEnv.option.GrpcDialOption)
|
|
}
|