Check the content type is json when calling exec start.

calavera · calavera · commit 45dc57f22931 · 2015-10-19T11:46:44.000-04:00
Signed-off-by: David Calavera &lt;david.calavera@gmail.com&gt;
diff --git a/api/client/exec.go b/api/client/exec.go
@@ -92,7 +92,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
 		}
 	}
 	errCh = promise.Go(func() error {
-		return cli.hijack("POST", "/exec/"+execID+"/start", execConfig.Tty, in, out, stderr, hijacked, execConfig)
+		return cli.hijackWithContentType("POST", "/exec/"+execID+"/start", "application/json", execConfig.Tty, in, out, stderr, hijacked, execConfig)
 	})
 
 	// Acknowledge the hijack before starting
diff --git a/api/client/hijack.go b/api/client/hijack.go
@@ -127,6 +127,10 @@ func (cli *DockerCli) dial() (net.Conn, error) {
 }
 
 func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.ReadCloser, stdout, stderr io.Writer, started chan io.Closer, data interface{}) error {
+	return cli.hijackWithContentType(method, path, "text/plain", setRawTerminal, in, stdout, stderr, started, data)
+}
+
+func (cli *DockerCli) hijackWithContentType(method, path, contentType string, setRawTerminal bool, in io.ReadCloser, stdout, stderr io.Writer, started chan io.Closer, data interface{}) error {
 	defer func() {
 		if started != nil {
 			close(started)
@@ -149,7 +153,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
 	}
 
 	req.Header.Set("User-Agent", "Docker-Client/"+dockerversion.VERSION+" ("+runtime.GOOS+")")
-	req.Header.Set("Content-Type", "text/plain")
+	req.Header.Set("Content-Type", contentType)
 	req.Header.Set("Connection", "Upgrade")
 	req.Header.Set("Upgrade", "tcp")
 	req.Host = cli.addr
diff --git a/api/server/router/local/exec.go b/api/server/router/local/exec.go
@@ -60,6 +60,9 @@ func (s *router) postContainerExecStart(ctx context.Context, w http.ResponseWrit
 	if err := httputils.ParseForm(r); err != nil {
 		return err
 	}
+	if err := httputils.CheckForJSON(r); err != nil {
+		return err
+	}
 	var (
 		execName                  = vars["name"]
 		stdin, inStream           io.ReadCloser

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`errCh = promise.Go(func() error {`
`95`		`- return cli.hijack("POST", "/exec/"+execID+"/start", execConfig.Tty, in, out, stderr, hijacked, execConfig)`
	`95`	`+ return cli.hijackWithContentType("POST", "/exec/"+execID+"/start", "application/json", execConfig.Tty, in, out, stderr, hijacked, execConfig)`
`96`	`96`	`})`
`97`	`97`
`98`	`98`	`// Acknowledge the hijack before starting`