Skip to content

Commit

Permalink
add proto validation at parse
Browse files Browse the repository at this point in the history
Docker-DCO-1.1-Signed-off-by: Victor Vieux <[email protected]> (github: vieux)
  • Loading branch information
vieux committed Jun 2, 2014
1 parent b292928 commit 0633b12
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion nat/nat.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ package nat

import (
"fmt"
"github.com/dotcloud/docker/utils"
"strconv"
"strings"

"github.com/dotcloud/docker/utils"
)

const (
Expand Down Expand Up @@ -72,6 +73,15 @@ func SplitProtoPort(rawPort string) (string, string) {
return parts[1], parts[0]
}

func validateProto(proto string) bool {
for _, availableProto := range []string{"tcp", "udp"} {
if availableProto == proto {
return true
}
}
return false
}

// We will receive port specs in the format of ip:public:private/proto and these need to be
// parsed in the internal types
func ParsePortSpecs(ports []string) (map[Port]struct{}, map[Port][]PortBinding, error) {
Expand Down Expand Up @@ -113,6 +123,9 @@ func ParsePortSpecs(ports []string) (map[Port]struct{}, map[Port][]PortBinding,
if _, err := strconv.ParseUint(hostPort, 10, 16); hostPort != "" && err != nil {
return nil, nil, fmt.Errorf("Invalid hostPort: %s", hostPort)
}
if !validateProto(proto) {
return nil, nil, fmt.Errorf("Invalid proto: %s", proto)
}

port := NewPort(proto, containerPort)
if _, exists := exposedPorts[port]; !exists {
Expand Down

0 comments on commit 0633b12

Please sign in to comment.