mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-04 12:37:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert (*UConn).BuildHandshakeState to lock session controller

Browse source 
This partially reverts ebe5d664d2
and introduces BuildHandshakeStateWithoutSession.
This commit is contained in:
Amir Khan 2024-06-26 16:46:26 -04:00
parent feb41f856b
commit cbf02ab408
2 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

50
u_conn.go
View file

@ -83,9 +83,33 @@ func UClient(conn net.Conn, config *Config, clientHelloID ClientHelloID) *UConn
// [each call] marshal ClientHello.
//
// BuildHandshakeState is automatically called before uTLS performs handshake,
// amd should only be called explicitly to inspect/change fields of
// and should only be called explicitly to inspect/change fields of
// default/mimicked ClientHello.
// With the excpetion of session ticket and psk extensions, which cannot be changed
// after calling BuildHandshakeState, all other fields can be modified.
func (uconn *UConn) BuildHandshakeState() error {
err := uconn.BuildHandshakeStateWithoutSession()
if err != nil {
return err
}
if uconn.ClientHelloID != HelloGolang {
err := uconn.uLoadSession()
if err != nil {
return err
}
uconn.uApplyPatch()
uconn.sessionController.finalCheck()
}
return nil
}
// BuildHandshakeStateWithoutSession is the same as BuildHandshakeState, but does not
// set the session. This is only useful when you want to inspect the ClientHello before
// setting the session manually through SetSessionTicketExtension or SetPSKExtension.
// BuildHandshakeState is automatically called before uTLS performs handshake.
func (uconn *UConn) BuildHandshakeStateWithoutSession() error {
if uconn.ClientHelloID == HelloGolang {
if uconn.clientHelloBuildStatus == BuildByGoTLS {
return nil
@ -129,26 +153,11 @@ func (uconn *UConn) BuildHandshakeState() error {
if err != nil {
return err
}
uconn.clientHelloBuildStatus = BuildByUtls
}
return nil
}
func (uconn *UConn) lockSessionState() error {
err := uconn.uLoadSession()
if err != nil {
return err
}
uconn.uApplyPatch()
uconn.sessionController.finalCheck()
uconn.clientHelloBuildStatus = BuildByUtls
return nil
}
func (uconn *UConn) uLoadSession() error {
if cfg := uconn.config; cfg.SessionTicketsDisabled || cfg.ClientSessionCache == nil {
return nil
@ -364,10 +373,6 @@ func (c *UConn) handshakeContext(ctx context.Context) (ret error) {
if err != nil {
return err
}
err = c.lockSessionState()
if err != nil {
return err
}
}
// [uTLS section ends]
c.handshakeErr = c.handshakeFn(handshakeCtx)
@ -993,9 +998,6 @@ func (c *UConn) handleRenegotiation() error {
if err = c.BuildHandshakeState(); err != nil {
return err
}
if err = c.lockSessionState(); err != nil {
return err
}
// [uTLS section ends]
if c.handshakeErr = c.clientHandshake(context.Background()); c.handshakeErr == nil {
c.handshakes++

5
u_conn_test.go
View file

@ -512,11 +512,6 @@ func (test *clientTest) runUTLS(t *testing.T, write bool, hello helloStrategy, o
t.Errorf("Client.BuildHandshakeState() failed: %s", err)
return
}
err = client.lockSessionState()
if err != nil {
t.Errorf("Client.lockSessionState() failed: %s", err)
return
}
// TODO: fix this name hack if we ever decide to use non-standard testing object
err = client.SetClientRandom([]byte("Custom ClientRandom h^xbw8bf0sn3"))
if err != nil {