From cd2c879cfd1d096a371c43239824b729ff6ef880 Mon Sep 17 00:00:00 2001
From: Jinnrry <19919556+Jinnrry@users.noreply.github.com>
Date: Sat, 23 May 2026 00:14:37 +0800
Subject: [PATCH] Feature/v2.9.1 (#338)

add test case
---
 server/dto/parsemail/email_test.go | 120 +++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)

diff --git a/server/dto/parsemail/email_test.go b/server/dto/parsemail/email_test.go
index 9df92a8..e08d667 100644
--- a/server/dto/parsemail/email_test.go
+++ b/server/dto/parsemail/email_test.go
@@ -5,10 +5,130 @@ import (
 	"fmt"
 	"github.com/emersion/go-message"
 	"io"
+	"strings"
 
 	"testing"
 )
 
+func TestHtmlTxtAttachment(t *testing.T) {
+	emailBytes := `From: "=?utf-8?B?amlubnJyeQ==?=" <ok@xjiangwei.cn>
+To: "=?utf-8?B?YWRtaW4=?=" <admin@jinnrry.com>
+Subject: FileTest
+Mime-Version: 1.0
+Content-Type: multipart/mixed;
+        boundary="----=_NextPart_6A102A6A_F16B7280_56878F2C"
+Content-Transfer-Encoding: 8Bit
+Date: Fri, 22 May 2026 18:05:30 +0800
+Message-ID: <tencent_CB10C599AF69D91666D5A66E4505F633A705@qq.com>
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_6A102A6A_F16B7280_56878F2C
+Content-Type: multipart/alternative;
+        boundary="----=_NextPart_6A102A6A_F16B7280_0A1A2221";
+
+------=_NextPart_6A102A6A_F16B7280_0A1A2221
+Content-Type: text/plain;
+        charset="utf-8"
+Content-Transfer-Encoding: base64
+
+RW1haWwgQ29udGVudCE=
+
+------=_NextPart_6A102A6A_F16B7280_0A1A2221
+Content-Type: text/html;
+        charset="utf-8"
+Content-Transfer-Encoding: base64
+
+PGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6IC1hcHBsZS1zeXN0ZW0sIHN5c3RlbS11aTsgZm9u
+dC1zaXplOiAxNHB4OyBjb2xvcjogcmdiKDAsIDAsIDApOyBsaW5lLWhlaWdodDogMS40Mzsi
+PjxiPkVtYWlsIENvbnRlbnQhPC9iPjwvZGl2Pg==
+
+------=_NextPart_6A102A6A_F16B7280_0A1A2221--
+
+------=_NextPart_6A102A6A_F16B7280_56878F2C
+Content-Type: application/octet-stream;
+        charset="utf-8";
+        name="html.html"
+Content-Disposition: attachment; filename="html.html"
+Content-Transfer-Encoding: base64
+
+dGhpcyBpcyBodG1sIGZpbGUgY29udGV4dCE=
+
+------=_NextPart_6A102A6A_F16B7280_56878F2C
+Content-Type: application/octet-stream;
+        charset="utf-8";
+        name="txt.txt"
+Content-Disposition: attachment; filename="txt.txt"
+Content-Transfer-Encoding: base64
+
+dGhpcyBpcyB0eHQgZmlsZSBjb250ZW50IQ==
+
+------=_NextPart_6A102A6A_F16B7280_56878F2C--`
+
+	email := NewEmailFromReader([]string{"admin@jinnrry.com"}, bytes.NewReader([]byte(emailBytes)), len(emailBytes))
+
+	if strings.Contains(string(email.Text), "file") {
+		t.Errorf("formatContentError:%s", "邮件内容解析错误，文件内容被解析到邮件中！")
+	}
+
+	if strings.Contains(string(email.HTML), "file") {
+		t.Errorf("formatContentError:%s", "邮件内容解析错误，文件内容被解析到邮件中！")
+	}
+
+	emailBytes = `Content-Type: multipart/mixed;
+ boundary=ee32d21f4234ae8884badf33c4eec57d61a93bc5048453d42dd9313d5974
+Mime-Version: 1.0
+Subject: TestHtmlTxtAttachment
+To: <admin@jinnrry.com>
+Sender: "jinnrry" <admin@jinnrry.com>
+From: "jinnrry" <admin@jinnrry.com>
+Message-Id: <0f376803f71ff716c49bdf0479c5568c.1779445057831143578@jinnrry.com>
+Date: Fri, 22 May 2026 18:17:37 +0800
+
+--ee32d21f4234ae8884badf33c4eec57d61a93bc5048453d42dd9313d5974
+Content-Type: multipart/alternative;
+ boundary=71b61b51b82589aba3a3315cc61b6406a790a8d6e50c34782a4f2149134d
+
+--71b61b51b82589aba3a3315cc61b6406a790a8d6e50c34782a4f2149134d
+Content-Disposition: inline
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: base64
+
+SGVyZSBpcyBlbWFpbCBjb250ZW50Lg==
+--71b61b51b82589aba3a3315cc61b6406a790a8d6e50c34782a4f2149134d
+Content-Disposition: inline
+Content-Transfer-Encoding: base64
+Content-Type: text/html; charset=UTF-8
+
+PHA+PHN0cm9uZz5IZXJlIGlzIGVtYWlsIGNvbnRlbnQuPC9zdHJvbmc+PC9wPg==
+--71b61b51b82589aba3a3315cc61b6406a790a8d6e50c34782a4f2149134d--
+
+--ee32d21f4234ae8884badf33c4eec57d61a93bc5048453d42dd9313d5974
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=html.html
+Content-Type: text/html
+
+dGhpcyBpcyBodG1sIGZpbGUgY29udGV4dCE=
+--ee32d21f4234ae8884badf33c4eec57d61a93bc5048453d42dd9313d5974
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=txt.txt
+Content-Type: text/plain
+
+dGhpcyBpcyB0eHQgZmlsZSBjb250ZW50IQ==
+--ee32d21f4234ae8884badf33c4eec57d61a93bc5048453d42dd9313d5974--`
+
+	email = NewEmailFromReader([]string{"admin@jinnrry.com"}, bytes.NewReader([]byte(emailBytes)), len(emailBytes))
+
+	if strings.Contains(string(email.Text), "file") {
+		t.Errorf("formatContentError:%s", "邮件内容解析错误，文件内容被解析到邮件中！")
+	}
+
+	if strings.Contains(string(email.HTML), "file") {
+		t.Errorf("formatContentError:%s", "邮件内容解析错误，文件内容被解析到邮件中！")
+	}
+
+}
+
 func Test_buildUser(t *testing.T) {
 	u := buildUser("Jinnrry N <jiangwei1995910@gmail.com>")
 	if u.EmailAddress != "jiangwei1995910@gmail.com" {