Fix windows cmd quoting

integration-tests/goss/windows/tests/command.goss.yaml

@@ -14,3 +14,17 @@ command:
     - 0
     stderr: []
     timeout: 10000
+  wrap a powershell with quotes - expect 0 because travis does not restrict anonymous logins:
+    exec: powershell -noprofile -noninteractive -command "(get-itemproperty -path 'HKLM:/SYSTEM/CurrentControlSet/Control/Lsa/').restrictanonymous"
+    exit-status: 0
+    stdout:
+    - 0
+    stderr: []
+    timeout: 10000
+  powershell with quotes:
+    exec: powershell /c "(echo '{"b":2, "a":1}' | ConvertFrom-json).a"
+    exit-status: 0
+    stdout:
+    - "1"
+    stderr: []
+    timeout: 10000

system/command_windows.go

@@ -7,5 +7,5 @@ import "github.com/aelsabbahy/goss/util"
 const windowsShell string = "cmd"
 
 func commandWrapper(cmd string) *util.Command {
-	return util.NewCommand(windowsShell, "/c", cmd)
+	return util.NewCommandForWindowsCmd(windowsShell, "/c", cmd)
 }

system/command_windows_test.go

@@ -15,4 +15,12 @@ func TestCommandWrapper(t *testing.T) {
 	if c.Cmd.Path != cmdPath {
 		t.Errorf("Command not wrapped properly for Windows os. got %s, want: %s", c.Cmd.Path, cmdPath)
 	}
+
+	if c.Cmd.SysProcAttr.CmdLine != "/c echo hello world" {
+		t.Errorf("Command not wrapped properly for Windows cmd.exe. got %s, want: %s", c.Cmd.SysProcAttr.CmdLine, "/c echo hello world")
+	}
+
+	if len(c.Cmd.Args) != 1 {
+		t.Errorf("Args length should be blank. got: %d, want: %d", len(c.Cmd.Args), 1)
+	}
 }

util/command.go

@@ -2,6 +2,7 @@ package util
 
 import (
 	"bytes"
+
 	//"fmt"
 	"os/exec"
 	"syscall"
@@ -20,6 +21,7 @@ func NewCommand(name string, arg ...string) *Command {
 	command := new(Command)
 	command.name = name
 	command.Cmd = exec.Command(name, arg...)
+
 	return command
 }
 

util/command_windows.go

@@ -0,0 +1,29 @@
+// +build windows
+
+package util
+
+import (
+	"strings"
+
+	//"fmt"
+	"os/exec"
+	"syscall"
+)
+
+func NewCommandForWindowsCmd(name string, arg ...string) *Command {
+	//fmt.Println(arg)
+	command := new(Command)
+	command.name = name
+
+	// cmd.exe has a unique unquoting algorithm
+	// provide the full command line in SysProcAttr.CmdLine, leaving Args empty.
+	// more information: https://golang.org/pkg/os/exec/#Command
+	command.Cmd = exec.Command(name)
+	command.Cmd.SysProcAttr = &syscall.SysProcAttr{
+		HideWindow:    false,
+		CmdLine:       strings.Join(arg, " "),
+		CreationFlags: 0,
+	}
+
+	return command
+}