wneessen/go-mail
1
1
Fork 0
mirror of https://github.com/wneessen/go-mail.git synced 2024-11-09 15:32:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into feature/145_add-eml-parser-to-generate-msg-from-eml-files

Browse source
This commit is contained in:
Winni Neessen 2024-02-22 17:48:54 +01:00
commit 4ec95adb30
Signed by: wneessen
GPG key ID: 5F3AF39B820C119D
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
auth.go
View file

@ -11,15 +11,20 @@ type SMTPAuthType string
// Supported SMTP AUTH types // Supported SMTP AUTH types
const ( const (
// SMTPAuthCramMD5 is the "CRAM-MD5" SASL authentication mechanism as described in RFC 4954
SMTPAuthCramMD5 SMTPAuthType = "CRAM-MD5"
// SMTPAuthLogin is the "LOGIN" SASL authentication mechanism // SMTPAuthLogin is the "LOGIN" SASL authentication mechanism
SMTPAuthLogin SMTPAuthType = "LOGIN" SMTPAuthLogin SMTPAuthType = "LOGIN"
// SMTPAuthNoAuth is equivalent to performing no authentication at all. It is a convenience
// option and should not be used. Instead, for mail servers that do no support/require
// authentication, the Client should not be used with the WithSMTPAuth option
SMTPAuthNoAuth SMTPAuthType = ""
// SMTPAuthPlain is the "PLAIN" authentication mechanism as described in RFC 4616 // SMTPAuthPlain is the "PLAIN" authentication mechanism as described in RFC 4616
SMTPAuthPlain SMTPAuthType = "PLAIN" SMTPAuthPlain SMTPAuthType = "PLAIN"
// SMTPAuthCramMD5 is the "CRAM-MD5" SASL authentication mechanism as described in RFC 4954
SMTPAuthCramMD5 SMTPAuthType = "CRAM-MD5"
// SMTPAuthXOAUTH2 is the "XOAUTH2" SASL authentication mechanism. // SMTPAuthXOAUTH2 is the "XOAUTH2" SASL authentication mechanism.
// https://developers.google.com/gmail/imap/xoauth2-protocol // https://developers.google.com/gmail/imap/xoauth2-protocol
SMTPAuthXOAUTH2 SMTPAuthType = "XOAUTH2" SMTPAuthXOAUTH2 SMTPAuthType = "XOAUTH2"

7
client_test.go
View file

@ -97,6 +97,7 @@ func TestNewClientWithOptions(t *testing.T) {
{"WithTLSPortPolicy()", WithTLSPortPolicy(TLSOpportunistic), false}, {"WithTLSPortPolicy()", WithTLSPortPolicy(TLSOpportunistic), false},
{"WithTLSConfig()", WithTLSConfig(&tls.Config{}), false}, {"WithTLSConfig()", WithTLSConfig(&tls.Config{}), false},
{"WithTLSConfig(); config is nil", WithTLSConfig(nil), true}, {"WithTLSConfig(); config is nil", WithTLSConfig(nil), true},
{"WithSMTPAuth(NoAuth)", WithSMTPAuth(SMTPAuthNoAuth), false},
{"WithSMTPAuth()", WithSMTPAuth(SMTPAuthLogin), false}, {"WithSMTPAuth()", WithSMTPAuth(SMTPAuthLogin), false},
{ {
"WithSMTPAuthCustom()", "WithSMTPAuthCustom()",
@ -576,9 +577,9 @@ func TestSetSMTPAuthCustom(t *testing.T) {
want string want string
sf bool sf bool
}{ }{
{"SMTPAuth: PLAIN", smtp.PlainAuth("", "", "", ""), "PLAIN", false},
{"SMTPAuth: CRAM-MD5", smtp.CRAMMD5Auth("", ""), "CRAM-MD5", false}, {"SMTPAuth: CRAM-MD5", smtp.CRAMMD5Auth("", ""), "CRAM-MD5", false},
{"SMTPAuth: LOGIN", smtp.LoginAuth("", "", ""), "LOGIN", false}, {"SMTPAuth: LOGIN", smtp.LoginAuth("", "", ""), "LOGIN", false},
{"SMTPAuth: PLAIN", smtp.PlainAuth("", "", "", ""), "PLAIN", false},
} }
si := smtp.ServerInfo{TLS: true} si := smtp.ServerInfo{TLS: true}
for _, tt := range tests { for _, tt := range tests {
@ -1405,7 +1406,7 @@ func TestXOAuth2OK(t *testing.T) {
} }
c, err := NewClient("fake.host", c, err := NewClient("fake.host",
WithDialContextFunc(getFakeDialFunc(fake)), WithDialContextFunc(getFakeDialFunc(fake)),
WithTLSPolicy(TLSOpportunistic), WithTLSPortPolicy(TLSOpportunistic),
WithSMTPAuth(SMTPAuthXOAUTH2), WithSMTPAuth(SMTPAuthXOAUTH2),
WithUsername("user"), WithUsername("user"),
WithPassword("token")) WithPassword("token"))
@ -1444,7 +1445,7 @@ func TestXOAuth2Unsupported(t *testing.T) {
} }
c, err := NewClient("fake.host", c, err := NewClient("fake.host",
WithDialContextFunc(getFakeDialFunc(fake)), WithDialContextFunc(getFakeDialFunc(fake)),
WithTLSPolicy(TLSOpportunistic), WithTLSPortPolicy(TLSOpportunistic),
WithSMTPAuth(SMTPAuthXOAUTH2)) WithSMTPAuth(SMTPAuthXOAUTH2))
if err != nil { if err != nil {
t.Fatalf("unable to create new client: %v", err) t.Fatalf("unable to create new client: %v", err)