Skip to content

Remove any notion of teleport namespace from tsh #51076

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
Jan 15, 2025
Merged

Remove any notion of teleport namespace from tsh #51076

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
28 changes: 12 additions & 16 deletions integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ func testLeafProxySessionRecording(t *testing.T, suite *integrationTestSuite) {
nodeClient, err := tc.ConnectToNode(
ctx,
clt,
client.NodeDetails{Addr: "leaf-zero:0", Namespace: tc.Namespace, Cluster: clt.ClusterName()},
client.NodeDetails{Addr: "leaf-zero:0", Cluster: clt.ClusterName()},
tc.Config.HostLogin,
)
assert.NoError(t, err)
Expand Down Expand Up @@ -1487,7 +1487,7 @@ func testIPPropagation(t *testing.T, suite *integrationTestSuite) {
nodeClient, err := tc.ConnectToNode(
ctx,
clt,
client.NodeDetails{Addr: nodeName, Namespace: tc.Namespace, Cluster: clt.ClusterName()},
client.NodeDetails{Addr: nodeName, Cluster: clt.ClusterName()},
tc.Config.HostLogin,
)
require.NoError(t, err)
Expand Down Expand Up @@ -1656,7 +1656,7 @@ func verifySessionJoin(t *testing.T, username string, teleport *helpers.TeleInst
return

case <-ticker.C:
err := cl.Join(context.TODO(), types.SessionPeerMode, defaults.Namespace, session.ID(sessionID), personB)
err := cl.Join(context.TODO(), types.SessionPeerMode, session.ID(sessionID), personB)
if err == nil {
sessionB <- nil
return
Expand Down Expand Up @@ -5955,7 +5955,7 @@ func testWindowChange(t *testing.T, suite *integrationTestSuite) {
}

for i := 0; i < 10; i++ {
err = cl.Join(ctx, types.SessionPeerMode, defaults.Namespace, session.ID(sessionID), personB)
err = cl.Join(ctx, types.SessionPeerMode, session.ID(sessionID), personB)
if err == nil || isSSHError(err) {
err = nil
break
Expand Down Expand Up @@ -7871,9 +7871,8 @@ func testModeratedSFTP(t *testing.T, suite *integrationTestSuite) {
})

nodeDetails := client.NodeDetails{
Addr: instance.Config.SSH.Addr.Addr,
Namespace: peerClient.Namespace,
Cluster: helpers.Site,
Addr: instance.Config.SSH.Addr.Addr,
Cluster: helpers.Site,
}
peerNodeClient, err := peerClient.ConnectToNode(
ctx,
Expand Down Expand Up @@ -7936,7 +7935,6 @@ func testModeratedSFTP(t *testing.T, suite *integrationTestSuite) {
close(emptyCh)
modNodeCli := client.NodeClient{
Client: tracessh.NewClient(modSSHConn, modSSHChans, emptyCh),
Namespace: nodeDetails.Namespace,
TC: modTC,
Tracer: modTC.Tracer,
FIPSEnabled: details.FIPS,
Expand Down Expand Up @@ -8133,9 +8131,8 @@ func testSFTP(t *testing.T, suite *integrationTestSuite) {
ctx,
clusterClient,
client.NodeDetails{
Addr: teleport.Config.SSH.Addr.Addr,
Namespace: teleportClient.Namespace,
Cluster: helpers.Site,
Addr: teleport.Config.SSH.Addr.Addr,
Cluster: helpers.Site,
},
suite.Me.Username,
)
Expand Down Expand Up @@ -8338,9 +8335,8 @@ func testAgentlessConn(t *testing.T, tc, joinTC *client.TeleportClient, node *ty
ctx,
clt,
client.NodeDetails{
Addr: uuidAddr,
Namespace: tc.Namespace,
Cluster: tc.SiteName,
Addr: uuidAddr,
Cluster: tc.SiteName,
},
tc.Username,
)
Expand Down Expand Up @@ -8399,7 +8395,7 @@ func testAgentlessConn(t *testing.T, tc, joinTC *client.TeleportClient, node *ty
}, 3*time.Second, 100*time.Millisecond)

// test that attempting to join the session returns an error
err = joinTC.Join(ctx, types.SessionPeerMode, tc.Namespace, session.ID(sessTracker.GetSessionID()), nil)
err = joinTC.Join(ctx, types.SessionPeerMode, session.ID(sessTracker.GetSessionID()), nil)
require.True(t, trace.IsBadParameter(err))
require.ErrorContains(t, err, "session joining is only supported for Teleport nodes, not OpenSSH nodes")

Expand Down Expand Up @@ -9041,7 +9037,7 @@ func testModeratedSessions(t *testing.T, suite *integrationTestSuite) {
cl.WebauthnLogin = customWebauthnLogin
cl.Stdout = moderatorTerminal
cl.Stdin = moderatorTerminal
if err := cl.Join(ctx, types.SessionModeratorMode, defaults.Namespace, session.ID(sessionID), moderatorTerminal); err != nil {
if err := cl.Join(ctx, types.SessionModeratorMode, session.ID(sessionID), moderatorTerminal); err != nil {
cancel(trace.Wrap(err, "moderator session failed"))
}
}
Expand Down
3 changes: 2 additions & 1 deletion lib/benchmark/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/gravitational/trace"

"github.com/gravitational/teleport/api/client/proto"
"github.com/gravitational/teleport/api/defaults"
"github.com/gravitational/teleport/api/types"
"github.com/gravitational/teleport/lib/client"
"github.com/gravitational/teleport/lib/srv/alpnproxy"
Expand Down Expand Up @@ -61,7 +62,7 @@ func retrieveDatabaseCertificates(ctx context.Context, tc *client.TeleportClient
// getDatabase loads the database which the name matches.
func getDatabase(ctx context.Context, tc *client.TeleportClient, serviceName string, protocol string) (types.Database, error) {
databases, err := tc.ListDatabases(ctx, &proto.ListResourcesRequest{
Namespace: tc.Namespace,
Namespace: defaults.Namespace,
ResourceType: types.KindDatabaseServer,
PredicateExpression: fmt.Sprintf(`name == "%s" && resource.spec.protocol == "%s"`, serviceName, protocol),
})
Expand Down
30 changes: 10 additions & 20 deletions lib/client/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,6 @@ type Config struct {
// Labels represent host Labels
Labels map[string]string

// Namespace is nodes namespace
Namespace string

// HostLogin is a user login on a remote host
HostLogin string

Expand Down Expand Up @@ -1192,7 +1189,7 @@ func (c *Config) ProxySpecified() bool {
func (c *Config) ResourceFilter(kind string) *proto.ListResourcesRequest {
return &proto.ListResourcesRequest{
ResourceType: kind,
Namespace: c.Namespace,
Namespace: apidefaults.Namespace,
Labels: c.Labels,
SearchKeywords: c.SearchKeywords,
PredicateExpression: c.PredicateExpression,
Expand Down Expand Up @@ -1261,8 +1258,6 @@ func NewClient(c *Config) (tc *TeleportClient, err error) {
log.InfoContext(context.Background(), "no host login given, using default", "default_host_login", c.HostLogin)
}

c.Namespace = types.ProcessNamespace(c.Namespace)

if c.Tracer == nil {
c.Tracer = tracing.NoopProvider().Tracer(teleport.ComponentTeleport)
}
Expand Down Expand Up @@ -2166,7 +2161,7 @@ func (tc *TeleportClient) runShellOrCommandOnSingleNode(ctx context.Context, clt
nodeClient, err := tc.ConnectToNode(
ctx,
clt,
NodeDetails{Addr: nodeAddr, Namespace: tc.Namespace, Cluster: cluster},
NodeDetails{Addr: nodeAddr, Cluster: cluster},
tc.Config.HostLogin,
)
if err != nil {
Expand Down Expand Up @@ -2284,7 +2279,7 @@ func (tc *TeleportClient) startPortForwarding(ctx context.Context, nodeClient *N
}

// Join connects to the existing/active SSH session
func (tc *TeleportClient) Join(ctx context.Context, mode types.SessionParticipantMode, namespace string, sessionID session.ID, input io.Reader) (err error) {
func (tc *TeleportClient) Join(ctx context.Context, mode types.SessionParticipantMode, sessionID session.ID, input io.Reader) (err error) {
ctx, span := tc.Tracer.Start(
ctx,
"teleportClient/Join",
Expand All @@ -2296,9 +2291,6 @@ func (tc *TeleportClient) Join(ctx context.Context, mode types.SessionParticipan
)
defer span.End()

if namespace == "" {
return trace.BadParameter(authclient.MissingNamespaceError)
}
tc.Stdin = input
if sessionID.Check() != nil {
return trace.Errorf("Invalid session ID format: %s", string(sessionID))
Expand Down Expand Up @@ -2347,7 +2339,7 @@ func (tc *TeleportClient) Join(ctx context.Context, mode types.SessionParticipan
// connect to server:
nc, err := tc.ConnectToNode(ctx,
clt,
NodeDetails{Addr: session.GetAddress() + ":0", Namespace: tc.Namespace, Cluster: clt.ClusterName()},
NodeDetails{Addr: session.GetAddress() + ":0", Cluster: clt.ClusterName()},
tc.Config.HostLogin,
)
if err != nil {
Expand Down Expand Up @@ -2607,9 +2599,8 @@ func (tc *TeleportClient) TransferFiles(ctx context.Context, clt *ClusterClient,
ctx,
clt,
NodeDetails{
Addr: nodeAddr,
Namespace: tc.Namespace,
Cluster: clt.ClusterName(),
Addr: nodeAddr,
Cluster: clt.ClusterName(),
},
hostLogin,
)
Expand Down Expand Up @@ -2946,11 +2937,10 @@ func (tc *TeleportClient) runCommandOnNodes(ctx context.Context, clt *ClusterCli
ctx,
clt,
NodeDetails{
Addr: node.Addr,
Namespace: tc.Namespace,
Cluster: cluster,
MFACheck: mfaRequiredCheck,
hostname: node.Hostname,
Addr: node.Addr,
Cluster: cluster,
MFACheck: mfaRequiredCheck,
hostname: node.Hostname,
},
tc.Config.HostLogin,
)
Expand Down
9 changes: 1 addition & 8 deletions lib/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ import (
// NodeClient implements ssh client to a ssh node (teleport or any regular ssh node)
// NodeClient can run shell and commands or upload and download files.
type NodeClient struct {
Namespace string
Comment thread
codingllama marked this conversation as resolved.
Tracer oteltrace.Tracer
Client *tracessh.Client
TC *TeleportClient
Expand Down Expand Up @@ -257,8 +256,6 @@ func nodeName(node TargetNode) string {
type NodeDetails struct {
// Addr is an address to dial
Addr string
// Namespace is the node namespace
Namespace string
// Cluster is the name of the target cluster
Cluster string

Expand All @@ -282,10 +279,7 @@ func (n NodeDetails) String() string {
// ProxyFormat returns the address in the format
// used by the proxy subsystem
func (n *NodeDetails) ProxyFormat() string {
parts := []string{n.Addr}
if n.Namespace != "" {
parts = append(parts, n.Namespace)
}
parts := []string{n.Addr, apidefaults.Namespace}
if n.Cluster != "" {
parts = append(parts, n.Cluster)
}
Expand Down Expand Up @@ -351,7 +345,6 @@ func NewNodeClient(ctx context.Context, sshConfig *ssh.ClientConfig, conn net.Co

nc := &NodeClient{
Client: tracessh.NewClient(sshconn, chans, emptyCh),
Namespace: apidefaults.Namespace,
TC: tc,
Tracer: tc.Tracer,
FIPSEnabled: fipsEnabled,
Expand Down
4 changes: 1 addition & 3 deletions lib/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ func TestHelperFunctions(t *testing.T) {

func TestNewSession(t *testing.T) {
nc := &NodeClient{
Namespace: "blue",
Tracer: tracing.NoopProvider().Tracer("test"),
Tracer: tracing.NoopProvider().Tracer("test"),
}

ctx := context.Background()
Expand All @@ -57,7 +56,6 @@ func TestNewSession(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, ses)
require.Equal(t, nc, ses.NodeClient())
require.Equal(t, nc.Namespace, ses.namespace)
require.NotNil(t, ses.env)
require.Equal(t, os.Stderr, ses.terminal.Stderr())
require.Equal(t, os.Stdout, ses.terminal.Stdout())
Expand Down
5 changes: 0 additions & 5 deletions lib/client/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ const (
)

type NodeSession struct {
// namespace is a session this namespace belongs to
namespace string

// id is the Teleport session ID
id session.ID

Expand Down Expand Up @@ -129,7 +126,6 @@ func newSession(ctx context.Context,
ns := &NodeSession{
env: env,
nodeClient: client,
namespace: client.Namespace,
closer: utils.NewCloseBroadcaster(),
closeWait: &sync.WaitGroup{},
enableEscapeSequences: enableEscapeSequences,
Expand All @@ -146,7 +142,6 @@ func newSession(ctx context.Context,
}

ns.id = session.ID(sessionID)
ns.namespace = joinSession.GetMetadata().Namespace

if ns.terminal.IsAttached() {
err = ns.terminal.Resize(int16(terminalSize.Width), int16(terminalSize.Height))
Expand Down
11 changes: 1 addition & 10 deletions lib/web/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (

"github.com/gravitational/teleport/api/client/proto"
"github.com/gravitational/teleport/api/defaults"
"github.com/gravitational/teleport/api/types"
"github.com/gravitational/teleport/api/utils/keys"
"github.com/gravitational/teleport/api/utils/sshutils"
"github.com/gravitational/teleport/lib/auth/authclient"
Expand All @@ -46,8 +45,6 @@ type fileTransferRequest struct {
serverID string
// Login is Linux username to connect as.
login string
// Namespace is node namespace.
namespace string
// Cluster is the name of the remote cluster to connect to.
cluster string
// remoteLocation is file remote location
Expand All @@ -71,7 +68,6 @@ func (h *Handler) transferFile(w http.ResponseWriter, r *http.Request, p httprou
serverID: p.ByName("server"),
remoteLocation: query.Get("location"),
filename: query.Get("filename"),
namespace: defaults.Namespace,
mfaResponse: query.Get("mfaResponse"),
fileTransferRequestID: query.Get("fileTransferRequestId"),
moderatedSessionID: query.Get("moderatedSessionId"),
Expand Down Expand Up @@ -186,15 +182,11 @@ type fileTransfer struct {
}

func (f *fileTransfer) createClient(req fileTransferRequest, httpReq *http.Request, proxySigner multiplexer.PROXYHeaderSigner) (*client.TeleportClient, error) {
if !types.IsValidNamespace(req.namespace) {
return nil, trace.BadParameter("invalid namespace %q", req.namespace)
}

if req.login == "" {
return nil, trace.BadParameter("missing login")
}

servers, err := f.authClient.GetNodes(httpReq.Context(), req.namespace)
servers, err := f.authClient.GetNodes(httpReq.Context(), defaults.Namespace)
if err != nil {
return nil, trace.Wrap(err)
}
Expand All @@ -211,7 +203,6 @@ func (f *fileTransfer) createClient(req fileTransferRequest, httpReq *http.Reque

cfg.HostLogin = req.login
cfg.SiteName = req.cluster
cfg.Namespace = req.namespace
if err := cfg.ParseProxyHost(f.proxyHostPort); err != nil {
return nil, trace.BadParameter("failed to parse proxy address: %v", err)
}
Expand Down
2 changes: 0 additions & 2 deletions lib/web/terminal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ import (

"github.com/gravitational/teleport"
authproto "github.com/gravitational/teleport/api/client/proto"
apidefaults "github.com/gravitational/teleport/api/defaults"
"github.com/gravitational/teleport/api/mfa"
"github.com/gravitational/teleport/api/observability/tracing"
tracessh "github.com/gravitational/teleport/api/observability/tracing/ssh"
Expand Down Expand Up @@ -507,7 +506,6 @@ func (t *TerminalHandler) makeClient(ctx context.Context, stream *terminal.Strea

clientConfig.HostLogin = t.sessionData.Login
clientConfig.ForwardAgent = client.ForwardAgentLocal
clientConfig.Namespace = apidefaults.Namespace
clientConfig.Stdout = stream
clientConfig.Stderr = stderrWriter{stream: stream}
clientConfig.Stdin = stream
Expand Down
5 changes: 3 additions & 2 deletions tool/tsh/common/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
"github.com/gravitational/teleport"
apiclient "github.com/gravitational/teleport/api/client"
"github.com/gravitational/teleport/api/client/proto"
apidefaults "github.com/gravitational/teleport/api/defaults"
"github.com/gravitational/teleport/api/types"
apiutils "github.com/gravitational/teleport/api/utils"
"github.com/gravitational/teleport/api/utils/keys"
Expand Down Expand Up @@ -1131,7 +1132,7 @@ func getDatabaseServers(ctx context.Context, tc *client.TeleportClient, name str
logger.DebugContext(ctx, "Listing databases with predicate and labels", "predicate", predicate, "labels", tc.Labels)

databases, err = tc.ListDatabaseServersWithFilters(ctx, &proto.ListResourcesRequest{
Namespace: tc.Namespace,
Namespace: apidefaults.Namespace,
ResourceType: types.KindDatabaseServer,
PredicateExpression: predicate,
Labels: tc.Labels,
Expand Down Expand Up @@ -1193,7 +1194,7 @@ func listDatabasesWithPredicate(ctx context.Context, tc *client.TeleportClient,
predicate := makePredicateConjunction(predicate, tc.PredicateExpression)
logger.DebugContext(ctx, "Listing databases with predicate and labels", "predicate", predicate, "labels", tc.Labels)
databases, err = tc.ListDatabases(ctx, &proto.ListResourcesRequest{
Namespace: tc.Namespace,
Namespace: apidefaults.Namespace,
ResourceType: types.KindDatabaseServer,
PredicateExpression: predicate,
Labels: tc.Labels,
Expand Down
5 changes: 3 additions & 2 deletions tool/tsh/common/kube.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1170,8 +1170,9 @@ func newKubeLoginCommand(parent *kingpin.CmdClause) *kubeLoginCommand {
c.Flag("query", queryHelp).StringVar(&c.predicateExpression)
c.Flag("as", "Configure custom Kubernetes user impersonation.").StringVar(&c.impersonateUser)
c.Flag("as-groups", "Configure custom Kubernetes group impersonation.").StringsVar(&c.impersonateGroups)
// TODO (tigrato): move this back to namespace once teleport drops the namespace flag.
c.Flag("kube-namespace", "Configure the default Kubernetes namespace.").Short('n').StringVar(&c.namespace)
// kube-namespace exists for backwards compatibility.
c.Flag("kube-namespace", "Configure the default Kubernetes namespace.").Hidden().StringVar(&c.namespace)
c.Flag("namespace", "Configure the default Kubernetes namespace.").Short('n').StringVar(&c.namespace)
Comment thread
rosstimothy marked this conversation as resolved.
c.Flag("all", "Generate a kubeconfig with every cluster the user has access to. Mutually exclusive with --labels or --query.").BoolVar(&c.all)
c.Flag("set-context-name", "Define a custom context name. To use it with --all include \"{{.KubeName}}\"").
// Use the default context name template if --set-context-name is not set.
Expand Down
Loading