smtp: add option to request DSN for successful deliveries

In some cases it can be desirable to receive a success notification for a message from the server. This currently only works on SMTP. Changelog-added: Add option to request full DSN for SMTP sent messages. Signed-off-by: Moritz Poldrack <[email protected]> Acked-by: Robin Jarry <[email protected]>
rjarry · Mar 8, 2025 · 1d6eb2d · 1d6eb2d
1 parent 03061fe
commit 1d6eb2d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/commands/compose/send.go b/commands/compose/send.go
@@ -30,6 +30,8 @@ type Send struct {
 
 	CopyToReplied   bool `opt:"-r" desc:"Save sent message to current folder."`
 	NoCopyToReplied bool `opt:"-R" desc:"Do not save sent message to current folder."`
+
+	RequestDSN bool `opt:"--dsn" desc:"Request full delivery status notification (including success)."`
 }
 
 func init() {
@@ -156,7 +158,8 @@ func (s Send) Execute(args []string) error {
 				if text == "n" || text == "N" {
 					sendHelper(composer, header, uri, domain,
 						from, rcpts, tab.Name, s.CopyTo,
-						s.Archive, copyToReplied)
+						s.Archive, copyToReplied,
+						s.RequestDSN)
 				}
 			}, func(ctx context.Context, cmd string) ([]opt.Completion, string) {
 				var comps []opt.Completion
@@ -171,15 +174,15 @@ func (s Send) Execute(args []string) error {
 		app.PushPrompt(prompt)
 	} else {
 		sendHelper(composer, header, uri, domain, from, rcpts, tab.Name,
-			s.CopyTo, s.Archive, copyToReplied)
+			s.CopyTo, s.Archive, copyToReplied, s.RequestDSN)
 	}
 
 	return nil
 }
 
 func sendHelper(composer *app.Composer, header *mail.Header, uri *url.URL, domain string,
 	from *mail.Address, rcpts []*mail.Address, tabName string, copyTo []string,
-	archive string, copyToReplied bool,
+	archive string, copyToReplied bool, requestDSN bool,
 ) {
 	// we don't want to block the UI thread while we are sending
 	// so we do everything in a goroutine and hide the composer from the user
@@ -203,7 +206,10 @@ func sendHelper(composer *app.Composer, header *mail.Header, uri *url.URL, domai
 			folders = append(folders, composer.Parent().Folder)
 		}
 		sender, err := send.NewSender(
-			composer.Worker(), uri, domain, from, rcpts, folders)
+			composer.Worker(), uri, domain,
+			from, rcpts,
+			folders, requestDSN,
+		)
 		if err != nil {
 			failCh <- errors.Wrap(err, "send:")
 			return

diff --git a/commands/msg/bounce.go b/commands/msg/bounce.go
@@ -159,7 +159,7 @@ func (b Bounce) Execute(args []string) error {
 				msg.Envelope.MessageId, addresses)
 
 			if sender, err = send.NewSender(acct.Worker(), uri,
-				domain, config.From, rcpts, nil); err != nil {
+				domain, config.From, rcpts, nil, false); err != nil {
 				return
 			}
 			defer func() {

diff --git a/lib/send/sender.go b/lib/send/sender.go
@@ -18,7 +18,7 @@ import (
 func NewSender(
 	worker *types.Worker, uri *url.URL, domain string,
 	from *mail.Address, rcpts []*mail.Address,
-	copyTo []string,
+	copyTo []string, requestDSN bool,
 ) (io.WriteCloser, error) {
 	protocol, auth, err := parseScheme(uri)
 	if err != nil {
@@ -29,7 +29,7 @@ func NewSender(
 
 	switch protocol {
 	case "smtp", "smtp+insecure", "smtps":
-		w, err = newSmtpSender(protocol, auth, uri, domain, from, rcpts)
+		w, err = newSmtpSender(protocol, auth, uri, domain, from, rcpts, requestDSN)
 	case "jmap":
 		w, err = newJmapSender(worker, from, rcpts, copyTo)
 	case "":

diff --git a/lib/send/smtp.go b/lib/send/smtp.go
@@ -82,7 +82,7 @@ func (s *smtpSender) Close() error {
 
 func newSmtpSender(
 	protocol string, auth string, uri *url.URL, domain string,
-	from *mail.Address, rcpts []*mail.Address,
+	from *mail.Address, rcpts []*mail.Address, requestDSN bool,
 ) (io.WriteCloser, error) {
 	var err error
 	var conn *smtp.Client
@@ -119,8 +119,18 @@ func newSmtpSender(
 		conn.Close()
 		return nil, errors.Wrap(err, "conn.Mail")
 	}
+	var rcptOptions *smtp.RcptOptions
+	if requestDSN {
+		rcptOptions = &smtp.RcptOptions{
+			Notify: []smtp.DSNNotify{
+				smtp.DSNNotifySuccess,
+				smtp.DSNNotifyDelayed,
+				smtp.DSNNotifyFailure,
+			},
+		}
+	}
 	for _, rcpt := range rcpts {
-		if err := s.conn.Rcpt(rcpt.Address, nil); err != nil {
+		if err := s.conn.Rcpt(rcpt.Address, rcptOptions); err != nil {
 			conn.Close()
 			return nil, errors.Wrap(err, "conn.Rcpt")
 		}