fix: Update SMTP auth preferences and adjust related tests

Removed XOAUTH2 from the preferred SMTPAuthType list. Since XOAUTH2 requires a Bearer token the auto-discovery feature will not work, since it will expect user/password. Updated test cases to reflect these changes, ensuring proper alignment with the revised authentication preferences. This addresses #415
wneessen · Jan 12, 2025 · feb096f · feb096f
1 parent 1e0dea7
commit feb096f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client.go b/client.go
@@ -1323,10 +1323,10 @@ func (c *Client) authTypeAutoDiscover(supported string, isEnc bool) (SMTPAuthTyp
 	}
 	preferList := []SMTPAuthType{
 		SMTPAuthSCRAMSHA256PLUS, SMTPAuthSCRAMSHA256, SMTPAuthSCRAMSHA1PLUS, SMTPAuthSCRAMSHA1,
-		SMTPAuthXOAUTH2, SMTPAuthCramMD5, SMTPAuthPlain, SMTPAuthLogin,
+		SMTPAuthCramMD5, SMTPAuthPlain, SMTPAuthLogin,
 	}
 	if !isEnc {
-		preferList = []SMTPAuthType{SMTPAuthSCRAMSHA256, SMTPAuthSCRAMSHA1, SMTPAuthXOAUTH2, SMTPAuthCramMD5}
+		preferList = []SMTPAuthType{SMTPAuthSCRAMSHA256, SMTPAuthSCRAMSHA1, SMTPAuthCramMD5}
 	}
 	mechs := strings.Split(supported, " ")
 

diff --git a/client_test.go b/client_test.go
@@ -2393,7 +2393,7 @@ func TestClient_auth(t *testing.T) {
 		{"PLAIN via AUTODISCOVER", SMTPAuthAutoDiscover},
 		{"SCRAM-SHA-1 via AUTODISCOVER", SMTPAuthAutoDiscover},
 		{"SCRAM-SHA-256 via AUTODISCOVER", SMTPAuthAutoDiscover},
-		{"XOAUTH2 via AUTODISCOVER", SMTPAuthAutoDiscover},
+		{"CRAM-MD5 via AUTODISCOVER", SMTPAuthAutoDiscover},
 		{"CRAM-MD5", SMTPAuthCramMD5},
 		{"LOGIN", SMTPAuthLogin},
 		{"LOGIN-NOENC", SMTPAuthLoginNoEnc},
@@ -2610,7 +2610,7 @@ func TestClient_authTypeAutoDiscover(t *testing.T) {
 		{"LOGIN SCRAM-SHA-256 SCRAM-SHA-1 SCRAM-SHA-256-PLUS SCRAM-SHA-1-PLUS", false, SMTPAuthSCRAMSHA256, false},
 		{"LOGIN PLAIN SCRAM-SHA-1 SCRAM-SHA-1-PLUS", true, SMTPAuthSCRAMSHA1PLUS, false},
 		{"LOGIN PLAIN SCRAM-SHA-1 SCRAM-SHA-1-PLUS", false, SMTPAuthSCRAMSHA1, false},
-		{"LOGIN XOAUTH2 SCRAM-SHA-1-PLUS", false, SMTPAuthXOAUTH2, false},
+		{"LOGIN XOAUTH2 SCRAM-SHA-1 SCRAM-SHA-1-PLUS", false, SMTPAuthSCRAMSHA1, false},
 		{"PLAIN LOGIN CRAM-MD5", false, SMTPAuthCramMD5, false},
 		{"CRAM-MD5", false, SMTPAuthCramMD5, false},
 		{"PLAIN", true, SMTPAuthPlain, false},