wneessen/go-mail
1
1
Fork 0
mirror of https://github.com/wneessen/go-mail.git synced 2024-11-22 13:50:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect error types for unsupported SMTP authentication

Browse source 
Corrects the error messages returned for unsupported SMTP authentication types from ErrXOauth2AuthNotSupported to specific errors like ErrSCRAMSHA1AuthNotSupported, ErrSCRAMSHA256AuthNotSupported, and so on. This change improves the accuracy of error reporting for various SMTP authentication mechanisms.
This commit is contained in:
Winni Neessen 2024-10-01 17:00:57 +02:00
parent b69ad27de3
commit 8838414c38
Signed by: wneessen
GPG key ID: 385AC9889632126E
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client.go
View file

@ -791,17 +791,17 @@ func (c *Client) auth() error {
c.smtpAuth = smtp.XOAuth2Auth(c.user, c.pass) c.smtpAuth = smtp.XOAuth2Auth(c.user, c.pass)
case SMTPAuthSCRAMSHA1: case SMTPAuthSCRAMSHA1:
if !strings.Contains(smtpAuthType, string(SMTPAuthSCRAMSHA1)) { if !strings.Contains(smtpAuthType, string(SMTPAuthSCRAMSHA1)) {
return ErrXOauth2AuthNotSupported return ErrSCRAMSHA1AuthNotSupported
} }
c.smtpAuth = smtp.ScramSHA1Auth(c.user, c.pass) c.smtpAuth = smtp.ScramSHA1Auth(c.user, c.pass)
case SMTPAuthSCRAMSHA256: case SMTPAuthSCRAMSHA256:
if !strings.Contains(smtpAuthType, string(SMTPAuthSCRAMSHA256)) { if !strings.Contains(smtpAuthType, string(SMTPAuthSCRAMSHA256)) {
return ErrXOauth2AuthNotSupported return ErrSCRAMSHA256AuthNotSupported
} }
c.smtpAuth = smtp.ScramSHA256Auth(c.user, c.pass) c.smtpAuth = smtp.ScramSHA256Auth(c.user, c.pass)
case SMTPAuthSCRAMSHA1PLUS: case SMTPAuthSCRAMSHA1PLUS:
if !strings.Contains(smtpAuthType, string(SMTPAuthSCRAMSHA1PLUS)) { if !strings.Contains(smtpAuthType, string(SMTPAuthSCRAMSHA1PLUS)) {
return ErrXOauth2AuthNotSupported return ErrSCRAMSHA1PLUSAuthNotSupported
} }
tlsConnState, err := c.smtpClient.GetTLSConnectionState() tlsConnState, err := c.smtpClient.GetTLSConnectionState()
if err != nil { if err != nil {
@ -810,7 +810,7 @@ func (c *Client) auth() error {
c.smtpAuth = smtp.ScramSHA1PlusAuth(c.user, c.pass, tlsConnState) c.smtpAuth = smtp.ScramSHA1PlusAuth(c.user, c.pass, tlsConnState)
case SMTPAuthSCRAMSHA256PLUS: case SMTPAuthSCRAMSHA256PLUS:
if !strings.Contains(smtpAuthType, string(SMTPAuthSCRAMSHA256PLUS)) { if !strings.Contains(smtpAuthType, string(SMTPAuthSCRAMSHA256PLUS)) {
return ErrXOauth2AuthNotSupported return ErrSCRAMSHA256PLUSAuthNotSupported
} }
tlsConnState, err := c.smtpClient.GetTLSConnectionState() tlsConnState, err := c.smtpClient.GetTLSConnectionState()
if err != nil { if err != nil {