fix: 验收修正

internal/logic/controllers/rule_validation.go

@@ -3,12 +3,16 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
+	"net"
 	"regexp"
 	"strings"
 
+	"git.apinb.com/ops/logs/internal/ingest"
 	"git.apinb.com/ops/logs/internal/models"
 )
 
+var trapOIDPattern = regexp.MustCompile(`^\d+(?:\.\d+)*$`)
+
 func validateSyslogRule(rule *models.SyslogRule) error {
 	regexFields := []struct {
 		name    string
@@ -71,6 +75,55 @@ func validateTrapRule(rule *models.TrapRule) error {
 	return nil
 }
 
+func validateTrapShield(shield *models.TrapShield) error {
+	shield.Name = strings.TrimSpace(shield.Name)
+	shield.SourceIPCIDR = strings.TrimSpace(shield.SourceIPCIDR)
+	shield.InterfaceHint = strings.TrimSpace(shield.InterfaceHint)
+	shield.TimeWindowsJSON = strings.TrimSpace(shield.TimeWindowsJSON)
+	if shield.Name == "" {
+		return fmt.Errorf("Trap 屏蔽规则名称不能为空")
+	}
+	if shield.SourceIPCIDR != "" {
+		if strings.Contains(shield.SourceIPCIDR, "/") {
+			if _, _, err := net.ParseCIDR(shield.SourceIPCIDR); err != nil {
+				return fmt.Errorf("源 IP / CIDR 格式无效：%v", err)
+			}
+		} else if net.ParseIP(shield.SourceIPCIDR) == nil {
+			return fmt.Errorf("源 IP / CIDR 格式无效")
+		}
+	}
+
+	normalizedPrefixes := make([]string, 0, len(shield.OIDPrefixes))
+	seenPrefixes := make(map[string]struct{}, len(shield.OIDPrefixes))
+	for _, raw := range shield.OIDPrefixes {
+		prefix := normalizeTrapOIDInput(raw)
+		if prefix == "" {
+			continue
+		}
+		if !trapOIDPattern.MatchString(prefix) {
+			return fmt.Errorf("Trap OID %q 格式无效", raw)
+		}
+		if _, exists := seenPrefixes[prefix]; exists {
+			continue
+		}
+		seenPrefixes[prefix] = struct{}{}
+		normalizedPrefixes = append(normalizedPrefixes, prefix)
+	}
+	shield.OIDPrefixes = normalizedPrefixes
+
+	if shield.SourceIPCIDR == "" && len(shield.OIDPrefixes) == 0 && shield.InterfaceHint == "" {
+		return fmt.Errorf("Trap 屏蔽范围不能为空；请至少设置源 IP / CIDR、Trap 类型或接口提示中的一项")
+	}
+	if err := ingest.ValidateTimeWindowsJSON(shield.TimeWindowsJSON); err != nil {
+		return err
+	}
+	return nil
+}
+
+func normalizeTrapOIDInput(value string) string {
+	return strings.Trim(strings.TrimSpace(value), ".")
+}
+
 func validateOptionalRegex(field, pattern string) error {
 	pattern = strings.TrimSpace(pattern)
 	if pattern == "" {