Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Update Postgrex SSL config (#4460)

ruslandoga19ecd3d0ee6e
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1480582fea..cceb20a547 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
- `bounce_rate` metric now returns 0 instead of null for event:page breakdown when page has never been entry page.
- Make `TOTP_VAULT_KEY` optional plausible/analytics#4317
- Sources like 'google' and 'facebook' are now stored in capitalized forms ('Google', 'Facebook') plausible/analytics#4417
+- `DATABASE_CACERTFILE` now forces TLS for PostgreSQL connections, so you don't need to add `?ssl=true` in `DATABASE_URL`
### Fixed
diff --git a/config/runtime.exs b/config/runtime.exs
index ff905ca0b8..0f81eeb4c8 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -353,7 +353,7 @@ if db_socket_dir = get_var_from_path_or_env(config_dir, "DATABASE_SOCKET_DIR") d
""")
end
-db_cacertfile = get_var_from_path_or_env(config_dir, "DATABASE_CACERTFILE", CAStore.file_path())
+db_cacertfile = get_var_from_path_or_env(config_dir, "DATABASE_CACERTFILE")
%URI{host: db_host} = db_uri = URI.parse(db_url)
db_socket_dir? = String.starts_with?(db_host, "%2F") or db_host == ""
@@ -382,14 +382,11 @@ if db_socket_dir? do
else
config :plausible, Plausible.Repo,
url: db_url,
- socket_options: db_maybe_ipv6,
- ssl_opts: [
- cacertfile: db_cacertfile,
- verify: :verify_peer,
- customize_hostname_check: [
- match_fun: :public_key.pkix_verify_hostname_match_fun(:https)
- ]
- ]
+ socket_options: db_maybe_ipv6
+
+ if db_cacertfile do
+ config :plausible, Plausible.Repo, ssl: [cacertfile: db_cacertfile]
+ end
end
sentry_app_version = runtime_metadata[:version] || app_version
diff --git a/test/plausible/config_test.exs b/test/plausible/config_test.exs
index 1c163638b3..75da84bd79 100644
--- a/test/plausible/config_test.exs
+++ b/test/plausible/config_test.exs
@@ -359,14 +359,7 @@ defmodule Plausible.ConfigTest do
assert get_in(config, [:plausible, Plausible.Repo]) == [
url: "postgres://postgres:postgres@plausible_db:5432/plausible_db",
- socket_options: [],
- ssl_opts: [
- cacertfile: CAStore.file_path(),
- verify: :verify_peer,
- customize_hostname_check: [
- match_fun: :public_key.pkix_verify_hostname_match_fun(:https)
- ]
- ]
+ socket_options: []
]
end
@@ -405,17 +398,27 @@ defmodule Plausible.ConfigTest do
config = runtime_config(env)
+ assert get_in(config, [:plausible, Plausible.Repo]) == [
+ url:
+ "postgresql://your_username:[email protected]:25060/defaultdb",
+ socket_options: []
+ ]
+ end
+
+ test "DATABASE_CACERTFILE enables SSL" do
+ env = [
+ {"DATABASE_URL",
+ "postgresql://your_username:[email protected]:25060/defaultdb"},
+ {"DATABASE_CACERTFILE", "/path/to/cacert.pem"}
+ ]
+
+ config = runtime_config(env)
+
assert get_in(config, [:plausible, Plausible.Repo]) == [
url:
"postgresql://your_username:[email protected]:25060/defaultdb",
socket_options: [],
- ssl_opts: [
- cacertfile: CAStore.file_path(),
- verify: :verify_peer,
- customize_hostname_check: [
- match_fun: :public_key.pkix_verify_hostname_match_fun(:https)
- ]
- ]
+ ssl: [cacertfile: "/path/to/cacert.pem"]
]
end
end