05bca5d5a8
优先使用原始邮件数据转发，保留原始发件人、主题、正文、MIME 和 DKIM 签名，避免重建邮件导致严格 DMARC 收件方拒收。 当原始转发被拒时，回退为使用本地转发账号重新投递，同时保持原始主题不变。 同时修正本地域名转发逻辑：精确识别本地域名，自转发时报错，转发给其他本地用户时直接投递到本地收件箱，避免旧的字符串包含判断误拦截。 测试：go test -v ./services/rule ./dto/parsemail ./utils/send Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
78 lines
2.2 KiB
Go
78 lines
2.2 KiB
Go
package parsemail
|
|
|
|
import (
|
|
"bytes"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/Jinnrry/pmail/config"
|
|
"github.com/Jinnrry/pmail/models"
|
|
"github.com/Jinnrry/pmail/utils/context"
|
|
"github.com/emersion/go-message/mail"
|
|
)
|
|
|
|
func TestForwardBuildBytesRemailsFromLocalUser(t *testing.T) {
|
|
oldConfig := config.Instance
|
|
oldDkim := instance
|
|
defer func() {
|
|
config.Instance = oldConfig
|
|
instance = oldDkim
|
|
}()
|
|
|
|
config.Instance = &config.Config{Domain: "example.com", Domains: []string{"example.com"}}
|
|
instance = nil
|
|
|
|
email := &Email{
|
|
From: &User{Name: "Original Sender", EmailAddress: "sender@example.com"},
|
|
To: []*User{{EmailAddress: "forwarder@example.com"}},
|
|
Subject: "hello",
|
|
Text: []byte("forward body"),
|
|
MsgID: "original-message@example.com",
|
|
}
|
|
|
|
data := email.ForwardBuildBytes(&context.Context{}, &models.User{Name: "forwarder", Account: "forwarder"}, "recipient@example.net")
|
|
|
|
msg, err := mail.CreateReader(bytes.NewReader(data))
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
defer msg.Close()
|
|
|
|
from, err := msg.Header.AddressList("From")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(from) != 1 || from[0].Address != "forwarder@example.com" {
|
|
t.Fatalf("expected forwarded From to be local user, got %+v", from)
|
|
}
|
|
|
|
to, err := msg.Header.AddressList("To")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(to) != 1 || to[0].Address != "recipient@example.net" {
|
|
t.Fatalf("expected forwarded To to be target address, got %+v", to)
|
|
}
|
|
|
|
replyTo, err := msg.Header.AddressList("Reply-To")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(replyTo) != 1 || replyTo[0].Address != "sender@example.com" {
|
|
t.Fatalf("expected Reply-To to preserve original sender, got %+v", replyTo)
|
|
}
|
|
|
|
if got := msg.Header.Get("X-Original-From"); !strings.Contains(got, "sender@example.com") {
|
|
t.Fatalf("expected X-Original-From to include original sender, got %q", got)
|
|
}
|
|
if got := msg.Header.Get("X-Forwarded-By"); got != "forwarder@example.com" {
|
|
t.Fatalf("expected X-Forwarded-By to be local user, got %q", got)
|
|
}
|
|
if got := msg.Header.Get("X-Forwarded-To"); got != "recipient@example.net" {
|
|
t.Fatalf("expected X-Forwarded-To to be target, got %q", got)
|
|
}
|
|
if got := msg.Header.Get("Subject"); got != "hello" {
|
|
t.Fatalf("expected original subject, got %q", got)
|
|
}
|
|
}
|