修复邮件解析和密送隐私泄露
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-06 05:40:33 +08:00
1 parent bf2d7b6e2d
commit 4769aad8e5
3 files changed
+28 -10

No files matched your search

-4
View File
@@ -8,7 +8,6 @@ import (
"encoding/pem" "encoding/pem"
"fmt" "fmt"
"git.pcux.cn/xuans/Smail/config" "git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/utils/consts"
"git.pcux.cn/xuans/Smail/utils/context" "git.pcux.cn/xuans/Smail/utils/context"
securefile "git.pcux.cn/xuans/Smail/utils/file" securefile "git.pcux.cn/xuans/Smail/utils/file"
"github.com/emersion/go-msgauth/dkim" "github.com/emersion/go-msgauth/dkim"
@@ -132,9 +131,6 @@ func Check(ctx *context.Context, mail io.Reader) bool {
} }
for _, v := range verifications { for _, v := range verifications {
if v.Domain == consts.TEST_DOMAIN {
return true
}
if v.Err == nil { if v.Err == nil {
log.Println("Valid signature for:", v.Domain) log.Println("Valid signature for:", v.Domain)
} else { } else {
+25 -6
View File
@@ -399,7 +399,7 @@ func NewEmailFromReader(to []string, r io.Reader, size int) (*Email, error) {
} }
ret.Cc = buildUsers(m.Header.Values("Cc")) ret.Cc = buildUsers(m.Header.Values("Cc"))
ret.ReplyTo = buildUsers(m.Header.Values("ReplyTo")) ret.ReplyTo = buildUsers(m.Header.Values("Reply-To"))
ret.Sender = buildUser(m.Header.Get("Sender")) ret.Sender = buildUser(m.Header.Get("Sender"))
if ret.Sender == nil || strings.TrimSpace(ret.Sender.EmailAddress) == "" { if ret.Sender == nil || strings.TrimSpace(ret.Sender.EmailAddress) == "" {
ret.Sender = ret.From ret.Sender = ret.From
@@ -582,12 +582,15 @@ func buildUsers(strs []string) []*User {
if strings.TrimSpace(line) == "" { if strings.TrimSpace(line) == "" {
continue continue
} }
addresses, err := mail.ParseAddressList(line)
parts := strings.Split(line, ",") if err == nil {
for _, part := range parts { for _, address := range addresses {
if u := buildUser(strings.TrimSpace(part)); u != nil { ret = append(ret, buildUser(address.String()))
ret = append(ret, u)
} }
continue
}
if user := buildUser(line); user != nil {
ret = append(ret, user)
} }
} }
return ret return ret
@@ -692,6 +695,9 @@ func (e *Email) ForwardBuildBytes(ctx *context.Context, sender *models.User, for
} }
var ah mail.AttachmentHeader var ah mail.AttachmentHeader
ah.Set("Content-Type", attachment.ContentType) ah.Set("Content-Type", attachment.ContentType)
if attachment.ContentID != "" {
ah.Set("Content-ID", fmt.Sprintf("<%s>", attachment.ContentID))
}
ah.SetFilename(attachment.Filename) ah.SetFilename(attachment.Filename)
w, err = mw.CreateAttachment(ah) w, err = mw.CreateAttachment(ah)
if err != nil { if err != nil {
@@ -825,6 +831,16 @@ func (e *Email) BuildBytes(ctx *context.Context, dkim bool) ([]byte, error) {
h.SetAddressList("Sender", from) h.SetAddressList("Sender", from)
h.SetAddressList("To", to) h.SetAddressList("To", to)
h.SetText("Subject", e.Subject) h.SetText("Subject", e.Subject)
if len(e.ReplyTo) != 0 {
replyTo := make([]*mail.Address, 0, len(e.ReplyTo))
for _, user := range e.ReplyTo {
if user == nil || user.EmailAddress == "" {
return nil, errors.New("invalid reply-to recipient")
}
replyTo = append(replyTo, &mail.Address{Name: user.Name, Address: user.EmailAddress})
}
h.SetAddressList("Reply-To", replyTo)
}
if len(e.Cc) != 0 { if len(e.Cc) != 0 {
cc := []*mail.Address{} cc := []*mail.Address{}
for _, user := range e.Cc { for _, user := range e.Cc {
@@ -894,6 +910,9 @@ func (e *Email) BuildBytes(ctx *context.Context, dkim bool) ([]byte, error) {
} }
var ah mail.AttachmentHeader var ah mail.AttachmentHeader
ah.Set("Content-Type", attachment.ContentType) ah.Set("Content-Type", attachment.ContentType)
if attachment.ContentID != "" {
ah.Set("Content-ID", fmt.Sprintf("<%s>", attachment.ContentID))
}
ah.SetFilename(attachment.Filename) ah.SetFilename(attachment.Filename)
w, err = mw.CreateAttachment(ah) w, err = mw.CreateAttachment(ah)
if err != nil { if err != nil {
+3
View File
@@ -41,6 +41,9 @@ func GetEmailDetail(ctx *context.Context, id int, markRead bool) (*response.Emai
} }
email.IsRead = ue.IsRead email.IsRead = ue.IsRead
if email.Type == 0 {
email.Bcc = "[]"
}
// 将内容中的cid内容替换成url // 将内容中的cid内容替换成url
if strings.TrimSpace(email.Attachments) != "" { if strings.TrimSpace(email.Attachments) != "" {