Evsyukov Denis
802943bd28
- Return err instead of nil in SS TCP/UDP connector Init when NewClientConfig fails, preventing nil pointer dereference in WrapConn - Initialize tcpClient in UDP connector for UDP-over-TCP path - Add decodeSIP002Auth to handle ss://BASE64(method:password)@host:port URL format with RawURLEncoding and StdEncoding fallback - Update buildServiceConfig and buildNodeConfig to decode SIP002 auth for ss* schemes before falling back to standard userinfo parsing - Support RawURLEncoding in parseAuthFromCmd with StdEncoding fallback - Add tests for decodeSIP002Auth, parseAuthFromCmd, and integration tests for buildNodeConfig/buildServiceConfig
106 lines
2.4 KiB
Go
106 lines
2.4 KiB
Go
package ss
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/go-gost/core/connector"
|
|
md "github.com/go-gost/core/metadata"
|
|
"github.com/go-gost/go-shadowsocks2/core"
|
|
"github.com/go-gost/go-shadowsocks2/socks"
|
|
"github.com/go-gost/go-shadowsocks2/utils"
|
|
ctxvalue "github.com/go-gost/x/ctx"
|
|
"github.com/go-gost/x/internal/util/relay"
|
|
"github.com/go-gost/x/internal/util/ss"
|
|
"github.com/go-gost/x/registry"
|
|
)
|
|
|
|
func init() {
|
|
registry.ConnectorRegistry().Register("ssu", NewConnector)
|
|
}
|
|
|
|
type ssuConnector struct {
|
|
client core.UDPClient
|
|
tcpClient core.TCPClient
|
|
md metadata
|
|
options connector.Options
|
|
sessionMap sync.Map
|
|
}
|
|
|
|
func NewConnector(opts ...connector.Option) connector.Connector {
|
|
options := connector.Options{}
|
|
for _, opt := range opts {
|
|
opt(&options)
|
|
}
|
|
|
|
return &ssuConnector{
|
|
options: options,
|
|
}
|
|
}
|
|
|
|
func (c *ssuConnector) Init(md md.Metadata) (err error) {
|
|
if err = c.parseMetadata(md); err != nil {
|
|
return
|
|
}
|
|
|
|
if c.options.Auth != nil {
|
|
method := c.options.Auth.Username()
|
|
password, _ := c.options.Auth.Password()
|
|
clientConfig, err := utils.NewClientConfig(method, password)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
c.client = core.NewUDPClient(clientConfig, 60)
|
|
c.tcpClient = core.NewTCPClient(clientConfig)
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (c *ssuConnector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
|
|
log := c.options.Logger.WithFields(map[string]any{
|
|
"remote": conn.RemoteAddr().String(),
|
|
"local": conn.LocalAddr().String(),
|
|
"network": network,
|
|
"address": address,
|
|
"sid": string(ctxvalue.SidFromContext(ctx)),
|
|
})
|
|
log.Debugf("connect %s/%s", address, network)
|
|
|
|
switch network {
|
|
case "udp", "udp4", "udp6":
|
|
default:
|
|
err := fmt.Errorf("network %s is unsupported", network)
|
|
log.Error(err)
|
|
return nil, err
|
|
}
|
|
|
|
if c.md.connectTimeout > 0 {
|
|
conn.SetDeadline(time.Now().Add(c.md.connectTimeout))
|
|
defer conn.SetDeadline(time.Time{})
|
|
}
|
|
|
|
taddr, _ := net.ResolveUDPAddr(network, address)
|
|
if taddr == nil {
|
|
taddr = &net.UDPAddr{}
|
|
}
|
|
|
|
pc, ok := conn.(net.PacketConn)
|
|
if ok {
|
|
// standard UDP relay
|
|
return ss.UDPClientConn(pc, conn.RemoteAddr(), taddr, c.md.udpBufferSize, &c.client, &c.sessionMap), nil
|
|
}
|
|
|
|
target := socks.ParseAddr(taddr.String())
|
|
conn, err := c.tcpClient.WrapConn(conn, target)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// UDP over TCP
|
|
return relay.UDPTunClientConn(conn, taddr), nil
|
|
}
|