ric/MailHog
1
0
Fork 0
mirror of https://gitlab.com/ric_harvey/MailHog.git synced 2025-03-13 03:54:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve received header

Browse source
This commit is contained in:
Ian Kent 2014-04-19 23:51:56 +01:00
parent 05d9c9ddeb
commit c4aebd5d66
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mailhog/data/message.go
View file

@ -49,7 +49,7 @@ func ParseSMTPMessage(c *mailhog.Config, m *SMTPMessage) *Message {
Created: time.Now(), Created: time.Now(),
} }
msg.Content.Headers["Message-ID"] = []string{msg.Id + "@" + c.Hostname} // FIXME 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 + ">"} msg.Content.Headers["Return-Path"] = []string{"<" + m.From + ">"}
return msg return msg
} }

3
main_test.go
View file

@ -4,6 +4,7 @@ import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"net" "net"
"strings"
"regexp" "regexp"
"github.com/ian-kent/MailHog/mailhog/storage" "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["Content-Length"], []string{"220"}, "Content-Length is 220")
assert.Equal(t, message.Content.Headers["To"], []string{"Someone <someone@mailhog.example>"}, "To is Someone <someone@mailhog.example>") assert.Equal(t, message.Content.Headers["To"], []string{"Someone <someone@mailhog.example>"}, "To is Someone <someone@mailhog.example>")
assert.Equal(t, message.Content.Headers["From"], []string{"Nobody <nobody@mailhog.example>"}, "From is Nobody <nobody@mailhog.example>") assert.Equal(t, message.Content.Headers["From"], []string{"Nobody <nobody@mailhog.example>"}, "From is Nobody <nobody@mailhog.example>")
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{"<nobody@mailhog.example>"}, "Return-Path is <nobody@mailhog.example>") assert.Equal(t, message.Content.Headers["Return-Path"], []string{"<nobody@mailhog.example>"}, "Return-Path is <nobody@mailhog.example>")
assert.Equal(t, message.Content.Headers["Message-ID"], []string{match[1] + "@mailhog.example"}, "Message-ID is " + match[1] + "@mailhog.example") assert.Equal(t, message.Content.Headers["Message-ID"], []string{match[1] + "@mailhog.example"}, "Message-ID is " + match[1] + "@mailhog.example")