Skip to content

fix(ztls): move handshake to goroutine to prevent indefinite hang #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
allornothingai wants to merge 2 commits into from
Closed

fix(ztls): move handshake to goroutine to prevent indefinite hang #966

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80d1951
fix(ztls): move handshake to goroutine to prevent indefinite hang
allornothingai Mar 19, 2026
0b844ed
style(ztls): follow Go convention by passing context as first parameter
Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions pkg/tlsx/ztls/ztls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func (c *Client) ConnectWithOptions(hostname, ip, port string, options clients.C

// new tls connection
tlsConn := tls.Client(conn, config)
err = c.tlsHandshakeWithTimeout(tlsConn, ctx)
err = c.tlsHandshakeWithTimeout(ctx, tlsConn)
if err != nil {
if clients.IsClientCertRequiredError(err) {
clientCertRequired = true
Expand Down Expand Up @@ -257,7 +257,7 @@ func (c *Client) EnumerateCiphers(hostname, ip, port string, options clients.Con
conn := tls.Client(baseConn, baseCfg)
baseCfg.CipherSuites = []uint16{ztlsCiphers[v]}

if err := c.tlsHandshakeWithTimeout(conn, context.TODO()); err == nil {
if err := c.tlsHandshakeWithTimeout(context.TODO(), conn); err == nil {
h1 := conn.GetHandshakeLog()
enumeratedCiphers = append(enumeratedCiphers, h1.ServerHello.CipherSuite.String())
}
Expand Down Expand Up @@ -320,20 +320,22 @@ func (c *Client) getConfig(hostname, ip, port string, options clients.ConnectOpt
return config, nil
}

// tlsHandshakeWithCtx attempts tls handshake with given timeout
func (c *Client) tlsHandshakeWithTimeout(tlsConn *tls.Conn, ctx context.Context) error {
// tlsHandshakeWithTimeout attempts tls handshake with given timeout
func (c *Client) tlsHandshakeWithTimeout(ctx context.Context, tlsConn *tls.Conn) error {
errChan := make(chan error, 1)
defer close(errChan)

go func() {
errChan <- tlsConn.Handshake()
}()

select {
case <-ctx.Done():
return errorutil.NewWithTag("ztls", "timeout while attempting handshake") //nolint
case errChan <- tlsConn.Handshake():
}

err := <-errChan
if err == tls.ErrCertsOnly {
err = nil
return errorutil.NewWithTag("ztls", "timeout while attempting handshake").Wrap(ctx.Err()) //nolint
case err := <-errChan:
if err == tls.ErrCertsOnly {
err = nil
}
return err
}
return err
}