diff options
| author | zeripath <art27@cantab.net> | 2022-11-27 10:08:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 10:08:40 +0000 |
| commit | f6fd501841816f5e5c1c9a30fbc4c9a2a6f987bc (patch) | |
| tree | 8f8919a0daec62f9d41827fcbf5f87ea6617a7ce /services/mailer | |
| parent | 32590db4cafe8fea30be3d19ba0f179f06a35427 (diff) | |
| download | gitea-f6fd501841816f5e5c1c9a30fbc4c9a2a6f987bc.tar.gz gitea-f6fd501841816f5e5c1c9a30fbc4c9a2a6f987bc.zip | |
Correct the fallbacks for mailer configuration (#21945)
Unfortunately the fallback configuration code for [mailer] that were
added in #18982 are incorrect. When you read a value from an ini section
that key is added. This leads to a failure of the fallback mechanism.
Further there is also a spelling mistake in the startTLS configuration.
This PR restructures the mailer code to first map the deprecated
settings on to the new ones - and then use ini.MapTo to map those on to
the struct with additional validation as necessary.
Ref #21744
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'services/mailer')
| -rw-r--r-- | services/mailer/mailer.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/mailer/mailer.go b/services/mailer/mailer.go index 46b0c8e2f4..2663b6b2ba 100644 --- a/services/mailer/mailer.go +++ b/services/mailer/mailer.go @@ -166,7 +166,7 @@ func (s *smtpSender) Send(from string, to []string, msg io.WriterTo) error { defer conn.Close() var tlsconfig *tls.Config - if opts.Protocol == "smtps" || opts.Protocol == "smtp+startls" { + if opts.Protocol == "smtps" || opts.Protocol == "smtp+starttls" { tlsconfig = &tls.Config{ InsecureSkipVerify: opts.ForceTrustServerCert, ServerName: opts.SMTPAddr, @@ -208,7 +208,7 @@ func (s *smtpSender) Send(from string, to []string, msg io.WriterTo) error { } } - if opts.Protocol == "smtp+startls" { + if opts.Protocol == "smtp+starttls" { hasStartTLS, _ := client.Extension("STARTTLS") if hasStartTLS { if err = client.StartTLS(tlsconfig); err != nil { |