Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-18 14:47:03 +00:00
Code Releases Activity

smtpsrv: Set connection deadline before the initial greeting

Browse Source 
When handling a connection, today we only set a deadline after each
command received.

However, this does not cover our initial greeting, or the initial TLS
handshake (if the socket is TLS), so a connection can hang
indefininitely at that stage.

This patch fixes that by setting a deadline earlier, before we send or
receive anythong on the connection.
This commit is contained in:
Alberto Bertogli
2019-03-31 12:13:09 +01:00
parent ec95131bb4
commit cac1e161ac
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/smtpsrv/conn.go
View File

@@ -163,6 +163,10 @@ func (c *Conn) Handle() {
defer c.tr.Finish() defer c.tr.Finish()
c.tr.Debugf("Connected, mode: %s", c.mode) c.tr.Debugf("Connected, mode: %s", c.mode)
// Set the first deadline, which covers possibly the TLS handshake and
// then our initial greeting.
c.conn.SetDeadline(time.Now().Add(c.commandTimeout))
if tc, ok := c.conn.(*tls.Conn); ok { if tc, ok := c.conn.(*tls.Conn); ok {
// For TLS connections, complete the handshake and get the state, so // For TLS connections, complete the handshake and get the state, so
// it can be used when we say hello below. // it can be used when we say hello below.