history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: support IN-PORT rule

Browse Source
This commit is contained in:
wwqgtxx
2022-11-11 23:36:06 +08:00
parent 64be213b66
commit b2d7149a95
13 changed files with 60 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rules/common/port.go
View File

@ -13,22 +13,23 @@ type Port struct {
*Base
adapter string
port string
isSource bool
ruleType C.RuleType
portList []utils.Range[uint16]
}
func (p *Port) RuleType() C.RuleType {
if p.isSource {
return C.SrcPort
}
return C.DstPort
return p.ruleType
}
func (p *Port) Match(metadata *C.Metadata) (bool, string) {
if p.isSource {
return p.matchPortReal(metadata.SrcPort), p.adapter
targetPort := metadata.DstPort
switch p.ruleType {
case C.InPort:
targetPort = metadata.InPort
case C.SrcPort:
targetPort = metadata.SrcPort
}
return p.matchPortReal(metadata.DstPort), p.adapter
return p.matchPortReal(targetPort), p.adapter
}
func (p *Port) Adapter() string {
@ -51,7 +52,7 @@ func (p *Port) matchPortReal(portRef string) bool {
return false
}
func NewPort(port string, adapter string, isSource bool) (*Port, error) {
func NewPort(port string, adapter string, ruleType C.RuleType) (*Port, error) {
ports := strings.Split(port, "/")
if len(ports) > 28 {
return nil, fmt.Errorf("%s, too many ports to use, maximum support 28 ports", errPayload.Error())
@ -95,7 +96,7 @@ func NewPort(port string, adapter string, isSource bool) (*Port, error) {
Base: &Base{},
adapter: adapter,
port: port,
isSource: isSource,
ruleType: ruleType,
portList: portRange,
}, nil
}

6
rules/logic/logic_test.go
View File

@ -33,9 +33,11 @@ func ParseRule(tp, payload, target string, params []string, subRules *map[string
case "SRC-IP-SUFFIX":
parsed, parseErr = RC.NewIPSuffix(payload, target, true, true)
case "SRC-PORT":
parsed, parseErr = RC.NewPort(payload, target, true)
parsed, parseErr = RC.NewPort(payload, target, C.SrcPort)
case "DST-PORT":
parsed, parseErr = RC.NewPort(payload, target, false)
parsed, parseErr = RC.NewPort(payload, target, C.DstPort)
case "IN-PORT":
parsed, parseErr = RC.NewPort(payload, target, C.InPort)
case "PROCESS-NAME":
parsed, parseErr = RC.NewProcess(payload, target, true)
case "PROCESS-PATH":

6
rules/parser.go
View File

@ -32,9 +32,11 @@ func ParseRule(tp, payload, target string, params []string, subRules *map[string
case "SRC-IP-SUFFIX":
parsed, parseErr = RC.NewIPSuffix(payload, target, true, true)
case "SRC-PORT":
parsed, parseErr = RC.NewPort(payload, target, true)
parsed, parseErr = RC.NewPort(payload, target, C.SrcPort)
case "DST-PORT":
parsed, parseErr = RC.NewPort(payload, target, false)
parsed, parseErr = RC.NewPort(payload, target, C.DstPort)
case "IN-PORT":
parsed, parseErr = RC.NewPort(payload, target, C.InPort)
case "PROCESS-NAME":
parsed, parseErr = RC.NewProcess(payload, target, true)
case "PROCESS-PATH":