GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-06-15 00:49:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement client side ACL for SOCKS5 UDP

Browse Source
This commit is contained in:
Toby 2020-04-26 15:32:55 -07:00
parent 5d14a34414
commit 654787cebd
1 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/socks5/server.go
View File

@ -283,25 +283,58 @@ func (s *Server) udpServer(c *net.UDPConn) {
// We already have a client and you're not it! // We already have a client and you're not it!
continue continue
} }
rc := remoteMap[d.Address()] domain, ip, port, addr := parseDatagramRequestAddress(d)
rc := remoteMap[addr]
if rc == nil { if rc == nil {
// Need a new entry // Need a new entry
rc, err = s.HyClient.Dial(true, d.Address()) action, arg := acl.ActionProxy, ""
if s.ACLEngine != nil {
action, arg = s.ACLEngine.Lookup(domain, ip)
}
s.NewUDPTunnelFunc(clientAddr, addr, action, arg)
// Handle according to the action
switch action {
case acl.ActionDirect:
rc, err = net.Dial("udp", addr)
if err != nil { if err != nil {
// Failed to establish a connection, silently ignore // Failed to establish a connection, silently ignore
continue continue
} }
// The other direction // The other direction
go udpReversePipe(clientAddr, c, rc) go udpReversePipe(clientAddr, c, rc)
remoteMap[d.Address()] = rc remoteMap[addr] = rc
s.NewUDPTunnelFunc(clientAddr, d.Address(), acl.ActionProxy, "") case acl.ActionProxy:
rc, err = s.HyClient.Dial(true, addr)
if err != nil {
// Failed to establish a connection, silently ignore
continue
}
// The other direction
go udpReversePipe(clientAddr, c, rc)
remoteMap[addr] = rc
case acl.ActionBlock:
// Silently ignore
continue
case acl.ActionHijack:
rc, err = net.Dial("udp", net.JoinHostPort(arg, port))
if err != nil {
// Failed to establish a connection, silently ignore
continue
}
// The other direction
go udpReversePipe(clientAddr, c, rc)
remoteMap[addr] = rc
default:
// Silently ignore
continue
}
} }
_, err = rc.Write(d.Data) _, err = rc.Write(d.Data)
if err != nil { if err != nil {
// The connection is no longer valid, close & remove from map // The connection is no longer valid, close & remove from map
_ = rc.Close() _ = rc.Close()
delete(remoteMap, d.Address()) delete(remoteMap, addr)
s.UDPTunnelClosedFunc(clientAddr, d.Address(), err) s.UDPTunnelClosedFunc(clientAddr, addr, err)
} }
} }
// Close all remote connections // Close all remote connections
@ -327,6 +360,16 @@ func parseRequestAddress(r *socks5.Request) (domain string, ip net.IP, port stri
} }
} }
func parseDatagramRequestAddress(r *socks5.Datagram) (domain string, ip net.IP, port string, addr string) {
p := strconv.Itoa(int(binary.BigEndian.Uint16(r.DstPort)))
if r.Atyp == socks5.ATYPDomain {
d := string(r.DstAddr[1:])
return d, nil, p, net.JoinHostPort(d, p)
} else {
return "", r.DstAddr, p, net.JoinHostPort(net.IP(r.DstAddr).String(), p)
}
}
func pipePair(conn *net.TCPConn, stream io.ReadWriteCloser, deadline int) error { func pipePair(conn *net.TCPConn, stream io.ReadWriteCloser, deadline int) error {
errChan := make(chan error, 2) errChan := make(chan error, 2)
// TCP to stream // TCP to stream