From 3d648a2ce7e4c23bdb09cf036c70b2341f3ff937 Mon Sep 17 00:00:00 2001
From: Bernhard Froehlich <decke@bluelife.at>
Date: Fri, 21 Dec 2018 09:06:22 +0000
Subject: [PATCH] Adjust SMTP error codes and messages to be aligned with the
 RFCs

---
 main.go | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/main.go b/main.go
index 1facf90..99f2e74 100644
--- a/main.go
+++ b/main.go
@@ -45,7 +45,7 @@ func connectionChecker(peer smtpd.Peer) error {
 	if addr, ok := peer.Addr.(*net.TCPAddr); ok {
 		peerIP = net.ParseIP(addr.IP.String())
 	} else {
-		return smtpd.Error{Code: 552, Message: "Denied"}
+		return smtpd.Error{Code: 421, Message: "Denied"}
 	}
 
 	nets := strings.Split(*allowedNets, " ")
@@ -58,7 +58,7 @@ func connectionChecker(peer smtpd.Peer) error {
 		}
 	}
 
-	return smtpd.Error{Code: 552, Message: "Denied"}
+	return smtpd.Error{Code: 421, Message: "Denied"}
 }
 
 func senderChecker(peer smtpd.Peer, addr string) error {
@@ -71,7 +71,7 @@ func senderChecker(peer smtpd.Peer, addr string) error {
 	if re.MatchString(addr) {
 		return nil
 	} else {
-		return smtpd.Error{Code: 552, Message: "Denied"}
+		return smtpd.Error{Code: 451, Message: "Bad sender address"}
 	}
 }
 
@@ -85,7 +85,7 @@ func recipientChecker(peer smtpd.Peer, addr string) error {
 	if re.MatchString(addr) {
 		return nil
 	} else {
-		return smtpd.Error{Code: 552, Message: "Denied"}
+		return smtpd.Error{Code: 451, Message: "Bad recipient address"}
 	}
 }
 
@@ -93,7 +93,7 @@ func authChecker(peer smtpd.Peer, username string, password string) error {
 	file, err := os.Open(*allowedUsers)
 	if err != nil {
 		log.Printf("User file not found %v", err)
-		return smtpd.Error{Code: 552, Message: "Denied"}
+		return smtpd.Error{Code: 535, Message: "Authentication credentials invalid"}
 	}
 	defer file.Close()
 
@@ -110,7 +110,7 @@ func authChecker(peer smtpd.Peer, username string, password string) error {
 		}
 	}
 
-	return smtpd.Error{Code: 552, Message: "Denied"}
+	return smtpd.Error{Code: 535, Message: "Authentication credentials invalid"}
 }
 
 func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
@@ -133,13 +133,19 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
 
 	log.Printf("delivering using smarthost %s\n", *remoteHost)
 
-	return smtp.SendMail(
+	err := smtp.SendMail(
 		*remoteHost,
 		auth,
 		env.Sender,
 		env.Recipients,
 		env.Data,
 	)
+	if err != nil {
+		log.Printf("delivery failed: %v\n", err);
+		return smtpd.Error{Code: 554, Message: "Forwarding failed"}
+	}
+
+	return nil
 }
 
 func main() {