From c4aebd5d660f2038577ad88ab16bdcb4776ca543 Mon Sep 17 00:00:00 2001 From: Ian Kent Date: Sat, 19 Apr 2014 23:51:56 +0100 Subject: [PATCH] Improve received header --- mailhog/data/message.go | 2 +- main_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mailhog/data/message.go b/mailhog/data/message.go index 7d46b45..abb72e0 100644 --- a/mailhog/data/message.go +++ b/mailhog/data/message.go @@ -49,7 +49,7 @@ func ParseSMTPMessage(c *mailhog.Config, m *SMTPMessage) *Message { Created: time.Now(), } msg.Content.Headers["Message-ID"] = []string{msg.Id + "@" + c.Hostname} // FIXME - msg.Content.Headers["Received"] = []string{"from " + m.Helo + " by " + c.Hostname + " (Go-MailHog)"} // FIXME + msg.Content.Headers["Received"] = []string{"from " + m.Helo + " by " + c.Hostname + " (Go-MailHog)\r\n id " + msg.Id + "@" + c.Hostname + "; " + time.Now().Format(time.RFC1123Z)} msg.Content.Headers["Return-Path"] = []string{"<" + m.From + ">"} return msg } diff --git a/main_test.go b/main_test.go index 30b4b39..0204bdc 100644 --- a/main_test.go +++ b/main_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" "net" + "strings" "regexp" "github.com/ian-kent/MailHog/mailhog/storage" ) @@ -106,7 +107,7 @@ func TestBasicHappyPath(t *testing.T) { assert.Equal(t, message.Content.Headers["Content-Length"], []string{"220"}, "Content-Length is 220") assert.Equal(t, message.Content.Headers["To"], []string{"Someone "}, "To is Someone ") assert.Equal(t, message.Content.Headers["From"], []string{"Nobody "}, "From is Nobody ") - assert.Equal(t, message.Content.Headers["Received"], []string{"from localhost by mailhog.example (Go-MailHog)"}, "Received is from localhost by mailhog.example (Go-MailHog)") + assert.True(t, strings.HasPrefix(message.Content.Headers["Received"][0], "from localhost by mailhog.example (Go-MailHog)\r\n id " + match[1] + "@mailhog.example; "), "Received header is correct") assert.Equal(t, message.Content.Headers["Return-Path"], []string{""}, "Return-Path is ") assert.Equal(t, message.Content.Headers["Message-ID"], []string{match[1] + "@mailhog.example"}, "Message-ID is " + match[1] + "@mailhog.example")