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

add sshd listener

Browse Source
This commit is contained in:
ginuerzh
2022-01-26 15:53:33 +08:00
parent a134026e76
commit 04dfc8c4c3
39 changed files with 1101 additions and 848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
pkg/handler/relay/bind.go
View File

@ -10,16 +10,17 @@ import (
"github.com/go-gost/gost/pkg/common/util/mux"
"github.com/go-gost/gost/pkg/common/util/socks"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/gost/pkg/logger"
"github.com/go-gost/relay"
)
func (h *relayHandler) handleBind(ctx context.Context, conn net.Conn, network, address string) {
h.logger = h.logger.WithFields(map[string]interface{}{
func (h *relayHandler) handleBind(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) {
log = log.WithFields(map[string]interface{}{
"dst": fmt.Sprintf("%s/%s", address, network),
"cmd": "bind",
})
h.logger.Infof("%s >> %s", conn.RemoteAddr(), address)
log.Infof("%s >> %s", conn.RemoteAddr(), address)
resp := relay.Response{
Version: relay.Version1,
@ -29,18 +30,18 @@ func (h *relayHandler) handleBind(ctx context.Context, conn net.Conn, network, a
if !h.md.enableBind {
resp.Status = relay.StatusForbidden
resp.WriteTo(conn)
h.logger.Error("BIND is diabled")
log.Error("BIND is diabled")
return
}
if network == "tcp" {
h.bindTCP(ctx, conn, network, address)
h.bindTCP(ctx, conn, network, address, log)
} else {
h.bindUDP(ctx, conn, network, address)
h.bindUDP(ctx, conn, network, address, log)
}
}
func (h *relayHandler) bindTCP(ctx context.Context, conn net.Conn, network, address string) {
func (h *relayHandler) bindTCP(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) {
resp := relay.Response{
Version: relay.Version1,
Status: relay.StatusOK,
@ -48,7 +49,7 @@ func (h *relayHandler) bindTCP(ctx context.Context, conn net.Conn, network, addr
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)
log.Error(err)
resp.Status = relay.StatusServiceUnavailable
resp.WriteTo(conn)
return
@ -57,7 +58,7 @@ func (h *relayHandler) bindTCP(ctx context.Context, conn net.Conn, network, addr
af := &relay.AddrFeature{}
err = af.ParseFrom(ln.Addr().String())
if err != nil {
h.logger.Warn(err)
log.Warn(err)
}
// Issue: may not reachable when host has multi-interface
@ -65,20 +66,20 @@ func (h *relayHandler) bindTCP(ctx context.Context, conn net.Conn, network, addr
af.AType = relay.AddrIPv4
resp.Features = append(resp.Features, af)
if _, err := resp.WriteTo(conn); err != nil {
h.logger.Error(err)
log.Error(err)
ln.Close()
return
}
h.logger = h.logger.WithFields(map[string]interface{}{
log = log.WithFields(map[string]interface{}{
"bind": fmt.Sprintf("%s/%s", ln.Addr(), ln.Addr().Network()),
})
h.logger.Debugf("bind on %s OK", ln.Addr())
log.Debugf("bind on %s OK", ln.Addr())
h.serveTCPBind(ctx, conn, ln)
h.serveTCPBind(ctx, conn, ln, log)
}
func (h *relayHandler) bindUDP(ctx context.Context, conn net.Conn, network, address string) {
func (h *relayHandler) bindUDP(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) {
resp := relay.Response{
Version: relay.Version1,
Status: relay.StatusOK,
@ -87,7 +88,7 @@ func (h *relayHandler) bindUDP(ctx context.Context, conn net.Conn, network, addr
bindAddr, _ := net.ResolveUDPAddr(network, address)
pc, err := net.ListenUDP(network, bindAddr)
if err != nil {
h.logger.Error(err)
log.Error(err)
return
}
defer pc.Close()
@ -95,7 +96,7 @@ func (h *relayHandler) bindUDP(ctx context.Context, conn net.Conn, network, addr
af := &relay.AddrFeature{}
err = af.ParseFrom(pc.LocalAddr().String())
if err != nil {
h.logger.Warn(err)
log.Warn(err)
}
// Issue: may not reachable when host has multi-interface
@ -103,33 +104,32 @@ func (h *relayHandler) bindUDP(ctx context.Context, conn net.Conn, network, addr
af.AType = relay.AddrIPv4
resp.Features = append(resp.Features, af)
if _, err := resp.WriteTo(conn); err != nil {
h.logger.Error(err)
log.Error(err)
return
}
h.logger = h.logger.WithFields(map[string]interface{}{
log = log.WithFields(map[string]interface{}{
"bind": pc.LocalAddr().String(),
})
h.logger.Debugf("bind on %s OK", pc.LocalAddr())
log.Debugf("bind on %s OK", pc.LocalAddr())
t := time.Now()
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), pc.LocalAddr())
log.Infof("%s <-> %s", conn.RemoteAddr(), pc.LocalAddr())
h.tunnelServerUDP(
socks.UDPTunServerConn(conn),
pc,
log,
)
h.logger.
WithFields(map[string]interface{}{
"duration": time.Since(t),
}).
Infof("%s >-< %s", conn.RemoteAddr(), pc.LocalAddr())
log.WithFields(map[string]interface{}{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), pc.LocalAddr())
}
func (h *relayHandler) serveTCPBind(ctx context.Context, conn net.Conn, ln net.Listener) {
func (h *relayHandler) serveTCPBind(ctx context.Context, conn net.Conn, ln net.Listener, log logger.Logger) {
// Upgrade connection to multiplex stream.
session, err := mux.ClientSession(conn)
if err != nil {
h.logger.Error(err)
log.Error(err)
return
}
defer session.Close()
@ -139,7 +139,7 @@ func (h *relayHandler) serveTCPBind(ctx context.Context, conn net.Conn, ln net.L
for {
conn, err := session.Accept()
if err != nil {
h.logger.Error(err)
log.Error(err)
return
}
conn.Close() // we do not handle incoming connections.
@ -149,17 +149,22 @@ func (h *relayHandler) serveTCPBind(ctx context.Context, conn net.Conn, ln net.L
for {
rc, err := ln.Accept()
if err != nil {
h.logger.Error(err)
log.Error(err)
return
}
h.logger.Debugf("peer %s accepted", rc.RemoteAddr())
log.Debugf("peer %s accepted", rc.RemoteAddr())
go func(c net.Conn) {
defer c.Close()
log = log.WithFields(map[string]interface{}{
"local": ln.Addr().String(),
"remote": c.RemoteAddr().String(),
})
sc, err := session.GetConn()
if err != nil {
h.logger.Error(err)
log.Error(err)
return
}
defer sc.Close()
@ -172,21 +177,20 @@ func (h *relayHandler) serveTCPBind(ctx context.Context, conn net.Conn, ln net.L
Features: []relay.Feature{af},
}
if _, err := resp.WriteTo(sc); err != nil {
h.logger.Error(err)
log.Error(err)
return
}
t := time.Now()
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), c.RemoteAddr().String())
log.Infof("%s <-> %s", c.LocalAddr(), c.RemoteAddr())
handler.Transport(sc, c)
h.logger.
WithFields(map[string]interface{}{"duration": time.Since(t)}).
Infof("%s >-< %s", conn.RemoteAddr(), c.RemoteAddr().String())
log.WithFields(map[string]interface{}{"duration": time.Since(t)}).
Infof("%s >-< %s", c.LocalAddr(), c.RemoteAddr())
}(rc)
}
}
func (h *relayHandler) tunnelServerUDP(tunnel, c net.PacketConn) (err error) {
func (h *relayHandler) tunnelServerUDP(tunnel, c net.PacketConn, log logger.Logger) (err error) {
bufSize := h.md.udpBufferSize
errc := make(chan error, 2)
@ -202,7 +206,7 @@ func (h *relayHandler) tunnelServerUDP(tunnel, c net.PacketConn) (err error) {
}
if h.options.Bypass != nil && h.options.Bypass.Contains(raddr.String()) {
h.logger.Warn("bypass: ", raddr)
log.Warn("bypass: ", raddr)
return nil
}
@ -210,7 +214,7 @@ func (h *relayHandler) tunnelServerUDP(tunnel, c net.PacketConn) (err error) {
return err
}
h.logger.Debugf("%s >>> %s data: %d",
log.Debugf("%s >>> %s data: %d",
c.LocalAddr(), raddr, n)
return nil
@ -235,14 +239,14 @@ func (h *relayHandler) tunnelServerUDP(tunnel, c net.PacketConn) (err error) {
}
if h.options.Bypass != nil && h.options.Bypass.Contains(raddr.String()) {
h.logger.Warn("bypass: ", raddr)
log.Warn("bypass: ", raddr)
return nil
}
if _, err := tunnel.WriteTo((*b)[:n], raddr); err != nil {
return err
}
h.logger.Debugf("%s <<< %s data: %d",
log.Debugf("%s <<< %s data: %d",
c.LocalAddr(), raddr, n)
return nil

23
pkg/handler/relay/connect.go
View File

@ -7,16 +7,17 @@ import (
"time"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/gost/pkg/logger"
"github.com/go-gost/relay"
)
func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network, address string) {
h.logger = h.logger.WithFields(map[string]interface{}{
func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network, address string, log logger.Logger) {
log = log.WithFields(map[string]interface{}{
"dst": fmt.Sprintf("%s/%s", address, network),
"cmd": "connect",
})
h.logger.Infof("%s >> %s", conn.RemoteAddr(), address)
log.Infof("%s >> %s", conn.RemoteAddr(), address)
resp := relay.Response{
Version: relay.Version1,
@ -26,12 +27,12 @@ func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network
if address == "" {
resp.Status = relay.StatusBadRequest
resp.WriteTo(conn)
h.logger.Error("target not specified")
log.Error("target not specified")
return
}
if h.options.Bypass != nil && h.options.Bypass.Contains(address) {
h.logger.Info("bypass: ", address)
log.Info("bypass: ", address)
resp.Status = relay.StatusForbidden
resp.WriteTo(conn)
return
@ -47,7 +48,7 @@ func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network
if h.md.noDelay {
if _, err := resp.WriteTo(conn); err != nil {
h.logger.Error(err)
log.Error(err)
return
}
}
@ -78,11 +79,9 @@ func (h *relayHandler) handleConnect(ctx context.Context, conn net.Conn, network
}
t := time.Now()
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), address)
log.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(), address)
log.WithFields(map[string]interface{}{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), address)
}

24
pkg/handler/relay/forward.go
View File

@ -7,10 +7,11 @@ import (
"time"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/gost/pkg/logger"
"github.com/go-gost/relay"
)
func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network string) {
func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network string, log logger.Logger) {
resp := relay.Response{
Version: relay.Version1,
Status: relay.StatusOK,
@ -19,15 +20,16 @@ func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network
if target == nil {
resp.Status = relay.StatusServiceUnavailable
resp.WriteTo(conn)
h.logger.Error("no target available")
log.Error("no target available")
return
}
h.logger = h.logger.WithFields(map[string]interface{}{
log = log.WithFields(map[string]interface{}{
"dst": fmt.Sprintf("%s/%s", target.Addr(), network),
"cmd": "forward",
})
h.logger.Infof("%s >> %s", conn.RemoteAddr(), target.Addr())
log.Infof("%s >> %s", conn.RemoteAddr(), target.Addr())
cc, err := h.router.Dial(ctx, network, target.Addr())
if err != nil {
@ -37,7 +39,7 @@ func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network
resp.Status = relay.StatusHostUnreachable
resp.WriteTo(conn)
h.logger.Error(err)
log.Error(err)
return
}
@ -46,7 +48,7 @@ func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network
if h.md.noDelay {
if _, err := resp.WriteTo(conn); err != nil {
h.logger.Error(err)
log.Error(err)
return
}
}
@ -77,11 +79,9 @@ func (h *relayHandler) handleForward(ctx context.Context, conn net.Conn, network
}
t := time.Now()
h.logger.Infof("%s <-> %s", conn.RemoteAddr(), target.Addr())
log.Infof("%s <-> %s", conn.RemoteAddr(), target.Addr())
handler.Transport(conn, cc)
h.logger.
WithFields(map[string]interface{}{
"duration": time.Since(t),
}).
Infof("%s >-< %s", conn.RemoteAddr(), target.Addr())
log.WithFields(map[string]interface{}{
"duration": time.Since(t),
}).Infof("%s >-< %s", conn.RemoteAddr(), target.Addr())
}

25
pkg/handler/relay/handler.go
View File

@ -10,7 +10,6 @@ import (
"github.com/go-gost/gost/pkg/chain"
auth_util "github.com/go-gost/gost/pkg/common/util/auth"
"github.com/go-gost/gost/pkg/handler"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
"github.com/go-gost/gost/pkg/registry"
"github.com/go-gost/relay"
@ -24,7 +23,6 @@ type relayHandler struct {
group *chain.NodeGroup
router *chain.Router
authenticator auth.Authenticator
logger logger.Logger
md metadata
options handler.Options
}
@ -53,7 +51,6 @@ func (h *relayHandler) Init(md md.Metadata) (err error) {
Hosts: h.options.Hosts,
Logger: h.options.Logger,
}
h.logger = h.options.Logger
return nil
}
@ -66,14 +63,14 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn) {
defer conn.Close()
start := time.Now()
h.logger = h.logger.WithFields(map[string]interface{}{
log := h.options.Logger.WithFields(map[string]interface{}{
"remote": conn.RemoteAddr().String(),
"local": conn.LocalAddr().String(),
})
h.logger.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr())
log.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr())
defer func() {
h.logger.WithFields(map[string]interface{}{
log.WithFields(map[string]interface{}{
"duration": time.Since(start),
}).Infof("%s >< %s", conn.RemoteAddr(), conn.LocalAddr())
}()
@ -84,14 +81,14 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn) {
req := relay.Request{}
if _, err := req.ReadFrom(conn); err != nil {
h.logger.Error(err)
log.Error(err)
return
}
conn.SetReadDeadline(time.Time{})
if req.Version != relay.Version1 {
h.logger.Error("bad version")
log.Error("bad version")
return
}
@ -109,7 +106,7 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn) {
}
if user != "" {
h.logger = h.logger.WithFields(map[string]interface{}{"user": user})
log = log.WithFields(map[string]interface{}{"user": user})
}
resp := relay.Response{
@ -119,7 +116,7 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn) {
if h.authenticator != nil && !h.authenticator.Authenticate(user, pass) {
resp.Status = relay.StatusUnauthorized
resp.WriteTo(conn)
h.logger.Error("unauthorized")
log.Error("unauthorized")
return
}
@ -132,18 +129,18 @@ func (h *relayHandler) Handle(ctx context.Context, conn net.Conn) {
if address != "" {
resp.Status = relay.StatusForbidden
resp.WriteTo(conn)
h.logger.Error("forward mode, connect is forbidden")
log.Error("forward mode, connect is forbidden")
return
}
// forward mode
h.handleForward(ctx, conn, network)
h.handleForward(ctx, conn, network, log)
return
}
switch req.Flags & relay.CmdMask {
case 0, relay.CONNECT:
h.handleConnect(ctx, conn, network, address)
h.handleConnect(ctx, conn, network, address, log)
case relay.BIND:
h.handleBind(ctx, conn, network, address)
h.handleBind(ctx, conn, network, address, log)
}
}