webui, rest: Render UTF-8 addresses correctly, fixes #117

pkg/test/integration_test.go

@@ -44,6 +44,7 @@ func TestSuite(t *testing.T) {
 	}{
 		{"basic", testBasic},
 		{"fullname", testFullname},
+		{"encodedHeader", testEncodedHeader},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, tc.test)
@@ -59,13 +60,13 @@ func testBasic(t *testing.T) {
 	to := []string{"recipient@inbucket.org"}
 	input := readTestData("basic.txt")
 
-	// Send mail
+	// Send mail.
 	err = smtpclient.SendMail(smtpHost, nil, from, to, input)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	// Confirm receipt
+	// Confirm receipt.
 	msg, err := client.GetMessage("recipient", "latest")
 	if err != nil {
 		t.Fatal(err)
@@ -88,13 +89,13 @@ func testFullname(t *testing.T) {
 	to := []string{"recipient@inbucket.org"}
 	input := readTestData("fullname.txt")
 
-	// Send mail
+	// Send mail.
 	err = smtpclient.SendMail(smtpHost, nil, from, to, input)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	// Confirm receipt
+	// Confirm receipt.
 	msg, err := client.GetMessage("recipient", "latest")
 	if err != nil {
 		t.Fatal(err)
@@ -108,6 +109,35 @@ func testFullname(t *testing.T) {
 	goldiff.File(t, got, "testdata", "fullname.golden")
 }
 
+func testEncodedHeader(t *testing.T) {
+	client, err := client.New(restBaseURL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	from := "fromuser@inbucket.org"
+	to := []string{"recipient@inbucket.org"}
+	input := readTestData("encodedheader.txt")
+
+	// Send mail.
+	err = smtpclient.SendMail(smtpHost, nil, from, to, input)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Confirm receipt.
+	msg, err := client.GetMessage("recipient", "latest")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if msg == nil {
+		t.Errorf("Got nil message, wanted non-nil message.")
+	}
+
+	// Compare to golden.
+	got := formatMessage(msg)
+	goldiff.File(t, got, "testdata", "encodedheader.golden")
+}
+
 func formatMessage(m *client.Message) []byte {
 	b := &bytes.Buffer{}
 	fmt.Fprintf(b, "Mailbox: %v\n", m.Mailbox)

pkg/test/testdata/encodedheader.golden

@@ -0,0 +1,12 @@
+Mailbox: recipient
+From: X-äéß Y-äéß <fromuser@inbucket.org>
+To: [Test of ȇɲʢȯȡɪɴʛ <recipient@inbucket.org>]
+Subject: Test of ȇɲʢȯȡɪɴʛ
+Size: 351
+
+BODY TEXT:
+Basic message.
+
+
+BODY HTML:
+

pkg/test/testdata/encodedheader.txt

@@ -0,0 +1,5 @@
+From: =?utf-8?q?X-=C3=A4=C3=A9=C3=9F_Y-=C3=A4=C3=A9=C3=9F?= <fromuser@inbucket.org>
+To: =?utf-8?B?VGVzdCBvZiDIh8myyqLIr8ihyarJtMqb?= <recipient@inbucket.org>
+Subject: =?utf-8?b?VGVzdCBvZiDIh8myyqLIr8ihyarJtMqb?=
+
+Basic message.

pkg/test/testdata/fullname.golden

@@ -1,6 +1,6 @@
 Mailbox: recipient
-From: "From User" <fromuser@inbucket.org>
-To: ["Rec I. Pient" <recipient@inbucket.org>]
+From: From User <fromuser@inbucket.org>
+To: [Rec I. Pient <recipient@inbucket.org>]
 Subject: basic subject
 Size: 246