Merge pull request docker-archive-public#4388 from docker/4302-scp-commandline-win

dgageot · web-flow · commit e02ab45b9ead · 2018-02-10T09:48:45.000+01:00
Fix argument escaping for scp on Windows
diff --git a/commands/scp.go b/commands/scp.go
@@ -7,7 +7,6 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/persist"
 )
@@ -54,26 +53,6 @@ func (s *storeHostInfoLoader) load(name string) (HostInfo, error) {
 	return host.Driver, nil
 }
 
-func cmdScp(c CommandLine, api libmachine.API) error {
-	args := c.Args()
-	if len(args) != 2 {
-		c.ShowHelp()
-		return errWrongNumberArguments
-	}
-
-	src := args[0]
-	dest := args[1]
-
-	hostInfoLoader := &storeHostInfoLoader{api}
-
-	cmd, err := getScpCmd(src, dest, c.Bool("recursive"), c.Bool("delta"), c.Bool("quiet"), hostInfoLoader)
-	if err != nil {
-		return err
-	}
-
-	return runCmdWithStdIo(*cmd)
-}
-
 func getScpCmd(src, dest string, recursive bool, delta bool, quiet bool, hostInfoLoader HostInfoLoader) (*exec.Cmd, error) {
 	var cmdPath string
 	var err error
diff --git a/commands/scp_unix.go b/commands/scp_unix.go
@@ -0,0 +1,27 @@
+// +build !windows
+
+package commands
+
+import (
+	"github.com/docker/machine/libmachine"
+)
+
+func cmdScp(c CommandLine, api libmachine.API) error {
+	args := c.Args()
+	if len(args) != 2 {
+		c.ShowHelp()
+		return errWrongNumberArguments
+	}
+
+	src := args[0]
+	dest := args[1]
+
+	hostInfoLoader := &storeHostInfoLoader{api}
+
+	cmd, err := getScpCmd(src, dest, c.Bool("recursive"), c.Bool("delta"), c.Bool("quiet"), hostInfoLoader)
+	if err != nil {
+		return err
+	}
+
+	return runCmdWithStdIo(*cmd)
+}
diff --git a/commands/scp_windows.go b/commands/scp_windows.go
@@ -0,0 +1,34 @@
+package commands
+
+import (
+	"fmt"
+	"strings"
+	"syscall"
+
+	"github.com/docker/machine/libmachine"
+)
+
+func cmdScp(c CommandLine, api libmachine.API) error {
+	args := c.Args()
+	if len(args) != 2 {
+		c.ShowHelp()
+		return errWrongNumberArguments
+	}
+
+	src := args[0]
+	dest := args[1]
+
+	hostInfoLoader := &storeHostInfoLoader{api}
+
+	cmd, err := getScpCmd(src, dest, c.Bool("recursive"), c.Bool("delta"), c.Bool("quiet"), hostInfoLoader)
+	if err != nil {
+		return err
+	}
+
+	// Default argument escaping is not valid for scp.exe with quoted arguments, so we do it ourselves
+	// see golang/go#15566
+	cmd.SysProcAttr = &syscall.SysProcAttr{}
+	cmd.SysProcAttr.CmdLine = fmt.Sprintf("%s %s", cmd.Path, strings.Join(cmd.Args, " "))
+
+	return runCmdWithStdIo(*cmd)
+}
