Mua: support 465 port connections #4606
Merged
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
ruslandoga
commented
Sep 23, 2024
| @@ -641,8 +641,21 @@ case mailer_adapter do | |||
| config :plausible, Plausible.Mailer, ssl: [middlebox_comp_mode: middlebox_comp_mode] | |||
|
|
|||
| if relay = get_var_from_path_or_env(config_dir, "SMTP_HOST_ADDR") do | |||
| port = get_int_from_path_or_env(config_dir, "SMTP_HOST_PORT", 25) | |||
| config :plausible, Plausible.Mailer, relay: relay, port: port | |||
| port = get_int_from_path_or_env(config_dir, "SMTP_HOST_PORT", 587) | |||
There was a problem hiding this comment.
Also changing default here to port=587 since that's what relays listen on usually.
ruslandoga
commented
Sep 23, 2024
| cond do | ||
| ssl_enabled -> :ssl | ||
| is_nil(ssl_enabled) and port == 465 -> :ssl | ||
| true -> :tcp |
There was a problem hiding this comment.
SMTP_HOST_SSL_ENABLED=false and SMTP_HOST_PORT=465 would still start connections in plaintext and then optimistically STARTTLS.
|
zoldar
approved these changes
Sep 24, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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.
This PR adds support for SMTPS connections and also makes Mua use SMTPS when relay port is 465.
I am using
SMTP_HOST_SSL_ENABLEDenvironment variable for now since it's already being used for the samegen_tcpvssslconfiguration ingen_smtp. I think we can maybe come up with a better name later on.Related: #4584