fix: make sure smtp can be set either via env or ui
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
parent
2bb01bd201
commit
01acea6838
9 changed files with 238 additions and 42 deletions
107
lib/mv/config.ex
107
lib/mv/config.ex
|
|
@ -478,48 +478,61 @@ defmodule Mv.Config do
|
|||
end
|
||||
|
||||
@doc """
|
||||
Returns SMTP port as integer. ENV `SMTP_PORT` (parsed) overrides Settings.
|
||||
Returns nil when neither ENV nor Settings provide a valid port.
|
||||
Returns SMTP port as integer.
|
||||
|
||||
Policy:
|
||||
- ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_PORT`
|
||||
- Settings mode: read from Settings only
|
||||
"""
|
||||
@spec smtp_port() :: non_neg_integer() | nil
|
||||
def smtp_port do
|
||||
case System.get_env("SMTP_PORT") do
|
||||
nil ->
|
||||
get_from_settings_integer(:smtp_port)
|
||||
|
||||
value when is_binary(value) ->
|
||||
case Integer.parse(String.trim(value)) do
|
||||
{port, _} when port > 0 -> port
|
||||
_ -> nil
|
||||
end
|
||||
if smtp_env_mode?() do
|
||||
parse_smtp_port_env(System.get_env("SMTP_PORT"))
|
||||
else
|
||||
get_from_settings_integer(:smtp_port)
|
||||
end
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns SMTP username. ENV `SMTP_USERNAME` overrides Settings.
|
||||
Returns SMTP username.
|
||||
|
||||
Policy:
|
||||
- ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_USERNAME`
|
||||
- Settings mode: read from Settings only
|
||||
"""
|
||||
@spec smtp_username() :: String.t() | nil
|
||||
def smtp_username do
|
||||
smtp_env_or_setting("SMTP_USERNAME", :smtp_username)
|
||||
if smtp_env_mode?() do
|
||||
System.get_env("SMTP_USERNAME") |> trim_nil()
|
||||
else
|
||||
get_from_settings(:smtp_username)
|
||||
end
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns SMTP password.
|
||||
|
||||
Priority: `SMTP_PASSWORD` ENV > `SMTP_PASSWORD_FILE` (file contents) > Settings.
|
||||
Policy:
|
||||
- ENV-only mode (`SMTP_HOST` set): `SMTP_PASSWORD` > `SMTP_PASSWORD_FILE`
|
||||
- Settings mode: read from Settings only
|
||||
|
||||
Strips trailing whitespace/newlines from file contents.
|
||||
"""
|
||||
@spec smtp_password() :: String.t() | nil
|
||||
def smtp_password do
|
||||
case System.get_env("SMTP_PASSWORD") do
|
||||
nil -> smtp_password_from_file_or_settings()
|
||||
value -> trim_nil(value)
|
||||
if smtp_env_mode?() do
|
||||
case System.get_env("SMTP_PASSWORD") do
|
||||
nil -> smtp_password_from_file_or_settings()
|
||||
value -> trim_nil(value)
|
||||
end
|
||||
else
|
||||
get_smtp_password_from_settings()
|
||||
end
|
||||
end
|
||||
|
||||
defp smtp_password_from_file_or_settings do
|
||||
case System.get_env("SMTP_PASSWORD_FILE") do
|
||||
nil -> get_smtp_password_from_settings()
|
||||
nil -> nil
|
||||
path -> read_smtp_password_file(path)
|
||||
end
|
||||
end
|
||||
|
|
@ -533,11 +546,18 @@ defmodule Mv.Config do
|
|||
|
||||
@doc """
|
||||
Returns SMTP TLS/SSL mode string (e.g. 'tls', 'ssl', 'none').
|
||||
ENV `SMTP_SSL` overrides Settings.
|
||||
|
||||
Policy:
|
||||
- ENV-only mode (`SMTP_HOST` set): read from ENV `SMTP_SSL`
|
||||
- Settings mode: read from Settings only
|
||||
"""
|
||||
@spec smtp_ssl() :: String.t() | nil
|
||||
def smtp_ssl do
|
||||
smtp_env_or_setting("SMTP_SSL", :smtp_ssl)
|
||||
if smtp_env_mode?() do
|
||||
System.get_env("SMTP_SSL") |> trim_nil()
|
||||
else
|
||||
get_from_settings(:smtp_ssl)
|
||||
end
|
||||
end
|
||||
|
||||
@doc """
|
||||
|
|
@ -549,12 +569,39 @@ defmodule Mv.Config do
|
|||
end
|
||||
|
||||
@doc """
|
||||
Returns true when any SMTP ENV variable is set (used in Settings UI for hints).
|
||||
Returns true when SMTP ENV mode is active.
|
||||
"""
|
||||
@spec smtp_env_configured?() :: boolean()
|
||||
def smtp_env_configured? do
|
||||
smtp_host_env_set?() or smtp_port_env_set?() or smtp_username_env_set?() or
|
||||
smtp_password_env_set?() or smtp_ssl_env_set?()
|
||||
smtp_env_mode?()
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns true when SMTP is managed by environment variables.
|
||||
|
||||
Policy: if `SMTP_HOST` is set, SMTP is treated as ENV-only.
|
||||
"""
|
||||
@spec smtp_env_mode?() :: boolean()
|
||||
def smtp_env_mode? do
|
||||
smtp_host_env_set?()
|
||||
end
|
||||
|
||||
@doc """
|
||||
Returns missing required SMTP ENV keys for ENV-only mode warnings.
|
||||
|
||||
Required in ENV-only mode:
|
||||
- `SMTP_USERNAME`
|
||||
- one of `SMTP_PASSWORD` or `SMTP_PASSWORD_FILE`
|
||||
"""
|
||||
@spec smtp_missing_required_env_keys() :: [String.t()]
|
||||
def smtp_missing_required_env_keys do
|
||||
if smtp_env_mode?() do
|
||||
[]
|
||||
|> maybe_add_missing("SMTP_USERNAME", smtp_username_env_set?())
|
||||
|> maybe_add_missing("SMTP_PASSWORD/SMTP_PASSWORD_FILE", smtp_password_env_set?())
|
||||
else
|
||||
[]
|
||||
end
|
||||
end
|
||||
|
||||
@doc "Returns true if SMTP_HOST ENV is set."
|
||||
|
|
@ -618,6 +665,17 @@ defmodule Mv.Config do
|
|||
@spec mail_from_email_env_set?() :: boolean()
|
||||
def mail_from_email_env_set?, do: env_set?("MAIL_FROM_EMAIL")
|
||||
|
||||
defp parse_smtp_port_env(nil), do: nil
|
||||
|
||||
defp parse_smtp_port_env(value) when is_binary(value) do
|
||||
case Integer.parse(String.trim(value)) do
|
||||
{port, _} when port > 0 -> port
|
||||
_ -> nil
|
||||
end
|
||||
end
|
||||
|
||||
defp parse_smtp_port_env(_), do: nil
|
||||
|
||||
# Reads a plain string SMTP setting: ENV first, then Settings.
|
||||
defp smtp_env_or_setting(env_key, setting_key) do
|
||||
case System.get_env(env_key) do
|
||||
|
|
@ -626,6 +684,9 @@ defmodule Mv.Config do
|
|||
end
|
||||
end
|
||||
|
||||
defp maybe_add_missing(acc, _label, true), do: acc
|
||||
defp maybe_add_missing(acc, label, false), do: acc ++ [label]
|
||||
|
||||
# Reads an integer setting attribute from Settings.
|
||||
defp get_from_settings_integer(key) do
|
||||
case Mv.Membership.get_settings() do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue