chore: remove internal crypto/tls fork in reality server

wwqgtxx · wwqgtxx · commit 8fa4e8122c83 · 2025-04-13T03:03:28.000+08:00
diff --git a/go.mod b/go.mod
@@ -24,7 +24,6 @@ require (
 	github.com/metacubex/gopacket v1.1.20-0.20230608035415-7e2f98a3e759
 	github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996
 	github.com/metacubex/randv2 v0.2.0
-	github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629
 	github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c
 	github.com/metacubex/sing-shadowsocks v0.2.8
 	github.com/metacubex/sing-shadowsocks2 v0.2.2
@@ -33,7 +32,7 @@ require (
 	github.com/metacubex/sing-vmess v0.1.14-0.20250228002636-abc39e113b82
 	github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589
 	github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422
-	github.com/metacubex/utls v1.6.8-alpha.5
+	github.com/metacubex/utls v1.6.8-alpha.6
 	github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181
 	github.com/miekg/dns v1.1.63
 	github.com/mroth/weightedrand/v2 v2.1.0
diff --git a/go.sum b/go.sum
@@ -111,8 +111,6 @@ github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996 h1:B+AP/Pj2/j
 github.com/metacubex/quic-go v0.49.1-0.20250212162123-c135a4412996/go.mod h1:ExVjGyEwTUjCFqx+5uxgV7MOoA3fZI+th4D40H35xmY=
 github.com/metacubex/randv2 v0.2.0 h1:uP38uBvV2SxYfLj53kuvAjbND4RUDfFJjwr4UigMiLs=
 github.com/metacubex/randv2 v0.2.0/go.mod h1:kFi2SzrQ5WuneuoLLCMkABtiBu6VRrMrWFqSPyj2cxY=
-github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629 h1:aHsYiTvubfgMa3JMTDY//hDXVvFWrHg6ARckR52ttZs=
-github.com/metacubex/reality v0.0.0-20250219003814-74e8d7850629/go.mod h1:TTeIOZLdGmzc07Oedn++vWUUfkZoXLF4sEMxWuhBFr8=
 github.com/metacubex/sing v0.0.0-20250228041610-d94509dc612a h1:xjPXdDTlIKq4U/KnKpoCtkxD03T8GimtQrvHy/3dN00=
 github.com/metacubex/sing v0.0.0-20250228041610-d94509dc612a/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/metacubex/sing-quic v0.0.0-20250404030904-b2cc8aab562c h1:OB3WmMA8YPJjE36RjD9X8xlrWGJ4orxbf2R/KAE28b0=
@@ -131,8 +129,8 @@ github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589 h1:Z6bNy0
 github.com/metacubex/sing-wireguard v0.0.0-20241126021510-0827d417b589/go.mod h1:4NclTLIZuk+QkHVCGrP87rHi/y8YjgPytxTgApJNMhc=
 github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422 h1:zGeQt3UyNydIVrMRB97AA5WsYEau/TyCnRtTf1yUmJY=
 github.com/metacubex/tfo-go v0.0.0-20241231083714-66613d49c422/go.mod h1:l9oLnLoEXyGZ5RVLsh7QCC5XsouTUyKk4F2nLm2DHLw=
-github.com/metacubex/utls v1.6.8-alpha.5 h1:A9kLiUMM0GuSBqkww3eFYSKpupVrgxwKXrjBu1E7a9o=
-github.com/metacubex/utls v1.6.8-alpha.5/go.mod h1:MEZ5WO/VLKYs/s/dOzEK/mlXOQxc04ESeLzRgjmLYtk=
+github.com/metacubex/utls v1.6.8-alpha.6 h1:5ZdZNiZFkKKgEcuPOOROIc8bA4dX2VJHoY3gajSnSaU=
+github.com/metacubex/utls v1.6.8-alpha.6/go.mod h1:MEZ5WO/VLKYs/s/dOzEK/mlXOQxc04ESeLzRgjmLYtk=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181 h1:hJLQviGySBuaynlCwf/oYgIxbVbGRUIKZCxdya9YrbQ=
 github.com/metacubex/wireguard-go v0.0.0-20240922131502-c182e7471181/go.mod h1:phewKljNYiTVT31Gcif8RiCKnTUOgVWFJjccqYM8s+Y=
 github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
diff --git a/listener/reality/reality.go b/listener/reality/reality.go
@@ -10,12 +10,13 @@ import (
 	"time"
 
 	"github.com/metacubex/mihomo/listener/inner"
+	"github.com/metacubex/mihomo/log"
 	"github.com/metacubex/mihomo/ntp"
 
-	"github.com/metacubex/reality"
+	utls "github.com/metacubex/utls"
 )
 
-type Conn = reality.Conn
+type Conn = utls.Conn
 
 type Config struct {
 	Dest              string
@@ -27,12 +28,13 @@ type Config struct {
 }
 
 func (c Config) Build() (*Builder, error) {
-	realityConfig := &reality.Config{}
+	realityConfig := &utls.RealityConfig{}
 	realityConfig.SessionTicketsDisabled = true
 	realityConfig.Type = "tcp"
 	realityConfig.Dest = c.Dest
 	realityConfig.Time = ntp.Now
 	realityConfig.ServerNames = make(map[string]bool)
+	realityConfig.Log = log.Debugln
 	for _, it := range c.ServerNames {
 		realityConfig.ServerNames[it] = true
 	}
@@ -72,19 +74,19 @@ func (c Config) Build() (*Builder, error) {
 }
 
 type Builder struct {
-	realityConfig *reality.Config
+	realityConfig *utls.RealityConfig
 }
 
 func (b Builder) NewListener(l net.Listener) net.Listener {
-	l = reality.NewListener(l, b.realityConfig)
+	l = utls.NewRealityListener(l, b.realityConfig)
 	// Due to low implementation quality, the reality server intercepted half close and caused memory leaks.
 	// We fixed it by calling Close() directly.
 	l = realityListenerWrapper{l}
 	return l
 }
 
 type realityConnWrapper struct {
-	*reality.Conn
+	*utls.Conn
 }
 
 func (c realityConnWrapper) Upstream() any {
@@ -104,5 +106,5 @@ func (l realityListenerWrapper) Accept() (net.Conn, error) {
 	if err != nil {
 		return nil, err
 	}
-	return realityConnWrapper{c.(*reality.Conn)}, nil
+	return realityConnWrapper{c.(*utls.Conn)}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,13 @@ import (`
`10`	`10`	`"time"`
`11`	`11`
`12`	`12`	`"github.com/metacubex/mihomo/listener/inner"`
	`13`	`+ "github.com/metacubex/mihomo/log"`
`13`	`14`	`"github.com/metacubex/mihomo/ntp"`
`14`	`15`
`15`		`- "github.com/metacubex/reality"`
	`16`	`+ utls "github.com/metacubex/utls"`
`16`	`17`	`)`
`17`	`18`
`18`		`-type Conn = reality.Conn`
	`19`	`+type Conn = utls.Conn`
`19`	`20`
`20`	`21`	`type Config struct {`
`21`	`22`	`Dest string`
`@@ -27,12 +28,13 @@ type Config struct {`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`func (c Config) Build() (*Builder, error) {`
`30`		`- realityConfig := &reality.Config{}`
	`31`	`+ realityConfig := &utls.RealityConfig{}`
`31`	`32`	`realityConfig.SessionTicketsDisabled = true`
`32`	`33`	`realityConfig.Type = "tcp"`
`33`	`34`	`realityConfig.Dest = c.Dest`
`34`	`35`	`realityConfig.Time = ntp.Now`
`35`	`36`	`realityConfig.ServerNames = make(map[string]bool)`
	`37`	`+ realityConfig.Log = log.Debugln`
`36`	`38`	`for _, it := range c.ServerNames {`
`37`	`39`	`realityConfig.ServerNames[it] = true`
`38`	`40`	`}`
`@@ -72,19 +74,19 @@ func (c Config) Build() (*Builder, error) {`
`72`	`74`	`}`
`73`	`75`
`74`	`76`	`type Builder struct {`
`75`		`- realityConfig *reality.Config`
	`77`	`+ realityConfig *utls.RealityConfig`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`func (b Builder) NewListener(l net.Listener) net.Listener {`
`79`		`- l = reality.NewListener(l, b.realityConfig)`
	`81`	`+ l = utls.NewRealityListener(l, b.realityConfig)`
`80`	`82`	`// Due to low implementation quality, the reality server intercepted half close and caused memory leaks.`
`81`	`83`	`// We fixed it by calling Close() directly.`
`82`	`84`	`l = realityListenerWrapper{l}`
`83`	`85`	`return l`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`type realityConnWrapper struct {`
`87`		`- *reality.Conn`
	`89`	`+ *utls.Conn`
`88`	`90`	`}`
`89`	`91`
`90`	`92`	`func (c realityConnWrapper) Upstream() any {`
`@@ -104,5 +106,5 @@ func (l realityListenerWrapper) Accept() (net.Conn, error) {`
`104`	`106`	`if err != nil {`
`105`	`107`	`return nil, err`
`106`	`108`	`}`
`107`		`- return realityConnWrapper{c.(*reality.Conn)}, nil`
	`109`	`+ return realityConnWrapper{c.(*utls.Conn)}, nil`
`108`	`110`	`}`