From e74c98aac6f8d3d52dc4b02d83957431dd6dd37c Mon Sep 17 00:00:00 2001 From: Adam Magued Date: Wed, 14 Oct 2026 04:47:31 +0000 Subject: [PATCH] feat(email): support multipart/alternative for emails with text and HTML bodies --- email/email.go | 31 +++++++++++- email/email_test.go | 118 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 1 deletion(-) diff --git a/email/email.go b/email/email.go index b340d9b..73e3d32 100644 --- a/email/email.go +++ b/email/email.go @@ -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") diff --git a/email/email_test.go b/email/email_test.go index 92af861..a4579ee 100644 --- a/email/email_test.go +++ b/email/email_test.go @@ -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 .\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: "

Hello HTML

", + } + 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, "

Hello HTML

") + 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: "

Hello HTML

", + } + 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, "

Hello HTML

") + case <-time.After(2 * time.Second): + t.Fatal("timeout waiting for SMTP data") + } + }) +}