Skip to content

fix: add read deadline to tls write #3283

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

Merged
dnwe merged 1 commit into from
Sep 15, 2025
Merged

fix: add read deadline to tls write #3283

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,12 +958,21 @@ func (b *Broker) readFull(buf []byte) (n int, err error) {
return io.ReadFull(b.conn, buf)
}

// write ensures the conn WriteDeadline has been setup before making a
// write ensures the conn Deadline has been setup before making a
// call to conn.Write
func (b *Broker) write(buf []byte) (n int, err error) {
if err := b.conn.SetWriteDeadline(time.Now().Add(b.conf.Net.WriteTimeout)); err != nil {
now := time.Now()
if err := b.conn.SetWriteDeadline(now.Add(b.conf.Net.WriteTimeout)); err != nil {
return 0, err
}
// TLS connections require both read and write deadlines to be set
// to avoid handshake indefinite blocking
// see https://github.com/golang/go/blob/go1.23.0/src/crypto/tls/conn.go#L1192-L1195
if b.conf.Net.TLS.Enable {
if err := b.conn.SetReadDeadline(now.Add(b.conf.Net.ReadTimeout)); err != nil {
return 0, err
}
}

return b.conn.Write(buf)
}
Expand Down
Loading