DomainMatcher: Prevent illegal domain rules from causing core startup failures (#5430)

Meo597 · web-flow · commit 7f6ceb39f7f1 · 2025-12-23T10:14:42.000Z
Closes #5429
diff --git a/app/dns/dns.go b/app/dns/dns.go
@@ -106,13 +106,12 @@ func New(ctx context.Context, config *Config) (*DNS, error) {
 
 	for _, ns := range config.NameServer {
 		clientIdx := len(clients)
-		updateDomain := func(domainRule strmatcher.Matcher, originalRuleIdx int, matcherInfos []*DomainMatcherInfo) error {
+		updateDomain := func(domainRule strmatcher.Matcher, originalRuleIdx int, matcherInfos []*DomainMatcherInfo) {
 			midx := domainMatcher.Add(domainRule)
 			matcherInfos[midx] = &DomainMatcherInfo{
 				clientIdx:     uint16(clientIdx),
 				domainRuleIdx: uint16(originalRuleIdx),
 			}
-			return nil
 		}
 
 		myClientIP := clientIP
diff --git a/app/dns/hosts.go b/app/dns/hosts.go
@@ -27,7 +27,8 @@ func NewStaticHosts(hosts []*Config_HostMapping) (*StaticHosts, error) {
 	for _, mapping := range hosts {
 		matcher, err := toStrMatcher(mapping.Type, mapping.Domain)
 		if err != nil {
-			return nil, errors.New("failed to create domain matcher").Base(err)
+			errors.LogErrorInner(context.Background(), err, "failed to create domain matcher, ignore domain rule [type: ", mapping.Type, ", domain: ", mapping.Domain, "]")
+			continue
 		}
 		id := g.Add(matcher)
 		ips := make([]net.Address, 0, len(mapping.Ip)+1)
@@ -46,10 +47,14 @@ func NewStaticHosts(hosts []*Config_HostMapping) (*StaticHosts, error) {
 			for _, ip := range mapping.Ip {
 				addr := net.IPAddress(ip)
 				if addr == nil {
-					return nil, errors.New("invalid IP address in static hosts: ", ip).AtWarning()
+					errors.LogError(context.Background(), "invalid IP address in static hosts: ", ip, ", ignore this ip for rule [type: ", mapping.Type, ", domain: ", mapping.Domain, "]")
+					continue
 				}
 				ips = append(ips, addr)
 			}
+			if len(ips) == 0 {
+				continue
+			}
 		}
 
 		sh.ips[id] = ips
diff --git a/app/dns/nameserver.go b/app/dns/nameserver.go
@@ -97,7 +97,7 @@ func NewClient(
 	tag string,
 	ipOption dns.IPOption,
 	matcherInfos *[]*DomainMatcherInfo,
-	updateDomainRule func(strmatcher.Matcher, int, []*DomainMatcherInfo) error,
+	updateDomainRule func(strmatcher.Matcher, int, []*DomainMatcherInfo),
 ) (*Client, error) {
 	client := &Client{}
 
@@ -134,7 +134,8 @@ func NewClient(
 		for _, domain := range ns.PrioritizedDomain {
 			domainRule, err := toStrMatcher(domain.Type, domain.Domain)
 			if err != nil {
-				return errors.New("failed to create prioritized domain").Base(err).AtWarning()
+				errors.LogErrorInner(ctx, err, "failed to create domain matcher, ignore domain rule [type: ", domain.Type, ", domain: ", domain.Domain, "]")
+				domainRule, _ = toStrMatcher(DomainMatchingType_Full, "hack.fix.index.for.illegal.domain.rule")
 			}
 			originalRuleIdx := ruleCurr
 			if ruleCurr < len(ns.OriginalRules) {
@@ -151,10 +152,7 @@ func NewClient(
 				rules = append(rules, domainRule.String())
 				ruleCurr++
 			}
-			err = updateDomainRule(domainRule, originalRuleIdx, *matcherInfos)
-			if err != nil {
-				return errors.New("failed to create prioritized domain").Base(err).AtWarning()
-			}
+			updateDomainRule(domainRule, originalRuleIdx, *matcherInfos)
 		}
 
 		// Establish expected IPs
diff --git a/app/router/condition.go b/app/router/condition.go
@@ -1,6 +1,7 @@
 package router
 
 import (
+	"context"
 	"regexp"
 	"strings"
 
@@ -56,11 +57,13 @@ func NewMphMatcherGroup(domains []*Domain) (*DomainMatcher, error) {
 	for _, d := range domains {
 		matcherType, f := matcherTypeMap[d.Type]
 		if !f {
-			return nil, errors.New("unsupported domain type", d.Type)
+			errors.LogError(context.Background(), "ignore unsupported domain type ", d.Type, " of rule ", d.Value)
+			continue
 		}
 		_, err := g.AddPattern(d.Value, matcherType)
 		if err != nil {
-			return nil, err
+			errors.LogErrorInner(context.Background(), err, "ignore domain rule ", d.Type, " ", d.Value)
+			continue
 		}
 	}
 	g.Build()
diff --git a/common/strmatcher/strmatcher.go b/common/strmatcher/strmatcher.go
@@ -1,6 +1,7 @@
 package strmatcher
 
 import (
+	"errors"
 	"regexp"
 )
 
@@ -44,7 +45,7 @@ func (t Type) New(pattern string) (Matcher, error) {
 			pattern: r,
 		}, nil
 	default:
-		panic("Unknown type")
+		return nil, errors.New("unk type")
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -106,13 +106,12 @@ func New(ctx context.Context, config Config) (DNS, error) {`
`106`	`106`
`107`	`107`	`for _, ns := range config.NameServer {`
`108`	`108`	`clientIdx := len(clients)`
`109`		`- updateDomain := func(domainRule strmatcher.Matcher, originalRuleIdx int, matcherInfos []*DomainMatcherInfo) error {`
	`109`	`+ updateDomain := func(domainRule strmatcher.Matcher, originalRuleIdx int, matcherInfos []*DomainMatcherInfo) {`
`110`	`110`	`midx := domainMatcher.Add(domainRule)`
`111`	`111`	`matcherInfos[midx] = &DomainMatcherInfo{`
`112`	`112`	`clientIdx: uint16(clientIdx),`
`113`	`113`	`domainRuleIdx: uint16(originalRuleIdx),`
`114`	`114`	`}`
`115`		`- return nil`
`116`	`115`	`}`
`117`	`116`
`118`	`117`	`myClientIP := clientIP`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ func NewStaticHosts(hosts []Config_HostMapping) (StaticHosts, error) {`
`27`	`27`	`for _, mapping := range hosts {`
`28`	`28`	`matcher, err := toStrMatcher(mapping.Type, mapping.Domain)`
`29`	`29`	`if err != nil {`
`30`		`- return nil, errors.New("failed to create domain matcher").Base(err)`
	`30`	`+ errors.LogErrorInner(context.Background(), err, "failed to create domain matcher, ignore domain rule [type: ", mapping.Type, ", domain: ", mapping.Domain, "]")`
	`31`	`+ continue`
`31`	`32`	`}`
`32`	`33`	`id := g.Add(matcher)`
`33`	`34`	`ips := make([]net.Address, 0, len(mapping.Ip)+1)`
`@@ -46,10 +47,14 @@ func NewStaticHosts(hosts []Config_HostMapping) (StaticHosts, error) {`
`46`	`47`	`for _, ip := range mapping.Ip {`
`47`	`48`	`addr := net.IPAddress(ip)`
`48`	`49`	`if addr == nil {`
`49`		`- return nil, errors.New("invalid IP address in static hosts: ", ip).AtWarning()`
	`50`	`+ errors.LogError(context.Background(), "invalid IP address in static hosts: ", ip, ", ignore this ip for rule [type: ", mapping.Type, ", domain: ", mapping.Domain, "]")`
	`51`	`+ continue`
`50`	`52`	`}`
`51`	`53`	`ips = append(ips, addr)`
`52`	`54`	`}`
	`55`	`+ if len(ips) == 0 {`
	`56`	`+ continue`
	`57`	`+ }`
`53`	`58`	`}`
`54`	`59`
`55`	`60`	`sh.ips[id] = ips`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package strmatcher`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "errors"`
`4`	`5`	`"regexp"`
`5`	`6`	`)`
`6`	`7`
`@@ -44,7 +45,7 @@ func (t Type) New(pattern string) (Matcher, error) {`
`44`	`45`	`pattern: r,`
`45`	`46`	`}, nil`
`46`	`47`	`default:`
`47`		`- panic("Unknown type")`
	`48`	`+ return nil, errors.New("unk type")`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`