Skip to content

Validate user and roles prior to creating #34263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rosstimothy merged 1 commit into from
Nov 6, 2023
Merged

Validate user and roles prior to creating #34263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/auth/users/usersv1/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,14 @@ func (s *Service) CreateUser(ctx context.Context, req *userspb.CreateUserRequest
return nil, trace.Wrap(err)
}

if err := services.ValidateUser(req.User); err != nil {
return nil, trace.Wrap(err)
}

if err := services.ValidateUserRoles(ctx, req.User, s.cache); err != nil {
return nil, trace.Wrap(err)
}

if req.User.GetCreatedBy().IsEmpty() {
req.User.SetCreatedBy(types.CreatedBy{
User: types.UserRef{Name: authz.ClientUsername(ctx)},
Expand Down
8 changes: 8 additions & 0 deletions lib/auth/users/usersv1/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
"github.com/gravitational/trace"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -211,6 +212,13 @@ func TestCreateUser(t *testing.T) {
event := <-env.emitter.C()
assert.Equal(t, events.UserCreateEvent, event.GetType(), "unexpected event type")
assert.Equal(t, events.UserCreateCode, event.GetCode(), "unexpected event code")

user, err := types.NewUser("alpaca")
require.NoError(t, err, "creating user alpaca")
user.SetRoles([]string{uuid.NewString()})
_, err = env.CreateUser(ctx, &userspb.CreateUserRequest{User: user.(*types.UserV2)})
assert.True(t, trace.IsNotFound(err), "expected a not found error, got %T", err)
require.Error(t, err, "user allowed to be created with a role that does not exist")
}

func TestDeleteUser(t *testing.T) {
Expand Down