api/t/network: ValidateIPAM: ignore v6 subnet when IPv6 is disabled

akerouanton · akerouanton · commit e37172c6131b · 2024-02-02T10:34:39.000+01:00
Commit 4f47013 introduced a new validation step to make sure no IPv6 subnet is configured on a network which has EnableIPv6=false. Commit 5d5eeac then removed that validation step and automatically enabled IPv6 for networks with a v6 subnet. But this specific commit was reverted in c59e93a and now the error introduced by 4f47013 is re-introduced. But it turns out some users expect a network created with an IPv6 subnet and EnableIPv6=false to actually have no IPv6 connectivity. This restores that behavior. Signed-off-by: Albin Kerouanton <albinker@gmail.com>
diff --git a/api/types/network/ipam.go b/api/types/network/ipam.go
@@ -49,12 +49,12 @@ func ValidateIPAM(ipam *IPAM, enableIPv6 bool) error {
 			subnetFamily = ip6
 		}
 
-		if subnet != subnet.Masked() {
-			errs = append(errs, fmt.Errorf("invalid subnet %s: it should be %s", subnet, subnet.Masked()))
+		if !enableIPv6 && subnetFamily == ip6 {
+			continue
 		}
 
-		if !enableIPv6 && subnetFamily == ip6 {
-			errs = append(errs, fmt.Errorf("invalid subnet %s: IPv6 has not been enabled for this network", subnet))
+		if subnet != subnet.Masked() {
+			errs = append(errs, fmt.Errorf("invalid subnet %s: it should be %s", subnet, subnet.Masked()))
 		}
 
 		if ipRangeErrs := validateIPRange(cfg.IPRange, subnet, subnetFamily); len(ipRangeErrs) > 0 {
diff --git a/api/types/network/ipam_test.go b/api/types/network/ipam_test.go
@@ -31,10 +31,10 @@ func TestNetworkWithInvalidIPAM(t *testing.T) {
 			},
 		},
 		{
-			name:           "IPv6 subnet is discarded when IPv6 is disabled",
-			ipam:           IPAM{Config: []IPAMConfig{{Subnet: "2001:db8::/32"}}},
-			ipv6:           false,
-			expectedErrors: []string{"invalid subnet 2001:db8::/32: IPv6 has not been enabled for this network"},
+			// Regression test for https://github.com/moby/moby/issues/47202
+			name: "IPv6 subnet is discarded with no error when IPv6 is disabled",
+			ipam: IPAM{Config: []IPAMConfig{{Subnet: "2001:db8::/32"}}},
+			ipv6: false,
 		},
 		{
 			name: "Invalid data - Subnet",

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,12 @@ func ValidateIPAM(ipam *IPAM, enableIPv6 bool) error {`
`49`	`49`	`subnetFamily = ip6`
`50`	`50`	`}`
`51`	`51`
`52`		`- if subnet != subnet.Masked() {`
`53`		`- errs = append(errs, fmt.Errorf("invalid subnet %s: it should be %s", subnet, subnet.Masked()))`
	`52`	`+ if !enableIPv6 && subnetFamily == ip6 {`
	`53`	`+ continue`
`54`	`54`	`}`
`55`	`55`
`56`		`- if !enableIPv6 && subnetFamily == ip6 {`
`57`		`- errs = append(errs, fmt.Errorf("invalid subnet %s: IPv6 has not been enabled for this network", subnet))`
	`56`	`+ if subnet != subnet.Masked() {`
	`57`	`+ errs = append(errs, fmt.Errorf("invalid subnet %s: it should be %s", subnet, subnet.Masked()))`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if ipRangeErrs := validateIPRange(cfg.IPRange, subnet, subnetFamily); len(ipRangeErrs) > 0 {`