Open platform to collect and prioritize feedback
fix: Allow SMTP without StartTLS (#926)
gsf10ee5d6dd5d
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.goindex 885a47cca..d25be8d51 100644--- a/app/pkg/env/env.go+++ b/app/pkg/env/env.go@@ -62,10 +62,11 @@ type config struct {Region string `env:"EMAIL_MAILGUN_REGION,default=US"`}SMTP struct {- Host string `env:"EMAIL_SMTP_HOST"`- Port string `env:"EMAIL_SMTP_PORT"`- Username string `env:"EMAIL_SMTP_USERNAME"`- Password string `env:"EMAIL_SMTP_PASSWORD"`+ Host string `env:"EMAIL_SMTP_HOST"`+ Port string `env:"EMAIL_SMTP_PORT"`+ Username string `env:"EMAIL_SMTP_USERNAME"`+ Password string `env:"EMAIL_SMTP_PASSWORD"`+ EnableStartTLS bool `env:"EMAIL_SMTP_ENABLE_STARTTLS,default=true"`}}BlobStorage struct {diff --git a/app/services/email/smtp/smtp.go b/app/services/email/smtp/smtp.goindex 41c72cb13..d0ec11102 100644--- a/app/services/email/smtp/smtp.go+++ b/app/services/email/smtp/smtp.go@@ -89,7 +89,7 @@ func sendMail(ctx context.Context, c *cmd.SendMail) {smtpConfig := env.Config.Email.SMTPservername := fmt.Sprintf("%s:%s", smtpConfig.Host, smtpConfig.Port)auth := authenticate(smtpConfig.Username, smtpConfig.Password, smtpConfig.Host)- err = Send(localname, servername, auth, email.NoReply, []string{to.Address}, b.Bytes())+ err = Send(localname, servername, smtpConfig.EnableStartTLS, auth, email.NoReply, []string{to.Address}, b.Bytes())if err != nil {panic(errors.Wrap(err, "failed to send email with template %s", c.TemplateName))}@@ -97,7 +97,7 @@ func sendMail(ctx context.Context, c *cmd.SendMail) {}}-var Send = func(localName, serverAddress string, a gosmtp.Auth, from string, to []string, msg []byte) error {+var Send = func(localName, serverAddress string, enableStartTLS bool, a gosmtp.Auth, from string, to []string, msg []byte) error {host, _, _ := net.SplitHostPort(serverAddress)c, err := gosmtp.Dial(serverAddress)if err != nil {@@ -107,10 +107,12 @@ var Send = func(localName, serverAddress string, a gosmtp.Auth, from string, toif err = c.Hello(localName); err != nil {return err}- if ok, _ := c.Extension("STARTTLS"); ok {- config := &tls.Config{ServerName: host}- if err = c.StartTLS(config); err != nil {- return err+ if enableStartTLS {+ if ok, _ := c.Extension("STARTTLS"); ok {+ config := &tls.Config{ServerName: host}+ if err = c.StartTLS(config); err != nil {+ return err+ }}}if a != nil {diff --git a/app/services/email/smtp/smtp_test.go b/app/services/email/smtp/smtp_test.goindex e787ab88c..19f612fda 100644--- a/app/services/email/smtp/smtp_test.go+++ b/app/services/email/smtp/smtp_test.go@@ -29,7 +29,7 @@ var ctx context.Contextvar requests = make([]request, 0)-func mockSend(localname, servername string, auth gosmtp.Auth, from string, to []string, body []byte) error {+func mockSend(localname, servername string, enableStartTLS bool, auth gosmtp.Auth, from string, to []string, body []byte) error {requests = append(requests, request{servername, auth, from, to, body})return nil}