Skip to content

[v17] fix: tsh label based commands always running serially #63611

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
Feb 9, 2026
Merged

[v17] fix: tsh label based commands always running serially #63611

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
4 changes: 2 additions & 2 deletions lib/client/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2825,7 +2825,7 @@ func (tc *TeleportClient) ListDatabases(ctx context.Context, customFilter *proto

// roleGetter retrieves roles for the current user
type roleGetter interface {
GetRoles(ctx context.Context) ([]types.Role, error)
GetCurrentUserRoles(ctx context.Context) ([]types.Role, error)
}

// commandLimit determines how many commands may be executed in parallel.
Expand All @@ -2841,7 +2841,7 @@ func commandLimit(ctx context.Context, getter roleGetter, mfaRequired bool) int
return 1
}

roles, err := getter.GetRoles(ctx)
roles, err := getter.GetCurrentUserRoles(ctx)
if err != nil {
return 1
}
Expand Down
110 changes: 67 additions & 43 deletions lib/client/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/coreos/go-semver/semver"
"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 All @@ -46,6 +47,7 @@ import (
"github.com/gravitational/teleport/api/utils/grpc/interceptors"
"github.com/gravitational/teleport/api/utils/keys"
"github.com/gravitational/teleport/lib/auth/authclient"
"github.com/gravitational/teleport/lib/auth/authtest"
"github.com/gravitational/teleport/lib/cryptosuites/cryptosuitestest"
"github.com/gravitational/teleport/lib/defaults"
"github.com/gravitational/teleport/lib/modules"
Expand Down Expand Up @@ -936,100 +938,122 @@ func TestFormatConnectToProxyErr(t *testing.T) {

type mockRoleGetter func(ctx context.Context) ([]types.Role, error)

func (m mockRoleGetter) GetRoles(ctx context.Context) ([]types.Role, error) {
func (m mockRoleGetter) GetCurrentUserRoles(ctx context.Context) ([]types.Role, error) {
return m(ctx)
}

func TestCommandLimit(t *testing.T) {
t.Parallel()

auth, err := authtest.NewTestServer(authtest.ServerConfig{
Auth: authtest.AuthServerConfig{
ClusterName: "test",
ClusterID: "test",
Dir: t.TempDir(),
},
})
require.NoError(t, err)

t.Cleanup(func() { require.NoError(t, auth.Close()) })

cases := []struct {
name string
mfaRequired bool
getter roleGetter
roleGetter roleGetter
roles []types.RoleSpecV6
expected int
}{
{
name: "mfa required",
mfaRequired: true,
expected: 1,
getter: mockRoleGetter(func(ctx context.Context) ([]types.Role, error) {
role, err := types.NewRole("test", types.RoleSpecV6{
roles: []types.RoleSpecV6{
{
Options: types.RoleOptions{MaxConnections: 500},
})
require.NoError(t, err)

return []types.Role{role}, nil
}),
},
},
},
{
name: "failure getting roles",
expected: 1,
getter: mockRoleGetter(func(ctx context.Context) ([]types.Role, error) {
roleGetter: mockRoleGetter(func(ctx context.Context) ([]types.Role, error) {
return nil, errors.New("fail")
}),
},
{
name: "no roles",
expected: 1,
},
{
name: "max_connections=0",
expected: -1,
getter: mockRoleGetter(func(ctx context.Context) ([]types.Role, error) {
return nil, nil
}),
roles: []types.RoleSpecV6{
{
Options: types.RoleOptions{MaxConnections: 0},
},
},
},
{
name: "max_connections=1",
expected: 1,
getter: mockRoleGetter(func(ctx context.Context) ([]types.Role, error) {
role, err := types.NewRole("test", types.RoleSpecV6{
roles: []types.RoleSpecV6{
{
Options: types.RoleOptions{MaxConnections: 1},
})
require.NoError(t, err)

return []types.Role{role}, nil
}),
},
},
},
{
name: "max_connections=2",
expected: 1,
getter: mockRoleGetter(func(ctx context.Context) ([]types.Role, error) {
role, err := types.NewRole("test", types.RoleSpecV6{
roles: []types.RoleSpecV6{
{
Options: types.RoleOptions{MaxConnections: 2},
})
require.NoError(t, err)

return []types.Role{role}, nil
}),
},
},
},
{
name: "max_connections=500",
expected: 250,
getter: mockRoleGetter(func(ctx context.Context) ([]types.Role, error) {
role, err := types.NewRole("test", types.RoleSpecV6{
roles: []types.RoleSpecV6{
{
Options: types.RoleOptions{MaxConnections: 500},
})
require.NoError(t, err)

return []types.Role{role}, nil
}),
},
},
},
{
name: "max_connections=max",
expected: math.MaxInt64 / 2,
getter: mockRoleGetter(func(ctx context.Context) ([]types.Role, error) {
role, err := types.NewRole("test", types.RoleSpecV6{
roles: []types.RoleSpecV6{
{
Options: types.RoleOptions{MaxConnections: math.MaxInt64},
})
require.NoError(t, err)

return []types.Role{role}, nil
}),
},
},
},
}

for _, tt := range cases {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
require.Equal(t, tt.expected, commandLimit(context.Background(), tt.getter, tt.mfaRequired))
var getter roleGetter
if tt.roleGetter != nil {
getter = tt.roleGetter
} else {
roles := make([]types.Role, 0, len(tt.roles))
for _, spec := range tt.roles {
role, err := authtest.CreateRole(t.Context(), auth.Auth(), uuid.NewString(), spec)
require.NoError(t, err)
roles = append(roles, role)
}

user, err := authtest.CreateUser(t.Context(), auth.Auth(), uuid.NewString(), roles...)
require.NoError(t, err)

clt, err := auth.NewClient(authtest.TestUser(user.GetName()))
require.NoError(t, err)
getter = clt
}

require.Equal(t, tt.expected, commandLimit(t.Context(), getter, tt.mfaRequired))
})
}
}
Expand Down
15 changes: 14 additions & 1 deletion tool/tsh/common/tsh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1807,6 +1807,7 @@ func TestSSHOnMultipleNodes(t *testing.T) {
)
require.NoError(t, err)

stdin := &input{buf: bytes.Buffer{}}
stdout := &output{buf: bytes.Buffer{}}
stderr := &output{buf: bytes.Buffer{}}
// Clear counter before each ssh command,
Expand All @@ -1828,7 +1829,7 @@ func TestSSHOnMultipleNodes(t *testing.T) {
args,
setHomePath(tmpHomePath),
func(conf *CLIConf) error {
conf.overrideStdin = &bytes.Buffer{}
conf.overrideStdin = stdin
conf.OverrideStdout = stdout
conf.overrideStderr = stderr
conf.MockHeadlessLogin = mockHeadlessLogin(t, tt.auth, user)
Expand Down Expand Up @@ -1868,6 +1869,18 @@ func TestSSHOnMultipleNodes(t *testing.T) {
}
}

type input struct {
lock sync.Mutex
buf bytes.Buffer
}

func (i *input) Read(p []byte) (int, error) {
i.lock.Lock()
defer i.lock.Unlock()

return i.buf.Read(p)
}

type output struct {
lock sync.Mutex
buf bytes.Buffer
Expand Down
Loading