feat: GEOIP,IP-ASN,IP-CIDR,IP-CIDR6 and IP-SUFFIX in rules …

…support `,src` option keep the same writing style as `RULE-SET`
MetaCubeX · Aug 29, 2024 · 38fd371 · 38fd371
1 parent 763a127
commit 38fd371
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/rules/common/base.go b/rules/common/base.go
@@ -8,8 +8,12 @@ import (
 
 var (
 	errPayload = errors.New("payloadRule error")
-	noResolve  = "no-resolve"
-	src        = "src"
+)
+
+// params
+var (
+	NoResolve = "no-resolve"
+	Src       = "src"
 )
 
 type Base struct {
@@ -25,10 +29,12 @@ func (b *Base) ShouldResolveIP() bool {
 
 func (b *Base) ProviderNames() []string { return nil }
 
-func HasNoResolve(params []string) bool {
-	return slices.Contains(params, noResolve)
-}
-
-func HasSrc(params []string) bool {
-	return slices.Contains(params, src)
+func ParseParams(params []string) (isSrc bool, noResolve bool) {
+	isSrc = slices.Contains(params, Src)
+	if isSrc {
+		noResolve = true
+	} else {
+		noResolve = slices.Contains(params, NoResolve)
+	}
+	return
 }
diff --git a/rules/parser.go b/rules/parser.go
@@ -22,23 +22,23 @@ func ParseRule(tp, payload, target string, params []string, subRules map[string]
 	case "GEOSITE":
 		parsed, parseErr = RC.NewGEOSITE(payload, target)
 	case "GEOIP":
-		noResolve := RC.HasNoResolve(params)
-		parsed, parseErr = RC.NewGEOIP(payload, target, false, noResolve)
+		isSrc, noResolve := RC.ParseParams(params)
+		parsed, parseErr = RC.NewGEOIP(payload, target, isSrc, noResolve)
 	case "SRC-GEOIP":
 		parsed, parseErr = RC.NewGEOIP(payload, target, true, true)
 	case "IP-ASN":
-		noResolve := RC.HasNoResolve(params)
-		parsed, parseErr = RC.NewIPASN(payload, target, false, noResolve)
+		isSrc, noResolve := RC.ParseParams(params)
+		parsed, parseErr = RC.NewIPASN(payload, target, isSrc, noResolve)
 	case "SRC-IP-ASN":
 		parsed, parseErr = RC.NewIPASN(payload, target, true, true)
 	case "IP-CIDR", "IP-CIDR6":
-		noResolve := RC.HasNoResolve(params)
-		parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRNoResolve(noResolve))
+		isSrc, noResolve := RC.ParseParams(params)
+		parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRSourceIP(isSrc), RC.WithIPCIDRNoResolve(noResolve))
 	case "SRC-IP-CIDR":
 		parsed, parseErr = RC.NewIPCIDR(payload, target, RC.WithIPCIDRSourceIP(true), RC.WithIPCIDRNoResolve(true))
 	case "IP-SUFFIX":
-		noResolve := RC.HasNoResolve(params)
-		parsed, parseErr = RC.NewIPSuffix(payload, target, false, noResolve)
+		isSrc, noResolve := RC.ParseParams(params)
+		parsed, parseErr = RC.NewIPSuffix(payload, target, isSrc, noResolve)
 	case "SRC-IP-SUFFIX":
 		parsed, parseErr = RC.NewIPSuffix(payload, target, true, true)
 	case "SRC-PORT":
@@ -76,11 +76,7 @@ func ParseRule(tp, payload, target string, params []string, subRules map[string]
 	case "NOT":
 		parsed, parseErr = logic.NewNOT(payload, target, ParseRule)
 	case "RULE-SET":
-		noResolve := RC.HasNoResolve(params)
-		isSrc := RC.HasSrc(params)
-		if isSrc {
-			noResolve = true
-		}
+		isSrc, noResolve := RC.ParseParams(params)
 		parsed, parseErr = RP.NewRuleSet(payload, target, isSrc, noResolve)
 	case "MATCH":
 		parsed = RC.NewMatch(target)