gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3340 from vanhtuan0409/put-user-policy

Browse source
This commit is contained in:
Chris Lu 2022-07-20 09:01:14 -07:00 committed by GitHub
parent 4820b594a7 312e13416b
commit efec31de8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
weed/iamapi/iamapi_management_handlers.go
View file

@ -219,8 +219,16 @@ func (iama *IamApiServer) PutUserPolicy(s3cfg *iam_pb.S3ApiConfiguration, values
if userName != ident.Name { if userName != ident.Name {
continue continue
} }
existedActions := make(map[string]bool, len(ident.Actions))
for _, action := range ident.Actions {
existedActions[action] = true
}
for _, action := range actions { for _, action := range actions {
ident.Actions = append(ident.Actions, action) if !existedActions[action] {
ident.Actions = append(ident.Actions, action)
}
} }
return resp, nil return resp, nil
} }
@ -349,7 +357,8 @@ func (iama *IamApiServer) CreateAccessKey(s3cfg *iam_pb.S3ApiConfiguration, valu
} }
if !changed { if !changed {
s3cfg.Identities = append(s3cfg.Identities, s3cfg.Identities = append(s3cfg.Identities,
&iam_pb.Identity{Name: userName, &iam_pb.Identity{
Name: userName,
Credentials: []*iam_pb.Credential{ Credentials: []*iam_pb.Credential{
{ {
AccessKey: accessKeyId, AccessKey: accessKeyId,