mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 19:44:21 +00:00
fix: Allow Auth over non-TLS SMTP connections (#6402)
* fix: Allow Auth over non-TLS SMTP connections * remove unused struct --------- Co-authored-by: Kitsune <kitsune@akitsune.dev> Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
parent
f07e40c70b
commit
14d799e750
@ -159,7 +159,9 @@ func (smtpConfig SMTP) smtpAuth(client *smtp.Client, host string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
// Auth
|
// Auth
|
||||||
auth := smtp.PlainAuth("", smtpConfig.User, smtpConfig.Password, host)
|
auth := unencryptedAuth{
|
||||||
|
smtp.PlainAuth("", smtpConfig.User, smtpConfig.Password, host),
|
||||||
|
}
|
||||||
err := client.Auth(auth)
|
err := client.Auth(auth)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return caos_errs.ThrowInternalf(err, "EMAIL-s9kfs", "could not add smtp auth for user %s", smtpConfig.User)
|
return caos_errs.ThrowInternalf(err, "EMAIL-s9kfs", "could not add smtp auth for user %s", smtpConfig.User)
|
||||||
|
22
internal/notification/channels/smtp/plain_auth.go
Normal file
22
internal/notification/channels/smtp/plain_auth.go
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
package smtp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/smtp"
|
||||||
|
)
|
||||||
|
|
||||||
|
type unencryptedAuth struct {
|
||||||
|
smtp.Auth
|
||||||
|
}
|
||||||
|
|
||||||
|
// PlainAuth returns an Auth that implements the PLAIN authentication
|
||||||
|
// mechanism as defined in RFC 4616. The returned Auth uses the given
|
||||||
|
// username and password to authenticate to host and act as identity.
|
||||||
|
// Usually identity should be the empty string, to act as username.
|
||||||
|
//
|
||||||
|
// This reimplementation allows it to work over non-TLS connections
|
||||||
|
|
||||||
|
func (a unencryptedAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
|
||||||
|
s := *server
|
||||||
|
s.TLS = true
|
||||||
|
return a.Auth.Start(&s)
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user