Merge pull request #3302 from guo-sj/fix_put_user_policy

This commit is contained in:
Chris Lu 2022-07-11 21:15:37 -07:00 committed by GitHub
commit de97ba94c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -213,23 +213,18 @@ func (iama *IamApiServer) PutUserPolicy(s3cfg *iam_pb.S3ApiConfiguration, values
if err != nil { if err != nil {
return PutUserPolicyResponse{}, err return PutUserPolicyResponse{}, err
} }
isFound := false
policyDocuments[policyName] = &policyDocument policyDocuments[policyName] = &policyDocument
actions := GetActions(&policyDocument) actions := GetActions(&policyDocument)
for _, ident := range s3cfg.Identities { for _, ident := range s3cfg.Identities {
if userName != ident.Name { if userName != ident.Name {
continue continue
} }
isFound = true
for _, action := range actions { for _, action := range actions {
ident.Actions = append(ident.Actions, action) ident.Actions = append(ident.Actions, action)
} }
break return resp, nil
} }
if !isFound { return resp, fmt.Errorf("%s: the user with name %s cannot be found", iam.ErrCodeNoSuchEntityException, userName)
return resp, fmt.Errorf("%s: the user with name %s cannot be found", iam.ErrCodeNoSuchEntityException, userName)
}
return resp, nil
} }
func (iama *IamApiServer) GetUserPolicy(s3cfg *iam_pb.S3ApiConfiguration, values url.Values) (resp GetUserPolicyResponse, err error) { func (iama *IamApiServer) GetUserPolicy(s3cfg *iam_pb.S3ApiConfiguration, values url.Values) (resp GetUserPolicyResponse, err error) {