From 0fc59af9a82dd5f240032934ac7522efe0328a5a Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Wed, 9 Aug 2023 10:20:45 +0200 Subject: [PATCH] add Deliver-To header for delivered messages for (experimental) rfc 9228 --- smtpserver/server.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/smtpserver/server.go b/smtpserver/server.go index 5bd94d2..babaf96 100644 --- a/smtpserver/server.go +++ b/smtpserver/server.go @@ -2324,9 +2324,14 @@ func (c *conn) deliver(ctx context.Context, recvHdrFor func(string) string, msgW } // ../rfc/5321:3204 - // ../rfc/5321:3300 // Received-SPF header goes before Received. ../rfc/7208:2038 - msgPrefix := []byte("Return-Path: <" + c.mailFrom.String() + ">\r\n" + authResults.Header() + receivedSPF.Header() + recvHdrFor(rcptAcc.rcptTo.String())) + msgPrefix := []byte( + "Delivered-To: " + rcptAcc.rcptTo.XString(c.smtputf8) + "\r\n" + // ../rfc/9228:274 + "Return-Path: <" + c.mailFrom.String() + ">\r\n" + // ../rfc/5321:3300 + authResults.Header() + + receivedSPF.Header() + + recvHdrFor(rcptAcc.rcptTo.String()), + ) if !msgWriter.HaveHeaders { msgPrefix = append(msgPrefix, "\r\n"...) }