mirror of
https://github.com/mjl-/mox.git
synced 2024-12-27 08:53:48 +03:00
2f5d6069bf
with requiretls, the tls verification mode/rules for email deliveries can be changed by the sender/submitter. in two ways: 1. "requiretls" smtp extension to always enforce verified tls (with mta-sts or dnssec+dane), along the entire delivery path until delivery into the final destination mailbox (so entire transport is verified-tls-protected). 2. "tls-required: no" message header, to ignore any tls and tls verification errors even if the recipient domain has a policy that requires tls verification (mta-sts and/or dnssec+dane), allowing delivery of non-sensitive messages in case of misconfiguration/interoperability issues (at least useful for sending tls reports). we enable requiretls by default (only when tls is active), for smtp and submission. it can be disabled through the config. for each delivery attempt, we now store (per recipient domain, in the account of the sender) whether the smtp server supports starttls and requiretls. this support is shown (after having sent a first message) in the webmail when sending a message (the previous 3 bars under the address input field are now 5 bars, the first for starttls support, the last for requiretls support). when all recipient domains for a message are known to implement requiretls, requiretls is automatically selected for sending (instead of "default" tls behaviour). users can also select the "fallback to insecure" to add the "tls-required: no" header. new metrics are added for insight into requiretls errors and (some, not yet all) cases where tls-required-no ignored a tls/verification error. the admin can change the requiretls status for messages in the queue. so with default delivery attempts, when verified tls is required by failing, an admin could potentially change the field to "tls-required: no"-behaviour. messages received (over smtp) with the requiretls option, get a comment added to their Received header line, just before "id", after "with".
180 lines
4.5 KiB
Go
180 lines
4.5 KiB
Go
package queue
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"os"
|
|
"time"
|
|
|
|
"github.com/mjl-/mox/dns"
|
|
"github.com/mjl-/mox/dsn"
|
|
"github.com/mjl-/mox/message"
|
|
"github.com/mjl-/mox/mlog"
|
|
"github.com/mjl-/mox/mox-"
|
|
"github.com/mjl-/mox/smtp"
|
|
"github.com/mjl-/mox/store"
|
|
)
|
|
|
|
func deliverDSNFailure(log *mlog.Log, m Msg, remoteMTA dsn.NameIP, secodeOpt, errmsg string) {
|
|
const subject = "mail delivery failed"
|
|
message := fmt.Sprintf(`
|
|
Delivery has failed permanently for your email to:
|
|
|
|
%s
|
|
|
|
No further deliveries will be attempted.
|
|
|
|
Error during the last delivery attempt:
|
|
|
|
%s
|
|
`, m.Recipient().XString(m.SMTPUTF8), errmsg)
|
|
|
|
deliverDSN(log, m, remoteMTA, secodeOpt, errmsg, true, nil, subject, message)
|
|
}
|
|
|
|
func deliverDSNDelay(log *mlog.Log, m Msg, remoteMTA dsn.NameIP, secodeOpt, errmsg string, retryUntil time.Time) {
|
|
const subject = "mail delivery delayed"
|
|
message := fmt.Sprintf(`
|
|
Delivery has been delayed of your email to:
|
|
|
|
%s
|
|
|
|
Next attempts to deliver: in 4 hours, 8 hours and 16 hours.
|
|
If these attempts all fail, you will receive a notice.
|
|
|
|
Error during the last delivery attempt:
|
|
|
|
%s
|
|
`, m.Recipient().XString(false), errmsg)
|
|
|
|
deliverDSN(log, m, remoteMTA, secodeOpt, errmsg, false, &retryUntil, subject, message)
|
|
}
|
|
|
|
// We only queue DSNs for delivery failures for emails submitted by authenticated
|
|
// users. So we are delivering to local users. ../rfc/5321:1466
|
|
// ../rfc/5321:1494
|
|
// ../rfc/7208:490
|
|
func deliverDSN(log *mlog.Log, m Msg, remoteMTA dsn.NameIP, secodeOpt, errmsg string, permanent bool, retryUntil *time.Time, subject, textBody string) {
|
|
kind := "delayed delivery"
|
|
if permanent {
|
|
kind = "failure"
|
|
}
|
|
|
|
qlog := func(text string, err error) {
|
|
log.Errorx("queue dsn: "+text+": sender will not be informed about dsn", err, mlog.Field("sender", m.Sender().XString(m.SMTPUTF8)), mlog.Field("kind", kind))
|
|
}
|
|
|
|
msgf, err := os.Open(m.MessagePath())
|
|
if err != nil {
|
|
qlog("opening queued message", err)
|
|
return
|
|
}
|
|
msgr := store.FileMsgReader(m.MsgPrefix, msgf)
|
|
defer func() {
|
|
err := msgr.Close()
|
|
log.Check(err, "closing message reader after queuing dsn")
|
|
}()
|
|
headers, err := message.ReadHeaders(bufio.NewReader(msgr))
|
|
if err != nil {
|
|
qlog("reading headers of queued message", err)
|
|
return
|
|
}
|
|
|
|
var action dsn.Action
|
|
var status string
|
|
if permanent {
|
|
status = "5."
|
|
action = dsn.Failed
|
|
} else {
|
|
action = dsn.Delayed
|
|
status = "4."
|
|
}
|
|
if secodeOpt != "" {
|
|
status += secodeOpt
|
|
} else {
|
|
status += "0.0"
|
|
}
|
|
diagCode := errmsg
|
|
if !dsn.HasCode(diagCode) {
|
|
diagCode = status + " " + errmsg
|
|
}
|
|
|
|
dsnMsg := &dsn.Message{
|
|
SMTPUTF8: m.SMTPUTF8,
|
|
From: smtp.Path{Localpart: "postmaster", IPDomain: dns.IPDomain{Domain: mox.Conf.Static.HostnameDomain}},
|
|
To: m.Sender(),
|
|
Subject: subject,
|
|
References: m.MessageID,
|
|
TextBody: textBody,
|
|
|
|
ReportingMTA: mox.Conf.Static.HostnameDomain.ASCII,
|
|
ArrivalDate: m.Queued,
|
|
|
|
Recipients: []dsn.Recipient{
|
|
{
|
|
FinalRecipient: m.Recipient(),
|
|
Action: action,
|
|
Status: status,
|
|
RemoteMTA: remoteMTA,
|
|
DiagnosticCode: diagCode,
|
|
LastAttemptDate: *m.LastAttempt,
|
|
WillRetryUntil: retryUntil,
|
|
},
|
|
},
|
|
|
|
Original: headers,
|
|
}
|
|
msgData, err := dsnMsg.Compose(log, m.SMTPUTF8)
|
|
if err != nil {
|
|
qlog("composing dsn", err)
|
|
return
|
|
}
|
|
|
|
msgData = append(msgData, []byte("Return-Path: <"+dsnMsg.From.XString(m.SMTPUTF8)+">\r\n")...)
|
|
|
|
mailbox := "Inbox"
|
|
acc, err := store.OpenAccount(m.SenderAccount)
|
|
if err != nil {
|
|
acc, err = store.OpenAccount(mox.Conf.Static.Postmaster.Account)
|
|
if err != nil {
|
|
qlog("looking up postmaster account after sender account was not found", err)
|
|
return
|
|
}
|
|
mailbox = mox.Conf.Static.Postmaster.Mailbox
|
|
}
|
|
defer func() {
|
|
err := acc.Close()
|
|
log.Check(err, "queue dsn: closing account", mlog.Field("sender", m.Sender().XString(m.SMTPUTF8)), mlog.Field("kind", kind))
|
|
}()
|
|
|
|
msgFile, err := store.CreateMessageTemp("queue-dsn")
|
|
if err != nil {
|
|
qlog("creating temporary message file", err)
|
|
return
|
|
}
|
|
defer func() {
|
|
name := msgFile.Name()
|
|
err := msgFile.Close()
|
|
log.Check(err, "closing message file")
|
|
err = os.Remove(name)
|
|
log.Check(err, "removing message file", mlog.Field("path", name))
|
|
}()
|
|
|
|
msgWriter := message.NewWriter(msgFile)
|
|
if _, err := msgWriter.Write(msgData); err != nil {
|
|
qlog("writing dsn message", err)
|
|
return
|
|
}
|
|
|
|
msg := &store.Message{
|
|
Received: time.Now(),
|
|
Size: msgWriter.Size,
|
|
MsgPrefix: []byte{},
|
|
}
|
|
acc.WithWLock(func() {
|
|
if err := acc.DeliverMailbox(log, mailbox, msg, msgFile); err != nil {
|
|
qlog("delivering dsn to mailbox", err)
|
|
return
|
|
}
|
|
})
|
|
}
|