Skip to content

Commit

Permalink
chore: Check regex rule expression when initializing
Browse files Browse the repository at this point in the history
  • Loading branch information
H1JK authored and wwqgtxx committed Mar 8, 2024
1 parent 5702d28 commit 90d0ef0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
18 changes: 10 additions & 8 deletions rules/common/domain_regex.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ package common

import (
"regexp"
"strings"

C "github.com/metacubex/mihomo/constant"
)

type DomainRegex struct {
*Base
regex string
regex *regexp.Regexp
adapter string
}

Expand All @@ -19,24 +18,27 @@ func (dr *DomainRegex) RuleType() C.RuleType {

func (dr *DomainRegex) Match(metadata *C.Metadata) (bool, string) {
domain := metadata.RuleHost()
match, _ := regexp.MatchString(dr.regex, domain)
return match, dr.adapter
return dr.regex.MatchString(domain), dr.adapter
}

func (dr *DomainRegex) Adapter() string {
return dr.adapter
}

func (dr *DomainRegex) Payload() string {
return dr.regex
return dr.regex.String()
}

func NewDomainRegex(regex string, adapter string) *DomainRegex {
func NewDomainRegex(regex string, adapter string) (*DomainRegex, error) {
r, err := regexp.Compile(regex)
if err != nil {
return nil, err
}
return &DomainRegex{
Base: &Base{},
regex: strings.ToLower(regex),
regex: r,
adapter: adapter,
}
}, nil
}

//var _ C.Rule = (*DomainRegex)(nil)
2 changes: 1 addition & 1 deletion rules/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func ParseRule(tp, payload, target string, params []string, subRules map[string]
case "DOMAIN-KEYWORD":
parsed = RC.NewDomainKeyword(payload, target)
case "DOMAIN-REGEX":
parsed = RC.NewDomainRegex(payload, target)
parsed, parseErr = RC.NewDomainRegex(payload, target)
case "GEOSITE":
parsed, parseErr = RC.NewGEOSITE(payload, target)
case "GEOIP":
Expand Down

0 comments on commit 90d0ef0

Please sign in to comment.