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

Feature: add inbounds for flexible binding inbound (#2818)

Browse Source
This commit is contained in:
fuyun
2023-08-03 22:30:08 +08:00
committed by GitHub
parent 10f4d5375a
commit 9e78137768
25 changed files with 552 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rule/parser.go
View File

@ -28,9 +28,11 @@ func ParseRule(tp, payload, target string, params []string) (C.Rule, error) {
case "SRC-IP-CIDR":
parsed, parseErr = NewIPCIDR(payload, target, WithIPCIDRSourceIP(true), WithIPCIDRNoResolve(true))
case "SRC-PORT":
parsed, parseErr = NewPort(payload, target, true)
parsed, parseErr = NewPort(payload, target, PortTypeSrc)
case "DST-PORT":
parsed, parseErr = NewPort(payload, target, false)
parsed, parseErr = NewPort(payload, target, PortTypeDest)
case "INBOUND-PORT":
parsed, parseErr = NewPort(payload, target, PortTypeInbound)
case "PROCESS-NAME":
parsed, parseErr = NewProcess(payload, target, true)
case "PROCESS-PATH":

35
rule/port.go
View File

@ -1,29 +1,50 @@
package rules
import (
"fmt"
"strconv"
C "github.com/Dreamacro/clash/constant"
)
type PortType int
const (
PortTypeSrc PortType = iota
PortTypeDest
PortTypeInbound
)
type Port struct {
adapter string
port string
isSource bool
portType PortType
}
func (p *Port) RuleType() C.RuleType {
if p.isSource {
switch p.portType {
case PortTypeSrc:
return C.SrcPort
case PortTypeDest:
return C.DstPort
case PortTypeInbound:
return C.InboundPort
default:
panic(fmt.Errorf("unknown port type: %v", p.portType))
}
return C.DstPort
}
func (p *Port) Match(metadata *C.Metadata) bool {
if p.isSource {
switch p.portType {
case PortTypeSrc:
return metadata.SrcPort == p.port
case PortTypeDest:
return metadata.DstPort == p.port
case PortTypeInbound:
return metadata.InboundPort == p.port
default:
panic(fmt.Errorf("unknown port type: %v", p.portType))
}
return metadata.DstPort == p.port
}
func (p *Port) Adapter() string {
@ -42,7 +63,7 @@ func (p *Port) ShouldFindProcess() bool {
return false
}
func NewPort(port string, adapter string, isSource bool) (*Port, error) {
func NewPort(port string, adapter string, portType PortType) (*Port, error) {
_, err := strconv.ParseUint(port, 10, 16)
if err != nil {
return nil, errPayload
@ -50,6 +71,6 @@ func NewPort(port string, adapter string, isSource bool) (*Port, error) {
return &Port{
adapter: adapter,
port: port,
isSource: isSource,
portType: portType,
}, nil
}