check the cidr format whether is correct (#1396)

(cherry picked from commit 3206a7a)
kubeovn · Mar 24, 2022 · 899de6f · 899de6f
1 parent b54364b
commit 899de6f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/util/net.go b/pkg/util/net.go
@@ -156,8 +156,12 @@ func CheckProtocol(address string) string {
 	ip := net.ParseIP(address)
 	if ip.To4() != nil {
 		return kubeovnv1.ProtocolIPv4
+	} else if ip.To16() != nil {
+		return kubeovnv1.ProtocolIPv6
 	}
-	return kubeovnv1.ProtocolIPv6
+
+	// cidr formal error
+	return ""
 }
 
 // ProtocolToFamily converts protocol string to netlink family

diff --git a/pkg/util/validator.go b/pkg/util/validator.go
@@ -45,6 +45,9 @@ func ValidateSubnet(subnet kubeovnv1.Subnet) error {
 	if err := cidrConflict(subnet.Spec.CIDRBlock); err != nil {
 		return err
 	}
+	if CheckProtocol(subnet.Spec.CIDRBlock) == "" {
+		return fmt.Errorf("CIDRBlock: %s formal error", subnet.Spec.CIDRBlock)
+	}
 	excludeIps := subnet.Spec.ExcludeIps
 	for _, ipr := range excludeIps {
 		ips := strings.Split(ipr, "..")