go/mailpit
1
0
Fork 0
mirror of https://github.com/axllent/mailpit.git synced 2025-04-11 11:41:58 +02:00
Code Issues Releases Activity

Feature: Clearer SMTP error messages

Browse Source
This commit is contained in:
Ralph Slooten 2023-06-26 17:27:41 +12:00
parent 1ed06161a8
commit 22a4509b13
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/smtpd/smtp.go
View File

@ -48,7 +48,7 @@ func Send(from string, to []string, msg []byte) error {
c, err := smtp.Dial(addr)
if err != nil {
return err
return fmt.Errorf("error connecting to %s: %s", addr, err.Error())
}
defer c.Close()
@ -59,7 +59,7 @@ func Send(from string, to []string, msg []byte) error {
conf.InsecureSkipVerify = config.SMTPRelayConfig.AllowInsecure
if err = c.StartTLS(conf); err != nil {
return err
return fmt.Errorf("error creating StartTLS config: %s", err.Error())
}
}
@ -79,30 +79,30 @@ func Send(from string, to []string, msg []byte) error {
if a != nil {
if err = c.Auth(a); err != nil {
return err
return fmt.Errorf("error authenticating: %s", err.Error())
}
}
if err = c.Mail(from); err != nil {
return err
return fmt.Errorf("error response to MAIL command: %s", err.Error())
}
for _, addr := range recipients {
if err = c.Rcpt(addr); err != nil {
return err
return fmt.Errorf("error response to RCPT command for %s: %s", addr, err.Error())
}
}
w, err := c.Data()
if err != nil {
return err
return fmt.Errorf("error response to DATA command: %s", err.Error())
}
if _, err := w.Write(msg); err != nil {
return err
return fmt.Errorf("error sending message: %s", err.Error())
}
if err := w.Close(); err != nil {
return err
return fmt.Errorf("error closing connection: %s", err.Error())
}
return c.Quit()