Use safeexec to get windows path

deansheather · deansheather · commit 5fa9eff10eae · 2021-05-21T20:54:33.000Z
diff --git a/go.mod b/go.mod
@@ -6,6 +6,7 @@ require (
 	cdr.dev/slog v1.4.0
 	cdr.dev/wsep v0.0.0-20200728013649-82316a09813f
 	github.com/briandowns/spinner v1.12.0
+	github.com/cli/safeexec v1.0.0
 	github.com/fatih/color v1.10.0
 	github.com/google/go-cmp v0.5.5
 	github.com/gorilla/websocket v1.4.2
diff --git a/go.sum b/go.sum
@@ -54,6 +54,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5O
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cli/safeexec v1.0.0 h1:0VngyaIyqACHdcMNWfo6+KdUYnqEr2Sg+bSP1pdF+dI=
+github.com/cli/safeexec v1.0.0/go.mod h1:Z/D4tTN8Vs5gXYHDCbaM1S/anmEDnJb1iW0+EJ5zx3Q=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
@@ -6,20 +6,19 @@ import (
 	"io/ioutil"
 	"net/url"
 	"os"
-	"os/exec"
 	"os/user"
 	"path/filepath"
 	"runtime"
 	"sort"
 	"strings"
 
-	"cdr.dev/coder-cli/pkg/clog"
-
+	"github.com/cli/safeexec"
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
 
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/coderutil"
+	"cdr.dev/coder-cli/pkg/clog"
 )
 
 const sshStartToken = "# ------------START-CODER-ENTERPRISE-----------"
@@ -181,7 +180,10 @@ func binPath() (string, error) {
 	// if it isn't.
 	if runtime.GOOS == "windows" {
 		binName := filepath.Base(exePath)
-		pathPath, err := exec.LookPath(exePath)
+		// We use safeexec instead of os/exec because os/exec returns paths in
+		// the current working directory, which we will run into very often when
+		// looking for our own path.
+		pathPath, err := safeexec.LookPath(binName)
 		if err != nil {
 			clog.LogWarn(
 				"The current executable is not in $PATH.",
