From 3a1ed825299d4686e4c5efc5324e0a70fc7dee2b Mon Sep 17 00:00:00 2001 From: Lanre Adelowo Date: Mon, 26 Nov 2018 20:21:42 +0100 Subject: Explicitly decide whether to use TLS in mailer's configuration (#5024) * explicitly decide on using TLS for mail connections * explicitly decide on using TLS for mail connections * keep compatibility --- modules/mailer/mailer.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'modules/mailer') diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index a54e836173..e9b752e14d 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -122,11 +122,10 @@ func (s *smtpSender) Send(from string, to []string, msg io.WriterTo) error { } defer conn.Close() - isSecureConn := false + isSecureConn := opts.IsTLSEnabled || (strings.HasSuffix(port, "465")) // Start TLS directly if the port ends with 465 (SMTPS protocol) - if strings.HasSuffix(port, "465") { + if isSecureConn { conn = tls.Client(conn, tlsconfig) - isSecureConn = true } client, err := smtp.NewClient(conn, host) -- cgit v1.2.3