kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17125 from calavera/check_exec_start_json

Browse source 
Check the content type is json when calling exec start.
This commit is contained in:
Antonio Murdaca 2015-10-19 18:44:42 +02:00
commit bb085b7661
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/exec.go
View file

@ -92,7 +92,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
} }
} }
errCh = promise.Go(func() 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 // Acknowledge the hijack before starting

6
api/client/hijack.go
View file

@ -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 { 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() { defer func() {
if started != nil { if started != nil {
close(started) 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("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("Connection", "Upgrade")
req.Header.Set("Upgrade", "tcp") req.Header.Set("Upgrade", "tcp")
req.Host = cli.addr req.Host = cli.addr

3
api/server/router/local/exec.go
View file

@ -60,6 +60,9 @@ func (s *router) postContainerExecStart(ctx context.Context, w http.ResponseWrit
if err := httputils.ParseForm(r); err != nil { if err := httputils.ParseForm(r); err != nil {
return err return err
} }
if err := httputils.CheckForJSON(r); err != nil {
return err
}
var ( var (
execName = vars["name"] execName = vars["name"]
stdin, inStream io.ReadCloser stdin, inStream io.ReadCloser