parse real client IP

handler/http/handler.go

@@ -665,6 +665,11 @@ func (h *httpHandler) dial(ctx context.Context, network, addr string) (conn net.
 	conn, err = h.options.Router.Dial(ctxvalue.ContextWithBuffer(ctx, &buf), network, addr)
 	if ro := ctx_internal.RecorderObjectFromContext(ctx); ro != nil {
 		ro.Route = buf.String()
+
+		if conn != nil {
+			ro.Src = conn.LocalAddr().String()
+			ro.Dst = conn.RemoteAddr().String()
+		}
 	}
 
 	return

handler/http/metadata.go

@@ -49,9 +49,12 @@ type metadata struct {
 
 func (h *httpHandler) parseMetadata(md mdata.Metadata) error {
 	h.md.readTimeout = mdutil.GetDuration(md, "readTimeout")
-	if h.md.readTimeout <= 0 {
+	if h.md.readTimeout == 0 {
 		h.md.readTimeout = 15 * time.Second
 	}
+	if h.md.readTimeout < 0 {
+		h.md.readTimeout = 0
+	}
 
 	if m := mdutil.GetStringMapString(md, "http.header", "header"); len(m) > 0 {
 		hd := http.Header{}

handler/socks/v5/bind.go

@@ -87,6 +87,9 @@ func (h *socks5Handler) bindLocal(ctx context.Context, conn net.Conn, network, a
 
 	// Issue: may not reachable when host has multi-interface
 	socksAddr.Host, _, _ = net.SplitHostPort(conn.LocalAddr().String())
+	if h.md.publicAddr != "" {
+		socksAddr.Host = h.md.publicAddr
+	}
 	socksAddr.Type = 0
 	reply := gosocks5.NewReply(gosocks5.Succeeded, &socksAddr)
 	log.Trace(reply)

handler/socks/v5/mbind.go

@@ -88,6 +88,9 @@ func (h *socks5Handler) muxBindLocal(ctx context.Context, conn net.Conn, network
 
 	// Issue: may not reachable when host has multi-interface
 	socksAddr.Host, _, _ = net.SplitHostPort(conn.LocalAddr().String())
+	if h.md.publicAddr != "" {
+		socksAddr.Host = h.md.publicAddr
+	}
 	socksAddr.Type = 0
 	reply := gosocks5.NewReply(gosocks5.Succeeded, &socksAddr)
 	log.Trace(reply)

handler/socks/v5/metadata.go

@@ -14,6 +14,7 @@ import (
 )
 
 type metadata struct {
+	publicAddr        string
 	readTimeout       time.Duration
 	noTLS             bool
 	enableBind        bool
@@ -40,6 +41,7 @@ type metadata struct {
 }
 
 func (h *socks5Handler) parseMetadata(md mdata.Metadata) (err error) {
+	h.md.publicAddr = mdutil.GetString(md, "socks.publicAddr", "publicAddr")
 	h.md.readTimeout = mdutil.GetDuration(md, "readTimeout")
 	if h.md.readTimeout <= 0 {
 		h.md.readTimeout = 15 * time.Second

handler/socks/v5/udp.go

@@ -17,6 +17,7 @@ import (
 	"github.com/go-gost/x/internal/net/udp"
 	"github.com/go-gost/x/internal/util/socks"
 	traffic_wrapper "github.com/go-gost/x/limiter/traffic/wrapper"
+	metrics "github.com/go-gost/x/metrics/wrapper"
 	xstats "github.com/go-gost/x/observer/stats"
 	stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
 	xrecorder "github.com/go-gost/x/recorder"
@@ -37,8 +38,8 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, ro *xrecor
 	lc := xnet.ListenConfig{
 		Netns: h.options.Netns,
 	}
-	laddr := &net.UDPAddr{IP: conn.LocalAddr().(*net.TCPAddr).IP, Port: 0} // use out-going interface's IP
-	cc, err := lc.ListenPacket(ctx, "udp", laddr.String())
+
+	cc, err := lc.ListenPacket(ctx, "udp", "")
 	if err != nil {
 		log.Error(err)
 		reply := gosocks5.NewReply(gosocks5.Failure, nil)
@@ -56,6 +57,12 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, ro *xrecor
 
 	saddr := gosocks5.Addr{}
 	saddr.ParseFrom(cc.LocalAddr().String())
+
+	saddr.Host, _, _ = net.SplitHostPort(conn.LocalAddr().String())
+	if v := net.ParseIP(h.md.publicAddr); v != nil {
+		saddr.Host = h.md.publicAddr
+	}
+	saddr.Type = 0
 	reply := gosocks5.NewReply(gosocks5.Succeeded, &saddr)
 	log.Trace(reply)
 	if err := reply.Write(conn); err != nil {
@@ -81,16 +88,17 @@ func (h *socks5Handler) handleUDP(ctx context.Context, conn net.Conn, ro *xrecor
 		log.Error(err)
 		return err
 	}
-
-	pStats := xstats.Stats{}
-	cc = stats_wrapper.WrapPacketConn(cc, &pStats)
-
-	defer func() {
-		ro.InputBytes = pStats.Get(stats.KindInputBytes)
-		ro.OutputBytes = pStats.Get(stats.KindOutputBytes)
-	}()
+	pc = metrics.WrapPacketConn(ro.Service, pc)
 
 	{
+		pStats := xstats.Stats{}
+		cc = stats_wrapper.WrapPacketConn(cc, &pStats)
+
+		defer func() {
+			ro.InputBytes = pStats.Get(stats.KindInputBytes)
+			ro.OutputBytes = pStats.Get(stats.KindOutputBytes)
+		}()
+
 		clientID := ctxvalue.ClientIDFromContext(ctx)
 		cc = traffic_wrapper.WrapPacketConn(
 			cc,

handler/tunnel/handler.go

@@ -186,10 +186,20 @@ func (h *tunnelHandler) initEntrypoint() (err error) {
 
 func (h *tunnelHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) (err error) {
 	start := time.Now()
+
+	clientIP := conn.RemoteAddr().String()
+	if clientAddr := ctxvalue.ClientAddrFromContext(ctx); clientAddr != "" {
+		clientIP = string(clientAddr)
+	}
+	if h, _, _ := net.SplitHostPort(clientIP); h != "" {
+		clientIP = h
+	}
+
 	log := h.log.WithFields(map[string]any{
 		"remote": conn.RemoteAddr().String(),
 		"local":  conn.LocalAddr().String(),
 		"sid":    ctxvalue.SidFromContext(ctx),
+		"client": clientIP,
 	})
 
 	log.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr())