Open platform to collect and prioritize feedback
fix: send EHLO during SMTP connection (#525)
Guilherme Oenningef8aea82625d
diff --git a/app/pkg/email/email.go b/app/pkg/email/email.goindex 2df866ad5..6b11d7117 100644--- a/app/pkg/email/email.go+++ b/app/pkg/email/email.go@@ -75,6 +75,7 @@ func RenderMessage(ctx Context, templateName string, params Params) *Message {// Context holds everything emailers need to know about execution contexttype Context interface {Tenant() *models.Tenant+ BaseURL() stringLogoURL() string}diff --git a/app/pkg/email/smtp/smtp.go b/app/pkg/email/smtp/smtp.goindex 3daf206aa..cf9904223 100644--- a/app/pkg/email/smtp/smtp.go+++ b/app/pkg/email/smtp/smtp.go@@ -1,8 +1,11 @@package smtpimport (+ "crypto/tls""fmt"+ "net"gosmtp "net/smtp"+ "net/url""github.com/getfider/fider/app/pkg/email""github.com/getfider/fider/app/pkg/errors"@@ -39,16 +42,16 @@ type Sender struct {port stringusername stringpassword string- send func(string, gosmtp.Auth, string, []string, []byte) error+ send func(string, string, gosmtp.Auth, string, []string, []byte) error}//NewSender creates a new mailgun email senderfunc NewSender(logger log.Logger, host, port, username, password string) *Sender {- return &Sender{logger, host, port, username, password, gosmtp.SendMail}+ return &Sender{logger, host, port, username, password, sendMail}}//ReplaceSend can be used to mock internal send function-func (s *Sender) ReplaceSend(send func(string, gosmtp.Auth, string, []string, []byte) error) {+func (s *Sender) ReplaceSend(send func(string, string, gosmtp.Auth, string, []string, []byte) error) {s.send = send}@@ -58,6 +61,12 @@ func (s *Sender) Send(ctx email.Context, templateName string, params email.Paramreturn nil}+ u, err := url.Parse(ctx.BaseURL())+ localname := "localhost"+ if err == nil {+ localname = u.Hostname()+ }+if !email.CanSendTo(to.Address) {s.logger.Warnf("Skipping email to '@{Name} <@{Address}>'.", log.Props{"Name": to.Name,@@ -84,7 +93,7 @@ func (s *Sender) Send(ctx email.Context, templateName string, params email.Paramservername := fmt.Sprintf("%s:%s", s.host, s.port)auth := authenticate(s.username, s.password, s.host)- err := s.send(servername, auth, email.NoReply, []string{to.Address}, b.Bytes())+ err = s.send(localname, servername, auth, email.NoReply, []string{to.Address}, b.Bytes())if err != nil {return errors.Wrap(err, "failed to send email with template %s", templateName)}@@ -101,3 +110,50 @@ func (s *Sender) BatchSend(ctx email.Context, templateName string, params email.}return nil}++func sendMail(localName, serverAddress string, a gosmtp.Auth, from string, to []string, msg []byte) error {+ host, _, _ := net.SplitHostPort(serverAddress)+ c, err := gosmtp.Dial(serverAddress)+ if err != nil {+ return err+ }+ defer c.Close()+ if 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 a != nil {+ if ok, _ := c.Extension("AUTH"); !ok {+ return errors.New("smtp: server doesn't support AUTH")+ }+ if err = c.Auth(a); err != nil {+ return err+ }+ }+ if err = c.Mail(from); err != nil {+ return err+ }+ for _, addr := range to {+ if err = c.Rcpt(addr); err != nil {+ return err+ }+ }+ w, err := c.Data()+ if err != nil {+ return err+ }+ _, err = w.Write(msg)+ if err != nil {+ return err+ }+ err = w.Close()+ if err != nil {+ return err+ }+ return c.Quit()+}diff --git a/app/pkg/email/smtp/smtp_test.go b/app/pkg/email/smtp/smtp_test.goindex 1a7d9471a..1bc6058f2 100644--- a/app/pkg/email/smtp/smtp_test.go+++ b/app/pkg/email/smtp/smtp_test.go@@ -31,7 +31,7 @@ var ctx = worker.NewContext("ID-1", "TaskName", nil, logger)var requests = make([]request, 0)-func mockSend(servername string, auth gosmtp.Auth, from string, to []string, body []byte) error {+func mockSend(localname, servername string, auth gosmtp.Auth, from string, to []string, body []byte) error {requests = append(requests, request{servername, auth, from, to, body})return nil}diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex 89989fdca..4b934356b 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -365,7 +365,7 @@ func (ctx *Context) ActiveTransaction() *dbx.Trx {}//BaseURL returns base URL-func (ctx *Context) BaseURL() string {+func (ctx Context) BaseURL() string {address := ctx.Request.URL.Scheme + "://" + ctx.Request.URL.Hostname()if ctx.Request.URL.Port() != "" {diff --git a/app/pkg/worker/context.go b/app/pkg/worker/context.goindex 612de0faf..55e3b7f53 100644--- a/app/pkg/worker/context.go+++ b/app/pkg/worker/context.go@@ -84,7 +84,7 @@ func (c *Context) TaskName() string {}//BaseURL from current context-func (c *Context) BaseURL() string {+func (c Context) BaseURL() string {return c.baseURL}diff --git a/magefile.go b/magefile.goindex 93818fe03..a6b4b31f8 100644--- a/magefile.go+++ b/magefile.go@@ -114,5 +114,5 @@ func (Test) UI() error {// Utilsfunc buildServer(env map[string]string) error {ldflags := "-s -w -X main.buildtime=" + buildTime + " -X main.buildnumber=" + buildNumber- return sh.RunWith(env, "go", "build", "-ldflags='"+ldflags+"'", "-o", exeName, ".")+ return sh.RunWith(env, "go", "build", "-ldflags", ldflags, "-o", exeName, ".")}