Doug Davis
a9efb7a3af
Closes #14621 This one grew to be much more than I expected so here's the story... :-) - when a bad port string (e.g. xxx80) is passed into container.create() via the API it wasn't being checked until we tried to start the container. - While starting the container we trid to parse 'xxx80' in nat.Int() and would panic on the strconv.ParseUint(). We should (almost) never panic. - In trying to remove the panic I decided to make it so that we, instead, checked the string during the NewPort() constructor. This means that I had to change all casts from 'string' to 'Port' to use NewPort() instead. Which is a good thing anyway, people shouldn't assume they know the internal format of types like that, in general. - This meant I had to go and add error checks on all calls to NewPort(). To avoid changing the testcases too much I create newPortNoError() **JUST** for the testcase uses where we know the port string is ok. - After all of that I then went back and added a check during container.create() to check the port string so we'll report the error as soon as we get the data. - If, somehow, the bad string does get into the metadata we will generate an error during container.start() but I can't test for that because the container.create() catches it now. But I did add a testcase for that. Signed-off-by: Doug Davis <dug@us.ibm.com> Upstream-commit: 12b6083c8f82db7e5db4c683cfe20151731ea851 Component: engine
72 lines
1.7 KiB
Go
72 lines
1.7 KiB
Go
package client
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
"github.com/docker/docker/pkg/nat"
|
|
)
|
|
|
|
// CmdPort lists port mappings for a container.
|
|
// If a private port is specified, it also shows the public-facing port that is NATed to the private port.
|
|
//
|
|
// Usage: docker port CONTAINER [PRIVATE_PORT[/PROTO]]
|
|
func (cli *DockerCli) CmdPort(args ...string) error {
|
|
cmd := cli.Subcmd("port", []string{"CONTAINER [PRIVATE_PORT[/PROTO]]"}, "List port mappings for the CONTAINER, or lookup the public-facing port that\nis NAT-ed to the PRIVATE_PORT", true)
|
|
cmd.Require(flag.Min, 1)
|
|
|
|
cmd.ParseFlags(args, true)
|
|
|
|
serverResp, err := cli.call("GET", "/containers/"+cmd.Arg(0)+"/json", nil, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
defer serverResp.body.Close()
|
|
|
|
var c struct {
|
|
NetworkSettings struct {
|
|
Ports nat.PortMap
|
|
}
|
|
}
|
|
|
|
if err := json.NewDecoder(serverResp.body).Decode(&c); err != nil {
|
|
return err
|
|
}
|
|
|
|
if cmd.NArg() == 2 {
|
|
var (
|
|
port = cmd.Arg(1)
|
|
proto = "tcp"
|
|
parts = strings.SplitN(port, "/", 2)
|
|
)
|
|
|
|
if len(parts) == 2 && len(parts[1]) != 0 {
|
|
port = parts[0]
|
|
proto = parts[1]
|
|
}
|
|
natPort := port + "/" + proto
|
|
newP, err := nat.NewPort(proto, port)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if frontends, exists := c.NetworkSettings.Ports[newP]; exists && frontends != nil {
|
|
for _, frontend := range frontends {
|
|
fmt.Fprintf(cli.out, "%s:%s\n", frontend.HostIp, frontend.HostPort)
|
|
}
|
|
return nil
|
|
}
|
|
return fmt.Errorf("Error: No public port '%s' published for %s", natPort, cmd.Arg(0))
|
|
}
|
|
|
|
for from, frontends := range c.NetworkSettings.Ports {
|
|
for _, frontend := range frontends {
|
|
fmt.Fprintf(cli.out, "%s -> %s:%s\n", from, frontend.HostIp, frontend.HostPort)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|