feat: IN-TYPE rule support

eg. IN-TYPE,SOCKS/REDIR/INNER,Proxy
support list: HTTP HTTPS SOCKS SOCKS4 SOCKS5 REDIR TPROXY TUN INNER
This commit is contained in:
adlyq
2022-05-20 23:17:16 +08:00
parent 0f43a19fdb
commit 3ab82849d4
8 changed files with 114 additions and 7 deletions

74
rule/common/in_type.go Normal file
View File

@ -0,0 +1,74 @@
package common
import (
"fmt"
C "github.com/Dreamacro/clash/constant"
"strings"
)
type InType struct {
*Base
types []C.Type
adapter string
payload string
}
func (u *InType) Match(metadata *C.Metadata) bool {
for _, tp := range u.types {
if metadata.Type == tp {
return true
}
}
return false
}
func (u *InType) RuleType() C.RuleType {
return C.INTYPE
}
func (u *InType) Adapter() string {
return u.adapter
}
func (u *InType) Payload() string {
return u.payload
}
func NewInType(iTypes, adapter string) (*InType, error) {
types := strings.Split(iTypes, "/")
if len(types) == 0 {
return nil, fmt.Errorf("in type could be empty")
}
tps, err := parseInTypes(types)
if err != nil {
return nil, err
}
return &InType{
Base: &Base{},
types: tps,
adapter: adapter,
payload: strings.ToUpper(iTypes),
}, nil
}
func parseInTypes(tps []string) (res []C.Type, err error) {
for _, tp := range tps {
utp := strings.ToUpper(tp)
var r *C.Type
if utp == "SOCKS" {
r, _ = C.ParseType("SOCKS4")
res = append(res, *r)
r, _ = C.ParseType("SOCKS5")
res = append(res, *r)
} else {
r, err = C.ParseType(utp)
if err != nil {
return
}
res = append(res, *r)
}
}
return
}

View File

@ -104,6 +104,8 @@ func parseRule(tp, payload string, params []string) (C.Rule, error) {
case "RULE-SET":
noResolve := RC.HasNoResolve(params)
parsed, parseErr = provider.NewRuleSet(payload, "", noResolve)
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, "")
case "NOT":
parsed, parseErr = NewNOT(payload, "")
case "AND":

View File

@ -3,7 +3,6 @@ package rules
import (
"fmt"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/log"
RC "github.com/Dreamacro/clash/rule/common"
"github.com/Dreamacro/clash/rule/logic"
RP "github.com/Dreamacro/clash/rule/provider"
@ -47,8 +46,10 @@ func ParseRule(tp, payload, target string, params []string) (C.Rule, error) {
if runtime.GOOS == "linux" || runtime.GOOS == "android" {
parsed, parseErr = RC.NewUid(payload, target)
} else {
log.Warnln("uid rule not support this platform")
parseErr = fmt.Errorf("uid rule not support this platform")
}
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target)
case "AND":
parsed, parseErr = logic.NewAND(payload, target)
case "OR":

View File

@ -84,6 +84,8 @@ func parseRule(tp, payload, target string, params []string) (C.Rule, error) {
parsed, parseErr = RC.NewProcess(payload, target, false)
case "NETWORK":
parsed, parseErr = RC.NewNetworkType(payload, target)
case "IN-TYPE":
parsed, parseErr = RC.NewInType(payload, target)
default:
parseErr = fmt.Errorf("unsupported rule type %s", tp)
}