Fix Linux PTY render

kylecarbs · kylecarbs · commit db73933d6e7e · 2022-02-17T15:26:45.000Z
diff --git a/cli/root.go b/cli/root.go
@@ -12,7 +12,6 @@ import (
 	"github.com/manifoldco/promptui"
 	"github.com/mattn/go-isatty"
 	"github.com/spf13/cobra"
-	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/cli/config"
 	"github.com/coder/coder/coderd"
@@ -138,21 +137,9 @@ func isTTY(cmd *cobra.Command) bool {
 }
 
 func prompt(cmd *cobra.Command, prompt *promptui.Prompt) (string, error) {
-	var ok bool
-	reader, ok := cmd.InOrStdin().(io.Reader)
-	if !ok {
-		return "", xerrors.New("stdin must be a readcloser")
-	}
-	prompt.Stdin = readWriteCloser{
-		Reader: reader,
-	}
-
-	writer, ok := cmd.OutOrStdout().(io.Writer)
-	if !ok {
-		return "", xerrors.New("stdout must be a readcloser")
-	}
+	prompt.Stdin = io.NopCloser(cmd.InOrStdin())
 	prompt.Stdout = readWriteCloser{
-		Writer: writer,
+		Writer: cmd.OutOrStdout(),
 	}
 
 	// The prompt library displays defaults in a jarring way for the user
diff --git a/pty/pty.go b/pty/pty.go
@@ -7,20 +7,23 @@ import (
 // PTY is a minimal interface for interacting with a TTY.
 type PTY interface {
 	io.Closer
-	// Output handles PTY output.
+
+	// Output handles TTY output.
 	//
 	// cmd.SetOutput(pty.Output()) would be used to specify a command
 	// uses the output stream for writing.
 	//
 	// The same stream could be read to validate output.
 	Output() io.ReadWriter
-	// Input handles PTY input.
+
+	// Input handles TTY input.
 	//
 	// cmd.SetInput(pty.Input()) would be used to specify a command
 	// uses the PTY input for reading.
 	//
 	// The same stream would be used to provide user input: pty.Input().Write(...)
 	Input() io.ReadWriter
+
 	// Resize sets the size of the PTY.
 	Resize(cols uint16, rows uint16) error
 }
@@ -29,3 +32,8 @@ type PTY interface {
 func New() (PTY, error) {
 	return newPty()
 }
+
+type readWriter struct {
+	io.Reader
+	io.Writer
+}
diff --git a/pty/pty_other.go b/pty/pty_other.go
@@ -27,15 +27,17 @@ type otherPty struct {
 }
 
 func (p *otherPty) Input() io.ReadWriter {
-	return p.pty
+	return readWriter{
+		Reader: p.tty,
+		Writer: p.pty,
+	}
 }
 
 func (p *otherPty) Output() io.ReadWriter {
-	return p.pty
-}
-
-func (p *otherPty) WriteString(str string) (int, error) {
-	return p.pty.WriteString(str)
+	return readWriter{
+		Reader: p.pty,
+		Writer: p.tty,
+	}
 }
 
 func (p *otherPty) Resize(cols uint16, rows uint16) error {
diff --git a/pty/pty_windows.go b/pty/pty_windows.go
@@ -67,11 +67,6 @@ type ptyWindows struct {
 	closed     bool
 }
 
-type readWriter struct {
-	io.Reader
-	io.Writer
-}
-
 func (p *ptyWindows) Output() io.ReadWriter {
 	return readWriter{
 		Reader: p.outputRead,
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -3,6 +3,7 @@ package ptytest
 import (
 	"bufio"
 	"bytes"
+	"fmt"
 	"io"
 	"os/exec"
 	"regexp"
@@ -88,6 +89,6 @@ func (p *PTY) ExpectMatch(str string) string {
 }
 
 func (p *PTY) WriteLine(str string) {
-	_, err := p.PTY.Input().Write([]byte(str + "\n"))
+	_, err := fmt.Fprintf(p.PTY.Input(), "%s\n", str)
 	require.NoError(p.t, err)
 }
diff --git a/pty/start_other.go b/pty/start_other.go
@@ -5,14 +5,30 @@ package pty
 
 import (
 	"os/exec"
+	"syscall"
 
 	"github.com/creack/pty"
 )
 
 func startPty(cmd *exec.Cmd) (PTY, error) {
-	pty, err := pty.Start(cmd)
+	pty, tty, err := pty.Open()
 	if err != nil {
 		return nil, err
 	}
-	return &otherPty{pty, pty}, nil
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Setsid:  true,
+		Setctty: true,
+	}
+	cmd.Stdout = tty
+	cmd.Stderr = tty
+	cmd.Stdin = tty
+	err = cmd.Start()
+	if err != nil {
+		_ = pty.Close()
+		return nil, err
+	}
+	return &otherPty{
+		pty: pty,
+		tty: tty,
+	}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package ptytest`
`3`	`3`	`import (`
`4`	`4`	`"bufio"`
`5`	`5`	`"bytes"`
	`6`	`+ "fmt"`
`6`	`7`	`"io"`
`7`	`8`	`"os/exec"`
`8`	`9`	`"regexp"`
`@@ -88,6 +89,6 @@ func (p *PTY) ExpectMatch(str string) string {`
`88`	`89`	`}`
`89`	`90`
`90`	`91`	`func (p *PTY) WriteLine(str string) {`
`91`		`- _, err := p.PTY.Input().Write([]byte(str + "\n"))`
	`92`	`+ _, err := fmt.Fprintf(p.PTY.Input(), "%s\n", str)`
`92`	`93`	`require.NoError(p.t, err)`
`93`	`94`	`}`