Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 13 additions & 4 deletions src-tauri/src/pool_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,24 @@ pub(crate) fn build_connection_key(
params: &ConnectionParams,
connection_id: Option<&str>,
) -> String {
let tls_key = (params.driver == "mysql").then(|| {
format!(
let tls_key = match params.driver.as_str() {
"mysql" => Some(format!(
"ssl:{}:{}:{}:{}",
params.ssl_mode.as_deref().unwrap_or("default"),
params.ssl_ca.as_deref().unwrap_or(""),
params.ssl_cert.as_deref().unwrap_or(""),
params.ssl_key.as_deref().unwrap_or("")
)
});
)),
"postgres" => {
let ssl_mode = params.ssl_mode.as_deref().unwrap_or("prefer");
let ssl_ca = match ssl_mode {
"verify-ca" | "verify-full" => params.ssl_ca.as_deref().unwrap_or(""),
_ => "",
};
Some(format!("ssl:{ssl_mode}:{ssl_ca}"))
}
_ => None,
};

let base_key = if let Some(conn_id) = connection_id {
// Include database in key so different databases on the same connection use separate pools
Expand Down
25 changes: 19 additions & 6 deletions src-tauri/src/pool_manager_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,33 @@ mod tests {
}

#[test]
fn postgres_pool_key_ignores_mysql_ssl_key_fields() {
let required = connection_params("postgres", Some("required"));
let disabled = connection_params("postgres", Some("disabled"));
fn postgres_pool_key_changes_when_ssl_mode_changes() {
let required = connection_params("postgres", Some("require"));
let disabled = connection_params("postgres", Some("disable"));

assert_eq!(
assert_ne!(
build_connection_key(&required, Some("conn-1")),
build_connection_key(&disabled, Some("conn-1"))
);
}

#[test]
fn sqlite_pool_key_ignores_mysql_ssl_key_fields() {
fn postgres_pool_key_changes_when_ssl_ca_changes() {
let without_ca = connection_params("postgres", Some("verify-ca"));
let mut with_ca = connection_params("postgres", Some("verify-ca"));
with_ca.ssl_ca = Some("/tmp/postgres-ca.pem".to_string());

assert_ne!(
build_connection_key(&without_ca, Some("conn-1")),
build_connection_key(&with_ca, Some("conn-1"))
);
}

#[test]
fn sqlite_pool_key_ignores_tls_key_fields() {
let required = connection_params("sqlite", Some("required"));
let disabled = connection_params("sqlite", Some("disabled"));
let mut disabled = connection_params("sqlite", Some("disabled"));
disabled.ssl_ca = Some("/tmp/sqlite-ca.pem".to_string());

assert_eq!(
build_connection_key(&required, Some("conn-1")),
Expand Down