修复按收件用户拦截黑名单邮件并补齐历史邮件警示
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-09-25 01:44:44 +08:00
1 parent ed7b960921
commit 6254217972
10 files changed
+136 -10

No files matched your search

+13
View File
@@ -42,6 +42,19 @@ func GetEmailDetail(ctx *context.Context, id int, markRead bool) (*response.Emai
}
email.IsRead = ue.IsRead
var sender parsemail.User
if strings.TrimSpace(email.Sender) != "" {
if err := json.Unmarshal([]byte(email.Sender), &sender); err != nil {
return nil, fmt.Errorf("decode stored sender: %w", err)
}
}
session := db.Instance.NewSession()
blocked, err := models.BlacklistedRecipientIDs(session, []int{ctx.UserID}, email.FromAddress, sender.EmailAddress)
session.Close()
if err != nil {
return nil, err
}
email.IsBlacklisted = blocked[ctx.UserID]
if email.Type == 0 {
email.Bcc = "[]"
}
+9
View File
@@ -169,6 +169,15 @@ func forwardToLocalUser(ctx *context.Context, email *parsemail.Email, account, f
if !has {
return fmt.Errorf("local forward user not found: %s", forwardAddress)
}
session := db.Instance.NewSession()
blocked, filterErr := models.BlacklistedRecipientIDs(session, []int{user.ID}, email.SenderFilterAddresses()...)
session.Close()
if filterErr != nil {
return filterErr
}
if blocked[user.ID] {
return fmt.Errorf("local forwarding rejected by recipient policy")
}
var ue models.UserEmail
has, err = db.Instance.Table(&models.UserEmail{}).