Skip to content

fix: always use ssl for upstream with jit #1038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
staaldraad wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: always use ssl for upstream with jit #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c650d3
fix: always use ssl for upstream with jit
staaldraad Jun 18, 2026
5235e17
Merge branch 'main' into fix/ssl-and-jit
staaldraad Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/supavisor/db_handler.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ defmodule Supavisor.DbHandler do
receiver_spawn_opts: [min_heap_size: 2048]
]

:none ->
verify when verify in [:none, nil] ->
[verify: :verify_none, receiver_spawn_opts: [min_heap_size: 2048]]
end

Expand Down
27 changes: 24 additions & 3 deletions test/integration/just_in_time_access_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ defmodule Supavisor.Integration.JustInTimeAccessTest do
auth_query: "SELECT rolname, rolpassword FROM pg_authid WHERE rolname=$1",
default_parameter_status: %{"server_version" => "15.0"},
upstream_tls_ca: ca_der,
upstream_ssl: true,
upstream_verify: :peer,
enforce_ssl: false,
upstream_ssl: Keyword.get(opts, :upstream_ssl, true),
upstream_verify: Keyword.get(opts, :upstream_verify, :peer),
enforce_ssl: Keyword.get(opts, :enforce_ssl, false),
availability_zone: Keyword.get(opts, :availability_zone),
use_jit: true,
jit_api_url: "http://localhost:8080/projects/odvmrtdcoyfyvfrdxzsj/database/jit",
Expand Down Expand Up @@ -352,6 +352,27 @@ defmodule Supavisor.Integration.JustInTimeAccessTest do
)
end

test "jit over client tls connects when tenant has ssl disabled and no verify", %{
db_conf: db_conf
} do
# Regression: a JIT tenant that has not configured upstream SSL leaves
# upstream_verify as nil. With `options jit=true` and a TLS client
# connection, upstream_tls/2 follows the client's SSL status, so the db
# handler opens an upstream TLS connection while upstream_verify is nil.
# ssl_connect/3 used to only match :peer/:none and crashed with a
# CaseClauseError on nil; nil must be treated as verify_none.
{tenant_id, ca_cert} =
setup_tenant(db_conf, upstream_ssl: false, upstream_verify: nil, enforce_ssl: false)

assert {:ok, pid} =
single_connection(db_conf, tenant_id, ca_cert,
password: "sbp_04fee3d26b63d9a3557c72a1b9902cbb8412c836",
jit: true
)

assert {:ok, %P.Result{}} = SingleConnection.query(pid, "SELECT 1")
end

test "jit successful authentication via proxy node", %{db_conf: db_conf} do
{tenant_id, ca_cert} =
Sandbox.unboxed_run(Supavisor.Repo, fn ->
Expand Down
Loading