Check parameter --ip --ip6 --link-local-ip in docker network connect

[chchliang]

Signed-off-by: chchliang chen.chuanliang@zte.com.cn

- What I did
Execute docker network connect --ip=aa network1 xxx but successful,i think ip address invalid,should be failure. like --ip6 --link-local-ip

- How I did it
To add check code in container/container.go

if epConfig != nil {
ipam := epConfig.IPAMConfig

	if ipam != nil {
		var (
			ipList          []net.IP
			ip, ip6, linkip net.IP
		)

		for _, ips := range ipam.LinkLocalIPs {
			if linkip = net.ParseIP(ips); linkip == nil && ips != "" {
				return nil, fmt.Errorf("Invalid link-local IP address:%s", ipam.LinkLocalIPs)
			}
			ipList = append(ipList, linkip)

		}

		if ip = net.ParseIP(ipam.IPv4Address); ip == nil && ipam.IPv4Address != "" {
			return nil, fmt.Errorf("Invalid IPv4 address:%s)", ipam.IPv4Address)
		}

		if ip6 = net.ParseIP(ipam.IPv6Address); ip6 == nil && ipam.IPv6Address != "" {
			return nil, fmt.Errorf("Invalid IPv6 address:%s)", ipam.IPv6Address)
		}

		createOptions = append(createOptions,
			libnetwork.CreateOptionIpam(ip, ip6, ipList, nil))

	}

	for _, alias := range epConfig.Aliases {
		createOptions = append(createOptions, libnetwork.CreateOptionMyAlias(alias))
	}
}

*- How to verify it
docker network connect --ip=aa network1 59bb1359f671
Error response from daemon: Invalid IPv4 address:aa

[vdemeester]

/cc @aboch @mavenugo

[chchliang]

@aboch @mavenugo
This error messages are time out.

[tiborvass]

I think this makes sense.

[aboch]

You do not need to check the length of the list.

[thaJeztah]

perhaps continue here, instead of else?

[aboch]

given we are parsing again later for

libnetwork.CreateOptionIpam(net.ParseIP(ipam.IPv4Address), net.ParseIP(ipam.IPv6Address), ipList, nil))

I think we should define var ip, ip6 net.IP

and change these to

if ip6 = net.ParseIP(ipam.IPv6Address); ip == nil &&  ipam.IPv6Address != "" {
                return nil, fmt.Errorf("Error parsing parameter ip value(%s)", ipam.IPv6Address)
}

and later change to

`libnetwork.CreateOptionIpam(ip, ip6, ipList, nil))`

[chchliang]

@aboch Has been modified,thank you!

[aboch]

Please create a var block

[aboch]

if you also add a llIP to the above var block, you can improve readability here dropping the else block

    if llIP  = net.ParseIP(ips); linkip == nil && ips != "" {
        return nil, fmt.Errorf("Error....)
    }
    ipList = append(ipList, llIP)
}

[chchliang]

I have refactoring code,thank you! @aboch

[aboch]

It would be nice to conform these errors to the errors docker already returns for invalid IP on docker run
As an example, I see
invalid IPv4 address: 3.3.3.333
invalid IPv6 address: 2001:db8:12345678::1

[aboch]

Thanks @chchliang
I was also suggesting to define all these vars in a

var (

)

block

[aboch]

so here we should probably return

invalid link-local IP address: ....

[chchliang]

Thanks @aboch
I have modified

[aboch]

Looks good to me.

[tiborvass]

LGTM

[vdemeester]

LGTM 💃