feat: support sub-rule, eg.
rules: - SUB-RULE,(AND,((NETWORK,TCP),(DOMAIN-KEYWORD,google))),TEST2 - SUB-RULE,(GEOIP,!CN),TEST1 - MATCH,DIRECT sub-rules: TEST2: - MATCH,Proxy TEST1: - RULE-SET,Local,DIRECT,no-resolve - GEOSITE,CN,Domestic - GEOIP,CN,Domestic - MATCH,Proxy
This commit is contained in:
parent
b86428884c
commit
d6dc5ba19c
28 changed files with 325 additions and 105 deletions
130
config/config.go
130
config/config.go
|
@ -153,6 +153,7 @@ type Config struct {
|
||||||
Hosts *trie.DomainTrie[netip.Addr]
|
Hosts *trie.DomainTrie[netip.Addr]
|
||||||
Profile *Profile
|
Profile *Profile
|
||||||
Rules []C.Rule
|
Rules []C.Rule
|
||||||
|
SubRules *map[string][]C.Rule
|
||||||
Users []auth.AuthUser
|
Users []auth.AuthUser
|
||||||
Proxies map[string]C.Proxy
|
Proxies map[string]C.Proxy
|
||||||
Providers map[string]providerTypes.ProxyProvider
|
Providers map[string]providerTypes.ProxyProvider
|
||||||
|
@ -233,6 +234,7 @@ type RawConfig struct {
|
||||||
Proxy []map[string]any `yaml:"proxies"`
|
Proxy []map[string]any `yaml:"proxies"`
|
||||||
ProxyGroup []map[string]any `yaml:"proxy-groups"`
|
ProxyGroup []map[string]any `yaml:"proxy-groups"`
|
||||||
Rule []string `yaml:"rules"`
|
Rule []string `yaml:"rules"`
|
||||||
|
SubRules map[string][]string `yaml:"sub-rules"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type RawGeoXUrl struct {
|
type RawGeoXUrl struct {
|
||||||
|
@ -381,12 +383,18 @@ func ParseRawConfig(rawCfg *RawConfig) (*Config, error) {
|
||||||
config.Proxies = proxies
|
config.Proxies = proxies
|
||||||
config.Providers = providers
|
config.Providers = providers
|
||||||
|
|
||||||
rules, ruleProviders, err := parseRules(rawCfg, proxies)
|
subRules, ruleProviders, err := parseSubRules(rawCfg, proxies)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
config.SubRules = subRules
|
||||||
|
config.RuleProviders = ruleProviders
|
||||||
|
|
||||||
|
rules, err := parseRules(rawCfg, proxies, subRules)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
config.Rules = rules
|
config.Rules = rules
|
||||||
config.RuleProviders = ruleProviders
|
|
||||||
|
|
||||||
hosts, err := parseHosts(rawCfg)
|
hosts, err := parseHosts(rawCfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -563,8 +571,9 @@ func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[
|
||||||
return proxies, providersMap, nil
|
return proxies, providersMap, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseRules(cfg *RawConfig, proxies map[string]C.Proxy) ([]C.Rule, map[string]providerTypes.RuleProvider, error) {
|
func parseSubRules(cfg *RawConfig, proxies map[string]C.Proxy) (subRules *map[string][]C.Rule, ruleProviders map[string]providerTypes.RuleProvider, err error) {
|
||||||
ruleProviders := map[string]providerTypes.RuleProvider{}
|
ruleProviders = map[string]providerTypes.RuleProvider{}
|
||||||
|
subRules = &map[string][]C.Rule{}
|
||||||
log.Infoln("Geodata Loader mode: %s", geodata.LoaderName())
|
log.Infoln("Geodata Loader mode: %s", geodata.LoaderName())
|
||||||
// parse rule provider
|
// parse rule provider
|
||||||
for name, mapping := range cfg.RuleProvider {
|
for name, mapping := range cfg.RuleProvider {
|
||||||
|
@ -577,6 +586,102 @@ func parseRules(cfg *RawConfig, proxies map[string]C.Proxy) ([]C.Rule, map[strin
|
||||||
RP.SetRuleProvider(rp)
|
RP.SetRuleProvider(rp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for name, rawRules := range cfg.SubRules {
|
||||||
|
var rules []C.Rule
|
||||||
|
for idx, line := range rawRules {
|
||||||
|
rawRule := trimArr(strings.Split(line, ","))
|
||||||
|
var (
|
||||||
|
payload string
|
||||||
|
target string
|
||||||
|
params []string
|
||||||
|
ruleName = strings.ToUpper(rawRule[0])
|
||||||
|
)
|
||||||
|
|
||||||
|
l := len(rawRule)
|
||||||
|
|
||||||
|
if ruleName == "NOT" || ruleName == "OR" || ruleName == "AND" || ruleName == "SUB-RULE" {
|
||||||
|
target = rawRule[l-1]
|
||||||
|
payload = strings.Join(rawRule[1:l-1], ",")
|
||||||
|
} else {
|
||||||
|
if l < 2 {
|
||||||
|
return nil, nil, fmt.Errorf("sub-rules[%d] [%s] error: format invalid", idx, line)
|
||||||
|
}
|
||||||
|
if l < 4 {
|
||||||
|
rawRule = append(rawRule, make([]string, 4-l)...)
|
||||||
|
}
|
||||||
|
if ruleName == "MATCH" {
|
||||||
|
l = 2
|
||||||
|
}
|
||||||
|
if l >= 3 {
|
||||||
|
l = 3
|
||||||
|
payload = rawRule[1]
|
||||||
|
}
|
||||||
|
target = rawRule[l-1]
|
||||||
|
params = rawRule[l:]
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, ok := proxies[target]; !ok && ruleName != "SUB-RULE" {
|
||||||
|
return nil, nil, fmt.Errorf("sub-rules[%d:%s] [%s] error: proxy [%s] not found", idx, name, line, target)
|
||||||
|
}
|
||||||
|
|
||||||
|
params = trimArr(params)
|
||||||
|
parsed, parseErr := R.ParseRule(ruleName, payload, target, params, subRules)
|
||||||
|
if parseErr != nil {
|
||||||
|
return nil, nil, fmt.Errorf("sub-rules[%d] [%s] error: %s", idx, line, parseErr.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
rules = append(rules, parsed)
|
||||||
|
}
|
||||||
|
(*subRules)[name] = rules
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = verifySubRule(subRules); err != nil {
|
||||||
|
return nil, nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func verifySubRule(subRules *map[string][]C.Rule) error {
|
||||||
|
for name := range *subRules {
|
||||||
|
err := verifySubRuleCircularReferences(name, subRules, []string{})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func verifySubRuleCircularReferences(n string, subRules *map[string][]C.Rule, arr []string) error {
|
||||||
|
isInArray := func(v string, array []string) bool {
|
||||||
|
for _, c := range array {
|
||||||
|
if v == c {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
arr = append(arr, n)
|
||||||
|
for i, rule := range (*subRules)[n] {
|
||||||
|
if rule.RuleType() == C.SubRules {
|
||||||
|
if _, ok := (*subRules)[rule.Adapter()]; !ok {
|
||||||
|
return fmt.Errorf("sub-rule[%d:%s] error: [%s] not found", i, n, rule.Adapter())
|
||||||
|
}
|
||||||
|
if isInArray(rule.Adapter(), arr) {
|
||||||
|
arr = append(arr, rule.Adapter())
|
||||||
|
return fmt.Errorf("sub-rule error: circular references [%s]", strings.Join(arr, "->"))
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := verifySubRuleCircularReferences(rule.Adapter(), subRules, arr); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseRules(cfg *RawConfig, proxies map[string]C.Proxy, subRules *map[string][]C.Rule) ([]C.Rule, error) {
|
||||||
var rules []C.Rule
|
var rules []C.Rule
|
||||||
rulesConfig := cfg.Rule
|
rulesConfig := cfg.Rule
|
||||||
|
|
||||||
|
@ -592,12 +697,12 @@ func parseRules(cfg *RawConfig, proxies map[string]C.Proxy) ([]C.Rule, map[strin
|
||||||
|
|
||||||
l := len(rule)
|
l := len(rule)
|
||||||
|
|
||||||
if ruleName == "NOT" || ruleName == "OR" || ruleName == "AND" {
|
if ruleName == "NOT" || ruleName == "OR" || ruleName == "AND" || ruleName == "SUB-RULE" {
|
||||||
target = rule[l-1]
|
target = rule[l-1]
|
||||||
payload = strings.Join(rule[1:l-1], ",")
|
payload = strings.Join(rule[1:l-1], ",")
|
||||||
} else {
|
} else {
|
||||||
if l < 2 {
|
if l < 2 {
|
||||||
return nil, nil, fmt.Errorf("rules[%d] [%s] error: format invalid", idx, line)
|
return nil, fmt.Errorf("rules[%d] [%s] error: format invalid", idx, line)
|
||||||
}
|
}
|
||||||
if l < 4 {
|
if l < 4 {
|
||||||
rule = append(rule, make([]string, 4-l)...)
|
rule = append(rule, make([]string, 4-l)...)
|
||||||
|
@ -612,15 +717,18 @@ func parseRules(cfg *RawConfig, proxies map[string]C.Proxy) ([]C.Rule, map[strin
|
||||||
target = rule[l-1]
|
target = rule[l-1]
|
||||||
params = rule[l:]
|
params = rule[l:]
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, ok := proxies[target]; !ok {
|
if _, ok := proxies[target]; !ok {
|
||||||
return nil, nil, fmt.Errorf("rules[%d] [%s] error: proxy [%s] not found", idx, line, target)
|
if ruleName != "SUB-RULE" {
|
||||||
|
return nil, fmt.Errorf("rules[%d] [%s] error: proxy [%s] not found", idx, line, target)
|
||||||
|
} else if _, ok = (*subRules)[target]; !ok {
|
||||||
|
return nil, fmt.Errorf("rules[%d] [%s] error: sub-rule [%s] not found", idx, line, target)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
params = trimArr(params)
|
params = trimArr(params)
|
||||||
parsed, parseErr := R.ParseRule(ruleName, payload, target, params)
|
parsed, parseErr := R.ParseRule(ruleName, payload, target, params, subRules)
|
||||||
if parseErr != nil {
|
if parseErr != nil {
|
||||||
return nil, nil, fmt.Errorf("rules[%d] [%s] error: %s", idx, line, parseErr.Error())
|
return nil, fmt.Errorf("rules[%d] [%s] error: %s", idx, line, parseErr.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
rules = append(rules, parsed)
|
rules = append(rules, parsed)
|
||||||
|
@ -628,7 +736,7 @@ func parseRules(cfg *RawConfig, proxies map[string]C.Proxy) ([]C.Rule, map[strin
|
||||||
|
|
||||||
runtime.GC()
|
runtime.GC()
|
||||||
|
|
||||||
return rules, ruleProviders, nil
|
return rules, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseHosts(cfg *RawConfig) (*trie.DomainTrie[netip.Addr], error) {
|
func parseHosts(cfg *RawConfig) (*trie.DomainTrie[netip.Addr], error) {
|
||||||
|
|
|
@ -19,6 +19,7 @@ const (
|
||||||
Network
|
Network
|
||||||
Uid
|
Uid
|
||||||
INTYPE
|
INTYPE
|
||||||
|
SubRules
|
||||||
MATCH
|
MATCH
|
||||||
AND
|
AND
|
||||||
OR
|
OR
|
||||||
|
@ -65,6 +66,8 @@ func (rt RuleType) String() string {
|
||||||
return "Uid"
|
return "Uid"
|
||||||
case INTYPE:
|
case INTYPE:
|
||||||
return "InType"
|
return "InType"
|
||||||
|
case SubRules:
|
||||||
|
return "SubRules"
|
||||||
case AND:
|
case AND:
|
||||||
return "AND"
|
return "AND"
|
||||||
case OR:
|
case OR:
|
||||||
|
@ -78,7 +81,7 @@ func (rt RuleType) String() string {
|
||||||
|
|
||||||
type Rule interface {
|
type Rule interface {
|
||||||
RuleType() RuleType
|
RuleType() RuleType
|
||||||
Match(metadata *Metadata) bool
|
Match(metadata *Metadata) (bool, string)
|
||||||
Adapter() string
|
Adapter() string
|
||||||
Payload() string
|
Payload() string
|
||||||
ShouldResolveIP() bool
|
ShouldResolveIP() bool
|
||||||
|
|
|
@ -5,7 +5,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
errPayload = errors.New("payload error")
|
errPayload = errors.New("payloadRule error")
|
||||||
initFlag bool
|
initFlag bool
|
||||||
noResolve = "no-resolve"
|
noResolve = "no-resolve"
|
||||||
)
|
)
|
||||||
|
|
|
@ -18,11 +18,11 @@ func (d *Domain) RuleType() C.RuleType {
|
||||||
return C.Domain
|
return C.Domain
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Domain) Match(metadata *C.Metadata) bool {
|
func (d *Domain) Match(metadata *C.Metadata) (bool, string) {
|
||||||
if metadata.AddrType != C.AtypDomainName {
|
if metadata.AddrType != C.AtypDomainName {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
return metadata.Host == d.domain
|
return metadata.Host == d.domain, d.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Domain) Adapter() string {
|
func (d *Domain) Adapter() string {
|
||||||
|
@ -47,4 +47,4 @@ func NewDomain(domain string, adapter string) *Domain {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ C.Rule = (*Domain)(nil)
|
//var _ C.Rule = (*Domain)(nil)
|
||||||
|
|
|
@ -18,12 +18,12 @@ func (dk *DomainKeyword) RuleType() C.RuleType {
|
||||||
return C.DomainKeyword
|
return C.DomainKeyword
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dk *DomainKeyword) Match(metadata *C.Metadata) bool {
|
func (dk *DomainKeyword) Match(metadata *C.Metadata) (bool, string) {
|
||||||
if metadata.AddrType != C.AtypDomainName {
|
if metadata.AddrType != C.AtypDomainName {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
domain := metadata.Host
|
domain := metadata.Host
|
||||||
return strings.Contains(domain, dk.keyword)
|
return strings.Contains(domain, dk.keyword), dk.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dk *DomainKeyword) Adapter() string {
|
func (dk *DomainKeyword) Adapter() string {
|
||||||
|
@ -48,4 +48,4 @@ func NewDomainKeyword(keyword string, adapter string) *DomainKeyword {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ C.Rule = (*DomainKeyword)(nil)
|
//var _ C.Rule = (*DomainKeyword)(nil)
|
||||||
|
|
|
@ -18,12 +18,12 @@ func (ds *DomainSuffix) RuleType() C.RuleType {
|
||||||
return C.DomainSuffix
|
return C.DomainSuffix
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ds *DomainSuffix) Match(metadata *C.Metadata) bool {
|
func (ds *DomainSuffix) Match(metadata *C.Metadata) (bool, string) {
|
||||||
if metadata.AddrType != C.AtypDomainName {
|
if metadata.AddrType != C.AtypDomainName {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
domain := metadata.Host
|
domain := metadata.Host
|
||||||
return strings.HasSuffix(domain, "."+ds.suffix) || domain == ds.suffix
|
return strings.HasSuffix(domain, "."+ds.suffix) || domain == ds.suffix, ds.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ds *DomainSuffix) Adapter() string {
|
func (ds *DomainSuffix) Adapter() string {
|
||||||
|
@ -48,4 +48,4 @@ func NewDomainSuffix(suffix string, adapter string) *DomainSuffix {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ C.Rule = (*DomainSuffix)(nil)
|
//var _ C.Rule = (*DomainSuffix)(nil)
|
||||||
|
|
|
@ -13,8 +13,8 @@ func (f *Match) RuleType() C.RuleType {
|
||||||
return C.MATCH
|
return C.MATCH
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *Match) Match(metadata *C.Metadata) bool {
|
func (f *Match) Match(metadata *C.Metadata) (bool, string) {
|
||||||
return true
|
return true, f.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *Match) Adapter() string {
|
func (f *Match) Adapter() string {
|
||||||
|
@ -32,4 +32,4 @@ func NewMatch(adapter string) *Match {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ C.Rule = (*Match)(nil)
|
//var _ C.Rule = (*Match)(nil)
|
||||||
|
|
|
@ -25,10 +25,10 @@ func (g *GEOIP) RuleType() C.RuleType {
|
||||||
return C.GEOIP
|
return C.GEOIP
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GEOIP) Match(metadata *C.Metadata) bool {
|
func (g *GEOIP) Match(metadata *C.Metadata) (bool, string) {
|
||||||
ip := metadata.DstIP
|
ip := metadata.DstIP
|
||||||
if !ip.IsValid() {
|
if !ip.IsValid() {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
if strings.EqualFold(g.country, "LAN") {
|
if strings.EqualFold(g.country, "LAN") {
|
||||||
|
@ -37,13 +37,13 @@ func (g *GEOIP) Match(metadata *C.Metadata) bool {
|
||||||
ip.IsLoopback() ||
|
ip.IsLoopback() ||
|
||||||
ip.IsMulticast() ||
|
ip.IsMulticast() ||
|
||||||
ip.IsLinkLocalUnicast() ||
|
ip.IsLinkLocalUnicast() ||
|
||||||
resolver.IsFakeBroadcastIP(ip)
|
resolver.IsFakeBroadcastIP(ip), g.adapter
|
||||||
}
|
}
|
||||||
if !C.GeodataMode {
|
if !C.GeodataMode {
|
||||||
record, _ := mmdb.Instance().Country(ip.AsSlice())
|
record, _ := mmdb.Instance().Country(ip.AsSlice())
|
||||||
return strings.EqualFold(record.Country.IsoCode, g.country)
|
return strings.EqualFold(record.Country.IsoCode, g.country), g.adapter
|
||||||
}
|
}
|
||||||
return g.geoIPMatcher.Match(ip.AsSlice())
|
return g.geoIPMatcher.Match(ip.AsSlice()), g.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GEOIP) Adapter() string {
|
func (g *GEOIP) Adapter() string {
|
||||||
|
@ -98,4 +98,4 @@ func NewGEOIP(country string, adapter string, noResolveIP bool) (*GEOIP, error)
|
||||||
return geoip, nil
|
return geoip, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ C.Rule = (*GEOIP)(nil)
|
//var _ C.Rule = (*GEOIP)(nil)
|
||||||
|
|
|
@ -23,13 +23,13 @@ func (gs *GEOSITE) RuleType() C.RuleType {
|
||||||
return C.GEOSITE
|
return C.GEOSITE
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gs *GEOSITE) Match(metadata *C.Metadata) bool {
|
func (gs *GEOSITE) Match(metadata *C.Metadata) (bool, string) {
|
||||||
if metadata.AddrType != C.AtypDomainName {
|
if metadata.AddrType != C.AtypDomainName {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
domain := metadata.Host
|
domain := metadata.Host
|
||||||
return gs.matcher.ApplyDomain(domain)
|
return gs.matcher.ApplyDomain(domain), gs.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (gs *GEOSITE) Adapter() string {
|
func (gs *GEOSITE) Adapter() string {
|
||||||
|
@ -75,4 +75,4 @@ func NewGEOSITE(country string, adapter string) (*GEOSITE, error) {
|
||||||
return geoSite, nil
|
return geoSite, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ C.Rule = (*GEOSITE)(nil)
|
//var _ C.Rule = (*GEOSITE)(nil)
|
||||||
|
|
|
@ -13,13 +13,13 @@ type InType struct {
|
||||||
payload string
|
payload string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *InType) Match(metadata *C.Metadata) bool {
|
func (u *InType) Match(metadata *C.Metadata) (bool, string) {
|
||||||
for _, tp := range u.types {
|
for _, tp := range u.types {
|
||||||
if metadata.Type == tp {
|
if metadata.Type == tp {
|
||||||
return true
|
return true, u.adapter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *InType) RuleType() C.RuleType {
|
func (u *InType) RuleType() C.RuleType {
|
||||||
|
|
|
@ -35,12 +35,12 @@ func (i *IPCIDR) RuleType() C.RuleType {
|
||||||
return C.IPCIDR
|
return C.IPCIDR
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *IPCIDR) Match(metadata *C.Metadata) bool {
|
func (i *IPCIDR) Match(metadata *C.Metadata) (bool, string) {
|
||||||
ip := metadata.DstIP
|
ip := metadata.DstIP
|
||||||
if i.isSourceIP {
|
if i.isSourceIP {
|
||||||
ip = metadata.SrcIP
|
ip = metadata.SrcIP
|
||||||
}
|
}
|
||||||
return ip.IsValid() && i.ipnet.Contains(ip)
|
return ip.IsValid() && i.ipnet.Contains(ip), i.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *IPCIDR) Adapter() string {
|
func (i *IPCIDR) Adapter() string {
|
||||||
|
@ -74,4 +74,4 @@ func NewIPCIDR(s string, adapter string, opts ...IPCIDROption) (*IPCIDR, error)
|
||||||
return ipcidr, nil
|
return ipcidr, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ C.Rule = (*IPCIDR)(nil)
|
//var _ C.Rule = (*IPCIDR)(nil)
|
||||||
|
|
|
@ -22,7 +22,7 @@ func (is *IPSuffix) RuleType() C.RuleType {
|
||||||
return C.IPSuffix
|
return C.IPSuffix
|
||||||
}
|
}
|
||||||
|
|
||||||
func (is *IPSuffix) Match(metadata *C.Metadata) bool {
|
func (is *IPSuffix) Match(metadata *C.Metadata) (bool, string) {
|
||||||
ip := metadata.DstIP
|
ip := metadata.DstIP
|
||||||
if is.isSourceIP {
|
if is.isSourceIP {
|
||||||
ip = metadata.SrcIP
|
ip = metadata.SrcIP
|
||||||
|
@ -30,7 +30,7 @@ func (is *IPSuffix) Match(metadata *C.Metadata) bool {
|
||||||
|
|
||||||
mIPBytes := ip.AsSlice()
|
mIPBytes := ip.AsSlice()
|
||||||
if len(is.ipBytes) != len(mIPBytes) {
|
if len(is.ipBytes) != len(mIPBytes) {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
size := len(mIPBytes)
|
size := len(mIPBytes)
|
||||||
|
@ -38,15 +38,15 @@ func (is *IPSuffix) Match(metadata *C.Metadata) bool {
|
||||||
|
|
||||||
for i := bits / 8; i > 0; i-- {
|
for i := bits / 8; i > 0; i-- {
|
||||||
if is.ipBytes[size-i] != mIPBytes[size-i] {
|
if is.ipBytes[size-i] != mIPBytes[size-i] {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is.ipBytes[size-bits/8-1] << (8 - bits%8)) != (mIPBytes[size-bits/8-1] << (8 - bits%8)) {
|
if (is.ipBytes[size-bits/8-1] << (8 - bits%8)) != (mIPBytes[size-bits/8-1] << (8 - bits%8)) {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return true, is.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (is *IPSuffix) Adapter() string {
|
func (is *IPSuffix) Adapter() string {
|
||||||
|
|
|
@ -36,8 +36,8 @@ func (n *NetworkType) RuleType() C.RuleType {
|
||||||
return C.Network
|
return C.Network
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *NetworkType) Match(metadata *C.Metadata) bool {
|
func (n *NetworkType) Match(metadata *C.Metadata) (bool, string) {
|
||||||
return n.network == metadata.NetWork
|
return n.network == metadata.NetWork, n.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (n *NetworkType) Adapter() string {
|
func (n *NetworkType) Adapter() string {
|
||||||
|
|
|
@ -24,11 +24,11 @@ func (p *Port) RuleType() C.RuleType {
|
||||||
return C.DstPort
|
return C.DstPort
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Port) Match(metadata *C.Metadata) bool {
|
func (p *Port) Match(metadata *C.Metadata) (bool, string) {
|
||||||
if p.isSource {
|
if p.isSource {
|
||||||
return p.matchPortReal(metadata.SrcPort)
|
return p.matchPortReal(metadata.SrcPort), p.adapter
|
||||||
}
|
}
|
||||||
return p.matchPortReal(metadata.DstPort)
|
return p.matchPortReal(metadata.DstPort), p.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Port) Adapter() string {
|
func (p *Port) Adapter() string {
|
||||||
|
|
|
@ -17,12 +17,12 @@ func (ps *Process) RuleType() C.RuleType {
|
||||||
return C.Process
|
return C.Process
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ps *Process) Match(metadata *C.Metadata) bool {
|
func (ps *Process) Match(metadata *C.Metadata) (bool, string) {
|
||||||
if ps.nameOnly {
|
if ps.nameOnly {
|
||||||
return strings.EqualFold(metadata.Process, ps.process)
|
return strings.EqualFold(metadata.Process, ps.process), ps.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
return strings.EqualFold(metadata.ProcessPath, ps.process)
|
return strings.EqualFold(metadata.ProcessPath, ps.process), ps.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ps *Process) Adapter() string {
|
func (ps *Process) Adapter() string {
|
||||||
|
|
|
@ -71,10 +71,10 @@ func (u *Uid) RuleType() C.RuleType {
|
||||||
return C.Uid
|
return C.Uid
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *Uid) Match(metadata *C.Metadata) bool {
|
func (u *Uid) Match(metadata *C.Metadata) (bool, string) {
|
||||||
srcPort, err := strconv.ParseUint(metadata.SrcPort, 10, 16)
|
srcPort, err := strconv.ParseUint(metadata.SrcPort, 10, 16)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
var uid int32
|
var uid int32
|
||||||
if metadata.Uid != nil {
|
if metadata.Uid != nil {
|
||||||
|
@ -83,15 +83,15 @@ func (u *Uid) Match(metadata *C.Metadata) bool {
|
||||||
metadata.Uid = &uid
|
metadata.Uid = &uid
|
||||||
} else {
|
} else {
|
||||||
log.Warnln("[UID] could not get uid from %s", metadata.String())
|
log.Warnln("[UID] could not get uid from %s", metadata.String())
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, _uid := range u.uids {
|
for _, _uid := range u.uids {
|
||||||
if _uid.Contains(uid) {
|
if _uid.Contains(uid) {
|
||||||
return true
|
return true, u.adapter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (u *Uid) Adapter() string {
|
func (u *Uid) Adapter() string {
|
||||||
|
|
|
@ -20,9 +20,9 @@ func (A *AND) ShouldFindProcess() bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewAND(payload string, adapter string,
|
func NewAND(payload string, adapter string,
|
||||||
parse func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) (*AND, error) {
|
parse func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) (*AND, error) {
|
||||||
and := &AND{Base: &common.Base{}, payload: payload, adapter: adapter}
|
and := &AND{Base: &common.Base{}, payload: payload, adapter: adapter}
|
||||||
rules, err := parseRuleByPayload(payload, parse)
|
rules, err := ParseRuleByPayload(payload, parse)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -45,14 +45,14 @@ func (A *AND) RuleType() C.RuleType {
|
||||||
return C.AND
|
return C.AND
|
||||||
}
|
}
|
||||||
|
|
||||||
func (A *AND) Match(metadata *C.Metadata) bool {
|
func (A *AND) Match(metadata *C.Metadata) (bool, string) {
|
||||||
for _, rule := range A.rules {
|
for _, rule := range A.rules {
|
||||||
if !rule.Match(metadata) {
|
if m, _ := rule.Match(metadata); !m {
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return true, A.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (A *AND) Adapter() string {
|
func (A *AND) Adapter() string {
|
||||||
|
|
|
@ -9,7 +9,7 @@ import (
|
||||||
_ "unsafe"
|
_ "unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
func parseRuleByPayload(payload string, parseRule func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) ([]C.Rule, error) {
|
func ParseRuleByPayload(payload string, parseRule func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) ([]C.Rule, error) {
|
||||||
regex, err := regexp.Compile("\\(.*\\)")
|
regex, err := regexp.Compile("\\(.*\\)")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -59,13 +59,13 @@ func payloadToRule(subPayload string, parseRule func(tp, payload, target string,
|
||||||
return parseRule(tp, param[0], "", param[1:])
|
return parseRule(tp, param[0], "", param[1:])
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseLogicSubRule(parseRule func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
|
func parseLogicSubRule(parseRule func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
|
||||||
return func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
|
return func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
|
||||||
switch tp {
|
switch tp {
|
||||||
case "MATCH":
|
case "MATCH", "SUB-RULE":
|
||||||
return nil, fmt.Errorf("unsupported rule type on logic rule")
|
return nil, fmt.Errorf("unsupported rule type [%s] on logic rule", tp)
|
||||||
default:
|
default:
|
||||||
return parseRule(tp, payload, target, params)
|
return parseRule(tp, payload, target, params, nil)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,13 +3,15 @@ package logic
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/Dreamacro/clash/constant"
|
"github.com/Dreamacro/clash/constant"
|
||||||
|
C "github.com/Dreamacro/clash/constant"
|
||||||
RC "github.com/Dreamacro/clash/rules/common"
|
RC "github.com/Dreamacro/clash/rules/common"
|
||||||
RP "github.com/Dreamacro/clash/rules/provider"
|
RP "github.com/Dreamacro/clash/rules/provider"
|
||||||
|
"github.com/Dreamacro/clash/rules/sub_rule"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func ParseRule(tp, payload, target string, params []string) (parsed constant.Rule, parseErr error) {
|
func ParseRule(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed constant.Rule, parseErr error) {
|
||||||
switch tp {
|
switch tp {
|
||||||
case "DOMAIN":
|
case "DOMAIN":
|
||||||
parsed = RC.NewDomain(payload, target)
|
parsed = RC.NewDomain(payload, target)
|
||||||
|
@ -46,6 +48,8 @@ func ParseRule(tp, payload, target string, params []string) (parsed constant.Rul
|
||||||
parsed, parseErr = RC.NewUid(payload, target)
|
parsed, parseErr = RC.NewUid(payload, target)
|
||||||
case "IN-TYPE":
|
case "IN-TYPE":
|
||||||
parsed, parseErr = RC.NewInType(payload, target)
|
parsed, parseErr = RC.NewInType(payload, target)
|
||||||
|
case "SUB-RULE":
|
||||||
|
parsed, parseErr = sub_rule.NewSubRule(payload, target, subRules, ParseRule)
|
||||||
case "AND":
|
case "AND":
|
||||||
parsed, parseErr = NewAND(payload, target, ParseRule)
|
parsed, parseErr = NewAND(payload, target, ParseRule)
|
||||||
case "OR":
|
case "OR":
|
||||||
|
@ -54,7 +58,7 @@ func ParseRule(tp, payload, target string, params []string) (parsed constant.Rul
|
||||||
parsed, parseErr = NewNOT(payload, target, ParseRule)
|
parsed, parseErr = NewNOT(payload, target, ParseRule)
|
||||||
case "RULE-SET":
|
case "RULE-SET":
|
||||||
noResolve := RC.HasNoResolve(params)
|
noResolve := RC.HasNoResolve(params)
|
||||||
parsed, parseErr = RP.NewRuleSet(payload, target, noResolve, ParseRule)
|
parsed, parseErr = RP.NewRuleSet(payload, target, noResolve)
|
||||||
case "MATCH":
|
case "MATCH":
|
||||||
parsed = RC.NewMatch(target)
|
parsed = RC.NewMatch(target)
|
||||||
parseErr = nil
|
parseErr = nil
|
||||||
|
@ -70,12 +74,13 @@ func TestAND(t *testing.T) {
|
||||||
assert.Equal(t, nil, err)
|
assert.Equal(t, nil, err)
|
||||||
assert.Equal(t, "DIRECT", and.adapter)
|
assert.Equal(t, "DIRECT", and.adapter)
|
||||||
assert.Equal(t, false, and.ShouldResolveIP())
|
assert.Equal(t, false, and.ShouldResolveIP())
|
||||||
assert.Equal(t, true, and.Match(&constant.Metadata{
|
m, _ := and.Match(&constant.Metadata{
|
||||||
Host: "baidu.com",
|
Host: "baidu.com",
|
||||||
AddrType: constant.AtypDomainName,
|
AddrType: constant.AtypDomainName,
|
||||||
NetWork: constant.TCP,
|
NetWork: constant.TCP,
|
||||||
DstPort: "20000",
|
DstPort: "20000",
|
||||||
}))
|
})
|
||||||
|
assert.Equal(t, true, m)
|
||||||
|
|
||||||
and, err = NewAND("(DOMAIN,baidu.com),(NETWORK,TCP),(DST-PORT,10001-65535))", "DIRECT", ParseRule)
|
and, err = NewAND("(DOMAIN,baidu.com),(NETWORK,TCP),(DST-PORT,10001-65535))", "DIRECT", ParseRule)
|
||||||
assert.NotEqual(t, nil, err)
|
assert.NotEqual(t, nil, err)
|
||||||
|
@ -87,9 +92,10 @@ func TestAND(t *testing.T) {
|
||||||
func TestNOT(t *testing.T) {
|
func TestNOT(t *testing.T) {
|
||||||
not, err := NewNOT("((DST-PORT,6000-6500))", "REJECT", ParseRule)
|
not, err := NewNOT("((DST-PORT,6000-6500))", "REJECT", ParseRule)
|
||||||
assert.Equal(t, nil, err)
|
assert.Equal(t, nil, err)
|
||||||
assert.Equal(t, false, not.Match(&constant.Metadata{
|
m, _ := not.Match(&constant.Metadata{
|
||||||
DstPort: "6100",
|
DstPort: "6100",
|
||||||
}))
|
})
|
||||||
|
assert.Equal(t, false, m)
|
||||||
|
|
||||||
_, err = NewNOT("((DST-PORT,5600-6666),(DOMAIN,baidu.com))", "DIRECT", ParseRule)
|
_, err = NewNOT("((DST-PORT,5600-6666),(DOMAIN,baidu.com))", "DIRECT", ParseRule)
|
||||||
assert.NotEqual(t, nil, err)
|
assert.NotEqual(t, nil, err)
|
||||||
|
@ -101,8 +107,9 @@ func TestNOT(t *testing.T) {
|
||||||
func TestOR(t *testing.T) {
|
func TestOR(t *testing.T) {
|
||||||
or, err := NewOR("((DOMAIN,baidu.com),(NETWORK,TCP),(DST-PORT,10001-65535))", "DIRECT", ParseRule)
|
or, err := NewOR("((DOMAIN,baidu.com),(NETWORK,TCP),(DST-PORT,10001-65535))", "DIRECT", ParseRule)
|
||||||
assert.Equal(t, nil, err)
|
assert.Equal(t, nil, err)
|
||||||
assert.Equal(t, true, or.Match(&constant.Metadata{
|
m, _ := or.Match(&constant.Metadata{
|
||||||
NetWork: constant.TCP,
|
NetWork: constant.TCP,
|
||||||
}))
|
})
|
||||||
|
assert.Equal(t, true, m)
|
||||||
assert.Equal(t, false, or.ShouldResolveIP())
|
assert.Equal(t, false, or.ShouldResolveIP())
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,9 +17,9 @@ func (not *NOT) ShouldFindProcess() bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewNOT(payload string, adapter string, parse func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) (*NOT, error) {
|
func NewNOT(payload string, adapter string, parse func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) (*NOT, error) {
|
||||||
not := &NOT{Base: &common.Base{}, adapter: adapter}
|
not := &NOT{Base: &common.Base{}, adapter: adapter}
|
||||||
rule, err := parseRuleByPayload(payload, parse)
|
rule, err := ParseRuleByPayload(payload, parse)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -38,8 +38,16 @@ func (not *NOT) RuleType() C.RuleType {
|
||||||
return C.NOT
|
return C.NOT
|
||||||
}
|
}
|
||||||
|
|
||||||
func (not *NOT) Match(metadata *C.Metadata) bool {
|
func (not *NOT) Match(metadata *C.Metadata) (bool, string) {
|
||||||
return not.rule == nil || !not.rule.Match(metadata)
|
if not.rule == nil {
|
||||||
|
return true, not.adapter
|
||||||
|
}
|
||||||
|
|
||||||
|
if m, _ := not.rule.Match(metadata); m {
|
||||||
|
return true, not.adapter
|
||||||
|
}
|
||||||
|
|
||||||
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (not *NOT) Adapter() string {
|
func (not *NOT) Adapter() string {
|
||||||
|
|
|
@ -23,14 +23,14 @@ func (or *OR) RuleType() C.RuleType {
|
||||||
return C.OR
|
return C.OR
|
||||||
}
|
}
|
||||||
|
|
||||||
func (or *OR) Match(metadata *C.Metadata) bool {
|
func (or *OR) Match(metadata *C.Metadata) (bool, string) {
|
||||||
for _, rule := range or.rules {
|
for _, rule := range or.rules {
|
||||||
if rule.Match(metadata) {
|
if m, _ := rule.Match(metadata); m {
|
||||||
return true
|
return true, or.adapter
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false
|
return false, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (or *OR) Adapter() string {
|
func (or *OR) Adapter() string {
|
||||||
|
@ -45,9 +45,9 @@ func (or *OR) ShouldResolveIP() bool {
|
||||||
return or.needIP
|
return or.needIP
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewOR(payload string, adapter string, parse func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) (*OR, error) {
|
func NewOR(payload string, adapter string, parse func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) (*OR, error) {
|
||||||
or := &OR{Base: &common.Base{}, payload: payload, adapter: adapter}
|
or := &OR{Base: &common.Base{}, payload: payload, adapter: adapter}
|
||||||
rules, err := parseRuleByPayload(payload, parse)
|
rules, err := ParseRuleByPayload(payload, parse)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,9 +6,10 @@ import (
|
||||||
RC "github.com/Dreamacro/clash/rules/common"
|
RC "github.com/Dreamacro/clash/rules/common"
|
||||||
"github.com/Dreamacro/clash/rules/logic"
|
"github.com/Dreamacro/clash/rules/logic"
|
||||||
RP "github.com/Dreamacro/clash/rules/provider"
|
RP "github.com/Dreamacro/clash/rules/provider"
|
||||||
|
"github.com/Dreamacro/clash/rules/sub_rule"
|
||||||
)
|
)
|
||||||
|
|
||||||
func ParseRule(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
|
func ParseRule(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error) {
|
||||||
switch tp {
|
switch tp {
|
||||||
case "DOMAIN":
|
case "DOMAIN":
|
||||||
parsed = RC.NewDomain(payload, target)
|
parsed = RC.NewDomain(payload, target)
|
||||||
|
@ -45,6 +46,8 @@ func ParseRule(tp, payload, target string, params []string) (parsed C.Rule, pars
|
||||||
parsed, parseErr = RC.NewUid(payload, target)
|
parsed, parseErr = RC.NewUid(payload, target)
|
||||||
case "IN-TYPE":
|
case "IN-TYPE":
|
||||||
parsed, parseErr = RC.NewInType(payload, target)
|
parsed, parseErr = RC.NewInType(payload, target)
|
||||||
|
case "SUB-RULE":
|
||||||
|
parsed, parseErr = sub_rule.NewSubRule(payload, target, subRules, ParseRule)
|
||||||
case "AND":
|
case "AND":
|
||||||
parsed, parseErr = logic.NewAND(payload, target, ParseRule)
|
parsed, parseErr = logic.NewAND(payload, target, ParseRule)
|
||||||
case "OR":
|
case "OR":
|
||||||
|
@ -53,7 +56,7 @@ func ParseRule(tp, payload, target string, params []string) (parsed C.Rule, pars
|
||||||
parsed, parseErr = logic.NewNOT(payload, target, ParseRule)
|
parsed, parseErr = logic.NewNOT(payload, target, ParseRule)
|
||||||
case "RULE-SET":
|
case "RULE-SET":
|
||||||
noResolve := RC.HasNoResolve(params)
|
noResolve := RC.HasNoResolve(params)
|
||||||
parsed, parseErr = RP.NewRuleSet(payload, target, noResolve, ParseRule)
|
parsed, parseErr = RP.NewRuleSet(payload, target, noResolve)
|
||||||
case "MATCH":
|
case "MATCH":
|
||||||
parsed = RC.NewMatch(target)
|
parsed = RC.NewMatch(target)
|
||||||
parseErr = nil
|
parseErr = nil
|
||||||
|
|
|
@ -16,7 +16,7 @@ type classicalStrategy struct {
|
||||||
|
|
||||||
func (c *classicalStrategy) Match(metadata *C.Metadata) bool {
|
func (c *classicalStrategy) Match(metadata *C.Metadata) bool {
|
||||||
for _, rule := range c.rules {
|
for _, rule := range c.rules {
|
||||||
if rule.Match(metadata) {
|
if m, _ := rule.Match(metadata); m {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -66,13 +66,13 @@ func ruleParse(ruleRaw string) (string, string, []string) {
|
||||||
return "", "", nil
|
return "", "", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewClassicalStrategy(parse func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) *classicalStrategy {
|
func NewClassicalStrategy(parse func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) *classicalStrategy {
|
||||||
return &classicalStrategy{rules: []C.Rule{}, parse: func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
|
return &classicalStrategy{rules: []C.Rule{}, parse: func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error) {
|
||||||
switch tp {
|
switch tp {
|
||||||
case "MATCH":
|
case "MATCH", "SUB-RULE":
|
||||||
return nil, fmt.Errorf("unsupported rule type on rule-set")
|
return nil, fmt.Errorf("unsupported rule type on rule-set")
|
||||||
default:
|
default:
|
||||||
return parse(tp, payload, target, params)
|
return parse(tp, payload, target, params, nil)
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ type ruleProviderSchema struct {
|
||||||
Interval int `provider:"interval,omitempty"`
|
Interval int `provider:"interval,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func ParseRuleProvider(name string, mapping map[string]interface{}, parse func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) (P.RuleProvider, error) {
|
func ParseRuleProvider(name string, mapping map[string]interface{}, parse func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) (P.RuleProvider, error) {
|
||||||
schema := &ruleProviderSchema{}
|
schema := &ruleProviderSchema{}
|
||||||
decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
|
decoder := structure.NewDecoder(structure.Option{TagName: "provider", WeaklyTypedInput: true})
|
||||||
if err := decoder.Decode(mapping, schema); err != nil {
|
if err := decoder.Decode(mapping, schema); err != nil {
|
||||||
|
|
|
@ -103,7 +103,7 @@ func (rp *ruleSetProvider) MarshalJSON() ([]byte, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewRuleSetProvider(name string, behavior P.RuleType, interval time.Duration, vehicle P.Vehicle,
|
func NewRuleSetProvider(name string, behavior P.RuleType, interval time.Duration, vehicle P.Vehicle,
|
||||||
parse func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) P.RuleProvider {
|
parse func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) P.RuleProvider {
|
||||||
rp := &ruleSetProvider{
|
rp := &ruleSetProvider{
|
||||||
behavior: behavior,
|
behavior: behavior,
|
||||||
}
|
}
|
||||||
|
@ -126,7 +126,7 @@ func NewRuleSetProvider(name string, behavior P.RuleType, interval time.Duration
|
||||||
return wrapper
|
return wrapper
|
||||||
}
|
}
|
||||||
|
|
||||||
func newStrategy(behavior P.RuleType, parse func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) ruleStrategy {
|
func newStrategy(behavior P.RuleType, parse func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) ruleStrategy {
|
||||||
switch behavior {
|
switch behavior {
|
||||||
case P.Domain:
|
case P.Domain:
|
||||||
strategy := NewDomainStrategy()
|
strategy := NewDomainStrategy()
|
||||||
|
|
|
@ -23,8 +23,8 @@ func (rs *RuleSet) RuleType() C.RuleType {
|
||||||
return C.RuleSet
|
return C.RuleSet
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rs *RuleSet) Match(metadata *C.Metadata) bool {
|
func (rs *RuleSet) Match(metadata *C.Metadata) (bool, string) {
|
||||||
return rs.getProviders().Match(metadata)
|
return rs.getProviders().Match(metadata), rs.adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
func (rs *RuleSet) Adapter() string {
|
func (rs *RuleSet) Adapter() string {
|
||||||
|
@ -47,7 +47,7 @@ func (rs *RuleSet) getProviders() P.RuleProvider {
|
||||||
return rs.ruleProvider
|
return rs.ruleProvider
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewRuleSet(ruleProviderName string, adapter string, noResolveIP bool, parse func(tp, payload, target string, params []string) (parsed C.Rule, parseErr error)) (*RuleSet, error) {
|
func NewRuleSet(ruleProviderName string, adapter string, noResolveIP bool) (*RuleSet, error) {
|
||||||
rp, ok := RuleProviders()[ruleProviderName]
|
rp, ok := RuleProviders()[ruleProviderName]
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, fmt.Errorf("rule set %s not found", ruleProviderName)
|
return nil, fmt.Errorf("rule set %s not found", ruleProviderName)
|
||||||
|
|
91
rules/sub_rule/sub_rules.go
Normal file
91
rules/sub_rule/sub_rules.go
Normal file
|
@ -0,0 +1,91 @@
|
||||||
|
package sub_rule
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
C "github.com/Dreamacro/clash/constant"
|
||||||
|
"github.com/Dreamacro/clash/rules/common"
|
||||||
|
"github.com/Dreamacro/clash/rules/logic"
|
||||||
|
)
|
||||||
|
|
||||||
|
type SubRule struct {
|
||||||
|
*common.Base
|
||||||
|
payload string
|
||||||
|
payloadRule C.Rule
|
||||||
|
subName string
|
||||||
|
subRules *map[string][]C.Rule
|
||||||
|
shouldFindProcess *bool
|
||||||
|
shouldResolveIP *bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSubRule(payload, subName string, sub *map[string][]C.Rule,
|
||||||
|
parse func(tp, payload, target string, params []string, subRules *map[string][]C.Rule) (parsed C.Rule, parseErr error)) (*SubRule, error) {
|
||||||
|
payloadRule, err := logic.ParseRuleByPayload(fmt.Sprintf("(%s)", payload), parse)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(payloadRule) != 1 {
|
||||||
|
return nil, fmt.Errorf("Sub-Rule rule must contain one rule")
|
||||||
|
}
|
||||||
|
|
||||||
|
return &SubRule{
|
||||||
|
Base: &common.Base{},
|
||||||
|
payload: payload,
|
||||||
|
payloadRule: payloadRule[0],
|
||||||
|
subName: subName,
|
||||||
|
subRules: sub,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *SubRule) RuleType() C.RuleType {
|
||||||
|
return C.SubRules
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *SubRule) Match(metadata *C.Metadata) (bool, string) {
|
||||||
|
|
||||||
|
return match(metadata, r.subName, r.subRules)
|
||||||
|
}
|
||||||
|
|
||||||
|
func match(metadata *C.Metadata, name string, subRules *map[string][]C.Rule) (bool, string) {
|
||||||
|
for _, rule := range (*subRules)[name] {
|
||||||
|
if m, a := rule.Match(metadata); m {
|
||||||
|
if rule.RuleType() == C.SubRules {
|
||||||
|
match(metadata, rule.Adapter(), subRules)
|
||||||
|
} else {
|
||||||
|
return m, a
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *SubRule) ShouldResolveIP() bool {
|
||||||
|
if r.shouldResolveIP == nil {
|
||||||
|
s := false
|
||||||
|
for _, rule := range (*r.subRules)[r.subName] {
|
||||||
|
s = s || rule.ShouldResolveIP()
|
||||||
|
}
|
||||||
|
r.shouldResolveIP = &s
|
||||||
|
}
|
||||||
|
|
||||||
|
return *r.shouldResolveIP
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *SubRule) ShouldFindProcess() bool {
|
||||||
|
if r.shouldFindProcess == nil {
|
||||||
|
s := false
|
||||||
|
for _, rule := range (*r.subRules)[r.subName] {
|
||||||
|
s = s || rule.ShouldFindProcess()
|
||||||
|
}
|
||||||
|
r.shouldFindProcess = &s
|
||||||
|
}
|
||||||
|
|
||||||
|
return *r.shouldFindProcess
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *SubRule) Adapter() string {
|
||||||
|
return r.subName
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *SubRule) Payload() string {
|
||||||
|
return r.payload
|
||||||
|
}
|
|
@ -410,8 +410,8 @@ func match(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if rule.Match(metadata) {
|
if matched, ada := rule.Match(metadata); matched {
|
||||||
adapter, ok := proxies[rule.Adapter()]
|
adapter, ok := proxies[ada]
|
||||||
if !ok {
|
if !ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue