From aa20e2d1cdd7bf96dbb0c51373ee7b60c4e8f592 Mon Sep 17 00:00:00 2001
From: Thomas Dupas <thomas.dupas@dnsbelgium.be>
Date: Wed, 2 Dec 2020 22:05:12 +0100
Subject: add envelope sender handling; needed for correct bounce processing

---
 main.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index 5de865c..d633368 100644
--- a/main.go
+++ b/main.go
@@ -19,6 +19,7 @@ const (
 var sesClient *ses.SES
 
 type Envelope struct {
+	from  string
 	rcpts []*string
 	b     bytes.Buffer
 }
@@ -50,12 +51,13 @@ func (e *Envelope) logMessageSend() {
 	for i := range e.rcpts {
 		dr[i] = *e.rcpts[i]
 	}
-	log.Printf("sending message to %+v", dr)
+	log.Printf("sending message from %+v to %+v", e.from, dr)
 }
 
 func (e *Envelope) Close() error {
 	e.logMessageSend()
 	r := &ses.SendRawEmailInput{
+		Source:       &e.from,
 		Destinations: e.rcpts,
 		RawMessage:   &ses.RawMessage{Data: e.b.Bytes()},
 	}
@@ -80,7 +82,7 @@ func main() {
 	s := &smtpd.Server{
 		Addr: addr,
 		OnNewMail: func(c smtpd.Connection, from smtpd.MailAddress) (smtpd.Envelope, error) {
-			return &Envelope{}, nil
+			return &Envelope{from: from.Email()}, nil
 		},
 	}
 	log.Printf("ListenAndServe on %s", addr)
-- 
cgit v1.2.3