Adds support for text/html with base64 CTE (#138)

leucos · web-flow · commit 943e75fe5223 · 2021-01-08T20:39:52.000-06:00
base64 was not supported when emails had a single text/* part encoded in base64 Added relevant code & test. Fixes #137
diff --git a/email.go b/email.go
@@ -243,9 +243,11 @@ func parseMIMEParts(hs textproto.MIMEHeader, b io.Reader) ([]*part, error) {
 		}
 	} else {
 		// If it is not a multipart email, parse the body content as a single "part"
-		if hs.Get("Content-Transfer-Encoding") == "quoted-printable" {
+		switch hs.Get("Content-Transfer-Encoding") {
+		case "quoted-printable":
 			b = quotedprintable.NewReader(b)
-
+		case "base64":
+			b = base64.NewDecoder(base64.StdEncoding, b)
 		}
 		var buf bytes.Buffer
 		if _, err := io.Copy(&buf, b); err != nil {
diff --git a/email_test.go b/email_test.go
@@ -837,6 +837,28 @@ Testing!
 	}
 }
 
+func TestNoMultipartHTMLContentTypeBase64Encoding(t *testing.T) {
+	raw := []byte(`MIME-Version: 1.0
+From: no-reply@example.com
+To: tester@example.org
+Date: 7 Jan 2021 03:07:44 -0800
+Subject: Hello
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: base64
+Message-Id: <20210107110744.547DD70532@example.com>
+
+PGh0bWw+PGhlYWQ+PHRpdGxlPnRlc3Q8L3RpdGxlPjwvaGVhZD48Ym9keT5IZWxsbyB3
+b3JsZCE8L2JvZHk+PC9odG1sPg==
+`)
+	e, err := NewEmailFromReader(bytes.NewReader(raw))
+	if err != nil {
+		t.Fatalf("Error when parsing email %s", err.Error())
+	}
+	if !bytes.Equal(e.HTML, []byte("<html><head><title>test</title></head><body>Hello world!</body></html>")) {
+		t.Fatalf("Error incorrect text: %#q != %#q\n", e.Text, "<html>...</html>")
+	}
+}
+
 // *Since the mime library in use by ```email``` is now in the stdlib, this test is deprecated
 func Test_quotedPrintDecode(t *testing.T) {
 	text := []byte("Dear reader!\r\n\r\n" +

Original file line number	Diff line number	Diff line change
`@@ -243,9 +243,11 @@ func parseMIMEParts(hs textproto.MIMEHeader, b io.Reader) ([]*part, error) {`
`243`	`243`	`}`
`244`	`244`	`} else {`
`245`	`245`	`// If it is not a multipart email, parse the body content as a single "part"`
`246`		`- if hs.Get("Content-Transfer-Encoding") == "quoted-printable" {`
	`246`	`+ switch hs.Get("Content-Transfer-Encoding") {`
	`247`	`+ case "quoted-printable":`
`247`	`248`	`b = quotedprintable.NewReader(b)`
`248`		`-`
	`249`	`+ case "base64":`
	`250`	`+ b = base64.NewDecoder(base64.StdEncoding, b)`
`249`	`251`	`}`
`250`	`252`	`var buf bytes.Buffer`
`251`	`253`	`if _, err := io.Copy(&buf, b); err != nil {`