Skip to content
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

Jump to bottom

[v14] Fix downgrade logic of KubernetesResources to Role v6 #36009

Merged
merged 1 commit into from
Dec 22, 2023
Merged

[v14] Fix downgrade logic of KubernetesResources to Role v6 #36009

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 35 additions & 11 deletions lib/auth/grpcserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2143,17 +2143,41 @@ func downgradeRoleToV6(r *types.RoleV6) (*types.RoleV6, bool, error) {
// If the role specifies any kubernetes resources, the V6 role will
// be unable to be used for kubernetes access because the labels
// will be empty and won't match anything.
downgraded.SetLabelMatchers(
types.Allow,
types.KindKubernetesCluster,
types.LabelMatchers{
Labels: types.Labels{},
},
)
// Clear out the allow list so that the V6 role doesn't include unknown
// resources in the allow list.
downgraded.SetKubeResources(types.Allow, nil)
restricted = true
hasRestrictiveRules := false
for _, resource := range r.GetKubeResources(types.Allow) {
if resource.Kind != types.Wildcard ||
resource.Namespace != types.Wildcard ||
resource.Name != types.Wildcard ||
(len(resource.Verbs) != 1 || resource.Verbs[0] != types.Wildcard) {
hasRestrictiveRules = true
break
}
}
if hasRestrictiveRules {
downgraded.SetLabelMatchers(
types.Allow,
types.KindKubernetesCluster,
types.LabelMatchers{
Labels: types.Labels{},
},
)
// Clear out the allow list so that the V6 role doesn't include unknown
// resources in the allow list.
downgraded.SetKubeResources(types.Allow, nil)
restricted = true
} else {
// Clear out the allow list so that the V6 role doesn't include unknown
// resources in the allow list.
downgraded.SetKubeResources(types.Allow,
[]types.KubernetesResource{
{
Kind: types.KindKubePod,
Namespace: types.Wildcard,
Name: types.Wildcard,
Verbs: []string{types.Wildcard},
},
})
}
}

return downgraded, restricted, nil
Expand Down
102 changes: 89 additions & 13 deletions lib/auth/grpcserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,6 @@ func TestIsMFARequired(t *testing.T) {

for _, authPrefRequireMFAType := range requireMFATypes {
t.Run(fmt.Sprintf("authPref=%v", authPrefRequireMFAType.String()), func(t *testing.T) {

authPref, err := types.NewAuthPreference(types.AuthPreferenceSpecV2{
Type: constants.Local,
SecondFactor: constants.SecondFactorOptional,
Expand Down Expand Up @@ -4165,16 +4164,16 @@ func TestRoleVersions(t *testing.T) {
wildcardLabels := types.Labels{types.Wildcard: {types.Wildcard}}

originalLabels := map[string]string{"env": "staging"}
newRole := func(version string, spec types.RoleSpecV6) types.Role {
role, err := types.NewRoleWithVersion("test_rule", version, spec)
newRole := func(name string, version string, spec types.RoleSpecV6) types.Role {
role, err := types.NewRoleWithVersion(name, version, spec)
meta := role.GetMetadata()
meta.Labels = maps.Clone(originalLabels)
role.SetMetadata(meta)
require.NoError(t, err)
return role
}

role := newRole(types.V7, types.RoleSpecV6{
role := newRole("test_role_1", types.V7, types.RoleSpecV6{
Allow: types.RoleConditions{
NodeLabels: wildcardLabels,
AppLabels: wildcardLabels,
Expand All @@ -4189,6 +4188,7 @@ func TestRoleVersions(t *testing.T) {
Kind: types.Wildcard,
Namespace: types.Wildcard,
Name: types.Wildcard,
Verbs: []string{types.VerbList},
},
},
},
Expand All @@ -4207,7 +4207,41 @@ func TestRoleVersions(t *testing.T) {
},
})

user, err := CreateUser(srv.Auth(), "user", role)
roleV7Wildcard := newRole("test_role_2", types.V7, types.RoleSpecV6{
Allow: types.RoleConditions{
NodeLabels: wildcardLabels,
AppLabels: wildcardLabels,
AppLabelsExpression: `labels["env"] == "staging"`,
DatabaseLabelsExpression: `labels["env"] == "staging"`,
Rules: []types.Rule{
types.NewRule(types.KindRole, services.RW()),
},
KubernetesLabels: wildcardLabels,
KubernetesResources: []types.KubernetesResource{
{
Kind: types.Wildcard,
Namespace: types.Wildcard,
Name: types.Wildcard,
Verbs: []string{types.Wildcard},
},
},
},
Deny: types.RoleConditions{
KubernetesLabels: types.Labels{"env": {"prod"}},
ClusterLabels: types.Labels{"env": {"prod"}},
ClusterLabelsExpression: `labels["env"] == "prod"`,
WindowsDesktopLabelsExpression: `labels["env"] == "prod"`,
KubernetesResources: []types.KubernetesResource{
{
Kind: types.Wildcard,
Namespace: types.Wildcard,
Name: types.Wildcard,
},
},
},
})

user, err := CreateUser(srv.Auth(), "user", role, roleV7Wildcard)
require.NoError(t, err)

client, err := srv.NewClient(TestUser(user.GetName()))
Expand All @@ -4217,6 +4251,7 @@ func TestRoleVersions(t *testing.T) {
desc string
clientVersions []string
expectError bool
inputRole types.Role
expectedRole types.Role
expectDowngraded bool
}{
Expand All @@ -4225,14 +4260,50 @@ func TestRoleVersions(t *testing.T) {
clientVersions: []string{
"14.0.0-alpha.1", "15.1.2", api.Version, "",
},
inputRole: role,
expectedRole: role,
},
{
desc: "downgrade role to v6 with wildcard on kube resources but supports label expressions",
clientVersions: []string{
minSupportedLabelExpressionVersion.String(), "13.3.0",
},
inputRole: roleV7Wildcard,
expectedRole: newRole(roleV7Wildcard.GetName(), types.V6, types.RoleSpecV6{
Allow: types.RoleConditions{
NodeLabels: wildcardLabels,
AppLabels: wildcardLabels,
KubernetesLabels: wildcardLabels,
KubernetesResources: []types.KubernetesResource{
{
Kind: types.KindKubePod,
Namespace: types.Wildcard,
Name: types.Wildcard,
Verbs: []string{types.Wildcard},
},
},
AppLabelsExpression: `labels["env"] == "staging"`,
DatabaseLabelsExpression: `labels["env"] == "staging"`,
Rules: []types.Rule{
types.NewRule(types.KindRole, services.RW()),
},
},
Deny: types.RoleConditions{
KubernetesLabels: wildcardLabels,
ClusterLabels: types.Labels{"env": {"prod"}},
ClusterLabelsExpression: `labels["env"] == "prod"`,
WindowsDesktopLabelsExpression: `labels["env"] == "prod"`,
},
}),
expectDowngraded: true,
},
{
desc: "downgrade role to v6 but supports label expressions",
clientVersions: []string{
minSupportedLabelExpressionVersion.String(), "13.3.0",
},
expectedRole: newRole(types.V6, types.RoleSpecV6{
inputRole: role,
expectedRole: newRole(role.GetName(), types.V6, types.RoleSpecV6{
Allow: types.RoleConditions{
NodeLabels: wildcardLabels,
AppLabels: wildcardLabels,
Expand All @@ -4255,11 +4326,15 @@ func TestRoleVersions(t *testing.T) {
desc: "bad client versions",
clientVersions: []string{"Not a version", "13", "13.1"},
expectError: true,
inputRole: role,
},
{
desc: "label expressions downgraded",
clientVersions: []string{"13.0.11", "12.4.3", "6.0.0"},
expectedRole: newRole(types.V6,
inputRole: role,
expectedRole: newRole(
role.GetName(),
types.V6,
types.RoleSpecV6{
Allow: types.RoleConditions{
// None of the allow labels change
Expand Down Expand Up @@ -4324,7 +4399,7 @@ func TestRoleVersions(t *testing.T) {
}

// Test GetRole
gotRole, err := client.GetRole(ctx, role.GetName())
gotRole, err := client.GetRole(ctx, tc.inputRole.GetName())
checkErr(err)
checkRole(gotRole)

Expand All @@ -4334,7 +4409,7 @@ func TestRoleVersions(t *testing.T) {
if !tc.expectError {
foundTestRole := false
for _, gotRole := range gotRoles {
if gotRole.GetName() != role.GetName() {
if gotRole.GetName() != tc.inputRole.GetName() {
continue
}
checkRole(gotRole)
Expand All @@ -4359,15 +4434,16 @@ func TestRoleVersions(t *testing.T) {
// Re-upsert the role so that the watcher sees it, do this
// on the auth server directly to avoid the
// TeleportDowngradedLabel check in ServerWithRoles
require.NoError(t, srv.Auth().UpsertRole(ctx, role))
err = srv.Auth().UpsertRole(ctx, tc.inputRole)
require.NoError(t, err)

gotRole, err = func() (types.Role, error) {
for {
select {
case <-watcher.Done():
return nil, watcher.Error()
case e := <-watcher.Events():
if gotRole, ok := e.Resource.(types.Role); ok && gotRole.GetName() == role.GetName() {
if gotRole, ok := e.Resource.(types.Role); ok && gotRole.GetName() == tc.inputRole.GetName() {
return gotRole, nil
}
}
Expand All @@ -4392,9 +4468,9 @@ func TestRoleVersions(t *testing.T) {
// role isn't modified
sv, err := semver.NewVersion(clientVersion)
if err == nil {
_, err := maybeDowngradeRoleToV6(ctx, role.(*types.RoleV6), sv)
_, err := maybeDowngradeRoleToV6(ctx, tc.inputRole.(*types.RoleV6), sv)
require.NoError(t, err)
require.Equal(t, originalLabels, role.GetMetadata().Labels)
require.Equal(t, originalLabels, tc.inputRole.GetMetadata().Labels)
}
})
}
Expand Down