go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add bind for relay

Browse Source
This commit is contained in:
ginuerzh
2021-11-23 23:23:16 +08:00
parent 7beb5bf6d7
commit 98ef6c7492
18 changed files with 391 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
pkg/handler/socks/v5/bind.go
View File

@ -2,23 +2,21 @@ package v5
import (
"context"
"fmt"
"net"
"time"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/handler"
)
func (h *socks5Handler) handleBind(ctx context.Context, conn net.Conn, req *gosocks5.Request) {
addr := req.Addr.String()
func (h *socks5Handler) handleBind(ctx context.Context, conn net.Conn, network, address string) {
h.logger = h.logger.WithFields(map[string]interface{}{
"dst": addr,
"dst": fmt.Sprintf("%s/%s", address, network),
"cmd": "bind",
})
h.logger.Infof("%s >> %s", conn.RemoteAddr(), addr)
h.logger.Infof("%s >> %s", conn.RemoteAddr(), address)
if !h.md.enableBind {
reply := gosocks5.NewReply(gosocks5.NotAllowed, nil)
@ -28,41 +26,12 @@ func (h *socks5Handler) handleBind(ctx context.Context, conn net.Conn, req *goso
return
}
if h.chain.IsEmpty() {
h.bindLocal(ctx, conn, addr)
return
}
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Connect(ctx)
if err != nil {
resp := gosocks5.NewReply(gosocks5.Failure, nil)
resp.Write(conn)
h.logger.Debug(resp)
return
}
defer cc.Close()
// forward request
if err := req.Write(cc); err != nil {
h.logger.Error(err)
resp := gosocks5.NewReply(gosocks5.NetUnreachable, nil)
resp.Write(conn)
h.logger.Debug(resp)
return
}
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), addr)
handler.Transport(conn, cc)
h.logger.Infof("%s >-< %s", conn.RemoteAddr(), addr)
// BIND does not support chain.
h.bindLocal(ctx, conn, network, address)
}
func (h *socks5Handler) bindLocal(ctx context.Context, conn net.Conn, addr string) {
bindAddr, _ := net.ResolveTCPAddr("tcp", addr)
ln, err := net.ListenTCP("tcp", bindAddr) // strict mode: if the port already in use, it will return error
func (h *socks5Handler) bindLocal(ctx context.Context, conn net.Conn, network, address string) {
ln, err := net.Listen(network, address) // strict mode: if the port already in use, it will return error
if err != nil {
h.logger.Error(err)
reply := gosocks5.NewReply(gosocks5.Failure, nil)
@ -90,9 +59,10 @@ func (h *socks5Handler) bindLocal(ctx context.Context, conn net.Conn, addr strin
h.logger.Debug(reply)
h.logger = h.logger.WithFields(map[string]interface{}{
"bind": socksAddr.String(),
"bind": fmt.Sprintf("%s/%s", ln.Addr(), ln.Addr().Network()),
})
h.logger.Debugf("bind on %s OK", &socksAddr)
h.logger.Debugf("bind on %s OK", ln.Addr())
h.serveBind(ctx, conn, ln)
}

17
pkg/handler/socks/v5/connect.go
View File

@ -2,6 +2,7 @@ package v5
import (
"context"
"fmt"
"net"
"time"
@ -10,18 +11,18 @@ import (
"github.com/go-gost/gost/pkg/handler"
)
func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, addr string) {
func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, network, address string) {
h.logger = h.logger.WithFields(map[string]interface{}{
"dst": addr,
"dst": fmt.Sprintf("%s/%s", address, network),
"cmd": "connect",
})
h.logger.Infof("%s >> %s", conn.RemoteAddr(), addr)
h.logger.Infof("%s >> %s", conn.RemoteAddr(), address)
if h.bypass != nil && h.bypass.Contains(addr) {
if h.bypass != nil && h.bypass.Contains(address) {
resp := gosocks5.NewReply(gosocks5.NotAllowed, nil)
resp.Write(conn)
h.logger.Debug(resp)
h.logger.Info("bypass: ", addr)
h.logger.Info("bypass: ", address)
return
}
@ -29,7 +30,7 @@ func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, addr s
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Dial(ctx, "tcp", addr)
cc, err := r.Dial(ctx, network, address)
if err != nil {
resp := gosocks5.NewReply(gosocks5.NetUnreachable, nil)
resp.Write(conn)
@ -47,11 +48,11 @@ func (h *socks5Handler) handleConnect(ctx context.Context, conn net.Conn, addr s
h.logger.Debug(resp)
t := time.Now()
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), addr)
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), address)
handler.Transport(conn, cc)
h.logger.
WithFields(map[string]interface{}{
"duration": time.Since(t),
}).
Infof("%s >-< %s", conn.RemoteAddr(), addr)
Infof("%s >-< %s", conn.RemoteAddr(), address)
}

12
pkg/handler/socks/v5/handler.go
View File

@ -90,17 +90,19 @@ func (h *socks5Handler) Handle(ctx context.Context, conn net.Conn) {
h.logger.Debug(req)
conn.SetReadDeadline(time.Time{})
address := req.Addr.String()
switch req.Cmd {
case gosocks5.CmdConnect:
h.handleConnect(ctx, conn, req.Addr.String())
h.handleConnect(ctx, conn, "tcp", address)
case gosocks5.CmdBind:
h.handleBind(ctx, conn, req)
h.handleBind(ctx, conn, "tcp", address)
case socks.CmdMuxBind:
h.handleMuxBind(ctx, conn, req)
h.handleMuxBind(ctx, conn, "tcp", address)
case gosocks5.CmdUdp:
h.handleUDP(ctx, conn, req)
h.handleUDP(ctx, conn)
case socks.CmdUDPTun:
h.handleUDPTun(ctx, conn, req)
h.handleUDPTun(ctx, conn, "udp", address)
default:
h.logger.Errorf("unknown cmd: %d", req.Cmd)
resp := gosocks5.NewReply(gosocks5.CmdUnsupported, nil)

58
pkg/handler/socks/v5/mbind.go
View File

@ -2,24 +2,22 @@ package v5
import (
"context"
"fmt"
"net"
"time"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/common/util/mux"
"github.com/go-gost/gost/pkg/handler"
)
func (h *socks5Handler) handleMuxBind(ctx context.Context, conn net.Conn, req *gosocks5.Request) {
addr := req.Addr.String()
func (h *socks5Handler) handleMuxBind(ctx context.Context, conn net.Conn, network, address string) {
h.logger = h.logger.WithFields(map[string]interface{}{
"dst": addr,
"dst": fmt.Sprintf("%s/%s", address, network),
"cmd": "mbind",
})
h.logger.Infof("%s >> %s", conn.RemoteAddr(), addr)
h.logger.Infof("%s >> %s", conn.RemoteAddr(), address)
if !h.md.enableBind {
reply := gosocks5.NewReply(gosocks5.NotAllowed, nil)
@ -29,46 +27,11 @@ func (h *socks5Handler) handleMuxBind(ctx context.Context, conn net.Conn, req *g
return
}
if h.chain.IsEmpty() {
h.muxBindLocal(ctx, conn, addr)
return
}
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Connect(ctx)
if err != nil {
resp := gosocks5.NewReply(gosocks5.Failure, nil)
resp.Write(conn)
h.logger.Debug(resp)
return
}
defer cc.Close()
// forward request
if err := req.Write(cc); err != nil {
h.logger.Error(err)
resp := gosocks5.NewReply(gosocks5.NetUnreachable, nil)
resp.Write(conn)
h.logger.Debug(resp)
return
}
t := time.Now()
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), addr)
handler.Transport(conn, cc)
h.logger.
WithFields(map[string]interface{}{
"duration": time.Since(t),
}).
Infof("%s >-< %s", conn.RemoteAddr(), addr)
h.muxBindLocal(ctx, conn, network, address)
}
func (h *socks5Handler) muxBindLocal(ctx context.Context, conn net.Conn, addr string) {
bindAddr, _ := net.ResolveTCPAddr("tcp", addr)
ln, err := net.ListenTCP("tcp", bindAddr) // strict mode: if the port already in use, it will return error
func (h *socks5Handler) muxBindLocal(ctx context.Context, conn net.Conn, network, address string) {
ln, err := net.Listen(network, address) // strict mode: if the port already in use, it will return error
if err != nil {
h.logger.Error(err)
reply := gosocks5.NewReply(gosocks5.Failure, nil)
@ -80,7 +43,7 @@ func (h *socks5Handler) muxBindLocal(ctx context.Context, conn net.Conn, addr st
}
socksAddr := gosocks5.Addr{}
socksAddr.ParseFrom(ln.Addr().String())
err = socksAddr.ParseFrom(ln.Addr().String())
if err != nil {
h.logger.Warn(err)
}
@ -97,9 +60,10 @@ func (h *socks5Handler) muxBindLocal(ctx context.Context, conn net.Conn, addr st
h.logger.Debug(reply)
h.logger = h.logger.WithFields(map[string]interface{}{
"bind": socksAddr.String(),
"bind": fmt.Sprintf("%s/%s", ln.Addr(), ln.Addr().Network()),
})
h.logger.Debugf("bind on %s OK", &socksAddr)
h.logger.Debugf("bind on %s OK", ln.Addr())
h.serveMuxBind(ctx, conn, ln)
}

2
pkg/handler/socks/v5/metadata.go
View File

@ -80,7 +80,7 @@ func (h *socks5Handler) parseMetadata(md md.Metadata) error {
h.md.udpBufferSize = 65 * 1024 // max buffer size
}
} else {
h.md.udpBufferSize = 4096 // default buffer size
h.md.udpBufferSize = 1024 // default buffer size
}
h.md.compatibilityMode = md.GetBool(compatibilityMode)

7
pkg/handler/socks/v5/udp.go
View File

@ -3,6 +3,7 @@ package v5
import (
"context"
"errors"
"fmt"
"io"
"io/ioutil"
"net"
@ -14,7 +15,7 @@ import (
"github.com/go-gost/gost/pkg/common/util/socks"
)
func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, req *gosocks5.Request) {
func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn) {
h.logger = h.logger.WithFields(map[string]interface{}{
"cmd": "udp",
})
@ -49,9 +50,9 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, req *gosoc
h.logger.Debug(reply)
h.logger = h.logger.WithFields(map[string]interface{}{
"bind": saddr.String(),
"bind": fmt.Sprintf("%s/%s", relay.LocalAddr(), relay.LocalAddr().Network()),
})
h.logger.Debugf("bind on %s OK", &saddr)
h.logger.Debugf("bind on %s OK", relay.LocalAddr())
if h.chain.IsEmpty() {
// serve as standard socks5 udp relay.

84
pkg/handler/socks/v5/udp_tun.go
View File

@ -2,17 +2,16 @@ package v5
import (
"context"
"fmt"
"net"
"time"
"github.com/go-gost/gosocks5"
"github.com/go-gost/gost/pkg/chain"
"github.com/go-gost/gost/pkg/common/bufpool"
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/handler"
)
func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, req *gosocks5.Request) {
func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, network, address string) {
h.logger = h.logger.WithFields(map[string]interface{}{
"cmd": "udp-tun",
})
@ -25,76 +24,41 @@ func (h *socks5Handler) handleUDPTun(ctx context.Context, conn net.Conn, req *go
return
}
if h.chain.IsEmpty() {
addr := req.Addr.String()
bindAddr, _ := net.ResolveUDPAddr("udp", addr)
relay, err := net.ListenUDP("udp", bindAddr)
if err != nil {
h.logger.Error(err)
return
}
defer relay.Close()
saddr, _ := gosocks5.NewAddr(relay.LocalAddr().String())
saddr.Host, _, _ = net.SplitHostPort(conn.LocalAddr().String())
saddr.Type = 0
reply := gosocks5.NewReply(gosocks5.Succeeded, saddr)
if err := reply.Write(conn); err != nil {
h.logger.Error(err)
return
}
h.logger.Debug(reply)
h.logger = h.logger.WithFields(map[string]interface{}{
"bind": saddr.String(),
})
t := time.Now()
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), saddr)
h.tunnelServerUDP(
socks.UDPTunServerConn(conn),
relay,
)
h.logger.
WithFields(map[string]interface{}{
"duration": time.Since(t),
}).
Infof("%s >-< %s", conn.RemoteAddr(), saddr)
return
}
r := (&chain.Router{}).
WithChain(h.chain).
WithRetry(h.md.retryCount).
WithLogger(h.logger)
cc, err := r.Connect(ctx)
bindAddr, _ := net.ResolveUDPAddr(network, address)
pc, err := net.ListenUDP(network, bindAddr)
if err != nil {
h.logger.Error(err)
reply := gosocks5.NewReply(gosocks5.Failure, nil)
reply.Write(conn)
h.logger.Debug(reply)
return
}
defer cc.Close()
defer pc.Close()
// forward request
if err := req.Write(cc); err != nil {
saddr, _ := gosocks5.NewAddr(pc.LocalAddr().String())
saddr.Host, _, _ = net.SplitHostPort(conn.LocalAddr().String())
saddr.Type = 0
reply := gosocks5.NewReply(gosocks5.Succeeded, saddr)
if err := reply.Write(conn); err != nil {
h.logger.Error(err)
reply := gosocks5.NewReply(gosocks5.Failure, nil)
reply.Write(conn)
h.logger.Debug(reply)
return
}
h.logger.Debug(reply)
h.logger = h.logger.WithFields(map[string]interface{}{
"bind": fmt.Sprintf("%s/%s", pc.LocalAddr(), pc.LocalAddr().Network()),
})
h.logger.Debugf("bind on %s OK", pc.LocalAddr())
t := time.Now()
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), cc.RemoteAddr())
handler.Transport(conn, cc)
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), pc.LocalAddr())
h.tunnelServerUDP(
socks.UDPTunServerConn(conn),
pc,
)
h.logger.
WithFields(map[string]interface{}{
"duration": time.Since(t),
}).
Infof("%s >-< %s", conn.RemoteAddr(), cc.RemoteAddr())
Infof("%s >-< %s", conn.RemoteAddr(), pc.LocalAddr())
}
func (h *socks5Handler) tunnelServerUDP(tunnel, c net.PacketConn) (err error) {