mirror of
https://blitiri.com.ar/repos/chasquid
synced 2025-12-18 14:47:03 +00:00
fe146f00e5
Today, we pick the domain used to send the DSN from based on what we presented to the client at EHLO time, which itself may be based on the TLS negotiation (which is not necessarily trusted). This is complex, not necessarily correct, and involves passing the domain around through the queue and persisting it in the items. So this patch simplifies that handling by always using the main domain as specified by the configuration.
81 lines
2.0 KiB
Go
81 lines
2.0 KiB
Go
package queue
|
|
|
|
import (
|
|
"bytes"
|
|
"text/template"
|
|
"time"
|
|
)
|
|
|
|
// Maximum length of the original message to include in the DSN.
|
|
const maxOrigMsgLen = 256 * 1024
|
|
|
|
// deliveryStatusNotification creates a delivery status notification (DSN) for
|
|
// the given item, and puts it in the queue.
|
|
//
|
|
// There is a standard, https://tools.ietf.org/html/rfc3464, although most
|
|
// MTAs seem to use a plain email and include an X-Failed-Recipients header.
|
|
// We're going with the latter for now, may extend it to the former later.
|
|
func deliveryStatusNotification(domainFrom string, item *Item) ([]byte, error) {
|
|
info := dsnInfo{
|
|
OurDomain: domainFrom,
|
|
Destination: item.From,
|
|
MessageID: "chasquid-dsn-" + <-newID + "@" + domainFrom,
|
|
Date: time.Now().Format(time.RFC1123Z),
|
|
To: item.To,
|
|
Recipients: item.Rcpt,
|
|
}
|
|
|
|
for _, rcpt := range item.Rcpt {
|
|
if rcpt.Status == Recipient_FAILED {
|
|
info.FailedRcpts = append(info.FailedRcpts, rcpt)
|
|
}
|
|
}
|
|
|
|
if len(item.Data) > maxOrigMsgLen {
|
|
info.OriginalMessage = string(item.Data[:maxOrigMsgLen])
|
|
} else {
|
|
info.OriginalMessage = string(item.Data)
|
|
}
|
|
|
|
buf := &bytes.Buffer{}
|
|
err := dsnTemplate.Execute(buf, info)
|
|
return buf.Bytes(), err
|
|
}
|
|
|
|
type dsnInfo struct {
|
|
OurDomain string
|
|
Destination string
|
|
MessageID string
|
|
Date string
|
|
To []string
|
|
Recipients []*Recipient
|
|
FailedRcpts []*Recipient
|
|
OriginalMessage string
|
|
}
|
|
|
|
var dsnTemplate = template.Must(template.New("dsn").Parse(
|
|
`From: Mail Delivery System <postmaster-dsn@{{.OurDomain}}>
|
|
To: <{{.Destination}}>
|
|
Subject: Mail delivery failed: returning message to sender
|
|
Message-ID: <{{.MessageID}}>
|
|
Date: {{.Date}}
|
|
X-Failed-Recipients: {{range .To}}{{.}}, {{end}}
|
|
Auto-Submitted: auto-replied
|
|
|
|
Delivery to the following recipient(s) failed permanently:
|
|
|
|
{{range .To -}} - {{.}}
|
|
{{end}}
|
|
|
|
----- Technical details -----
|
|
{{range .Recipients}}
|
|
- "{{.Address}}" ({{.Type}}) failed with error:
|
|
{{.LastFailureMessage}}
|
|
{{end}}
|
|
|
|
----- Original message -----
|
|
|
|
{{.OriginalMessage}}
|
|
|
|
`))
|