mirror of
https://github.com/cloudreve/cloudreve.git
synced 2025-12-15 10:04:01 +08:00
fix(smtp): SMTP reset error should be ignored for non-standard SMTP server implementation (#2791)
This commit is contained in:
2
assets
2
assets
Submodule assets updated: f7aa0a09e2...2c5b89c59c
@@ -2,6 +2,7 @@ package email
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -159,6 +160,16 @@ func (client *SMTPPool) Init() {
|
||||
|
||||
l := client.l.CopyWithPrefix(fmt.Sprintf("[Cid: %s]", m.cid))
|
||||
if err := d.Send(m.msg); err != nil {
|
||||
// Check if this is an SMTP RESET error after successful delivery
|
||||
var sendErr *mail.SendError
|
||||
var errParsed = errors.As(err, &sendErr)
|
||||
if errParsed && sendErr.Reason == mail.ErrSMTPReset {
|
||||
open = false
|
||||
l.Debug("SMTP RESET error, closing connection...")
|
||||
// https://github.com/wneessen/go-mail/issues/463
|
||||
continue // Don't treat this as a delivery failure since mail was sent
|
||||
}
|
||||
|
||||
l.Warning("Failed to send email: %s, Cid=%s", err, m.cid)
|
||||
} else {
|
||||
l.Info("Email sent to %q, title: %q.", m.to, m.subject)
|
||||
|
||||
@@ -2,6 +2,7 @@ package admin
|
||||
|
||||
import (
|
||||
"encoding/hex"
|
||||
"errors"
|
||||
"net/http"
|
||||
"strconv"
|
||||
|
||||
@@ -165,6 +166,13 @@ func (s *TestSMTPService) Test(c *gin.Context) error {
|
||||
|
||||
err = d.DialAndSendWithContext(c, m)
|
||||
if err != nil {
|
||||
// Check if this is an SMTP RESET error after successful delivery
|
||||
var sendErr *mail.SendError
|
||||
var errParsed = errors.As(err, &sendErr)
|
||||
if errParsed && sendErr.Reason == mail.ErrSMTPReset {
|
||||
return nil // Don't treat this as a delivery failure since mail was sent
|
||||
}
|
||||
|
||||
return serializer.NewError(serializer.CodeInternalSetting, "Failed to send test email: "+err.Error(), err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user