Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion email/email.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,36 @@ func (e *Email) Send(m *Message) (err error) {
m.buffer.WriteString("\r\n")

// Message body
if m.BodyText != "" {
if m.BodyText != "" && m.BodyHTML != "" {
altBoundary := random.String(16)
m.writeHeader("Content-Type", "multipart/alternative; boundary="+altBoundary)
m.buffer.WriteString("\r\n")

// Write text/plain part
m.buffer.WriteString("--")
m.buffer.WriteString(altBoundary)
m.buffer.WriteString("\r\n")
m.writeHeader("Content-Type", "text/plain; charset=UTF-8")
m.buffer.WriteString("\r\n")
m.buffer.WriteString(m.BodyText)
m.buffer.WriteString("\r\n")
m.buffer.WriteString("\r\n")

// Write text/html part
m.buffer.WriteString("--")
m.buffer.WriteString(altBoundary)
m.buffer.WriteString("\r\n")
m.writeHeader("Content-Type", "text/html; charset=UTF-8")
m.buffer.WriteString("\r\n")
m.buffer.WriteString(m.BodyHTML)
m.buffer.WriteString("\r\n")
m.buffer.WriteString("\r\n")

// Close alternative boundary
m.buffer.WriteString("--")
m.buffer.WriteString(altBoundary)
m.buffer.WriteString("--\r\n")
} else if m.BodyText != "" {
m.writeText(m.BodyText, "text/plain")
} else if m.BodyHTML != "" {
m.writeText(m.BodyHTML, "text/html")
Expand Down
118 changes: 118 additions & 0 deletions email/email_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,121 @@ func runFakeSMTP(ln net.Listener) <-chan struct{} {
}()
return done
}

// TestSend_MessageFormatting verifies MIME formatting for text-only, HTML-only, and multipart/alternative emails.
func TestSend_MessageFormatting(t *testing.T) {
// We test message buffer construction by running a fake SMTP server that captures the DATA command.
ln, err := net.Listen("tcp", "127.0.0.1:0")
assert.NoError(t, err)
defer ln.Close()

dataChan := make(chan string, 1)
go func() {
conn, err := ln.Accept()
if err != nil {
return
}
defer conn.Close()
conn.SetDeadline(time.Now().Add(5 * time.Second))

_, _ = conn.Write([]byte("220 fake.local ESMTP ready\r\n"))
r := bufio.NewReader(conn)
recording := false
var sb strings.Builder
for {
line, err := r.ReadString('\n')
if err != nil {
return
}
upper := strings.ToUpper(strings.TrimSpace(line))
switch {
case strings.HasPrefix(upper, "EHLO"), strings.HasPrefix(upper, "HELO"):
_, _ = conn.Write([]byte("250-fake.local\r\n250 OK\r\n"))
case strings.HasPrefix(upper, "MAIL FROM"):
_, _ = conn.Write([]byte("250 OK\r\n"))
case strings.HasPrefix(upper, "RCPT TO"):
_, _ = conn.Write([]byte("250 OK\r\n"))
case strings.HasPrefix(upper, "DATA"):
_, _ = conn.Write([]byte("354 Start mail input; end with <CRLF>.<CRLF>\r\n"))
recording = true
case recording && strings.TrimSpace(line) == ".":
_, _ = conn.Write([]byte("250 OK message accepted\r\n"))
dataChan <- sb.String()
recording = false
case recording:
sb.WriteString(line)
case strings.HasPrefix(upper, "QUIT"):
_, _ = conn.Write([]byte("221 bye\r\n"))
return
default:
_, _ = conn.Write([]byte("502 not implemented\r\n"))
}
}
}()

t.Run("Text only", func(t *testing.T) {
e := New(ln.Addr().String())
msg := &Message{
From: "sender@example.com",
To: "recipient@example.com",
Subject: "Test Text",
BodyText: "Hello Text",
}
err := e.Send(msg)
assert.NoError(t, err)

select {
case data := <-dataChan:
assert.Contains(t, data, "Content-Type: text/plain; charset=UTF-8")
assert.Contains(t, data, "Hello Text")
assert.NotContains(t, data, "multipart/alternative")
case <-time.After(2 * time.Second):
t.Fatal("timeout waiting for SMTP data")
}
})

t.Run("HTML only", func(t *testing.T) {
e := New(ln.Addr().String())
msg := &Message{
From: "sender@example.com",
To: "recipient@example.com",
Subject: "Test HTML",
BodyHTML: "<p>Hello HTML</p>",
}
err := e.Send(msg)
assert.NoError(t, err)

select {
case data := <-dataChan:
assert.Contains(t, data, "Content-Type: text/html; charset=UTF-8")
assert.Contains(t, data, "<p>Hello HTML</p>")
assert.NotContains(t, data, "multipart/alternative")
case <-time.After(2 * time.Second):
t.Fatal("timeout waiting for SMTP data")
}
})

t.Run("Both Text and HTML (Multipart Alternative)", func(t *testing.T) {
e := New(ln.Addr().String())
msg := &Message{
From: "sender@example.com",
To: "recipient@example.com",
Subject: "Test Both",
BodyText: "Hello Text",
BodyHTML: "<p>Hello HTML</p>",
}
err := e.Send(msg)
assert.NoError(t, err)

select {
case data := <-dataChan:
assert.Contains(t, data, "Content-Type: multipart/alternative;")
assert.Contains(t, data, "text/plain; charset=UTF-8")
assert.Contains(t, data, "Hello Text")
assert.Contains(t, data, "text/html; charset=UTF-8")
assert.Contains(t, data, "<p>Hello HTML</p>")
case <-time.After(2 * time.Second):
t.Fatal("timeout waiting for SMTP data")
}
})
}