other_mirrors/ Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-22 20:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added utls to http2 transport

This commit is contained in:
Hirbod Behnam 2022-10-13 15:34:00 +03:30 committed by yuhan6665
parent ed9b99cfc8
commit 93c7ebe382
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
transport/internet/http/dialer.go
View File

@ -39,8 +39,8 @@ func getHTTPClient(ctx context.Context, dest net.Destination, streamSettings *in
} }
httpSettings := streamSettings.ProtocolSettings.(*Config) httpSettings := streamSettings.ProtocolSettings.(*Config)
tlsConfig := tls.ConfigFromStreamSettings(streamSettings) tlsConfigs := tls.ConfigFromStreamSettings(streamSettings)
if tlsConfig == nil { if tlsConfigs == nil {
return nil, newError("TLS must be enabled for http transport.").AtWarning() return nil, newError("TLS must be enabled for http transport.").AtWarning()
} }
sockopt := streamSettings.SocketSettings sockopt := streamSettings.SocketSettings
@ -74,7 +74,12 @@ func getHTTPClient(ctx context.Context, dest net.Destination, streamSettings *in
return nil, err return nil, err
} }
cn := gotls.Client(pconn, tlsConfig) var cn tls.Interface
if fingerprint, ok := tls.Fingerprints[tlsConfigs.Fingerprint]; ok {
cn = tls.UClient(pconn, tlsConfig, fingerprint).(*tls.UConn)
} else {
cn = tls.Client(pconn, tlsConfig).(*tls.Conn)
}
if err := cn.Handshake(); err != nil { if err := cn.Handshake(); err != nil {
newError("failed to dial to " + addr).Base(err).AtError().WriteToLog() newError("failed to dial to " + addr).Base(err).AtError().WriteToLog()
return nil, err return nil, err
@ -85,16 +90,16 @@ func getHTTPClient(ctx context.Context, dest net.Destination, streamSettings *in
return nil, err return nil, err
} }
} }
state := cn.ConnectionState() negotiatedProtocol, negotiatedProtocolIsMutual := cn.NegotiatedProtocol()
if p := state.NegotiatedProtocol; p != http2.NextProtoTLS { if negotiatedProtocol != http2.NextProtoTLS {
return nil, newError("http2: unexpected ALPN protocol " + p + "; want q" + http2.NextProtoTLS).AtError() return nil, newError("http2: unexpected ALPN protocol " + negotiatedProtocol + "; want q" + http2.NextProtoTLS).AtError()
} }
if !state.NegotiatedProtocolIsMutual { if !negotiatedProtocolIsMutual {
return nil, newError("http2: could not negotiate protocol mutually").AtError() return nil, newError("http2: could not negotiate protocol mutually").AtError()
} }
return cn, nil return cn, nil
}, },
TLSClientConfig: tlsConfig.GetTLSConfig(tls.WithDestination(dest)), TLSClientConfig: tlsConfigs.GetTLSConfig(tls.WithDestination(dest)),
} }
if httpSettings.IdleTimeout > 0 || httpSettings.HealthCheckTimeout > 0 { if httpSettings.IdleTimeout > 0 || httpSettings.HealthCheckTimeout > 0 {

17
transport/internet/tls/tls.go
View File

@ -34,6 +34,11 @@ func (c *Conn) HandshakeAddress() net.Address {
return net.ParseAddress(state.ServerName) return net.ParseAddress(state.ServerName)
} }
func (c *Conn) NegotiatedProtocol() (name string, mutual bool) {
state := c.ConnectionState()
return state.NegotiatedProtocol, state.NegotiatedProtocolIsMutual
}
// Client initiates a TLS client handshake on the given connection. // Client initiates a TLS client handshake on the given connection.
func Client(c net.Conn, config *tls.Config) net.Conn { func Client(c net.Conn, config *tls.Config) net.Conn {
tlsConn := tls.Client(c, config) tlsConn := tls.Client(c, config)
@ -61,6 +66,11 @@ func (c *UConn) HandshakeAddress() net.Address {
return net.ParseAddress(state.ServerName) return net.ParseAddress(state.ServerName)
} }
func (c *UConn) NegotiatedProtocol() (name string, mutual bool) {
state := c.ConnectionState()
return state.NegotiatedProtocol, state.NegotiatedProtocolIsMutual
}
func UClient(c net.Conn, config *tls.Config, fingerprint *utls.ClientHelloID) net.Conn { func UClient(c net.Conn, config *tls.Config, fingerprint *utls.ClientHelloID) net.Conn {
utlsConn := utls.UClient(c, copyConfig(config), *fingerprint) utlsConn := utls.UClient(c, copyConfig(config), *fingerprint)
return &UConn{UConn: utlsConn} return &UConn{UConn: utlsConn}
@ -80,3 +90,10 @@ var Fingerprints = map[string]*utls.ClientHelloID{
"safari": &utls.HelloIOS_Auto, "safari": &utls.HelloIOS_Auto,
"randomized": &utls.HelloRandomized, "randomized": &utls.HelloRandomized,
} }
type Interface interface {
net.Conn
Handshake() error
VerifyHostname(host string) error
NegotiatedProtocol() (name string, mutual bool)
}