coder · bryphe-coder · Feb 15, 2022 · Feb 11, 2022 · Feb 11, 2022 · Feb 11, 2022
diff --git a/cli/clitest/clitest.go b/cli/clitest/clitest.go
@@ -2,16 +2,13 @@ package clitest
 
 import (
 	"archive/tar"
-	"bufio"
 	"bytes"
 	"errors"
 	"io"
 	"os"
 	"path/filepath"
-	"regexp"
 	"testing"
 
-	"github.com/Netflix/go-expect"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 
@@ -21,12 +18,6 @@ import (
 	"github.com/coder/coder/provisioner/echo"
 )
 
-var (
-	// Used to ensure terminal output doesn't have anything crazy!
-	// See: https://stackoverflow.com/a/29497680
-	stripAnsi = regexp.MustCompile("[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))")
-)
-
 // New creates a CLI instance with a configuration pointed to a
 // temporary testing directory.
 func New(t *testing.T, args ...string) (*cobra.Command, config.Root) {
@@ -55,31 +46,6 @@ func CreateProjectVersionSource(t *testing.T, responses *echo.Responses) string
 	return directory
 }
 
-// NewConsole creates a new TTY bound to the command provided.
-// All ANSI escape codes are stripped to provide clean output.
-func NewConsole(t *testing.T, cmd *cobra.Command) *expect.Console {
-	reader, writer := io.Pipe()
-	scanner := bufio.NewScanner(reader)
-	t.Cleanup(func() {
-		_ = reader.Close()
-		_ = writer.Close()
-	})
-	go func() {
-		for scanner.Scan() {
-			if scanner.Err() != nil {
-				return
-			}
-			t.Log(stripAnsi.ReplaceAllString(scanner.Text(), ""))
-		}
-	}()
-
-	console, err := expect.NewConsole(expect.WithStdout(writer))
-	require.NoError(t, err)
-	cmd.SetIn(console.Tty())
-	cmd.SetOut(console.Tty())
-	return console
-}
-
 func extractTar(t *testing.T, data []byte, directory string) {
 	reader := tar.NewReader(bytes.NewBuffer(data))
 	for {

diff --git a/cli/clitest/clitest_test.go b/cli/clitest/clitest_test.go
@@ -1,12 +1,11 @@
-//go:build !windows
-
 package clitest_test
 
 import (
 	"testing"
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/expect"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
 )
@@ -21,7 +20,7 @@ func TestCli(t *testing.T) {
 	client := coderdtest.New(t)
 	cmd, config := clitest.New(t)
 	clitest.SetupConfig(t, client, config)
-	console := clitest.NewConsole(t, cmd)
+	console := expect.NewTestConsole(t, cmd)
 	go func() {
 		err := cmd.Execute()
 		require.NoError(t, err)

diff --git a/cli/login.go b/cli/login.go
@@ -22,6 +22,7 @@ func login() *cobra.Command {
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			rawURL := args[0]
+
 			if !strings.HasPrefix(rawURL, "http://") && !strings.HasPrefix(rawURL, "https://") {
 				scheme := "https"
 				if strings.HasPrefix(rawURL, "localhost") {
@@ -44,7 +45,7 @@ func login() *cobra.Command {
 				return xerrors.Errorf("has initial user: %w", err)
 			}
 			if !hasInitialUser {
-				if !isTTY(cmd.InOrStdin()) {
+				if !isTTY(cmd) {
 					return xerrors.New("the initial user cannot be created in non-interactive mode. use the API")
 				}
 				_, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Your Coder deployment hasn't been set up!\n", color.HiBlackString(">"))

diff --git a/cli/login_test.go b/cli/login_test.go
@@ -1,11 +1,10 @@
-//go:build !windows
-
 package cli_test
 
 import (
 	"testing"
 
 	"github.com/coder/coder/cli/clitest"
+	"github.com/coder/coder/expect"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/stretchr/testify/require"
 )
@@ -23,8 +22,11 @@ func TestLogin(t *testing.T) {
 	t.Run("InitialUserTTY", func(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t)
-		root, _ := clitest.New(t, "login", client.URL.String())
-		console := clitest.NewConsole(t, root)
+		// The --force-tty flag is required on Windows, because the `isatty` library does not
+		// accurately detect Windows ptys when they are not attached to a process:
+		// https://github.com/mattn/go-isatty/issues/59
+		root, _ := clitest.New(t, "login", client.URL.String(), "--force-tty")
+		console := expect.NewTestConsole(t, root)
 		go func() {
 			err := root.Execute()
 			require.NoError(t, err)

diff --git a/cli/projectcreate_test.go b/cli/projectcreate_test.go
@@ -1,5 +1,3 @@
-//go:build !windows
-
 package cli_test
 
 import (
@@ -10,6 +8,7 @@ import (
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/database"
+	"github.com/coder/coder/expect"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
 )
@@ -27,7 +26,7 @@ func TestProjectCreate(t *testing.T) {
 		cmd, root := clitest.New(t, "projects", "create", "--directory", source, "--provisioner", string(database.ProvisionerTypeEcho))
 		clitest.SetupConfig(t, client, root)
 		_ = coderdtest.NewProvisionerDaemon(t, client)
-		console := clitest.NewConsole(t, cmd)
+		console := expect.NewTestConsole(t, cmd)
 		closeChan := make(chan struct{})
 		go func() {
 			err := cmd.Execute()
@@ -74,7 +73,7 @@ func TestProjectCreate(t *testing.T) {
 		cmd, root := clitest.New(t, "projects", "create", "--directory", source, "--provisioner", string(database.ProvisionerTypeEcho))
 		clitest.SetupConfig(t, client, root)
 		coderdtest.NewProvisionerDaemon(t, client)
-		console := clitest.NewConsole(t, cmd)
+		console := expect.NewTestConsole(t, cmd)
 		closeChan := make(chan struct{})
 		go func() {
 			err := cmd.Execute()

diff --git a/cli/root.go b/cli/root.go
@@ -21,6 +21,7 @@ import (
 
 const (
 	varGlobalConfig = "global-config"
+	varForceTty     = "force-tty"
 )
 
 func Root() *cobra.Command {
@@ -65,6 +66,12 @@ func Root() *cobra.Command {
 	cmd.AddCommand(users())
 
 	cmd.PersistentFlags().String(varGlobalConfig, configdir.LocalConfig("coder"), "Path to the global `coder` config directory")
+	cmd.PersistentFlags().Bool(varForceTty, false, "Force the `coder` command to run as if connected to a TTY")
+	err := cmd.PersistentFlags().MarkHidden(varForceTty)
+	if err != nil {
+		// This should never return an error, because we just added the `--force-tty`` flag prior to calling MarkHidden.
+		panic(err)
+	}
 
 	return cmd
 }
@@ -113,7 +120,16 @@ func createConfig(cmd *cobra.Command) config.Root {
 // isTTY returns whether the passed reader is a TTY or not.
 // This accepts a reader to work with Cobra's "InOrStdin"
 // function for simple testing.
-func isTTY(reader io.Reader) bool {
+func isTTY(cmd *cobra.Command) bool {
+	// If the `--force-tty` command is available, and set,
+	// assume we're in a tty. This is primarily for cases on Windows
+	// where we may not be able to reliably detect this automatically (ie, tests)
+	forceTty, err := cmd.Flags().GetBool(varForceTty)
+	if forceTty && err == nil {
+		return true
+	}
+
+	reader := cmd.InOrStdin()
 	file, ok := reader.(*os.File)
 	if !ok {
 		return false

diff --git a/cli/workspacecreate_test.go b/cli/workspacecreate_test.go
@@ -1,12 +1,11 @@
-//go:build !windows
-
 package cli_test
 
 import (
 	"testing"
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/expect"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
 	"github.com/stretchr/testify/require"
@@ -37,7 +36,7 @@ func TestWorkspaceCreate(t *testing.T) {
 		cmd, root := clitest.New(t, "workspaces", "create", project.Name)
 		clitest.SetupConfig(t, client, root)
 
-		console := clitest.NewConsole(t, cmd)
+		console := expect.NewTestConsole(t, cmd)
 		closeChan := make(chan struct{})
 		go func() {
 			err := cmd.Execute()

diff --git a/expect/conpty/conpty.go b/expect/conpty/conpty.go
@@ -0,0 +1,107 @@
+//go:build windows
+// +build windows
+
+// Original copyright 2020 ActiveState Software. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file
+
+package conpty
+
+import (
+	"fmt"
+	"io"
+	"os"
+
+	"golang.org/x/sys/windows"
+)
+
+// ConPty represents a windows pseudo console.
+type ConPty struct {
+	hpCon                    windows.Handle
+	outPipePseudoConsoleSide windows.Handle
+	outPipeOurSide           windows.Handle
+	inPipeOurSide            windows.Handle
+	inPipePseudoConsoleSide  windows.Handle
+	consoleSize              uintptr
+	outFilePseudoConsoleSide *os.File
+	outFileOurSide           *os.File
+	inFilePseudoConsoleSide  *os.File
+	inFileOurSide            *os.File
+	closed                   bool
+}
+
+// New returns a new ConPty pseudo terminal device
+func New(columns int16, rows int16) (*ConPty, error) {
+	c := &ConPty{
+		consoleSize: uintptr(columns) + (uintptr(rows) << 16),
+	}
+
+	return c, c.createPseudoConsoleAndPipes()
+}
+
+// Close closes the pseudo-terminal and cleans up all attached resources
+func (c *ConPty) Close() error {
+	// Trying to close these pipes multiple times will result in an
+	// access violation
+	if c.closed {
+		return nil
+	}
+
+	err := closePseudoConsole(c.hpCon)
+	c.outFilePseudoConsoleSide.Close()
+	c.outFileOurSide.Close()
+	c.inFilePseudoConsoleSide.Close()
+	c.inFileOurSide.Close()
+	c.closed = true
+	return err
+}
+
+// OutPipe returns the output pipe of the pseudo terminal
+func (c *ConPty) OutPipe() *os.File {
+	return c.outFilePseudoConsoleSide
+}
+
+func (c *ConPty) Reader() io.Reader {
+	return c.outFileOurSide
+}
+
+// InPipe returns input pipe of the pseudo terminal
+// Note: It is safer to use the Write method to prevent partially-written VT sequences
+// from corrupting the terminal
+func (c *ConPty) InPipe() *os.File {
+	return c.inFilePseudoConsoleSide
+}
+
+func (c *ConPty) WriteString(str string) (int, error) {
+	return c.inFileOurSide.WriteString(str)
+}
+
+func (c *ConPty) createPseudoConsoleAndPipes() error {
+	// Create the stdin pipe
+	if err := windows.CreatePipe(&c.inPipePseudoConsoleSide, &c.inPipeOurSide, nil, 0); err != nil {
+		return err
+	}
+
+	// Create the stdout pipe
+	if err := windows.CreatePipe(&c.outPipeOurSide, &c.outPipePseudoConsoleSide, nil, 0); err != nil {
+		return err
+	}
+
+	// Create the pty with our stdin/stdout
+	if err := createPseudoConsole(c.consoleSize, c.inPipePseudoConsoleSide, c.outPipePseudoConsoleSide, &c.hpCon); err != nil {
+		return fmt.Errorf("failed to create pseudo console: %d, %v", uintptr(c.hpCon), err)
+	}
+
+	c.outFilePseudoConsoleSide = os.NewFile(uintptr(c.outPipePseudoConsoleSide), "|0")
+	c.outFileOurSide = os.NewFile(uintptr(c.outPipeOurSide), "|1")
+
+	c.inFilePseudoConsoleSide = os.NewFile(uintptr(c.inPipePseudoConsoleSide), "|2")
+	c.inFileOurSide = os.NewFile(uintptr(c.inPipeOurSide), "|3")
+	c.closed = false
+
+	return nil
+}
+
+func (c *ConPty) Resize(cols uint16, rows uint16) error {
+	return resizePseudoConsole(c.hpCon, uintptr(cols)+(uintptr(rows)<<16))
+}
diff --git a/expect/conpty/syscall.go b/expect/conpty/syscall.go
@@ -0,0 +1,53 @@
+//go:build windows
+// +build windows
+
+// Copyright 2020 ActiveState Software. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file
+
+package conpty
+
+import (
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+)
+
+var (
+	kernel32                = windows.NewLazySystemDLL("kernel32.dll")
+	procResizePseudoConsole = kernel32.NewProc("ResizePseudoConsole")
+	procCreatePseudoConsole = kernel32.NewProc("CreatePseudoConsole")
+	procClosePseudoConsole  = kernel32.NewProc("ClosePseudoConsole")
+)
+
+func createPseudoConsole(consoleSize uintptr, ptyIn windows.Handle, ptyOut windows.Handle, hpCon *windows.Handle) (err error) {
+	r1, _, e1 := procCreatePseudoConsole.Call(
+		consoleSize,
+		uintptr(ptyIn),
+		uintptr(ptyOut),
+		0,
+		uintptr(unsafe.Pointer(hpCon)),
+	)
+
+	if r1 != 0 { // !S_OK
+		err = e1
+	}
+	return
+}
+
+func resizePseudoConsole(handle windows.Handle, consoleSize uintptr) (err error) {
+	r1, _, e1 := procResizePseudoConsole.Call(uintptr(handle), consoleSize)
+	if r1 != 0 { // !S_OK
+		err = e1
+	}
+	return
+}
+
+func closePseudoConsole(handle windows.Handle) (err error) {
+	r1, _, e1 := procClosePseudoConsole.Call(uintptr(handle))
+	if r1 == 0 {
+		err = e1
+	}
+
+	return
+}