domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Explicitly decide whether to use TLS in mailer's configuration (#5024)

Browse source 
* explicitly decide on using TLS for mail connections

* explicitly decide on using TLS for mail connections

* keep compatibility
This commit is contained in:
Lanre Adelowo 2018-11-26 20:21:42 +01:00 • committed by techknowlogick
parent ce9a5173fe
commit 3a1ed82529
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/mailer/mailer.go
View file

@ -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)