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

UTLS兼容

Browse Source
This commit is contained in:
wenyifan
2026-06-28 12:08:30 +08:00
parent f63f36805b
commit 3993c95700
9 changed files with 305 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dialer/mtls/dialer.go
+2 -2
View File
@@ -2,7 +2,6 @@ package mtls
import (
"context"
"crypto/tls"
"errors"
"net"
"sync"
@@ -16,6 +15,7 @@ import (
"github.com/go-gost/x/internal/net/proxyproto"
"github.com/go-gost/x/internal/util/mux"
"github.com/go-gost/x/registry"
"github.com/go-gost/x/util"
)
func init() {
@@ -141,7 +141,7 @@ func (d *mtlsDialer) Handshake(ctx context.Context, conn net.Conn, options ...di
}
func (d *mtlsDialer) initSession(ctx context.Context, conn net.Conn) (*muxSession, error) {
tlsConn := tls.Client(conn, d.options.TLSConfig)
tlsConn := util.NewUTLSChromeClient(conn, d.options.TLSConfig)
if err := tlsConn.HandshakeContext(ctx); err != nil {
return nil, err
}
dialer/mws/dialer.go
+18 -4
View File
@@ -17,6 +17,7 @@ import (
"github.com/go-gost/x/internal/util/mux"
ws_util "github.com/go-gost/x/internal/util/ws"
"github.com/go-gost/x/registry"
"github.com/go-gost/x/util"
"github.com/gorilla/websocket"
)
@@ -172,17 +173,30 @@ func (d *mwsDialer) initSession(ctx context.Context, host string, conn net.Conn,
},
}
url := url.URL{Scheme: "ws", Host: host, Path: d.md.path}
urlObj := url.URL{Scheme: "ws", Host: host, Path: d.md.path}
if d.tlsEnabled {
url.Scheme = "wss"
urlObj.Scheme = "wss"
dialer.TLSClientConfig = d.options.TLSConfig
dialer.NetDialTLSContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
client, err := util.NewUTLSWebSocketClient(conn, d.options.TLSConfig, d.md.useH2)
if err != nil {
return nil, err
}
if err := client.Handshake(); err != nil {
return nil, err
}
return client, nil
}
}
if d.md.handshakeTimeout > 0 {
conn.SetReadDeadline(time.Now().Add(d.md.handshakeTimeout))
}
c, resp, err := dialer.DialContext(ctx, url.String(), d.md.header)
urlStr, errUnescape := url.QueryUnescape(urlObj.String())
if errUnescape != nil {
d.options.Logger.Debugf("[mws] URL QueryUnescape Error URL.String() -> %s", urlObj.String())
}
c, resp, err := dialer.DialContext(ctx, urlStr, d.md.header)
if err != nil {
return nil, err
}
dialer/mws/metadata.go
+5 -1
View File
@@ -5,8 +5,8 @@ import (
"time"
mdata "github.com/go-gost/core/metadata"
mdutil "github.com/go-gost/x/metadata/util"
"github.com/go-gost/x/internal/util/mux"
mdutil "github.com/go-gost/x/metadata/util"
)
const (
@@ -18,6 +18,8 @@ type metadata struct {
host string
path string
useH2 bool
handshakeTimeout time.Duration
readHeaderTimeout time.Duration
readBufferSize int
@@ -77,5 +79,7 @@ func (d *mwsDialer) parseMetadata(md mdata.Metadata) (err error) {
d.md.tcpKeepaliveInterval = mdutil.GetDuration(md, "tcp.keepalive.interval")
d.md.tcpKeepaliveCount = mdutil.GetInt(md, "tcp.keepalive.count")
d.md.useH2 = mdutil.GetBool(md, "h2")
return
}
dialer/tls/dialer.go
+2 -2
View File
@@ -2,7 +2,6 @@ package tls
import (
"context"
"crypto/tls"
"net"
"time"
@@ -13,6 +12,7 @@ import (
xnet "github.com/go-gost/x/internal/net"
"github.com/go-gost/x/internal/net/proxyproto"
"github.com/go-gost/x/registry"
"github.com/go-gost/x/util"
)
func init() {
@@ -77,7 +77,7 @@ func (d *tlsDialer) Handshake(ctx context.Context, conn net.Conn, options ...dia
defer conn.SetDeadline(time.Time{})
}
tlsConn := tls.Client(conn, d.options.TLSConfig)
tlsConn := util.NewUTLSChromeClient(conn, d.options.TLSConfig)
if err := tlsConn.HandshakeContext(ctx); err != nil {
conn.Close()
return nil, err
dialer/utls/dialer.go
+2 -2
View File
@@ -5,7 +5,6 @@ import (
"crypto/tls"
"net"
"time"
"unsafe"
"github.com/go-gost/core/dialer"
"github.com/go-gost/core/logger"
@@ -14,6 +13,7 @@ import (
xnet "github.com/go-gost/x/internal/net"
"github.com/go-gost/x/internal/net/proxyproto"
"github.com/go-gost/x/registry"
"github.com/go-gost/x/util"
utls "github.com/refraction-networking/utls"
)
@@ -82,7 +82,7 @@ func (d *utlsDialer) Handshake(ctx context.Context, conn net.Conn, options ...di
clientHelloID, ok := GetClientHelloID(d.md.fingerprint)
if ok {
d.log.Debugf("utls handshake with fingerprint: %s", d.md.fingerprint)
utlsCfg := (*utls.Config)(unsafe.Pointer(d.options.TLSConfig))
utlsCfg := util.NewUTLSConfig(d.options.TLSConfig)
uconn := utls.UClient(conn, utlsCfg, clientHelloID)
if err := uconn.HandshakeContext(ctx); err != nil {
conn.Close()
dialer/ws/dialer.go
+18 -4
View File
@@ -13,6 +13,7 @@ import (
"github.com/go-gost/x/internal/net/proxyproto"
ws_util "github.com/go-gost/x/internal/util/ws"
"github.com/go-gost/x/registry"
"github.com/go-gost/x/util"
"github.com/gorilla/websocket"
)
@@ -110,13 +111,26 @@ func (d *wsDialer) Handshake(ctx context.Context, conn net.Conn, options ...dial
},
}
url := url.URL{Scheme: "ws", Host: host, Path: d.md.path}
urlObj := url.URL{Scheme: "ws", Host: host, Path: d.md.path}
if d.tlsEnabled {
url.Scheme = "wss"
urlObj.Scheme = "wss"
dialer.TLSClientConfig = d.options.TLSConfig
dialer.NetDialTLSContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
client, err := util.NewUTLSWebSocketClient(conn, d.options.TLSConfig, d.md.useH2)
if err != nil {
return nil, err
}
if err := client.Handshake(); err != nil {
return nil, err
}
return client, nil
}
}
c, resp, err := dialer.DialContext(ctx, url.String(), d.md.header)
urlStr, errUnescape := url.QueryUnescape(urlObj.String())
if errUnescape != nil {
d.options.Logger.Debugf("[ws] URL QueryUnescape Error URL.String() -> %s", urlObj.String())
}
c, resp, err := dialer.DialContext(ctx, urlStr, d.md.header)
if err != nil {
return nil, err
}
dialer/ws/metadata.go
+4 -2
View File
@@ -14,8 +14,9 @@ const (
)
type metadata struct {
host string
path string
host string
path string
useH2 bool
handshakeTimeout time.Duration
readHeaderTimeout time.Duration
@@ -66,5 +67,6 @@ func (d *wsDialer) parseMetadata(md mdata.Metadata) (err error) {
d.md.tcpKeepaliveInterval = mdutil.GetDuration(md, "tcp.keepalive.interval")
d.md.tcpKeepaliveCount = mdutil.GetInt(md, "tcp.keepalive.count")
d.md.useH2 = mdutil.GetBool(md, "h2")
return
}