Add package_name_regex route, DNS and headless rule item

This commit is contained in:
世界
2026-04-10 11:54:47 +08:00
parent 39dda9fb42
commit 0a9d8f945e
22 changed files with 190 additions and 11 deletions
+8
View File
@@ -209,6 +209,14 @@ func NewDefaultRule(ctx context.Context, logger log.ContextLogger, options optio
rule.items = append(rule.items, item)
rule.allItems = append(rule.allItems, item)
}
if len(options.PackageNameRegex) > 0 {
item, err := NewPackageNameRegexItem(options.PackageNameRegex)
if err != nil {
return nil, E.Cause(err, "package_name_regex")
}
rule.items = append(rule.items, item)
rule.allItems = append(rule.allItems, item)
}
if len(options.User) > 0 {
item := NewUserItem(options.User)
rule.items = append(rule.items, item)
+8
View File
@@ -251,6 +251,14 @@ func NewDefaultDNSRule(ctx context.Context, logger log.ContextLogger, options op
rule.items = append(rule.items, item)
rule.allItems = append(rule.allItems, item)
}
if len(options.PackageNameRegex) > 0 {
item, err := NewPackageNameRegexItem(options.PackageNameRegex)
if err != nil {
return nil, E.Cause(err, "package_name_regex")
}
rule.items = append(rule.items, item)
rule.allItems = append(rule.allItems, item)
}
if len(options.User) > 0 {
item := NewUserItem(options.User)
rule.items = append(rule.items, item)
+8
View File
@@ -153,6 +153,14 @@ func NewDefaultHeadlessRule(ctx context.Context, options option.DefaultHeadlessR
rule.items = append(rule.items, item)
rule.allItems = append(rule.allItems, item)
}
if len(options.PackageNameRegex) > 0 {
item, err := NewPackageNameRegexItem(options.PackageNameRegex)
if err != nil {
return nil, E.Cause(err, "package_name_regex")
}
rule.items = append(rule.items, item)
rule.allItems = append(rule.allItems, item)
}
if networkManager != nil {
if len(options.NetworkType) > 0 {
item := NewNetworkTypeItem(networkManager, common.Map(options.NetworkType, option.InterfaceType.Build))
@@ -0,0 +1,56 @@
package rule
import (
"regexp"
"strings"
"github.com/sagernet/sing-box/adapter"
E "github.com/sagernet/sing/common/exceptions"
F "github.com/sagernet/sing/common/format"
)
var _ RuleItem = (*PackageNameRegexItem)(nil)
type PackageNameRegexItem struct {
matchers []*regexp.Regexp
description string
}
func NewPackageNameRegexItem(expressions []string) (*PackageNameRegexItem, error) {
matchers := make([]*regexp.Regexp, 0, len(expressions))
for i, regex := range expressions {
matcher, err := regexp.Compile(regex)
if err != nil {
return nil, E.Cause(err, "parse expression ", i)
}
matchers = append(matchers, matcher)
}
description := "package_name_regex="
eLen := len(expressions)
if eLen == 1 {
description += expressions[0]
} else if eLen > 3 {
description += F.ToString("[", strings.Join(expressions[:3], " "), "]")
} else {
description += F.ToString("[", strings.Join(expressions, " "), "]")
}
return &PackageNameRegexItem{matchers, description}, nil
}
func (r *PackageNameRegexItem) Match(metadata *adapter.InboundContext) bool {
if metadata.ProcessInfo == nil || len(metadata.ProcessInfo.AndroidPackageNames) == 0 {
return false
}
for _, matcher := range r.matchers {
for _, packageName := range metadata.ProcessInfo.AndroidPackageNames {
if matcher.MatchString(packageName) {
return true
}
}
}
return false
}
func (r *PackageNameRegexItem) String() string {
return r.description
}
+1 -1
View File
@@ -60,7 +60,7 @@ func HasHeadlessRule(rules []option.HeadlessRule, cond func(rule option.DefaultH
}
func isProcessHeadlessRule(rule option.DefaultHeadlessRule) bool {
return len(rule.ProcessName) > 0 || len(rule.ProcessPath) > 0 || len(rule.ProcessPathRegex) > 0 || len(rule.PackageName) > 0
return len(rule.ProcessName) > 0 || len(rule.ProcessPath) > 0 || len(rule.ProcessPathRegex) > 0 || len(rule.PackageName) > 0 || len(rule.PackageNameRegex) > 0
}
func isWIFIHeadlessRule(rule option.DefaultHeadlessRule) bool {