Open platform to collect and prioritize feedback
enhancement: add Date and Message-ID to mail messages (#573)
my3a52fab3d93fc
diff --git a/app/pkg/email/smtp/smtp.go b/app/pkg/email/smtp/smtp.goindex cf9904223..6b8c2949e 100644--- a/app/pkg/email/smtp/smtp.go+++ b/app/pkg/email/smtp/smtp.go@@ -1,11 +1,15 @@package smtpimport (+ "crypto/rand""crypto/tls"+ "encoding/hex""fmt""net"gosmtp "net/smtp""net/url"+ "strconv"+ "time""github.com/getfider/fider/app/pkg/email""github.com/getfider/fider/app/pkg/errors"@@ -89,6 +93,8 @@ func (s *Sender) Send(ctx email.Context, templateName string, params email.Paramb.Set("Subject", message.Subject)b.Set("MIME-version", "1.0")b.Set("Content-Type", "text/html; charset=\"UTF-8\"")+ b.Set("Date", time.Now().Format(time.RFC1123Z))+ b.Set("Message-ID", generateMessageID(localname))b.Body(message.Body)servername := fmt.Sprintf("%s:%s", s.host, s.port)@@ -157,3 +163,15 @@ func sendMail(localName, serverAddress string, a gosmtp.Auth, from string, to []}return c.Quit()}++func generateMessageID(localName string) string {+ timestamp := strconv.FormatInt(time.Now().UTC().UnixNano(), 10)+ buf := make([]byte, 16)+ _, err := rand.Read(buf)+ if err != nil {+ panic(err)+ }+ randStr := hex.EncodeToString(buf)+ messageID := fmt.Sprintf("<%s.%s@%s>", randStr, timestamp, localName)+ return messageID+}diff --git a/app/pkg/email/smtp/smtp_test.go b/app/pkg/email/smtp/smtp_test.goindex 1bc6058f2..2d6f383fd 100644--- a/app/pkg/email/smtp/smtp_test.go+++ b/app/pkg/email/smtp/smtp_test.go@@ -2,6 +2,7 @@ package smtp_testimport (gosmtp "net/smtp"+ "regexp""testing""github.com/getfider/fider/app/pkg/worker"@@ -60,8 +61,12 @@ func TestSend_Success(t *testing.T) {Expect(requests[0].auth).Equals(gosmtp.PlainAuth("", "us3r", "p4ss", "localhost"))Expect(requests[0].from).Equals("[email protected]")Expect(requests[0].to).Equals([]string{"[email protected]"})- Expect(string(requests[0].body)).ContainsSubstring("From: \"Fider Test\" <[email protected]>\r\nReply-To: [email protected]\r\nTo: \"Jon Sow\" <[email protected]>\r\nSubject: Message to: Hello\r\nMIME-version: 1.0\r\nContent-Type: text/html; charset=\"UTF-8\"\r\n\r\n")+ Expect(string(requests[0].body)).ContainsSubstring("From: \"Fider Test\" <[email protected]>\r\nReply-To: [email protected]\r\nTo: \"Jon Sow\" <[email protected]>\r\nSubject: Message to: Hello\r\nMIME-version: 1.0\r\nContent-Type: text/html; charset=\"UTF-8\"\r\nDate: ")+ Expect(string(requests[0].body)).ContainsSubstring("Message-ID: ")Expect(string(requests[0].body)).ContainsSubstring("Hello World Hello!")++ var validID = regexp.MustCompile(`.*Message-ID: <[a-z0-9\-].*\.[0-9].*@.*>.*`)+ Expect(validID.MatchString(string(requests[0].body))).IsTrue()}func TestSend_SkipEmptyAddress(t *testing.T) {RegisterT(t)@@ -127,13 +132,15 @@ func TestBatch_Success(t *testing.T) {Expect(requests[0].auth).Equals(gosmtp.PlainAuth("", "us3r", "p4ss", "localhost"))Expect(requests[0].from).Equals("[email protected]")Expect(requests[0].to).Equals([]string{"[email protected]"})- Expect(string(requests[0].body)).ContainsSubstring("From: \"Fider Test\" <[email protected]>\r\nReply-To: [email protected]\r\nTo: \"Jon Sow\" <[email protected]>\r\nSubject: Message to: Jon\r\nMIME-version: 1.0\r\nContent-Type: text/html; charset=\"UTF-8\"\r\n\r\n")+ Expect(string(requests[0].body)).ContainsSubstring("From: \"Fider Test\" <[email protected]>\r\nReply-To: [email protected]\r\nTo: \"Jon Sow\" <[email protected]>\r\nSubject: Message to: Jon\r\nMIME-version: 1.0\r\nContent-Type: text/html; charset=\"UTF-8\"\r\nDate: ")+ Expect(string(requests[0].body)).ContainsSubstring("Message-ID: ")Expect(string(requests[0].body)).ContainsSubstring("Hello World Jon!")Expect(requests[1].servername).Equals("localhost:1234")Expect(requests[1].auth).Equals(gosmtp.PlainAuth("", "us3r", "p4ss", "localhost"))Expect(requests[1].from).Equals("[email protected]")Expect(requests[1].to).Equals([]string{"[email protected]"})- Expect(string(requests[1].body)).ContainsSubstring("From: \"Fider Test\" <[email protected]>\r\nReply-To: [email protected]\r\nTo: \"Arya Stark\" <[email protected]>\r\nSubject: Message to: Arya\r\nMIME-version: 1.0\r\nContent-Type: text/html; charset=\"UTF-8\"\r\n\r\n")+ Expect(string(requests[1].body)).ContainsSubstring("From: \"Fider Test\" <[email protected]>\r\nReply-To: [email protected]\r\nTo: \"Arya Stark\" <[email protected]>\r\nSubject: Message to: Arya\r\nMIME-version: 1.0\r\nContent-Type: text/html; charset=\"UTF-8\"\r\nDate: ")+ Expect(string(requests[1].body)).ContainsSubstring("Message-ID: ")Expect(string(requests[1].body)).ContainsSubstring("Hello World Arya!")}