mirrors/XTLS_REALITY
0
0
Fork 0
mirror of https://github.com/XTLS/REALITY.git synced 2025-08-22 14:38:35 +00:00
Code

Refine GlobalPostHandshakeRecordsLens' locker

Browse Source 
https://github.com/XTLS/Xray-core/issues/4778#issuecomment-2952303176
This commit is contained in:
RPRX 2025-06-07 10:56:25 +00:00 committed by GitHub
parent 88910695ec
commit 90e738a94c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
record_detect.go
View File

@ -12,60 +12,61 @@ import (
utls "github.com/refraction-networking/utls" utls "github.com/refraction-networking/utls"
) )
var lock sync.Mutex var GlobalPostHandshakeRecordsLock sync.Mutex
var PostHandshakeRecordsLen map[*Config]map[string][]int var GlobalPostHandshakeRecordsLens map[*Config]map[string][]int
func DetectPostHandshakeRecords(config *Config) { func DetectPostHandshakeRecordsLens(config *Config) map[string][]int {
lock.Lock() GlobalPostHandshakeRecordsLock.Lock()
if PostHandshakeRecordsLen == nil { defer GlobalPostHandshakeRecordsLock.Unlock()
PostHandshakeRecordsLen = make(map[*Config]map[string][]int) if GlobalPostHandshakeRecordsLens == nil {
GlobalPostHandshakeRecordsLens = make(map[*Config]map[string][]int)
} }
if PostHandshakeRecordsLen[config] == nil { if GlobalPostHandshakeRecordsLens[config] == nil {
PostHandshakeRecordsLen[config] = make(map[string][]int) GlobalPostHandshakeRecordsLens[config] = make(map[string][]int)
for sni := range config.ServerNames { for sni := range config.ServerNames {
target, err := net.Dial("tcp", config.Dest) target, err := net.Dial("tcp", config.Dest)
if err != nil { if err != nil {
return continue
} }
if config.Xver == 1 || config.Xver == 2 { if config.Xver == 1 || config.Xver == 2 {
if _, err = proxyproto.HeaderProxyFromAddrs(config.Xver, target.LocalAddr(), target.RemoteAddr()).WriteTo(target); err != nil { if _, err = proxyproto.HeaderProxyFromAddrs(config.Xver, target.LocalAddr(), target.RemoteAddr()).WriteTo(target); err != nil {
return continue
} }
} }
detectConn := &DetectConn{ detectConn := &DetectConn{
Conn: target, Conn: target,
config: config, PostHandshakeRecordsLens: GlobalPostHandshakeRecordsLens[config],
sni: sni, Sni: sni,
} }
uConn := utls.UClient(detectConn, &utls.Config{ uConn := utls.UClient(detectConn, &utls.Config{
ServerName: sni, ServerName: sni,
}, utls.HelloChrome_Auto) }, utls.HelloChrome_Auto)
if err = uConn.Handshake(); err != nil { if err = uConn.Handshake(); err != nil {
return continue
} }
io.Copy(io.Discard, uConn) io.Copy(io.Discard, uConn)
} }
} }
lock.Unlock() return GlobalPostHandshakeRecordsLens[config]
} }
type DetectConn struct { type DetectConn struct {
net.Conn net.Conn
config *Config PostHandshakeRecordsLens map[string][]int
sni string Sni string
ccsSent bool CcsSent bool
} }
func (c *DetectConn) Write(b []byte) (n int, err error) { func (c *DetectConn) Write(b []byte) (n int, err error) {
if len(b) >= 3 && bytes.Equal(b[:3], []byte{20, 3, 3}) { if len(b) >= 3 && bytes.Equal(b[:3], []byte{20, 3, 3}) {
c.ccsSent = true c.CcsSent = true
} }
return c.Conn.Write(b) return c.Conn.Write(b)
} }
func (c *DetectConn) Read(b []byte) (n int, err error) { func (c *DetectConn) Read(b []byte) (n int, err error) {
if !c.ccsSent { if !c.CcsSent {
return c.Conn.Read(b) return c.Conn.Read(b)
} }
c.Conn.SetReadDeadline(time.Now().Add(5 * time.Second)) c.Conn.SetReadDeadline(time.Now().Add(5 * time.Second))
@ -73,7 +74,7 @@ func (c *DetectConn) Read(b []byte) (n int, err error) {
for { for {
if len(data) >= 5 && bytes.Equal(data[:3], []byte{23, 3, 3}) { if len(data) >= 5 && bytes.Equal(data[:3], []byte{23, 3, 3}) {
length := int(binary.BigEndian.Uint16(data[3:5])) + 5 length := int(binary.BigEndian.Uint16(data[3:5])) + 5
PostHandshakeRecordsLen[c.config][c.sni] = append(PostHandshakeRecordsLen[c.config][c.sni], length) c.PostHandshakeRecordsLens[c.Sni] = append(c.PostHandshakeRecordsLens[c.Sni], length)
data = data[length:] data = data[length:]
} else { } else {
break break

5
tls.go
View File

@ -126,7 +126,7 @@ func Value(vals ...byte) (value int) {
// The configuration config must be non-nil and must include // The configuration config must be non-nil and must include
// at least one certificate or else set GetCertificate. // at least one certificate or else set GetCertificate.
func Server(ctx context.Context, conn net.Conn, config *Config) (*Conn, error) { func Server(ctx context.Context, conn net.Conn, config *Config) (*Conn, error) {
DetectPostHandshakeRecords(config) postHandshakeRecordsLens := DetectPostHandshakeRecordsLens(config)
remoteAddr := conn.RemoteAddr().String() remoteAddr := conn.RemoteAddr().String()
if config.Show { if config.Show {
@ -338,7 +338,7 @@ func Server(ctx context.Context, conn net.Conn, config *Config) (*Conn, error) {
if err != nil { if err != nil {
break break
} }
for _, length := range PostHandshakeRecordsLen[config][hs.clientHello.serverName] { for _, length := range postHandshakeRecordsLens[hs.clientHello.serverName] {
plainText := make([]byte, length-16) plainText := make([]byte, length-16)
plainText[0] = 23 plainText[0] = 23
plainText[1] = 3 plainText[1] = 3
@ -437,6 +437,7 @@ func (l *listener) Accept() (net.Conn, error) {
// The configuration config must be non-nil and must include // The configuration config must be non-nil and must include
// at least one certificate or else set GetCertificate. // at least one certificate or else set GetCertificate.
func NewListener(inner net.Listener, config *Config) net.Listener { func NewListener(inner net.Listener, config *Config) net.Listener {
go DetectPostHandshakeRecordsLens(config)
l := new(listener) l := new(listener)
l.Listener = inner l.Listener = inner
l.config = config l.config = config