fix use SMTP auth when port 25 is ban problem #16104
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
techknowlogick
requested changes
Jun 13, 2021
GiteaBot
added
the
lgtm/need 2
The current code can configure TLS, but now it is based on the support of 25 to jump to use TLS. When 25 is not available, an unlinkable exception will be generated here. If TLS is confirmed in this modification, TLS will be directly used to connect, so as to avoid the abnormal unavailability when port 25 is not available |
jnan88
commented
Jun 15, 2021
| @@ -604,6 +604,9 @@ var SMTPAuths = []string{SMTPPlain, SMTPLogin} | |||
|
|
|||
| // SMTPAuth performs an SMTP authentication. | |||
| func SMTPAuth(a smtp.Auth, cfg *SMTPConfig) error { | |||
| if cfg.TLS { | |||
| return SMTPAuthTLS(a,cfg) | |||
| } | |||
| c, err := smtp.Dial(fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)) | |||
There was a problem hiding this comment.
Suggested change
| c, err := smtp.Dial(fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)) | |
| c, err := smtp.Dial(fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)) |
Only non TLS connection are used here
jnan88
commented
Jun 15, 2021
| // SMTPAuthTLS SMTP authentication by TLS | ||
| func SMTPAuthTLS(a smtp.Auth, cfg *SMTPConfig) error { | ||
| addr :=fmt.Sprintf("%s:%d", cfg.Host, cfg.Port) | ||
| tlsClient, err := tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify:cfg.SkipVerify}) |
There was a problem hiding this comment.
Suggested change
| tlsClient, err := tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify:cfg.SkipVerify}) | |
| tlsClient, err := tls.Dial("tcp", addr, &tls.Config{InsecureSkipVerify:cfg.SkipVerify}) |
New TLS connection
jnan88
commented
Jun 15, 2021
| @@ -648,7 +671,11 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC | |||
|
|
|||
| var auth smtp.Auth | |||
| if cfg.Auth == SMTPPlain { | |||
| auth = smtp.PlainAuth("", login, password, cfg.Host) | |||
| if cfg.TLS { | |||
| auth = smtp.PlainAuth("", login, password, fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)) | |||
There was a problem hiding this comment.
Suggested change
| auth = smtp.PlainAuth("", login, password, fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)) | |
| auth = smtp.PlainAuth("", login, password, fmt.Sprintf("%s:%d", cfg.Host, cfg.Port)) |
When TLS connection is used, ports need to be added at the same time
|
Hi @jnan88 I've finally got round to looking at this - apologies for conflicting your PR. I now think I understand the problem. I think we simply have to make a breaking change with the configuration of this source and make it more like the configuration for the mailer. That is:
To that end I'm going to propose a breaking change PR which will attempt to rationalise the configuration. |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Aug 7, 2021
…/key options This PR has two parts: Improvements for SMTP authentication: * Default to use SMTPS if port is 465, and allow setting of force SMTPS. * Always use STARTTLS if available * Provide CRAM-MD5 mechanism * Add options for HELO hostname disabling * Add options for providing certificates and keys * Handle application specific password response as a failed user login instead of as a 500. Close go-gitea#16104 Fix creation of new users: * A bug was introduced when allowing users to change usernames which prevents the creation of external users. * The LoginSource refactor also broke this page. Close go-gitea#16104 Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath
added a commit
that referenced
this pull request
Aug 11, 2021
* Improve SMTP authentication, Fix user creation bugs and add LDAP cert/key options This PR has two parts: Improvements for SMTP authentication: * Default to use SMTPS if port is 465, and allow setting of force SMTPS. * Always use STARTTLS if available * Provide CRAM-MD5 mechanism * Add options for HELO hostname disabling * Add options for providing certificates and keys * Handle application specific password response as a failed user login instead of as a 500. Close #16104 Fix creation of new users: * A bug was introduced when allowing users to change usernames which prevents the creation of external users. * The LoginSource refactor also broke this page. Close #16104 Signed-off-by: Andrew Thornton <art27@cantab.net>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Solve the authentication timeout problem caused by the unavailability of port 25 for SMTP authentication. When using TLS mode, use TLS connection for SMTP communication