Skip to content

fix(sender): add SMTP dial timeouts #1692

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

Open
kawacukennedy wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(sender): add SMTP dial timeouts #1692

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e545e99
fix(sender): add connection timeouts to SMTP dial
kawacukennedy Jul 20, 2026
ba1eaa5
ci: retrigger CI
Jul 20, 2026
a40ff9c
ci: retrigger CI
Jul 20, 2026
e6ff9ac
ci: retrigger CI
Jul 20, 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
3 changes: 3 additions & 0 deletions internal/httpclient/httpclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ const (
InstallTimeout = 30 * time.Second
// UpdateCheckTimeout bounds version checks and asset downloads from main (main.go).
UpdateCheckTimeout = 30 * time.Second
// SMTPDialTimeout bounds SMTP TCP + TLS handshake and plain TCP dial
// used by sender/sender.go.
SMTPDialTimeout = 30 * time.Second
// IMAPBatchActionTimeout bounds bulk IMAP operations (delete/archive/move) from main (main.go).
IMAPBatchActionTimeout = 60 * time.Second
// IMAPSearchTimeout bounds server-side IMAP search queries from main (main.go).
Expand Down
19 changes: 16 additions & 3 deletions sender/sender.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package sender

import (
"bytes"
"context"
"crypto/rand"
"crypto/tls"
"crypto/x509"
Expand All @@ -13,6 +14,7 @@ import (
"mime"
"mime/multipart"
"mime/quotedprintable"
"net"
"net/mail"
"net/smtp"
"net/textproto"
Expand All @@ -26,6 +28,7 @@ import (
"github.com/emersion/go-pgpmail"
"github.com/floatpane/matcha/clib"
"github.com/floatpane/matcha/config"
"github.com/floatpane/matcha/internal/httpclient"
"github.com/floatpane/matcha/internal/loglevel"
"github.com/floatpane/matcha/pgp"
"github.com/yuin/goldmark"
Expand Down Expand Up @@ -682,7 +685,7 @@ func SendEmail(account *config.Account, to, cc, bcc []string, subject, plainBody
allRecipients = append(allRecipients, cc...)
allRecipients = append(allRecipients, bcc...)

addr := fmt.Sprintf("%s:%d", smtpServer, smtpPort)
addr := net.JoinHostPort(smtpServer, fmt.Sprintf("%d", smtpPort))

tlsConfig := &tls.Config{
ServerName: smtpServer,
Expand All @@ -700,7 +703,11 @@ func SendEmail(account *config.Account, to, cc, bcc []string, subject, plainBody
// Port 465 uses implicit TLS (the connection starts with TLS).
// All other ports use plain TCP with optional STARTTLS upgrade.
if smtpPort == 465 {
conn, err := tls.Dial("tcp", addr, tlsConfig) //nolint:noctx
dialer := tls.Dialer{
NetDialer: &net.Dialer{Timeout: httpclient.SMTPDialTimeout},
Config: tlsConfig,
}
conn, err := dialer.DialContext(context.Background(), "tcp", addr)
if err != nil {
return nil, err
}
Expand All @@ -711,8 +718,14 @@ func SendEmail(account *config.Account, to, cc, bcc []string, subject, plainBody
}
} else {
var err error
c, err = smtp.Dial(addr)
nd := &net.Dialer{Timeout: httpclient.SMTPDialTimeout}
conn, dialErr := nd.DialContext(context.Background(), "tcp", addr)
if dialErr != nil {
return nil, dialErr
}
c, err = smtp.NewClient(conn, smtpServer)
if err != nil {
conn.Close() //nolint:errcheck,gosec
return nil, err
}
}
Expand Down
Loading