SMTP: allow disabling starttls_auto since it's now true by default in Ruby 3 #1480
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
… Ruby 3 Passing enable_tls/starttls/starttls_auto: false now explicitly disables these options. They used to be all false by default, so they could only be turned ON. So we ignored turning them OFF! We now disable_tls/starttls/starttls_auto when they're set to false. Leaving them set to nil inherits the upstream default.
bygf
pushed a commit
to bygf/charts-gitlab
that referenced
this pull request
Apr 14, 2023
This commit fixes mail sending when TLS is disabled. In Ruby 3.0.5, net-smtp v0.2.1 enabled TLS by default if the server advertises STARTTLS support. However, mail v2.7.1 didn't explicitly disable TLS (mikel/mail#1434), so TLS may be used with Ruby 3 even if it is disabled. mail v2.8.1 has since fixed this issue via mikel/mail#1480. However, mail v2.8.1 has a bug in the logic for retrieving the settings (https://github.com/mikel/mail/blob/2.8.1/lib/mail/network/delivery_methods/smtp.rb#L114): ``` tls = settings[:tls] || settings[:ssl] ``` If `settings[:tls]` is `false` and `settings[:ssl]` is `nil`, then the result of `false || nil` is `nil`. This means that TLS cannot be disabled if `settings[:tls]` is set to `false`. To fix this, just add a redundant `ssl` config parameter. This came out of https://gitlab.com/gitlab-org/gitlab/-/issues/399241. Changelog: fixed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
rebased #1435