smtp_configure.go: disable smtp auth when unset

This commit is contained in:
Mariusz Gronczewski 2020-02-09 14:25:23 +01:00 committed by Adhityaa Chandrasekar
parent c040f95e25
commit 2006b02f59

View File

@ -19,10 +19,6 @@ func smtpConfigure() error {
return nil return nil
} }
if username == "" || password == "" {
logger.Warningf("no SMTP username/password set, Commento will assume they aren't required")
}
if os.Getenv("SMTP_FROM_ADDRESS") == "" { if os.Getenv("SMTP_FROM_ADDRESS") == "" {
logger.Errorf("COMMENTO_SMTP_FROM_ADDRESS not set") logger.Errorf("COMMENTO_SMTP_FROM_ADDRESS not set")
smtpConfigured = false smtpConfigured = false
@ -30,7 +26,11 @@ func smtpConfigure() error {
} }
logger.Infof("configuring smtp: %s", host) logger.Infof("configuring smtp: %s", host)
smtpAuth = smtp.PlainAuth("", username, password, host) if username == "" || password == "" {
logger.Warningf("no SMTP username/password set, Commento will assume they aren't required")
} else {
smtpAuth = smtp.PlainAuth("", username, password, host)
}
smtpConfigured = true smtpConfigured = true
return nil return nil
} }