Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 8 commits into from
Nov 26, 2018
Merged

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

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c93cd2
explicitly decide on using TLS for mail connections
adelowo Oct 6, 2018
47722bf
explicitly decide on using TLS for mail connections
adelowo Oct 6, 2018
d64cce9
keep compatibility
adelowo Nov 2, 2018
94a93ab
Merge branch 'master' of https://github.com/go-gitea/gitea into expli…
adelowo Nov 2, 2018
b0f6471
Merge branch 'master' into explicitly_use_tls_for_mailer
adelowo Nov 5, 2018
af1f36c
Merge branch 'master' into explicitly_use_tls_for_mailer
adelowo Nov 7, 2018
6d7004e
Merge branch 'master' into explicitly_use_tls_for_mailer
adelowo Nov 15, 2018
a393bd9
Merge branch 'master' into explicitly_use_tls_for_mailer
techknowlogick Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
keep compatibility
  • Loading branch information
@adelowo
adelowo committed Nov 2, 2018
commit d64cce9c6272fdf9e2627f12381f690b6c8fe85c
2 changes: 1 addition & 1 deletion modules/mailer/mailer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ func (s *smtpSender) Send(from string, to []string, msg io.WriterTo) error {
}
defer conn.Close()

isSecureConn := opts.IsTLSEnabled
isSecureConn := opts.IsTLSEnabled || (strings.HasSuffix(port, "465"))
// Start TLS directly if the port ends with 465 (SMTPS protocol)
if isSecureConn {
conn = tls.Client(conn, tlsconfig)
Expand Down