Skip to content

[v14] Use GetRole in the user login state generator, fail if not found. #36321

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
mdwn merged 1 commit into from
Jan 5, 2024
Merged

[v14] Use GetRole in the user login state generator, fail if not found. #36321

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
21 changes: 5 additions & 16 deletions lib/auth/userloginstate/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,25 +222,14 @@ func (g *Generator) postProcess(ctx context.Context, state *userloginstate.UserL
return nil
}

// Remove roles that don't exist in the backend so that we don't generate certs for non-existent roles.
// Doing so can prevent login from working properly. This could occur if access lists refer to roles that
// no longer exist, for example.
roles, err := g.access.GetRoles(ctx)
if err != nil {
return trace.Wrap(err)
}

roleLookup := map[string]bool{}
for _, role := range roles {
roleLookup[role.GetName()] = true
}

existingRoles := []string{}
// Make sure all the roles exist. If they don't, error out.
var existingRoles []string
for _, role := range state.Spec.Roles {
if roleLookup[role] {
_, err := g.access.GetRole(ctx, role)
if err == nil {
existingRoles = append(existingRoles, role)
} else {
g.log.Warnf("Role %s does not exist when trying to add user login state, will be skipped", role)
return trace.Wrap(err)
}
}
state.Spec.Roles = existingRoles
Expand Down
42 changes: 24 additions & 18 deletions lib/auth/userloginstate/generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/gravitational/trace"
"github.com/jonboulle/clockwork"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -64,15 +65,17 @@ func TestAccessLists(t *testing.T) {
members []*accesslist.AccessListMember
locks []types.Lock
roles []string
wantErr require.ErrorAssertionFunc
expected *userloginstate.UserLoginState
expectedRoleCount int
expectedTraitCount int
}{
{
name: "access lists are empty",
user: user,
cloud: true,
roles: []string{"orole1"},
name: "access lists are empty",
user: user,
cloud: true,
roles: []string{"orole1"},
wantErr: require.NoError,
expected: newUserLoginState(t, "user",
map[string]string{
"label1": "value1",
Expand Down Expand Up @@ -101,6 +104,7 @@ func TestAccessLists(t *testing.T) {
},
members: append(newAccessListMembers(t, clock, "1", "user"), newAccessListMembers(t, clock, "2", "user")...),
roles: []string{"orole1", "role1", "role2"},
wantErr: require.NoError,
expected: newUserLoginState(t, "user",
map[string]string{
"label1": "value1",
Expand Down Expand Up @@ -131,7 +135,8 @@ func TestAccessLists(t *testing.T) {
locks: []types.Lock{
newUserLock(t, "test-lock", user.GetName()),
},
roles: []string{"orole1", "role1", "role2"},
roles: []string{"orole1", "role1", "role2"},
wantErr: require.NoError,
expected: newUserLoginState(t, "user",
map[string]string{
"label1": "value1",
Expand Down Expand Up @@ -160,6 +165,7 @@ func TestAccessLists(t *testing.T) {
},
members: append(newAccessListMembers(t, clock, "1", "user"), newAccessListMembers(t, clock, "2", "user")...),
roles: []string{"orole1", "role1", "role2"},
wantErr: require.NoError,
expected: newUserLoginState(t, "user",
map[string]string{
"label1": "value1",
Expand Down Expand Up @@ -188,18 +194,9 @@ func TestAccessLists(t *testing.T) {
},
members: append(newAccessListMembers(t, clock, "1", "user"), newAccessListMembers(t, clock, "2", "user")...),
roles: []string{"orole1"},
expected: newUserLoginState(t, "user",
map[string]string{
"label1": "value1",
"label2": "value2",
userloginstate.OriginalRolesAndTraitsSet: "true",
},
[]string{"orole1"},
trait.Traits{"otrait1": {"value1", "value2"}},
[]string{"orole1"},
trait.Traits{"otrait1": {"value1", "value2"}, "trait1": {"value1", "value2"}, "trait2": {"value3"}}),
expectedRoleCount: 0,
expectedTraitCount: 3,
wantErr: func(tt require.TestingT, err error, i ...interface{}) {
require.ErrorIs(t, err, trace.NotFound("role role1 is not found"))
},
},
{
name: "access lists only a member of some lists",
Expand All @@ -216,6 +213,7 @@ func TestAccessLists(t *testing.T) {
},
members: append(newAccessListMembers(t, clock, "1", "user"), newAccessListMembers(t, clock, "2", "not-user")...),
roles: []string{"orole1", "role1", "role2"},
wantErr: require.NoError,
expected: newUserLoginState(t, "user",
map[string]string{
"label1": "value1",
Expand All @@ -240,6 +238,7 @@ func TestAccessLists(t *testing.T) {
},
members: append(newAccessListMembers(t, clock, "1", "user"), newAccessListMembers(t, clock, "2", "user")...),
roles: []string{"orole1", "role1", "role2", "role3"},
wantErr: require.NoError,
expected: newUserLoginState(t, "user",
map[string]string{
"label1": "value1",
Expand Down Expand Up @@ -273,6 +272,7 @@ func TestAccessLists(t *testing.T) {
},
members: append(newAccessListMembers(t, clock, "1", "user"), newAccessListMembers(t, clock, "2", "user")...),
roles: []string{"orole1"},
wantErr: require.NoError,
expected: newUserLoginState(t, "user",
map[string]string{
"label1": "value1",
Expand Down Expand Up @@ -305,6 +305,7 @@ func TestAccessLists(t *testing.T) {
},
members: append(newAccessListMembers(t, clock, "1", "user"), newAccessListMembers(t, clock, "2", "user")...),
roles: []string{"role1"},
wantErr: require.NoError,
expected: newUserLoginState(t, "user",
map[string]string{
userloginstate.OriginalRolesAndTraitsSet: "true",
Expand Down Expand Up @@ -355,7 +356,12 @@ func TestAccessLists(t *testing.T) {
}

state, err := svc.Generate(ctx, test.user)
require.NoError(t, err)
test.wantErr(t, err)

if err != nil {
return
}

require.Empty(t, cmp.Diff(test.expected, state,
cmpopts.SortSlices(func(str1, str2 string) bool {
return str1 < str2
Expand Down