smtp: take smtp-domain into account for tls connections

smtp-domain is ignored when using smtps:// transport. It is only
configured for clear text and STARTTLS connections.

Also use it for TLS encrypted connections.

Fixes: c10cb370bb94 ("config: add option for SMTP HELO/EHLO local domain")
Changelog-fixed: `smtp-domain` is now properly taken into account
 for TLS connections.
Signed-off-by: Robin Jarry <robin@jarry.cc>
Reviewed-by: Tristan Partin <tristan@partin.io>

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/send/smtp.go b/lib/send/smtp.go
index b1679014..77406fbb 100644
--- a/lib/send/smtp.go
+++ b/lib/send/smtp.go
@@ -39,7 +39,7 @@ func connectSmtp(starttls bool, host string, domain string) (*smtp.Client, error
 	return conn, nil
 }
 
-func connectSmtps(host string) (*smtp.Client, error) {
+func connectSmtps(host string, domain string) (*smtp.Client, error) {
 	serverName := host
 	if !strings.ContainsRune(host, ':') {
 		host += ":465" // Default to smtps port
@@ -52,6 +52,13 @@ func connectSmtps(host string) (*smtp.Client, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "smtp.DialTLS")
 	}
+	if domain != "" {
+		err := conn.Hello(domain)
+		if err != nil {
+			conn.Close()
+			return nil, errors.Wrap(err, "Hello")
+		}
+	}
 	return conn, nil
 }
 
@@ -85,7 +92,7 @@ func newSmtpSender(
 	case "smtp+insecure":
 		conn, err = connectSmtp(false, uri.Host, domain)
 	case "smtps":
-		conn, err = connectSmtps(uri.Host)
+		conn, err = connectSmtps(uri.Host, domain)
 	default:
 		return nil, fmt.Errorf("not a smtp protocol %s", protocol)
 	}