From 68d384166b8dbd25fc44c793652076787560534f Mon Sep 17 00:00:00 2001 From: k1LoW Date: Fri, 29 Mar 2024 12:18:22 +0900 Subject: [PATCH] Allow defining cases where authentication is not supported --- smtptest.go | 7 ++++--- smtptest_test.go | 6 ++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/smtptest.go b/smtptest.go index f62b867..b47ef4b 100644 --- a/smtptest.go +++ b/smtptest.go @@ -60,14 +60,15 @@ func (s *Session) Logout() error { } func (s *Session) AuthMechanisms() []string { + if s.be.username == nil { + return nil + } return []string{sasl.Plain} } func (s *Session) Auth(mech string) (sasl.Server, error) { if s.be.username == nil { - return sasl.NewPlainServer(func(identity, username, password string) error { - return nil - }), nil + return nil, smtp.ErrAuthUnsupported } return sasl.NewPlainServer(func(identity, username, password string) error { if identity != "" && identity != username { diff --git a/smtptest_test.go b/smtptest_test.go index 1c17356..cfeff64 100644 --- a/smtptest_test.go +++ b/smtptest_test.go @@ -42,8 +42,7 @@ func TestServer(t *testing.T) { }) addr := ts.Addr() - auth := smtp.PlainAuth("", "user@example.com", "password", ts.Host) - if err := smtp.SendMail(addr, auth, "sender@example.org", []string{"recipient@example.net"}, []byte(testMsg)); err != nil { + if err := smtp.SendMail(addr, nil, "sender@example.org", []string{"recipient@example.net"}, []byte(testMsg)); err != nil { t.Fatal(err) } @@ -136,8 +135,7 @@ func TestServerMultipleRecipients(t *testing.T) { }) addr := ts.Addr() - auth := smtp.PlainAuth("", "user@example.com", "password", ts.Host) - if err := smtp.SendMail(addr, auth, "sender@example.org", []string{"recipient@example.net", "another_recipient@example.net"}, []byte(testMsg)); err != nil { + if err := smtp.SendMail(addr, nil, "sender@example.org", []string{"recipient@example.net", "another_recipient@example.net"}, []byte(testMsg)); err != nil { t.Fatal(err) }