Jan 9, 2025
diff --git a/cli/ssh.go b/cli/ssh.go
 parsedEnv = append(parsedEnv, [2]string{k, v})
 }

 workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, inv.Args[0])
 namedWorkspace := inv.Args[0]
 if parts := strings.Split(namedWorkspace, "--"); len(parts) >= 3 {
 owner := parts[1]
 name := parts[2]
 namedWorkspace = owner + "/" + name
 if len(parts) > 3 {
 namedWorkspace += "." + parts[3]
 }
 }

 workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, namedWorkspace)
 if err != nil {
 return err
 }
diff --git a/cli/ssh_test.go b/cli/ssh_test.go
 })
 }
 })

 t.Run("ParseHostname", func(t *testing.T) {
 t.Parallel()
 client, workspace, agentToken := setupWorkspaceForAgent(t)
 _, _ = tGoContext(t, func(ctx context.Context) {
 // Run this async so the SSH command has to wait for
 // the build and agent to connect!
 _ = agenttest.New(t, client.URL, agentToken)
 <-ctx.Done()
 })

 clientOutput, clientInput := io.Pipe()
 serverOutput, serverInput := io.Pipe()
 defer func() {
 for _, c := range []io.Closer{clientOutput, clientInput, serverOutput, serverInput} {
 _ = c.Close()
 }
 }()

 ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 defer cancel()

 user, err := client.User(ctx, codersdk.Me)
 require.NoError(t, err)

 inv, root := clitest.New(t, "ssh", "--stdio", fmt.Sprintf("coder-vscode.coder.prod.netflix.net--%s--%s", user.Username, workspace.Name))
 clitest.SetupConfig(t, client, root)
 inv.Stdin = clientOutput
 inv.Stdout = serverInput
 inv.Stderr = io.Discard

 cmdDone := tGo(t, func() {
 err := inv.WithContext(ctx).Run()
 assert.NoError(t, err)
 })

 conn, channels, requests, err := ssh.NewClientConn(&stdioConn{
 Reader: serverOutput,
 Writer: clientInput,
 }, "", &ssh.ClientConfig{
 // #nosec
 HostKeyCallback: ssh.InsecureIgnoreHostKey(),
 })
 require.NoError(t, err)
 defer conn.Close()

 sshClient := ssh.NewClient(conn, channels, requests)
 session, err := sshClient.NewSession()
 require.NoError(t, err)
 defer session.Close()

 command := "sh -c exit"
 if runtime.GOOS == "windows" {
 command = "cmd.exe /c exit"
 }
 err = session.Run(command)
 require.NoError(t, err)
 err = sshClient.Close()
 require.NoError(t, err)
 _ = clientOutput.Close()

 <-cmdDone
 })
 }

 //nolint:paralleltest // This test uses t.Setenv, parent test MUST NOT be parallel.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -180,7 +180,17 @@ func (r RootCmd) ssh() serpent.Command {
		parsedEnv = append(parsedEnv, [2]string{k, v})
		}

		workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, inv.Args[0])
		namedWorkspace := inv.Args[0]
		if parts := strings.Split(namedWorkspace, "--"); len(parts) >= 3 {
		owner := parts[1]
		name := parts[2]
		namedWorkspace = owner + "/" + name
		if len(parts) > 3 {
		namedWorkspace += "." + parts[3]
		}
		}

		workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, namedWorkspace)
		if err != nil {
		return err
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1482,6 +1482,69 @@ func TestSSH(t *testing.T) {
		})
		}
		})

		t.Run("ParseHostname", func(t *testing.T) {
		t.Parallel()
		client, workspace, agentToken := setupWorkspaceForAgent(t)
		_, _ = tGoContext(t, func(ctx context.Context) {
		// Run this async so the SSH command has to wait for
		// the build and agent to connect!
		_ = agenttest.New(t, client.URL, agentToken)
		<-ctx.Done()
		})

		clientOutput, clientInput := io.Pipe()
		serverOutput, serverInput := io.Pipe()
		defer func() {
		for _, c := range []io.Closer{clientOutput, clientInput, serverOutput, serverInput} {
		_ = c.Close()
		}
		}()

		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
		defer cancel()

		user, err := client.User(ctx, codersdk.Me)
		require.NoError(t, err)

		inv, root := clitest.New(t, "ssh", "--stdio", fmt.Sprintf("coder-vscode.coder.prod.netflix.net--%s--%s", user.Username, workspace.Name))
		clitest.SetupConfig(t, client, root)
		inv.Stdin = clientOutput
		inv.Stdout = serverInput
		inv.Stderr = io.Discard

		cmdDone := tGo(t, func() {
		err := inv.WithContext(ctx).Run()
		assert.NoError(t, err)
		})

		conn, channels, requests, err := ssh.NewClientConn(&stdioConn{
		Reader: serverOutput,
		Writer: clientInput,
		}, "", &ssh.ClientConfig{
		// #nosec
		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
		})
		require.NoError(t, err)
		defer conn.Close()

		sshClient := ssh.NewClient(conn, channels, requests)
		session, err := sshClient.NewSession()
		require.NoError(t, err)
		defer session.Close()

		command := "sh -c exit"
		if runtime.GOOS == "windows" {
		command = "cmd.exe /c exit"
		}
		err = session.Run(command)
		require.NoError(t, err)
		err = sshClient.Close()
		require.NoError(t, err)
		_ = clientOutput.Close()

		<-cmdDone
		})
		}

		//nolint:paralleltest // This test uses t.Setenv, parent test MUST NOT be parallel.
Expand Down