vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #14682 from duglin/Issue14621

Browse source 
Remove panic in nat package on invalid hostport
This commit is contained in:
David Calavera 2015-07-21 15:48:51 -07:00
commit e6e9fbe4f7
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
nat/nat.go
View file

@ -29,8 +29,16 @@ type PortSet map[Port]struct{}
// 80/tcp // 80/tcp
type Port string type Port string
func NewPort(proto, port string) Port { func NewPort(proto, port string) (Port, error) {
return Port(fmt.Sprintf("%s/%s", port, proto)) // Check for parsing issues on "port" now so we can avoid having
// to check it later on.
portInt, err := ParsePort(port)
if err != nil {
return "", err
}
return Port(fmt.Sprintf("%d/%s", portInt, proto)), nil
} }
func ParsePort(rawPort string) (int, error) { func ParsePort(rawPort string) (int, error) {
@ -55,11 +63,15 @@ func (p Port) Port() string {
} }
func (p Port) Int() int { func (p Port) Int() int {
port, err := ParsePort(p.Port()) portStr := p.Port()
if err != nil { if len(portStr) == 0 {
panic(err) return 0
} }
return port
// We don't need to check for an error because we're going to
// assume that any error would have been found, and reported, in NewPort()
port, _ := strconv.ParseUint(portStr, 10, 16)
return int(port)
} }
// Splits a port in the format of proto/port // Splits a port in the format of proto/port
@ -152,7 +164,10 @@ func ParsePortSpecs(ports []string) (map[Port]struct{}, map[Port][]PortBinding,
if len(hostPort) > 0 { if len(hostPort) > 0 {
hostPort = strconv.FormatUint(startHostPort+i, 10) hostPort = strconv.FormatUint(startHostPort+i, 10)
} }
port := NewPort(strings.ToLower(proto), containerPort) port, err := NewPort(strings.ToLower(proto), containerPort)
if err != nil {
return nil, nil, err
}
if _, exists := exposedPorts[port]; !exists { if _, exists := exposedPorts[port]; !exists {
exposedPorts[port] = struct{}{} exposedPorts[port] = struct{}{}
} }

11
nat/nat_test.go
View file

@ -42,7 +42,11 @@ func TestParsePort(t *testing.T) {
} }
func TestPort(t *testing.T) { func TestPort(t *testing.T) {
p := NewPort("tcp", "1234") p, err := NewPort("tcp", "1234")
if err != nil {
t.Fatalf("tcp, 1234 had a parsing issue: %v", err)
}
if string(p) != "1234/tcp" { if string(p) != "1234/tcp" {
t.Fatal("tcp, 1234 did not result in the string 1234/tcp") t.Fatal("tcp, 1234 did not result in the string 1234/tcp")
@ -59,6 +63,11 @@ func TestPort(t *testing.T) {
if p.Int() != 1234 { if p.Int() != 1234 {
t.Fatal("port int value was not 1234") t.Fatal("port int value was not 1234")
} }
p, err = NewPort("tcp", "asd1234")
if err == nil {
t.Fatal("tcp, asd1234 was supposed to fail")
}
} }
func TestSplitProtoPort(t *testing.T) { func TestSplitProtoPort(t *testing.T) {