Check network mask when init subnet

Signed-off-by: zhuanlan <[email protected]>

pkg/controller/init.go

@@ -301,6 +301,9 @@ func (c *Controller) InitIPAM() error {
 	subnetProviderMaps := make(map[string]string, len(subnets))
 	for _, subnet := range subnets {
 		subnetProviderMaps[subnet.Name] = subnet.Spec.Provider
+
+		klog.Infof("Init subnet %s", subnet.Name)
+
 		if err := c.ipam.AddOrUpdateSubnet(subnet.Name, subnet.Spec.CIDRBlock, subnet.Spec.Gateway, subnet.Spec.ExcludeIps); err != nil {
 			klog.Errorf("failed to init subnet %s: %v", subnet.Name, err)
 		}

pkg/util/net.go

@@ -712,3 +712,11 @@ func InvalidCIDR(s string) error {
 	}
 	return nil
 }
+
+func InvalidNetworkMask(network *net.IPNet) error {
+	if ones, bits := network.Mask.Size(); ones == bits {
+		err := fmt.Errorf("invalid network mask %d", ones)
+		return err
+	}
+	return nil
+}

pkg/util/validator.go

@@ -78,8 +78,13 @@ func ValidateSubnet(subnet kubeovnv1.Subnet) error {
 			klog.Errorf("invalid subnet %s cidr %s, %s", subnet.Name, cidr, err)
 			return err
 		}
-		if _, _, err := net.ParseCIDR(cidr); err != nil {
-			return fmt.Errorf("subnet %s cidr %s is invalid", subnet.Name, cidr)
+		_, network, err := net.ParseCIDR(cidr)
+		if err != nil {
+			return fmt.Errorf("subnet %s cidr %s is invalid, due to %w", subnet.Name, cidr, err)
+		}
+		// check network mask is 32 in ipv4 or 128 in ipv6
+		if err = InvalidNetworkMask(network); err != nil {
+			return fmt.Errorf("subnet %s cidr %s mask is invalid, due to %w", subnet.Name, cidr, err)
 		}
 	}