support ipv6 for port binding

Signed-off-by: fahed dorgaa <[email protected]>

support ipv6 for port binding

Signed-off-by: fahed dorgaa <[email protected]>

support ipv6 for port binding

Signed-off-by: fahed dorgaa <[email protected]>

support ipv6 for port binding

Signed-off-by: fahed dorgaa <[email protected]>

Author: fahedouch

pkg/portutil/portutil.go

@@ -1,6 +1,5 @@
 /*
-   Copyright (C) nerdctl authors.
-   Copyright (C) containerd authors.
+   Copyright The containerd Authors.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -26,6 +25,23 @@ import (
 	"github.com/pkg/errors"
 )
 
+func splitParts(rawport string) (string, string, string) {
+	parts := strings.Split(rawport, ":")
+	n := len(parts)
+	containerport := parts[n-1]
+
+	switch n {
+	case 1:
+		return "", "", containerport
+	case 2:
+		return "", parts[0], containerport
+	case 3:
+		return parts[0], parts[1], containerport
+	default:
+		return strings.Join(parts[:n-2], ":"), parts[n-2], containerport
+	}
+}
+
 func ParseFlagP(s string) (*gocni.PortMapping, error) {
 	proto := "tcp"
 	splitBySlash := strings.Split(s, "/")
@@ -48,39 +64,41 @@ func ParseFlagP(s string) (*gocni.PortMapping, error) {
 		HostIP:   "0.0.0.0",
 	}
 
-	splitByColon := strings.Split(splitBySlash[0], ":")
-	switch len(splitByColon) {
-	case 1:
-		return nil, errors.Errorf("automatic host port assignment is not supported yet (FIXME)")
-	case 2:
-		i, err := strconv.Atoi(splitByColon[0])
-		if err != nil {
-			return nil, err
-		}
-		res.HostPort = int32(i)
-		i, err = strconv.Atoi(splitByColon[1])
-		if err != nil {
-			return nil, err
-		}
-		res.ContainerPort = int32(i)
-		return res, nil
-	case 3:
-		res.HostIP = splitByColon[0]
-		if net.ParseIP(res.HostIP) == nil {
-			return nil, errors.Errorf("invalid IP %q", res.HostIP)
-		}
-		i, err := strconv.Atoi(splitByColon[1])
-		if err != nil {
-			return nil, err
-		}
-		res.HostPort = int32(i)
-		i, err = strconv.Atoi(splitByColon[2])
+	ip, hostPort, containerPort := splitParts(splitBySlash[0])
+
+	if ip != "" && ip[0] == '[' {
+		// Strip [] from IPV6 addresses
+		rawIP, _, err := net.SplitHostPort(ip + ":")
 		if err != nil {
-			return nil, err
+			return nil, errors.Errorf("Invalid ip address %v: %s", ip, err)
 		}
-		res.ContainerPort = int32(i)
-		return res, nil
-	default:
-		return nil, errors.Errorf("failed to parse %q, unexpected colons", s)
+		ip = rawIP
+	}
+
+	if ip != "" && net.ParseIP(ip) == nil {
+		return nil, errors.Errorf("Invalid ip address: %s", ip)
+	}
+	if containerPort == "" {
+		return nil, errors.Errorf("No port specified: %s<empty>", splitBySlash[0])
+	}
+
+	if hostPort == "" {
+		return nil, errors.Errorf("automatic host port assignment is not supported yet (FIXME)")
+	}
+
+	i, err := strconv.Atoi(hostPort)
+	if err != nil {
+		return nil, err
 	}
+	res.HostPort = int32(i)
+
+	i, err = strconv.Atoi(containerPort)
+	if err != nil {
+		return nil, err
+	}
+	res.ContainerPort = int32(i)
+
+	res.HostIP = ip
+	return res, nil
+
 }