rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add SMTP auth support

Browse Source 
Signed-off-by: gearnode <bryan@frimin.fr>
This commit is contained in:
gearnode
2025-03-12 14:31:15 +01:00
parent 1f9c5aeadb
commit 9e950b1ba0
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/mailer/mailer.go
View File

@@ -40,7 +40,9 @@ type (
SenderName string SenderName string
SenderEmail string SenderEmail string
Addr string Addr string
Timeout time.Duration // Timeout for SMTP operations Timeout time.Duration
User string
Password string
} }
) )
@@ -67,8 +69,8 @@ LOOP:
} }
} }
func sendMailWithTimeout(ctx context.Context, addr string, a smtp.Auth, from string, to []string, msg []byte) error { func (m *Mailer) sendMailWithTimeout(ctx context.Context, to []string, msg []byte) error {
host, _, err := net.SplitHostPort(addr) host, _, err := net.SplitHostPort(m.cfg.Addr)
if err != nil { if err != nil {
return fmt.Errorf("invalid address: %w", err) return fmt.Errorf("invalid address: %w", err)
} }
@@ -76,7 +78,7 @@ func sendMailWithTimeout(ctx context.Context, addr string, a smtp.Auth, from str
var d net.Dialer var d net.Dialer
d.Timeout = 5 * time.Second d.Timeout = 5 * time.Second
conn, err := d.DialContext(ctx, "tcp", addr) conn, err := d.DialContext(ctx, "tcp", m.cfg.Addr)
if err != nil { if err != nil {
return fmt.Errorf("connection error: %w", err) return fmt.Errorf("connection error: %w", err)
} }
@@ -88,7 +90,14 @@ func sendMailWithTimeout(ctx context.Context, addr string, a smtp.Auth, from str
} }
defer c.Quit() defer c.Quit()
if err = c.Mail(from); err != nil { if m.cfg.User != "" && m.cfg.Password != "" {
auth := smtp.PlainAuth("", m.cfg.User, m.cfg.Password, host)
if err = c.Auth(auth); err != nil {
return fmt.Errorf("SMTP authentication error: %w", err)
}
}
if err = c.Mail(m.cfg.SenderEmail); err != nil {
return fmt.Errorf("MAIL FROM error: %w", err) return fmt.Errorf("MAIL FROM error: %w", err)
} }
@@ -145,7 +154,7 @@ func (m *Mailer) batchSendEmails(ctx context.Context) error {
sendCtx, cancel := context.WithTimeout(ctx, m.cfg.Timeout) sendCtx, cancel := context.WithTimeout(ctx, m.cfg.Timeout)
defer cancel() defer cancel()
if err := sendMailWithTimeout(sendCtx, m.cfg.Addr, nil, m.cfg.SenderEmail, []string{email.RecipientEmail}, buf.Bytes()); err != nil { if err := m.sendMailWithTimeout(sendCtx, []string{email.RecipientEmail}, buf.Bytes()); err != nil {
if errors.Is(err, context.DeadlineExceeded) { if errors.Is(err, context.DeadlineExceeded) {
return fmt.Errorf("email sending timed out after %s: %w", m.cfg.Timeout, err) return fmt.Errorf("email sending timed out after %s: %w", m.cfg.Timeout, err)
} }

2
pkg/probod/probod.go
View File

@@ -220,6 +220,8 @@ func (impl *Implm) Run(
SenderEmail: impl.cfg.Mailer.SenderEmail, SenderEmail: impl.cfg.Mailer.SenderEmail,
SenderName: impl.cfg.Mailer.SenderName, SenderName: impl.cfg.Mailer.SenderName,
Addr: impl.cfg.Mailer.SMTP.Addr, Addr: impl.cfg.Mailer.SMTP.Addr,
User: impl.cfg.Mailer.SMTP.User,
Password: impl.cfg.Mailer.SMTP.Password,
Timeout: time.Second * 10, Timeout: time.Second * 10,
}) })
wg.Add(1) wg.Add(1)