Browse Source

fix: reorder embedded IAM UpdateUser to verify source first

Find the source identity before checking for collisions, matching
the standalone handler's logic. Previously a non-existent user
renamed to an existing name would get EntityAlreadyExists instead
of NoSuchEntity.
pull/8560/head
Chris Lu 17 hours ago
parent
commit
f8c06f3994
  1. 71
      weed/s3api/s3api_embedded_iam.go

71
weed/s3api/s3api_embedded_iam.go

@ -348,40 +348,51 @@ func (e *EmbeddedIamApi) UpdateUser(s3cfg *iam_pb.S3ApiConfiguration, values url
resp := &iamUpdateUserResponse{}
userName := values.Get("UserName")
newUserName := values.Get("NewUserName")
if newUserName != "" {
// Check for name collision before renaming
if newUserName != userName {
for _, ident := range s3cfg.Identities {
if ident.Name == newUserName {
return resp, &iamError{Code: iam.ErrCodeEntityAlreadyExistsException, Error: fmt.Errorf("user %s already exists", newUserName)}
}
}
if newUserName == "" {
return resp, nil
}
// Find the source identity first
var sourceIdent *iam_pb.Identity
for _, ident := range s3cfg.Identities {
if ident.Name == userName {
sourceIdent = ident
break
}
for _, ident := range s3cfg.Identities {
if userName == ident.Name {
ident.Name = newUserName
// Update group membership references
for _, g := range s3cfg.Groups {
for j, m := range g.Members {
if m == userName {
g.Members[j] = newUserName
break
}
}
}
// Update service account parent references
for _, sa := range s3cfg.ServiceAccounts {
if sa.ParentUser == userName {
sa.ParentUser = newUserName
}
}
return resp, nil
}
if sourceIdent == nil {
return resp, &iamError{Code: iam.ErrCodeNoSuchEntityException, Error: fmt.Errorf(iamUserDoesNotExist, userName)}
}
// No-op if renaming to the same name
if newUserName == userName {
return resp, nil
}
// Check for name collision before renaming
for _, ident := range s3cfg.Identities {
if ident.Name == newUserName {
return resp, &iamError{Code: iam.ErrCodeEntityAlreadyExistsException, Error: fmt.Errorf("user %s already exists", newUserName)}
}
}
sourceIdent.Name = newUserName
// Update group membership references
for _, g := range s3cfg.Groups {
for j, m := range g.Members {
if m == userName {
g.Members[j] = newUserName
break
}
}
} else {
return resp, nil
}
return resp, &iamError{Code: iam.ErrCodeNoSuchEntityException, Error: fmt.Errorf(iamUserDoesNotExist, userName)}
// Update service account parent references
for _, sa := range s3cfg.ServiceAccounts {
if sa.ParentUser == userName {
sa.ParentUser = newUserName
}
}
return resp, nil
}
// CreateAccessKey creates an access key for a user.

Loading…
Cancel
Save