mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-05 11:37:44 +01:00
* shell: accept ReadAcp and WriteAcp in per-bucket and service account actions s3.bucket.access, s3.anonymous.set and s3.serviceaccount.create rejected ReadAcp and WriteAcp, so the ACL actions the S3 gateway enforces could not be granted through them. Share one canonical action table across the three commands and list the ACL actions in their help. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * shell: list ReadAcp and WriteAcp in s3.configure and s3.circuitBreaker help The -actions usage of both commands stopped at Admin, so the ACL actions the gateway enforces could only be found in the source. s3.circuitBreaker now prints the actions it actually accepts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: offer ReadAcp and WriteAcp in the object store user permissions The create and edit user forms only offered Read, Write, List, Tagging and Admin among the bucket permissions, so an identity could not be given the ACL actions from the UI even though uploads with x-amz-acl need WriteAcp. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3api: log the WriteAcp denial of an upload that sets an ACL An upload or copy that carries x-amz-acl or an x-amz-grant-* header also needs WriteAcp. When that check denies, the client only sees a bare AccessDenied and nothing reached the log at the default verbosity, so the header was never suspected. Log the identity and the missing action. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3api: quote the key in the ACL upload denial log An object key can carry a decoded newline, which let a caller add forged lines to the default log. Quote the bucket and key, and word the message so it also fits a policy deny, not only a missing grant. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * shell: say ACL uploads need both Write and WriteAcp The s3.configure example granted WriteAcp alone, which still fails the upload's Write check. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * shell: parse S3 action lists with one shared helper s3.bucket.access, s3.anonymous.set and s3.serviceaccount.create each had their own validation loop, so a test of the table did not cover the parsing the commands run. They now call canonicalActionList, which skips empty entries and repeats. s3.anonymous.set validates before contacting IAM, and s3.bucket.access still rejects a list with no actions. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: keep bucket-scoped actions the user form cannot show When a user has both global and bucket-scoped actions, the edit form shows only the global ones, and saving replaced the identity's actions with what the form rebuilt, deleting the scoped grants. Carry those actions through the save. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: list hidden bucket grants in the user edit form Restoring the bucket-scoped grants the form cannot show kept them active even when an admin narrowed the user's permissions, with no way to see or drop them. Show them as checked boxes under Other Bucket Permissions; unchecking one removes it on save. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * shell: reject an s3.anonymous.set -access list with no actions A blank list such as ",," parsed to nothing and cleared the bucket's anonymous grants. Use "none" for that, as s3.bucket.access does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3api: skip the ACL upload denial log for anonymous requests Anonymous uploads with ACL headers can be sent by anyone, so logging each denial at the default level lets unauthenticated clients flood the log. Keep the line for named identities. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: count kept bucket grants when checking an edited user for permissions The empty check ran before the checked Other Bucket Permissions were merged, so a user left with only those grants could not be saved. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: list bucket grants of Admin users in the user edit form parseBucketPermissions returned before reading scoped actions when the user had Admin, so removing Admin and saving dropped grants such as WriteAcp:bucket. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: keep unpaired bucket grants as separate checkboxes in the user edit form The form saves every selected permission on every selected bucket, so grants such as ReadAcp:a with WriteAcp:b came back as all four pairs. Show the grants through the picker only when they cover that full product; otherwise list each grant on its own. Opening the form also resets the bucket scope left over from the previous user. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: keep grants the edit pickers have no option for A permission x bucket product was shown through the pickers even when a bucket was not in the bucket list (deleted, prefix or wildcard grants) or a permission had no picker option (DeleteBucket, PutBucketQuota). Saving then dropped those grants. Such grants now go to the checkbox list, global ones included, and are submitted unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * shell: name the s3.bucket.access anonymous example by what it grants Read,Write,List leaves out ReadAcp and WriteAcp, so it is not full access. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: keep unlisted global grants of Admin users in the user edit form parseBucketPermissions returned for Admin before splitting global grants into picker options and the rest, and only raw option values were re-selected. Saving an Admin user dropped s3tables:* and grants with no picker option such as DeleteBucket. Admin users now use the same split. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: keep the /* suffix of bucket grants in the user edit form parseBucketPermissions dropped a trailing /* before matching bucket options, so saving rewrote ReadAcp:bucket/* as ReadAcp:bucket. The bare form also matches bucket-level requests such as GET ?acl, so the save widened the grant. A /* bucket is not a picker option, so the grant now stays in the checkbox list as written. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * shell: test that s3.bucket.access saves ReadAcp and WriteAcp grants Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
287 lines
8.3 KiB
Go
287 lines
8.3 KiB
Go
package shell
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"strings"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
|
"github.com/seaweedfs/seaweedfs/weed/iam"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/iam_pb"
|
|
"google.golang.org/grpc/codes"
|
|
"google.golang.org/grpc/status"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandS3Configure{})
|
|
}
|
|
|
|
type commandS3Configure struct {
|
|
}
|
|
|
|
func (c *commandS3Configure) Name() string {
|
|
return "s3.configure"
|
|
}
|
|
|
|
func (c *commandS3Configure) Help() string {
|
|
return `configure and apply s3 options for each bucket
|
|
|
|
# see the current configuration file content
|
|
s3.configure
|
|
|
|
# create a new identity with account information
|
|
s3.configure -user=username -actions=Read,Write,List,Tagging -buckets=bucket-name -policies=policy1,policy2 -access_key=key -secret_key=secret -account_id=id -account_display_name=name -account_email=email@example.com -apply
|
|
|
|
# allow uploads that send an ACL header such as x-amz-acl
|
|
s3.configure -user=username -actions=Write,WriteAcp -buckets=bucket-name -apply
|
|
|
|
Common action names: Read, ReadAcp, Write, WriteAcp, List, Tagging, Admin
|
|
ReadAcp covers GET ?acl and WriteAcp covers PUT ?acl. An upload or copy
|
|
that carries an ACL header such as x-amz-acl needs both Write and WriteAcp.
|
|
`
|
|
}
|
|
|
|
func (c *commandS3Configure) HasTag(tag CommandTag) bool {
|
|
return tag == Hidden
|
|
}
|
|
|
|
func (c *commandS3Configure) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
|
|
|
|
s3ConfigureCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
actions := s3ConfigureCommand.String("actions", "", "comma separated actions names: Read,ReadAcp,Write,WriteAcp,List,Tagging,Admin")
|
|
user := s3ConfigureCommand.String("user", "", "user name")
|
|
buckets := s3ConfigureCommand.String("buckets", "", "bucket name")
|
|
accessKey := s3ConfigureCommand.String("access_key", "", "specify the access key")
|
|
secretKey := s3ConfigureCommand.String("secret_key", "", "specify the secret key")
|
|
accountId := s3ConfigureCommand.String("account_id", "", "specify the account id")
|
|
accountDisplayName := s3ConfigureCommand.String("account_display_name", "", "specify the account display name")
|
|
accountEmail := s3ConfigureCommand.String("account_email", "", "specify the account email address")
|
|
policies := s3ConfigureCommand.String("policies", "", "comma separated policy names")
|
|
isDelete := s3ConfigureCommand.Bool("delete", false, "delete users, actions, access keys or policies")
|
|
apply := s3ConfigureCommand.Bool("apply", false, "update and apply s3 configuration")
|
|
if err = s3ConfigureCommand.Parse(args); err != nil {
|
|
return nil
|
|
}
|
|
|
|
// Case 1: List configuration (no user specified)
|
|
if *user == "" {
|
|
return c.listConfiguration(commandEnv, writer)
|
|
}
|
|
|
|
// Case 2: Modify specific user
|
|
var identity *iam_pb.Identity
|
|
var isNewUser bool
|
|
|
|
err = commandEnv.withIamClient(func(ctx context.Context, client iam_pb.SeaweedIdentityAccessManagementClient) error {
|
|
|
|
// Try to get existing user
|
|
resp, getErr := client.GetUser(ctx, &iam_pb.GetUserRequest{
|
|
Username: *user,
|
|
})
|
|
|
|
if getErr == nil {
|
|
identity = resp.Identity
|
|
if identity == nil {
|
|
// Should not happen if err is nil, but handle defensively
|
|
isNewUser = true
|
|
identity = &iam_pb.Identity{Name: *user}
|
|
}
|
|
} else {
|
|
st, ok := status.FromError(getErr)
|
|
if ok && st.Code() == codes.NotFound {
|
|
isNewUser = true
|
|
identity = &iam_pb.Identity{
|
|
Name: *user,
|
|
Credentials: []*iam_pb.Credential{},
|
|
Actions: []string{},
|
|
PolicyNames: []string{},
|
|
}
|
|
} else {
|
|
return fmt.Errorf("failed to get user %s: %v", *user, getErr)
|
|
}
|
|
}
|
|
|
|
// Apply changes to identity object
|
|
if err := c.applyChanges(identity, isNewUser, actions, buckets, accessKey, secretKey, policies, isDelete, accountId, accountDisplayName, accountEmail); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Print changes (Simulation)
|
|
var buf bytes.Buffer
|
|
filer.ProtoToText(&buf, identity)
|
|
fmt.Fprint(writer, buf.String())
|
|
fmt.Fprintln(writer)
|
|
|
|
if !*apply {
|
|
infoAboutSimulationMode(writer, *apply, "-apply")
|
|
return nil
|
|
}
|
|
|
|
// Apply changes
|
|
if *isDelete && *actions == "" && *accessKey == "" && *buckets == "" && *policies == "" {
|
|
// Delete User
|
|
_, err := client.DeleteUser(ctx, &iam_pb.DeleteUserRequest{Username: *user})
|
|
return err
|
|
} else {
|
|
// Create or Update User
|
|
if isNewUser {
|
|
_, err := client.CreateUser(ctx, &iam_pb.CreateUserRequest{Identity: identity})
|
|
return err
|
|
} else {
|
|
_, err := client.UpdateUser(ctx, &iam_pb.UpdateUserRequest{Username: *user, Identity: identity})
|
|
return err
|
|
}
|
|
}
|
|
})
|
|
|
|
return err
|
|
}
|
|
|
|
func (c *commandS3Configure) listConfiguration(commandEnv *CommandEnv, writer io.Writer) error {
|
|
return commandEnv.withIamClient(func(ctx context.Context, client iam_pb.SeaweedIdentityAccessManagementClient) error {
|
|
resp, err := client.GetConfiguration(ctx, &iam_pb.GetConfigurationRequest{})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
var buf bytes.Buffer
|
|
filer.ProtoToText(&buf, resp.Configuration)
|
|
fmt.Fprint(writer, buf.String())
|
|
fmt.Fprintln(writer)
|
|
return nil
|
|
})
|
|
}
|
|
|
|
func (c *commandS3Configure) applyChanges(identity *iam_pb.Identity, isNewUser bool, actions, buckets, accessKey, secretKey, policies *string, isDelete *bool, accountId, accountDisplayName, accountEmail *string) error {
|
|
|
|
// Helper to update account info
|
|
if *accountId != "" || *accountDisplayName != "" || *accountEmail != "" {
|
|
if identity.Account == nil {
|
|
identity.Account = &iam_pb.Account{}
|
|
}
|
|
if *accountId != "" {
|
|
identity.Account.Id = *accountId
|
|
}
|
|
if *accountDisplayName != "" {
|
|
identity.Account.DisplayName = *accountDisplayName
|
|
}
|
|
if *accountEmail != "" {
|
|
identity.Account.EmailAddress = *accountEmail
|
|
}
|
|
}
|
|
|
|
// Prepare lists
|
|
var cmdActions []string
|
|
if *actions != "" {
|
|
for _, action := range strings.Split(*actions, ",") {
|
|
if *buckets == "" {
|
|
cmdActions = append(cmdActions, action)
|
|
} else {
|
|
for _, bucket := range strings.Split(*buckets, ",") {
|
|
cmdActions = append(cmdActions, fmt.Sprintf("%s:%s", action, bucket))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
var cmdPolicies []string
|
|
if *policies != "" {
|
|
for _, policy := range strings.Split(*policies, ",") {
|
|
if policy != "" {
|
|
cmdPolicies = append(cmdPolicies, policy)
|
|
}
|
|
}
|
|
}
|
|
|
|
if *isDelete {
|
|
// DELETE LOGIC
|
|
|
|
// Remove Actions
|
|
if len(cmdActions) > 0 {
|
|
identity.Actions = removeFromSlice(identity.Actions, cmdActions)
|
|
}
|
|
|
|
// Remove Credentials
|
|
if *accessKey != "" {
|
|
var keepCredentials []*iam_pb.Credential
|
|
for _, cred := range identity.Credentials {
|
|
if cred.AccessKey != *accessKey {
|
|
keepCredentials = append(keepCredentials, cred)
|
|
}
|
|
}
|
|
identity.Credentials = keepCredentials
|
|
}
|
|
|
|
// Remove Policies
|
|
if len(cmdPolicies) > 0 {
|
|
identity.PolicyNames = removeFromSlice(identity.PolicyNames, cmdPolicies)
|
|
}
|
|
|
|
} else {
|
|
// ADD/UPDATE LOGIC
|
|
|
|
// Add Actions
|
|
identity.Actions = addUniqueToSlice(identity.Actions, cmdActions)
|
|
|
|
// Add/Update Credentials
|
|
if *accessKey != "" && identity.Name != "anonymous" {
|
|
found := false
|
|
for _, cred := range identity.Credentials {
|
|
if cred.AccessKey == *accessKey {
|
|
found = true
|
|
if *secretKey != "" {
|
|
cred.SecretKey = *secretKey
|
|
}
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
if *secretKey == "" {
|
|
return fmt.Errorf("secret_key is required when adding a new access_key")
|
|
}
|
|
identity.Credentials = append(identity.Credentials, &iam_pb.Credential{
|
|
AccessKey: *accessKey,
|
|
SecretKey: *secretKey,
|
|
Status: iam.AccessKeyStatusActive,
|
|
})
|
|
}
|
|
}
|
|
|
|
// Add Policies
|
|
identity.PolicyNames = addUniqueToSlice(identity.PolicyNames, cmdPolicies)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Helper to remove items from a slice
|
|
func removeFromSlice(current []string, toRemove []string) []string {
|
|
removeSet := make(map[string]struct{}, len(toRemove))
|
|
for _, item := range toRemove {
|
|
removeSet[item] = struct{}{}
|
|
}
|
|
var result []string
|
|
for _, item := range current {
|
|
if _, found := removeSet[item]; !found {
|
|
result = append(result, item)
|
|
}
|
|
}
|
|
return result
|
|
}
|
|
|
|
// Helper to add unique items to a slice
|
|
func addUniqueToSlice(current []string, toAdd []string) []string {
|
|
existingSet := make(map[string]struct{}, len(current))
|
|
for _, item := range current {
|
|
existingSet[item] = struct{}{}
|
|
}
|
|
for _, item := range toAdd {
|
|
if _, found := existingSet[item]; !found {
|
|
current = append(current, item)
|
|
}
|
|
}
|
|
return current
|
|
}
|