mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-07-29 11:33:25 +00:00
Chris LuandGitHub
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
82 lines
1.9 KiB
Go
82 lines
1.9 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
"text/tabwriter"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
"google.golang.org/grpc"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandS3UserList{})
|
|
}
|
|
|
|
type commandS3UserList struct {
|
|
}
|
|
|
|
func (c *commandS3UserList) Name() string {
|
|
return "s3.user.list"
|
|
}
|
|
|
|
func (c *commandS3UserList) Help() string {
|
|
return `list S3 IAM users
|
|
|
|
s3.user.list
|
|
|
|
Lists all users with their status, attached policies, and credential count.
|
|
`
|
|
}
|
|
|
|
func (c *commandS3UserList) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandS3UserList) Do(args []string, commandEnv *CommandEnv, writer io.Writer) error {
|
|
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.GetConfiguration(ctx, &iam_pb.GetConfigurationRequest{})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
identities := resp.Configuration.GetIdentities()
|
|
if len(identities) == 0 {
|
|
fmt.Fprintln(writer, "No users found.")
|
|
return nil
|
|
}
|
|
|
|
tw := tabwriter.NewWriter(writer, 0, 4, 2, ' ', 0)
|
|
fmt.Fprintln(tw, "NAME\tSTATUS\tPOLICIES\tKEYS")
|
|
|
|
for _, id := range identities {
|
|
status := "enabled"
|
|
if id.Disabled {
|
|
status = "disabled"
|
|
}
|
|
policies := "-"
|
|
if len(id.PolicyNames) > 0 {
|
|
policies = joinMax(id.PolicyNames, 3)
|
|
}
|
|
fmt.Fprintf(tw, "%s\t%s\t%s\t%d\n", id.Name, status, policies, len(id.Credentials))
|
|
}
|
|
return tw.Flush()
|
|
}, commandEnv.option.FilerAddress.ToGrpcAddress(), false, commandEnv.option.GrpcDialOption)
|
|
}
|
|
|
|
// joinMax joins up to max strings with ", " and appends "..." if truncated.
|
|
func joinMax(items []string, max int) string {
|
|
if len(items) <= max {
|
|
return strings.Join(items, ", ")
|
|
}
|
|
return strings.Join(items[:max], ", ") + "..."
|
|
}
|