2023-01-30 16:27:06 +03:00
package queue
import (
"bufio"
2023-12-05 23:13:57 +03:00
"context"
queue: deliver to multiple recipients in a single smtp transaction
transferring the data only once. we only do this when the recipient domains
are the same. when queuing, we now take care to set the same NextAttempt
timestamp, so queued messages are actually eligable for combined delivery.
this adds a DeliverMultiple to the smtp client. for pipelined requests, it will
send all RCPT TO (and MAIL and DATA) in one go, and handles the various
responses and error conditions, returning either an overal error, or per
recipient smtp responses. the results of the smtp LIMITS extension are also
available in the smtp client now.
this also takes the "LIMITS RCPTMAX" smtp extension into account: if the server
only accepts a single recipient, we won't send multiple.
if a server doesn't announce a RCPTMAX limit, but still has one (like mox does
for non-spf-verified transactions), we'll recognize code 452 and 552 (for
historic reasons) as temporary error, and try again in a separate transaction
immediately after. we don't yet implement "LIMITS MAILMAX", doesn't seem likely
in practice.
2024-03-07 12:07:53 +03:00
"errors"
2023-01-30 16:27:06 +03:00
"fmt"
2024-02-08 16:49:01 +03:00
"log/slog"
queue: deliver to multiple recipients in a single smtp transaction
transferring the data only once. we only do this when the recipient domains
are the same. when queuing, we now take care to set the same NextAttempt
timestamp, so queued messages are actually eligable for combined delivery.
this adds a DeliverMultiple to the smtp client. for pipelined requests, it will
send all RCPT TO (and MAIL and DATA) in one go, and handles the various
responses and error conditions, returning either an overal error, or per
recipient smtp responses. the results of the smtp LIMITS extension are also
available in the smtp client now.
this also takes the "LIMITS RCPTMAX" smtp extension into account: if the server
only accepts a single recipient, we won't send multiple.
if a server doesn't announce a RCPTMAX limit, but still has one (like mox does
for non-spf-verified transactions), we'll recognize code 452 and 552 (for
historic reasons) as temporary error, and try again in a separate transaction
immediately after. we don't yet implement "LIMITS MAILMAX", doesn't seem likely
in practice.
2024-03-07 12:07:53 +03:00
"net"
2023-01-30 16:27:06 +03:00
"os"
2024-02-15 01:37:43 +03:00
"strings"
2023-01-30 16:27:06 +03:00
"time"
2023-11-01 19:55:40 +03:00
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
queue: deliver to multiple recipients in a single smtp transaction
transferring the data only once. we only do this when the recipient domains
are the same. when queuing, we now take care to set the same NextAttempt
timestamp, so queued messages are actually eligable for combined delivery.
this adds a DeliverMultiple to the smtp client. for pipelined requests, it will
send all RCPT TO (and MAIL and DATA) in one go, and handles the various
responses and error conditions, returning either an overal error, or per
recipient smtp responses. the results of the smtp LIMITS extension are also
available in the smtp client now.
this also takes the "LIMITS RCPTMAX" smtp extension into account: if the server
only accepts a single recipient, we won't send multiple.
if a server doesn't announce a RCPTMAX limit, but still has one (like mox does
for non-spf-verified transactions), we'll recognize code 452 and 552 (for
historic reasons) as temporary error, and try again in a separate transaction
immediately after. we don't yet implement "LIMITS MAILMAX", doesn't seem likely
in practice.
2024-03-07 12:07:53 +03:00
"github.com/mjl-/bstore"
2023-01-30 16:27:06 +03:00
"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"
queue: deliver to multiple recipients in a single smtp transaction
transferring the data only once. we only do this when the recipient domains
are the same. when queuing, we now take care to set the same NextAttempt
timestamp, so queued messages are actually eligable for combined delivery.
this adds a DeliverMultiple to the smtp client. for pipelined requests, it will
send all RCPT TO (and MAIL and DATA) in one go, and handles the various
responses and error conditions, returning either an overal error, or per
recipient smtp responses. the results of the smtp LIMITS extension are also
available in the smtp client now.
this also takes the "LIMITS RCPTMAX" smtp extension into account: if the server
only accepts a single recipient, we won't send multiple.
if a server doesn't announce a RCPTMAX limit, but still has one (like mox does
for non-spf-verified transactions), we'll recognize code 452 and 552 (for
historic reasons) as temporary error, and try again in a separate transaction
immediately after. we don't yet implement "LIMITS MAILMAX", doesn't seem likely
in practice.
2024-03-07 12:07:53 +03:00
"github.com/mjl-/mox/smtpclient"
2023-01-30 16:27:06 +03:00
"github.com/mjl-/mox/store"
)
2023-11-01 19:55:40 +03:00
var (
metricDMARCReportFailure = promauto . NewCounter (
prometheus . CounterOpts {
Name : "mox_queue_dmarcreport_failure_total" ,
Help : "Permanent failures to deliver a DMARC report." ,
} ,
)
)
queue: deliver to multiple recipients in a single smtp transaction
transferring the data only once. we only do this when the recipient domains
are the same. when queuing, we now take care to set the same NextAttempt
timestamp, so queued messages are actually eligable for combined delivery.
this adds a DeliverMultiple to the smtp client. for pipelined requests, it will
send all RCPT TO (and MAIL and DATA) in one go, and handles the various
responses and error conditions, returning either an overal error, or per
recipient smtp responses. the results of the smtp LIMITS extension are also
available in the smtp client now.
this also takes the "LIMITS RCPTMAX" smtp extension into account: if the server
only accepts a single recipient, we won't send multiple.
if a server doesn't announce a RCPTMAX limit, but still has one (like mox does
for non-spf-verified transactions), we'll recognize code 452 and 552 (for
historic reasons) as temporary error, and try again in a separate transaction
immediately after. we don't yet implement "LIMITS MAILMAX", doesn't seem likely
in practice.
2024-03-07 12:07:53 +03:00
// todo: rename function, perhaps put some of the params in a delivery struct so we don't pass all the params all the time?
func fail ( ctx context . Context , qlog mlog . Log , msgs [ ] * Msg , dialedIPs map [ string ] [ ] net . IP , backoff time . Duration , remoteMTA dsn . NameIP , err error ) {
// todo future: when we implement relaying, we should be able to send DSNs to non-local users. and possibly specify a null mailfrom. ../rfc/5321:1503
// todo future: when we implement relaying, and a dsn cannot be delivered, and requiretls was active, we cannot drop the message. instead deliver to local postmaster? though ../rfc/8689:383 may intend to say the dsn should be delivered without requiretls?
// todo future: when we implement smtp dsn extension, parameter RET=FULL must be disregarded for messages with REQUIRETLS. ../rfc/8689:379
m0 := msgs [ 0 ]
var smtpLines [ ] string
var cerr smtpclient . Error
var permanent bool
var errmsg = err . Error ( )
var code int
var secodeOpt string
if errors . As ( err , & cerr ) {
if cerr . Line != "" {
smtpLines = append ( [ ] string { cerr . Line } , cerr . MoreLines ... )
}
permanent = cerr . Permanent
code = cerr . Code
secodeOpt = cerr . Secode
}
qlog = qlog . With (
slog . Bool ( "permanent" , permanent ) ,
slog . Int ( "code" , code ) ,
slog . String ( "secode" , secodeOpt ) ,
)
ids := make ( [ ] int64 , len ( msgs ) )
for i , m := range msgs {
ids [ i ] = m . ID
}
if permanent || m0 . MaxAttempts == 0 && m0 . Attempts >= 8 || m0 . MaxAttempts > 0 && m0 . Attempts >= m0 . MaxAttempts {
for _ , m := range msgs {
qmlog := qlog . With ( slog . Int64 ( "msgid" , m . ID ) , slog . Any ( "recipient" , m . Recipient ( ) ) )
qmlog . Errorx ( "permanent failure delivering from queue" , err )
deliverDSNFailure ( ctx , qmlog , * m , remoteMTA , secodeOpt , errmsg , smtpLines )
}
if err := queueDelete ( context . Background ( ) , ids ... ) ; err != nil {
qlog . Errorx ( "deleting messages from queue after permanent failure" , err )
}
return
}
// All messages should have the same DialedIPs, so we can update them all at once.
qup := bstore . QueryDB [ Msg ] ( context . Background ( ) , DB )
qup . FilterIDs ( ids )
if _ , xerr := qup . UpdateNonzero ( Msg { LastError : errmsg , DialedIPs : dialedIPs } ) ; err != nil {
qlog . Errorx ( "storing delivery error" , xerr , slog . String ( "deliveryerror" , errmsg ) )
}
if m0 . Attempts == 5 {
// We've attempted deliveries at these intervals: 0, 7.5m, 15m, 30m, 1h, 2u.
// Let sender know delivery is delayed.
retryUntil := m0 . LastAttempt . Add ( ( 4 + 8 + 16 ) * time . Hour )
for _ , m := range msgs {
qmlog := qlog . With ( slog . Int64 ( "msgid" , m . ID ) , slog . Any ( "recipient" , m . Recipient ( ) ) )
qmlog . Errorx ( "temporary failure delivering from queue, sending delayed dsn" , err , slog . Duration ( "backoff" , backoff ) )
deliverDSNDelay ( ctx , qmlog , * m , remoteMTA , secodeOpt , errmsg , smtpLines , retryUntil )
}
} else {
for _ , m := range msgs {
qlog . Errorx ( "temporary failure delivering from queue" , err ,
slog . Int64 ( "msgid" , m . ID ) ,
slog . Any ( "recipient" , m . Recipient ( ) ) ,
slog . Duration ( "backoff" , backoff ) ,
slog . Time ( "nextattempt" , m0 . NextAttempt ) )
}
}
}
2024-02-20 18:31:15 +03:00
func deliverDSNFailure ( ctx context . Context , log mlog . Log , m Msg , remoteMTA dsn . NameIP , secodeOpt , errmsg string , smtpLines [ ] string ) {
2023-01-30 16:27:06 +03:00
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
2024-02-20 18:31:15 +03:00
` , m . Recipient ( ) . XString ( m . SMTPUTF8 ) , errmsg )
if len ( smtpLines ) > 0 {
message += "\nFull SMTP response:\n\n\t" + strings . Join ( smtpLines , "\n\t" ) + "\n"
}
2023-01-30 16:27:06 +03:00
2024-02-20 18:31:15 +03:00
deliverDSN ( ctx , log , m , remoteMTA , secodeOpt , errmsg , smtpLines , true , nil , subject , message )
2023-01-30 16:27:06 +03:00
}
2024-02-20 18:31:15 +03:00
func deliverDSNDelay ( ctx context . Context , log mlog . Log , m Msg , remoteMTA dsn . NameIP , secodeOpt , errmsg string , smtpLines [ ] string , retryUntil time . Time ) {
2023-11-01 19:55:40 +03:00
// Should not happen, but doesn't hurt to prevent sending delayed delivery
// notifications for DMARC reports. We don't want to waste postmaster attention.
if m . IsDMARCReport {
return
}
2023-01-30 16:27:06 +03:00
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
2024-02-20 18:31:15 +03:00
` , m . Recipient ( ) . XString ( false ) , errmsg )
if len ( smtpLines ) > 0 {
message += "\nFull SMTP response:\n\n\t" + strings . Join ( smtpLines , "\n\t" ) + "\n"
}
2023-01-30 16:27:06 +03:00
2024-02-20 18:31:15 +03:00
deliverDSN ( ctx , log , m , remoteMTA , secodeOpt , errmsg , smtpLines , false , & retryUntil , subject , message )
2023-01-30 16:27:06 +03:00
}
// 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
2024-02-20 18:31:15 +03:00
func deliverDSN ( ctx context . Context , log mlog . Log , m Msg , remoteMTA dsn . NameIP , secodeOpt , errmsg string , smtpLines [ ] string , permanent bool , retryUntil * time . Time , subject , textBody string ) {
2023-01-30 16:27:06 +03:00
kind := "delayed delivery"
if permanent {
kind = "failure"
}
qlog := func ( text string , err error ) {
2023-12-05 15:35:58 +03:00
log . Errorx ( "queue dsn: " + text + ": sender will not be informed about dsn" , err , slog . String ( "sender" , m . Sender ( ) . XString ( m . SMTPUTF8 ) ) , slog . String ( "kind" , kind ) )
2023-01-30 16:27:06 +03:00
}
msgf , err := os . Open ( m . MessagePath ( ) )
if err != nil {
qlog ( "opening queued message" , err )
return
}
msgr := store . FileMsgReader ( m . MsgPrefix , msgf )
2023-02-16 15:22:00 +03:00
defer func ( ) {
err := msgr . Close ( )
log . Check ( err , "closing message reader after queuing dsn" )
} ( )
2023-01-30 16:27:06 +03:00
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"
}
2024-02-20 18:31:15 +03:00
// ../rfc/3461:1329
var smtpDiag string
if len ( smtpLines ) > 0 {
smtpDiag = "smtp; " + strings . Join ( smtpLines , " " )
2023-01-30 16:27:06 +03:00
}
dsnMsg := & dsn . Message {
2023-07-23 18:56:39 +03:00
SMTPUTF8 : m . SMTPUTF8 ,
From : smtp . Path { Localpart : "postmaster" , IPDomain : dns . IPDomain { Domain : mox . Conf . Static . HostnameDomain } } ,
To : m . Sender ( ) ,
Subject : subject ,
2023-12-05 23:13:57 +03:00
MessageID : mox . MessageIDGen ( false ) ,
2023-07-23 18:56:39 +03:00
References : m . MessageID ,
TextBody : textBody ,
2023-01-30 16:27:06 +03:00
2024-02-10 19:55:56 +03:00
ReportingMTA : mox . Conf . Static . HostnameDomain . ASCII ,
ArrivalDate : m . Queued ,
FutureReleaseRequest : m . FutureReleaseRequest ,
2023-01-30 16:27:06 +03:00
Recipients : [ ] dsn . Recipient {
{
FinalRecipient : m . Recipient ( ) ,
Action : action ,
Status : status ,
2024-02-20 18:31:15 +03:00
StatusComment : errmsg ,
2023-01-30 16:27:06 +03:00
RemoteMTA : remoteMTA ,
2024-02-20 18:31:15 +03:00
DiagnosticCode : smtpDiag ,
2023-01-30 16:27:06 +03:00
LastAttemptDate : * m . LastAttempt ,
WillRetryUntil : retryUntil ,
} ,
} ,
Original : headers ,
}
msgData , err := dsnMsg . Compose ( log , m . SMTPUTF8 )
if err != nil {
qlog ( "composing dsn" , err )
return
}
2024-02-20 18:39:49 +03:00
prefix := [ ] byte ( "Return-Path: <" + dsnMsg . From . XString ( m . SMTPUTF8 ) + ">\r\n" + "Delivered-To: " + m . Sender ( ) . XString ( m . SMTPUTF8 ) + "\r\n" )
msgData = append ( prefix , msgData ... )
2023-01-30 16:27:06 +03:00
mailbox := "Inbox"
2023-11-01 19:55:40 +03:00
senderAccount := m . SenderAccount
if m . IsDMARCReport {
// senderAccount should already by postmaster, but doesn't hurt to ensure it.
senderAccount = mox . Conf . Static . Postmaster . Account
}
2023-12-05 15:35:58 +03:00
acc , err := store . OpenAccount ( log , senderAccount )
2023-01-30 16:27:06 +03:00
if err != nil {
2023-12-05 15:35:58 +03:00
acc , err = store . OpenAccount ( log , mox . Conf . Static . Postmaster . Account )
2023-01-30 16:27:06 +03:00
if err != nil {
qlog ( "looking up postmaster account after sender account was not found" , err )
return
}
mailbox = mox . Conf . Static . Postmaster . Mailbox
}
defer func ( ) {
2023-02-16 15:22:00 +03:00
err := acc . Close ( )
2023-12-05 15:35:58 +03:00
log . Check ( err , "queue dsn: closing account" , slog . String ( "sender" , m . Sender ( ) . XString ( m . SMTPUTF8 ) ) , slog . String ( "kind" , kind ) )
2023-01-30 16:27:06 +03:00
} ( )
2023-12-05 15:35:58 +03:00
msgFile , err := store . CreateMessageTemp ( log , "queue-dsn" )
2023-01-30 16:27:06 +03:00
if err != nil {
qlog ( "creating temporary message file" , err )
return
}
2023-11-01 20:57:38 +03:00
defer store . CloseRemoveTempFile ( log , msgFile , "dsn message" )
2023-01-30 16:27:06 +03:00
2023-08-11 15:07:49 +03:00
msgWriter := message . NewWriter ( msgFile )
2023-01-30 16:27:06 +03:00
if _ , err := msgWriter . Write ( msgData ) ; err != nil {
qlog ( "writing dsn message" , err )
return
}
msg := & store . Message {
Received : time . Now ( ) ,
Size : msgWriter . Size ,
MsgPrefix : [ ] byte { } ,
2024-03-04 18:40:27 +03:00
DSN : true ,
2023-01-30 16:27:06 +03:00
}
2023-11-01 19:55:40 +03:00
// If this is a DMARC report, deliver it as seen message to a submailbox of the
// postmaster mailbox. We mark it as seen so it doesn't waste postmaster attention,
// but we deliver them so they can be checked in case of problems.
if m . IsDMARCReport {
mailbox = fmt . Sprintf ( "%s/dmarc" , mox . Conf . Static . Postmaster . Mailbox )
msg . Seen = true
metricDMARCReportFailure . Inc ( )
log . Info ( "delivering dsn for failure to deliver outgoing dmarc report" )
}
2023-01-30 16:27:06 +03:00
acc . WithWLock ( func ( ) {
make mox compile on windows, without "mox serve" but with working "mox localserve"
getting mox to compile required changing code in only a few places where
package "syscall" was used: for accessing file access times and for umask
handling. an open problem is how to start a process as an unprivileged user on
windows. that's why "mox serve" isn't implemented yet. and just finding a way
to implement it now may not be good enough in the near future: we may want to
starting using a more complete privilege separation approach, with a process
handling sensitive tasks (handling private keys, authentication), where we may
want to pass file descriptors between processes. how would that work on
windows?
anyway, getting mox to compile for windows doesn't mean it works properly on
windows. the largest issue: mox would normally open a file, rename or remove
it, and finally close it. this happens during message delivery. that doesn't
work on windows, the rename/remove would fail because the file is still open.
so this commit swaps many "remove" and "close" calls. renames are a longer
story: message delivery had two ways to deliver: with "consuming" the
(temporary) message file (which would rename it to its final destination), and
without consuming (by hardlinking the file, falling back to copying). the last
delivery to a recipient of a message (and the only one in the common case of a
single recipient) would consume the message, and the earlier recipients would
not. during delivery, the already open message file was used, to parse the
message. we still want to use that open message file, and the caller now stays
responsible for closing it, but we no longer try to rename (consume) the file.
we always hardlink (or copy) during delivery (this works on windows), and the
caller is responsible for closing and removing (in that order) the original
temporary file. this does cost one syscall more. but it makes the delivery code
(responsibilities) a bit simpler.
there is one more obvious issue: the file system path separator. mox already
used the "filepath" package to join paths in many places, but not everywhere.
and it still used strings with slashes for local file access. with this commit,
the code now uses filepath.FromSlash for path strings with slashes, uses
"filepath" in a few more places where it previously didn't. also switches from
"filepath" to regular "path" package when handling mailbox names in a few
places, because those always use forward slashes, regardless of local file
system conventions. windows can handle forward slashes when opening files, so
test code that passes path strings with forward slashes straight to go stdlib
file i/o functions are left unchanged to reduce code churn. the regular
non-test code, or test code that uses path strings in places other than
standard i/o functions, does have the paths converted for consistent paths
(otherwise we would end up with paths with mixed forward/backward slashes in
log messages).
windows cannot dup a listening socket. for "mox localserve", it isn't
important, and we can work around the issue. the current approach for "mox
serve" (forking a process and passing file descriptors of listening sockets on
"privileged" ports) won't work on windows. perhaps it isn't needed on windows,
and any user can listen on "privileged" ports? that would be welcome.
on windows, os.Open cannot open a directory, so we cannot call Sync on it after
message delivery. a cursory internet search indicates that directories cannot
be synced on windows. the story is probably much more nuanced than that, with
long deep technical details/discussions/disagreement/confusion, like on unix.
for "mox localserve" we can get away with making syncdir a no-op.
2023-10-14 11:54:07 +03:00
if err := acc . DeliverMailbox ( log , mailbox , msg , msgFile ) ; err != nil {
2023-01-30 16:27:06 +03:00
qlog ( "delivering dsn to mailbox" , err )
return
}
} )
}