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

Adapt new shadowsocks library.

Browse Source 
1. Modify ss/ssu handler and connector
2. Add users to metadata of ss and ssu handler
This commit is contained in:
RMT
2025-11-05 21:26:24 +08:00
committed by ginuerzh
parent d2cc07d3ac
commit 0c97db3c05
12 changed files with 372 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
handler/ss/handler.go
+24 -22
View File
@@ -5,7 +5,6 @@ import (
"bytes"
"context"
"crypto/tls"
"io"
"net"
"time"
@@ -14,7 +13,8 @@ import (
md "github.com/go-gost/core/metadata"
"github.com/go-gost/core/observer/stats"
"github.com/go-gost/core/recorder"
"github.com/go-gost/gosocks5"
"github.com/go-gost/go-shadowsocks2/core"
"github.com/go-gost/go-shadowsocks2/utils"
xctx "github.com/go-gost/x/ctx"
ictx "github.com/go-gost/x/internal/ctx"
xnet "github.com/go-gost/x/internal/net"
@@ -26,7 +26,6 @@ import (
stats_wrapper "github.com/go-gost/x/observer/stats/wrapper"
xrecorder "github.com/go-gost/x/recorder"
"github.com/go-gost/x/registry"
"github.com/shadowsocks/go-shadowsocks2/core"
)
func init() {
@@ -34,11 +33,11 @@ func init() {
}
type ssHandler struct {
cipher core.Cipher
md metadata
options handler.Options
recorder recorder.RecorderObject
certPool tls_util.CertPool
server core.TCPServer
}
func NewHandler(opts ...handler.Option) handler.Handler {
@@ -59,9 +58,15 @@ func (h *ssHandler) Init(md md.Metadata) (err error) {
if h.options.Auth != nil {
method := h.options.Auth.Username()
password, _ := h.options.Auth.Password()
h.cipher, err = ss.ShadowCipher(method, password, h.md.key)
serverConfig, err := utils.NewServerConfig(method, password, h.md.users)
if err != nil {
return
return err
}
h.server = core.NewTCPServer(serverConfig)
err = h.server.Init()
if err != nil {
return err
}
}
@@ -131,41 +136,38 @@ func (h *ssHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.H
return rate_limiter.ErrRateLimit
}
if h.cipher != nil {
conn = ss.ShadowConn(h.cipher.StreamConn(conn), nil)
wrappedConn, err := h.server.WrapConn(conn)
if err != nil {
return
}
target := wrappedConn.Target()
conn = ss.ShadowConn(wrappedConn, nil)
conn.SetReadDeadline(time.Now().Add(h.md.readTimeout))
addr := &gosocks5.Addr{}
if _, err := addr.ReadFrom(conn); err != nil {
log.Error(err)
io.Copy(io.Discard, conn)
return err
}
ro.Host = addr.String()
ro.Host = target.String()
conn.SetReadDeadline(time.Time{})
log = log.WithFields(map[string]any{
"dst": addr.String(),
"host": addr.String(),
"dst": target.String(),
"host": target.String(),
})
log.Debugf("%s >> %s", conn.RemoteAddr(), addr)
log.Debugf("%s >> %s", conn.RemoteAddr(), target)
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, "tcp", addr.String(), bypass.WithService(h.options.Service)) {
log.Debug("bypass: ", addr.String())
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, "tcp", target.String(), bypass.WithService(h.options.Service)) {
log.Debug("bypass: ", target.String())
return nil
}
switch h.md.hash {
case "host":
ctx = xctx.ContextWithHash(ctx, &xctx.Hash{Source: addr.String()})
ctx = xctx.ContextWithHash(ctx, &xctx.Hash{Source: target.String()})
}
var buf bytes.Buffer
cc, err := h.options.Router.Dial(ictx.ContextWithBuffer(ctx, &buf), "tcp", addr.String())
cc, err := h.options.Router.Dial(ictx.ContextWithBuffer(ctx, &buf), "tcp", target.String())
ro.Route = buf.String()
if err != nil {
return err
handler/ss/metadata.go
+11
View File
@@ -8,6 +8,7 @@ import (
"github.com/go-gost/core/bypass"
mdata "github.com/go-gost/core/metadata"
"github.com/go-gost/go-shadowsocks2/core"
mdutil "github.com/go-gost/x/metadata/util"
"github.com/go-gost/x/registry"
)
@@ -26,6 +27,8 @@ type metadata struct {
privateKey crypto.PrivateKey
alpn string
mitmBypass bypass.Bypass
users []core.UserConfig
}
func (h *ssHandler) parseMetadata(md mdata.Metadata) (err error) {
@@ -34,6 +37,14 @@ func (h *ssHandler) parseMetadata(md mdata.Metadata) (err error) {
h.md.readTimeout = 15 * time.Second
}
usersMap := mdutil.GetStringMapString(md, "users")
for name, pass := range usersMap {
h.md.users = append(h.md.users, core.UserConfig{
Name: name,
Password: pass,
})
}
h.md.key = mdutil.GetString(md, "key")
h.md.hash = mdutil.GetString(md, "hash")
handler/ss/udp/handler.go
+211 -110
View File
@@ -5,6 +5,8 @@ import (
"context"
"errors"
"net"
"net/netip"
"sync"
"time"
"github.com/go-gost/core/bypass"
@@ -13,14 +15,14 @@ import (
"github.com/go-gost/core/logger"
md "github.com/go-gost/core/metadata"
"github.com/go-gost/core/recorder"
"github.com/go-gost/go-shadowsocks2/core"
"github.com/go-gost/go-shadowsocks2/utils"
xctx "github.com/go-gost/x/ctx"
ictx "github.com/go-gost/x/internal/ctx"
"github.com/go-gost/x/internal/util/relay"
"github.com/go-gost/x/internal/util/ss"
rate_limiter "github.com/go-gost/x/limiter/rate"
xrecorder "github.com/go-gost/x/recorder"
"github.com/go-gost/x/registry"
"github.com/shadowsocks/go-shadowsocks2/core"
)
func init() {
@@ -28,10 +30,12 @@ func init() {
}
type ssuHandler struct {
cipher core.Cipher
md metadata
options handler.Options
recorder recorder.RecorderObject
udpServer core.UDPServer
tcpServer core.TCPServer // for udp over tcp
connMap sync.Map
md metadata
options handler.Options
recorder recorder.RecorderObject
}
func NewHandler(opts ...handler.Option) handler.Handler {
@@ -53,9 +57,21 @@ func (h *ssuHandler) Init(md md.Metadata) (err error) {
if h.options.Auth != nil {
method := h.options.Auth.Username()
password, _ := h.options.Auth.Password()
h.cipher, err = ss.ShadowCipher(method, password, h.md.key)
serverConfig, err := utils.NewServerConfig(method, password, h.md.users)
if err != nil {
return
return err
}
h.udpServer = core.NewUDPServer(serverConfig, time.Duration(60*time.Second))
err = h.udpServer.Init()
if err != nil {
return err
}
h.tcpServer = core.NewTCPServer(serverConfig)
err = h.udpServer.Init()
if err != nil {
return err
}
}
@@ -113,123 +129,208 @@ func (h *ssuHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.
}
pc, ok := conn.(net.PacketConn)
if ok {
if h.cipher != nil {
pc = h.cipher.PacketConn(pc)
}
// standard UDP relay.
pc = ss.UDPServerConn(pc, conn.RemoteAddr(), h.md.udpBufferSize)
} else {
if h.cipher != nil {
conn = ss.ShadowConn(h.cipher.StreamConn(conn), nil)
}
// UDP over TCP
pc = relay.UDPTunServerConn(conn)
}
// obtain a udp connection
var buf bytes.Buffer
c, err := h.options.Router.Dial(ictx.ContextWithBuffer(ctx, &buf), "udp", "") // UDP association
ro.Route = buf.String()
if err != nil {
log.Error(err)
return err
}
defer c.Close()
cc, ok := c.(net.PacketConn)
if !ok {
err := errors.New("ss: wrong connection type")
log.Error(err)
return err
// UDP over TCP
conn, err := h.tcpServer.WrapConn(conn)
if err != nil {
return err
}
// Note that UDPTunServerConn returns a wraped net.Conn, but it's behavior is not ordinary.
// ReadFrom will return target addr of socks5 instead of normal remote addr
// WriteTo will write data to original remote addr instead of the addr parameter passed to
pc = relay.UDPTunServerConn(conn)
return h.relayPacketTCP(ctx, pc, ro, log)
} else {
return h.relayPacketUDP(ctx, pc, ro, log)
}
t := time.Now()
log.Infof("%s <-> %s", conn.LocalAddr(), cc.LocalAddr())
h.relayPacket(ctx, pc, cc, ro, log)
log.WithFields(map[string]any{"duration": time.Since(t)}).
Infof("%s >-< %s", conn.LocalAddr(), cc.LocalAddr())
return nil
}
func (h *ssuHandler) relayPacket(ctx context.Context, pc1, pc2 net.PacketConn, ro *xrecorder.HandlerRecorderObject, log logger.Logger) (err error) {
errc := make(chan error, 2)
// UDP over TCP
func (h *ssuHandler) relayPacketTCP(ctx context.Context, src net.PacketConn, ro *xrecorder.HandlerRecorderObject, log logger.Logger) error {
bufferSize := h.md.udpBufferSize
if bufferSize <= 0 {
bufferSize = defaultBufferSize
}
go func() {
b := bufpool.Get(bufferSize)
defer bufpool.Put(b)
b := bufpool.Get(bufferSize)
defer bufpool.Put(b)
for {
err := func() error {
n, addr, err := pc1.ReadFrom(b)
if err != nil {
return err
}
if ro.Host == "" {
ro.Host = addr.String()
}
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, addr.Network(), addr.String(), bypass.WithService(h.options.Service)) {
log.Warn("bypass: ", addr)
return nil
}
if _, err = pc2.WriteTo(b[:n], addr); err != nil {
return err
}
log.Tracef("%s >>> %s data: %d",
pc2.LocalAddr(), addr, n)
return nil
}()
if err != nil {
errc <- err
return
}
var dstConn net.Conn
defer func() {
if dstConn != nil {
dstConn.Close()
}
}()
go func() {
b := bufpool.Get(bufferSize)
defer bufpool.Put(b)
for {
err := func() error {
n, raddr, err := pc2.ReadFrom(b)
if err != nil {
return err
}
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, raddr.Network(), raddr.String(), bypass.WithService(h.options.Service)) {
log.Warn("bypass: ", raddr)
return nil
}
if _, err = pc1.WriteTo(b[:n], raddr); err != nil {
return err
}
log.Tracef("%s <<< %s data: %d",
pc2.LocalAddr(), raddr, n)
return nil
}()
if err != nil {
errc <- err
return
}
for {
n, targetAddr, err := src.ReadFrom(b)
if err != nil {
return err
}
}()
return <-errc
if ro.Host == "" {
ro.Host = targetAddr.String()
}
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, targetAddr.Network(), targetAddr.String(), bypass.WithService(h.options.Service)) {
log.Warn("bypass: ", targetAddr)
return nil
}
if dstConn == nil {
// obtain a udp connection
var buf bytes.Buffer
dstConn, err := h.options.Router.Dial(ictx.ContextWithBuffer(ctx, &buf), "udp", "") // UDP association
ro.Route = buf.String()
if err != nil {
log.Error(err)
return err
}
cc, ok := dstConn.(net.PacketConn)
if !ok {
err := errors.New("ss: wrong connection type")
log.Error(err)
return err
}
log.Infof("%s <-> %s", src.LocalAddr(), cc.LocalAddr())
go func() {
defer dstConn.Close()
for {
n, raddr, err := cc.ReadFrom(b)
if err != nil {
log.Warnf("failed to read response from %v: %v", raddr, err)
return
}
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, raddr.Network(), raddr.String(), bypass.WithService(h.options.Service)) {
log.Warn("bypass: ", raddr)
return
}
if _, err = src.WriteTo(b[:n], targetAddr); err != nil {
log.Warnf("failed to write response from %v: %v", targetAddr, err)
return
}
log.Tracef("%s <<< %s data: %d",
cc.LocalAddr(), raddr, n)
}
}()
}
if _, err = dstConn.(net.PacketConn).WriteTo(b[:n], targetAddr); err != nil {
return err
}
log.Tracef("%s >>> %s data: %d",
dstConn.(net.PacketConn).LocalAddr(), targetAddr, n)
}
}
// standard udp relay
// Dataflow: src (encrypted data) <-> dst (plaintext data)
func (h *ssuHandler) relayPacketUDP(ctx context.Context, src net.PacketConn, ro *xrecorder.HandlerRecorderObject, log logger.Logger) error {
bufferSize := h.md.udpBufferSize
if bufferSize <= 0 {
bufferSize = defaultBufferSize
}
b := bufpool.Get(bufferSize)
defer bufpool.Put(b)
for {
n, addr, err := src.ReadFrom(b)
if err != nil {
return err
}
clientAddr, err := netip.ParseAddrPort(addr.String())
if err != nil {
return err
}
session, payload, err := h.udpServer.Inbound(b[:n], clientAddr)
if err != nil {
return err
}
targetAddr, err := net.ResolveUDPAddr("udp", session.Target().String())
if ro.Host == "" {
ro.Host = targetAddr.String()
}
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, targetAddr.Network(), targetAddr.String(), bypass.WithService(h.options.Service)) {
log.Warn("bypass: ", addr)
return nil
}
if err != nil {
return err
}
dstConn, ok := h.connMap.Load(session.Hash())
if !ok {
// obtain a udp connection
var buf bytes.Buffer
c, err := h.options.Router.Dial(ictx.ContextWithBuffer(ctx, &buf), "udp", "") // UDP association
ro.Route = buf.String()
if err != nil {
log.Error(err)
return err
}
cc, ok := c.(net.PacketConn)
if !ok {
err := errors.New("ss: wrong connection type")
log.Error(err)
return err
}
h.connMap.Store(session.Hash(), c)
dstConn = cc
log.Infof("%s <-> %s", src.LocalAddr(), cc.LocalAddr())
go func() {
defer func() {
c.Close()
h.connMap.Delete(session.Hash())
}()
for {
n, raddr, err := dstConn.(net.PacketConn).ReadFrom(b)
if err != nil {
log.Warnf("failed to read response: %v", err)
return
}
clientAddr := session.ClientAddr()
if h.options.Bypass != nil && h.options.Bypass.Contains(ctx, raddr.Network(), raddr.String(), bypass.WithService(h.options.Service)) {
log.Warn("bypass: ", raddr)
return
}
encrypted, err := h.udpServer.Outbound(b[:n], session)
if _, err = src.WriteTo(encrypted, net.UDPAddrFromAddrPort(clientAddr)); err != nil {
log.Warnf("failed to write response to %v: %v", clientAddr, err)
return
}
log.Tracef("%s <<< %s data: %d",
dstConn.(net.PacketConn).LocalAddr(), raddr, n)
}
}()
}
if n, err = dstConn.(net.PacketConn).WriteTo(payload, targetAddr); err != nil {
return err
}
log.Tracef("%s >>> %s data: %d",
dstConn.(net.PacketConn).LocalAddr(), targetAddr, n)
}
}
func (h *ssuHandler) checkRateLimit(addr net.Addr) bool {
handler/ss/udp/metadata.go
+11
View File
@@ -4,6 +4,7 @@ import (
"time"
mdata "github.com/go-gost/core/metadata"
"github.com/go-gost/go-shadowsocks2/core"
mdutil "github.com/go-gost/x/metadata/util"
)
@@ -15,6 +16,8 @@ type metadata struct {
key string
readTimeout time.Duration
udpBufferSize int
users []core.UserConfig
}
func (h *ssuHandler) parseMetadata(md mdata.Metadata) (err error) {
@@ -23,5 +26,13 @@ func (h *ssuHandler) parseMetadata(md mdata.Metadata) (err error) {
h.md.readTimeout = mdutil.GetDuration(md, "readTimeout")
h.md.udpBufferSize = mdutil.GetInt(md, "udpBufferSize", "udp.bufferSize")
usersMap := mdutil.GetStringMapString(md, "users")
for name, pass := range usersMap {
h.md.users = append(h.md.users, core.UserConfig{
Name: name,
Password: pass,
})
}
return
}