首页 发现 帮助
登录
BP
/
email
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

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

base64 was not supported when emails had a single text/* part encoded in base64

Added relevant code & test.

Fixes #137
Michel Blanc 4 年之前
父节点
3656afaaba
当前提交
943e75fe52
共有 2 个文件被更改，包括 26 次插入 和 2 次删除
合并视图 显示文件统计
  1. 4 2
      email.go
  2. 22 0
      email_test.go

+ 4 - 2
email.go
查看文件 

@@ -243,9 +243,11 @@ func parseMIMEParts(hs textproto.MIMEHeader, b io.Reader) ([]*part, error) {
 
 		}
 
 		}
 
 	} else {
 
 	} else {
 
 		// If it is not a multipart email, parse the body content as a single "part"
 
 		// 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)
 
 			b = quotedprintable.NewReader(b)
 
-
 
+		case "base64":
 
+			b = base64.NewDecoder(base64.StdEncoding, b)
 
 		}
 
 		}
 
 		var buf bytes.Buffer
 
 		var buf bytes.Buffer
 
 		if _, err := io.Copy(&buf, b); err != nil {
 
 		if _, err := io.Copy(&buf, b); err != nil {

+ 22 - 0
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
 
 // *Since the mime library in use by ```email``` is now in the stdlib, this test is deprecated
 
 func Test_quotedPrintDecode(t *testing.T) {
 
 func Test_quotedPrintDecode(t *testing.T) {
 
 	text := []byte("Dear reader!\r\n\r\n" +
 
 	text := []byte("Dear reader!\r\n\r\n" +