mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

[bugfix/email] Don't use plainAuth when no smtp username/password provided (#3332) 

* Do not use plainAuth when no user or password. Fixes #3320

* formatting

---------

Co-authored-by: Yonas Yanfa <yonas.y@gmail.com>
This commit is contained in:
tobi 2024-09-23 16:07:13 +02:00 committed by GitHub
parent 1ce854358d
commit 5bd6ad68e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
internal/email/sender.go
View File

@ -71,17 +71,26 @@ func NewSender() (Sender, error) {
return nil, err return nil, err
} }
username := config.GetSMTPUsername() var (
password := config.GetSMTPPassword() username = config.GetSMTPUsername()
host := config.GetSMTPHost() password = config.GetSMTPPassword()
port := config.GetSMTPPort() host = config.GetSMTPHost()
from := config.GetSMTPFrom() port = config.GetSMTPPort()
msgIDHost := config.GetHost() from = config.GetSMTPFrom()
msgIDHost = config.GetHost()
smtpAuth smtp.Auth
)
if username == "" || password == "" {
smtpAuth = nil
} else {
smtpAuth = smtp.PlainAuth("", username, password, host)
}
return &sender{ return &sender{
hostAddress: fmt.Sprintf("%s:%d", host, port), hostAddress: fmt.Sprintf("%s:%d", host, port),
from: from, from: from,
auth: smtp.PlainAuth("", username, password, host), auth: smtpAuth,
msgIDHost: msgIDHost, msgIDHost: msgIDHost,
template: t, template: t,
}, nil }, nil