mirror of https://github.com/docker/cli.git
Merge pull request #5483 from robmry/ip-range-validation
Check that --ip-range is a CIDR address
This commit is contained in:
commit
c767b9b2da
|
@ -163,6 +163,9 @@ func createIPAMConfig(options ipamOptions) (*network.IPAM, error) {
|
|||
for _, r := range options.ipRanges {
|
||||
match := false
|
||||
for _, s := range options.subnets {
|
||||
if _, _, err := net.ParseCIDR(r); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ok, err := subnetMatches(s, r)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
|
@ -124,6 +124,15 @@ func TestNetworkCreateErrors(t *testing.T) {
|
|||
},
|
||||
expectedError: "no matching subnet for aux-address",
|
||||
},
|
||||
{
|
||||
args: []string{"toto"},
|
||||
flags: map[string]string{
|
||||
"ip-range": "192.168.83.1-192.168.83.254",
|
||||
"gateway": "192.168.80.1",
|
||||
"subnet": "192.168.80.0/20",
|
||||
},
|
||||
expectedError: "invalid CIDR address: 192.168.83.1-192.168.83.254",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
|
|
Loading…
Reference in New Issue