Skip to content

armgit / posta

Public Imported from GitHub
0

Self-hosted email delivery platform that enables applications to send emails via HTTP APIs while handling SMTP delivery, templates, storage, security, and analytics. Fully self-hostable alternative to services like SendGrid or Mailgun.

fix(email): encode subjects that look like encoded-words

Mike Kosulin345c521413b2
diff --git a/internal/services/email/header_encoding_test.go b/internal/services/email/header_encoding_test.go
index 9e6494f..87013bb 100644
--- a/internal/services/email/header_encoding_test.go
+++ b/internal/services/email/header_encoding_test.go
@@ -125,3 +125,19 @@ func TestBuildMessageDefaultSenderNameSplitsBetweenWords(t *testing.T) {
t.Errorf("From arrives as %q, want %q", naive, want)
}
}
+
+// Plain text that merely looks like an encoded-word must reach the reader as
+// written, not be decoded by their client.
+func TestBuildMessageSubjectKeepsLiteralEncodedWordSyntax(t *testing.T) {
+ const subject = "Use =?UTF-8?Q?hi?= in your template"
+ raw := buildMessage("[email protected]", []string{"[email protected]"},
+ subject, "", "body", nil, nil, "", "", false)
+
+ msg, err := mail.ReadMessage(strings.NewReader(string(raw)))
+ if err != nil {
+ t.Fatalf("built message does not parse: %v", err)
+ }
+ if got, _ := new(mime.WordDecoder).DecodeHeader(msg.Header.Get("Subject")); got != subject {
+ t.Errorf("subject decodes as %q, want %q", got, subject)
+ }
+}
diff --git a/internal/services/email/smtp_sender.go b/internal/services/email/smtp_sender.go
index 4b10ed6..7ba1db6 100644
--- a/internal/services/email/smtp_sender.go
+++ b/internal/services/email/smtp_sender.go
@@ -311,9 +311,10 @@ func isASCII(s string) bool {
}
// encodeHeader encodes s for an unstructured header such as Subject, folding
-// its encoded-words onto separate lines.
+// its encoded-words onto separate lines. Plain text containing "=?" is encoded
+// too, or a reader would decode what merely looks like an encoded-word.
func encodeHeader(s string) string {
- if mime.BEncoding.Encode("UTF-8", s) == s {
+ if mime.BEncoding.Encode("UTF-8", s) == s && !strings.Contains(s, "=?") {
return foldPlain(s)
}
return strings.Join(encodeWords(s), "\r\n ")