mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
65370be888
The trust code used to parse the console output of `docker push` to extract the digest, tag, and size information and determine what to sign. This is fragile and might give an attacker control over what gets signed if the attacker can find a way to influence what gets printed as part of the push output. This commit sends the push metadata out-of-band. It introduces an `Aux` field in JSONMessage that can carry application-specific data alongside progress updates. Instead of parsing formatted output, the client looks in this field to get the digest, size, and tag from the push. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
45 lines
1 KiB
Go
45 lines
1 KiB
Go
package client
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
|
|
Cli "github.com/docker/docker/cli"
|
|
"github.com/docker/docker/pkg/jsonmessage"
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
)
|
|
|
|
// CmdLoad loads an image from a tar archive.
|
|
//
|
|
// The tar archive is read from STDIN by default, or from a tar archive file.
|
|
//
|
|
// Usage: docker load [OPTIONS]
|
|
func (cli *DockerCli) CmdLoad(args ...string) error {
|
|
cmd := Cli.Subcmd("load", nil, Cli.DockerCommands["load"].Description, true)
|
|
infile := cmd.String([]string{"i", "-input"}, "", "Read from a tar archive file, instead of STDIN")
|
|
cmd.Require(flag.Exact, 0)
|
|
cmd.ParseFlags(args, true)
|
|
|
|
var input io.Reader = cli.in
|
|
if *infile != "" {
|
|
file, err := os.Open(*infile)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer file.Close()
|
|
input = file
|
|
}
|
|
|
|
response, err := cli.client.ImageLoad(input)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer response.Body.Close()
|
|
|
|
if response.JSON {
|
|
return jsonmessage.DisplayJSONMessagesStream(response.Body, cli.out, cli.outFd, cli.isTerminalOut, nil)
|
|
}
|
|
|
|
_, err = io.Copy(cli.out, response.Body)
|
|
return err
|
|
}
|