Merge pull request ActiveState#3396 from ActiveState/DX-2946

Fix `state exec` unable to run complex arguments

Author: Naatan

internal/osutils/exeutils_windows.go

@@ -8,6 +8,8 @@ import (
 	"syscall"
 
 	"github.com/thoas/go-funk"
+
+	"github.com/ActiveState/cli/internal/logging"
 )
 
 const ExeExtension = ".exe"
@@ -28,6 +30,7 @@ func Command(name string, arg ...string) *exec.Cmd {
 		// other characters that need escaping such as `<` and `>`.
 		// This can be dropped once we update to a Go version that fixes this bug: https://github.com/golang/go/issues/68313
 		cmd.SysProcAttr = &syscall.SysProcAttr{CmdLine: makeCmdLine(cmd.Args)}
+		logging.Debug("Forcing command line: %s", cmd.SysProcAttr.CmdLine)
 	}
 
 	return cmd

internal/runners/exec/exec.go

@@ -195,8 +195,8 @@ func (s *Exec) Run(params *Params, args ...string) (rerr error) {
 	lang := language.Bash
 	scriptArgs := fmt.Sprintf(`%q "$@"`, exeTarget)
 	if strings.Contains(s.subshell.Binary(), "cmd") {
-		lang = language.PowerShell
-		scriptArgs = fmt.Sprintf("& %q @args\nexit $LASTEXITCODE", exeTarget)
+		lang = language.Batch
+		scriptArgs = fmt.Sprintf("@ECHO OFF\n%q %%*", exeTarget)
 	}
 
 	sf, err := scriptfile.New(lang, "state-exec", scriptArgs)

internal/subshell/sscommon/sscommon.go

@@ -15,7 +15,7 @@ import (
 )
 
 func NewCommand(command string, args []string, env []string) *exec.Cmd {
-	cmd := exec.Command(command, args...)
+	cmd := osutils.Command(command, args...)
 	if env != nil {
 		cmd.Env = append(os.Environ(), env...)
 	}
@@ -127,7 +127,7 @@ func runWithCmd(env []string, name string, args ...string) error {
 	case ".bat":
 		// No action required
 	case ".ps1":
-		args = append([]string{"-executionpolicy", "bypass", "-file", name}, args...)
+		args = append([]string{"-file", name}, args...)
 		name = "powershell"
 	case ".sh":
 		bashPath, err := osutils.BashifyPath(name)
@@ -166,7 +166,7 @@ func binaryPathCmd(env []string, name string) (string, error) {
 func runDirect(env []string, name string, args ...string) (rerr error) {
 	logging.Debug("Running command: %s %s", name, strings.Join(args, " "))
 
-	runCmd := exec.Command(name, args...)
+	runCmd := osutils.Command(name, args...)
 	runCmd.Stdin, runCmd.Stdout, runCmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 	runCmd.Env = env
 

test/integration/exec_int_test.go

@@ -6,13 +6,17 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"strings"
 	"testing"
+	"time"
 
-	"github.com/ActiveState/cli/internal/testhelpers/suite"
+	"github.com/ActiveState/termtest"
 
 	"github.com/ActiveState/cli/internal/constants"
+	"github.com/ActiveState/cli/internal/environment"
 	"github.com/ActiveState/cli/internal/fileutils"
 	"github.com/ActiveState/cli/internal/testhelpers/e2e"
+	"github.com/ActiveState/cli/internal/testhelpers/suite"
 	"github.com/ActiveState/cli/internal/testhelpers/tagsuite"
 )
 
@@ -197,25 +201,26 @@ func (suite *ExecIntegrationTestSuite) TestExecWithPath() {
 
 }
 
-func (suite *ExecIntegrationTestSuite) TestExecPerlArgs() {
+func (suite *ExecIntegrationTestSuite) TestExeBatArguments() {
 	suite.OnlyRunForTags(tagsuite.Exec)
-	ts := e2e.New(suite.T(), false)
+
+	if runtime.GOOS != "windows" {
+		suite.T().Skip("This test is only for windows")
+	}
+
+	ts := e2e.New(suite.T(), true)
 	defer ts.Close()
 
-	cp := ts.Spawn("checkout", "ActiveState-CLI/Perl-5.32", ".")
-	cp.Expect("Skipping runtime setup")
-	cp.Expect("Checked out")
-	cp.ExpectExitCode(0)
+	ts.PrepareProject("ActiveState-CLI/small-python", "5a1e49e5-8ceb-4a09-b605-ed334474855b")
 
-	suite.NoError(fileutils.WriteFile(filepath.Join(ts.Dirs.Work, "testargs.pl"), []byte(`
-printf "Argument: '%s'.\n", $ARGV[0];
-`)))
+	root := environment.GetRootPathUnsafe()
+	reportBat := filepath.Join(root, "test", "integration", "testdata", "batarguments", "report.bat")
+	suite.Require().FileExists(reportBat)
 
-	cp = ts.SpawnWithOpts(
-		e2e.OptArgs("exec", "perl", "testargs.pl", "<3"),
-		e2e.OptAppendEnv(constants.DisableRuntime+"=false"),
-	)
-	cp.Expect("Argument: '<3'", e2e.RuntimeSourcingTimeoutOpt)
+	inputs := []string{"a<b", "b>a", "hello world", "&whoami", "imnot|apipe", "%NotAppData%", "^NotEscaped", "(NotAGroup)"}
+	outputs := `"` + strings.Join(inputs, `" "`) + `"`
+	cp := ts.SpawnWithOpts(e2e.OptArgs(append([]string{"exec", reportBat, "--"}, inputs...)...))
+	cp.Expect(outputs, termtest.OptExpectTimeout(5*time.Second))
 	cp.ExpectExitCode(0)
 }