fix(postgres): default absent sslmode to prefer

This commit is contained in:
Freedom authored and GitHub committed 2026-07-23 15:36:23 +08:00
1 parent 87bb06d3e4
commit 48b373729d
5 files changed
+30 -27

No files matched your search

@@ -5621,7 +5621,7 @@ function openExternalUrl(url: string) {
? 'catalog=paimon_catalog' ? 'catalog=paimon_catalog'
: form.db_type === 'cassandra' : form.db_type === 'cassandra'
? 'localdatacenter=dc1' ? 'localdatacenter=dc1'
: 'sslmode=disable' : 'sslmode=prefer'
" "
/> />
</div> </div>
@@ -2,8 +2,8 @@ import { describe, expect, it } from "vitest";
import { postgresTlsModeForForm } from "@/lib/connection/postgresTlsMode"; import { postgresTlsModeForForm } from "@/lib/connection/postgresTlsMode";
describe("postgresTlsModeForForm", () => { describe("postgresTlsModeForForm", () => {
it("uses disable when legacy connections have no explicit mode", () => { it("uses prefer when legacy connections have no explicit mode", () => {
expect(postgresTlsModeForForm(undefined, false)).toBe("disable"); expect(postgresTlsModeForForm(undefined, false)).toBe("prefer");
}); });
it("keeps the legacy TLS toggle mapped to require", () => { it("keeps the legacy TLS toggle mapped to require", () => {
@@ -12,6 +12,7 @@ describe("postgresTlsModeForForm", () => {
it("honors explicit modes and aliases", () => { it("honors explicit modes and aliases", () => {
expect(postgresTlsModeForForm("disable", false)).toBe("disable"); expect(postgresTlsModeForForm("disable", false)).toBe("disable");
expect(postgresTlsModeForForm("prefer", false)).toBe("prefer");
expect(postgresTlsModeForForm("verify_identity", false)).toBe("verify-full"); expect(postgresTlsModeForForm("verify_identity", false)).toBe("verify-full");
}); });
}); });
@@ -12,7 +12,8 @@ export function postgresTlsModeForForm(value: string | undefined, ssl: boolean |
case "verify-identity": case "verify-identity":
return "verify-full"; return "verify-full";
default: default:
// DBX and DBeaver expose TLS as opt-in; an absent mode must remain plaintext. // Align with libpq/JDBC: absent mode prefers TLS and can fall back to plaintext.
return ssl ? "require" : "disable"; // Legacy ssl=true still maps to require.
return ssl ? "require" : "prefer";
} }
} }
+8 -8
View File
@@ -3638,10 +3638,10 @@ fn native_postgres_url_config(config: &ConnectionConfig) -> Option<ConnectionCon
if config.ssl { if config.ssl {
"sslmode=require".to_string() "sslmode=require".to_string()
} else { } else {
"sslmode=disable".to_string() "sslmode=prefer".to_string()
} }
} else { } else {
let sslmode = if config.ssl { "sslmode=require" } else { "sslmode=disable" }; let sslmode = if config.ssl { "sslmode=require" } else { "sslmode=prefer" };
format!("{sslmode}&{params}") format!("{sslmode}&{params}")
}); });
} }
@@ -4589,11 +4589,11 @@ mod tests {
assert_eq!( assert_eq!(
connection_url_for_endpoint(&config, &config.host, config.port), connection_url_for_endpoint(&config, &config.host, config.port),
"postgres://gaussdb:secret@127.0.0.1:3306/postgres?sslmode=disable" "postgres://gaussdb:secret@127.0.0.1:3306/postgres?sslmode=prefer"
); );
assert_eq!( assert_eq!(
redacted_connection_url_for_endpoint(&config, &config.host, config.port), redacted_connection_url_for_endpoint(&config, &config.host, config.port),
"postgres://127.0.0.1:3306/postgres?sslmode=disable" "postgres://127.0.0.1:3306/postgres?sslmode=prefer"
); );
} }
@@ -4607,11 +4607,11 @@ mod tests {
assert_eq!( assert_eq!(
connection_url_for_endpoint(&config, &config.host, config.port), connection_url_for_endpoint(&config, &config.host, config.port),
"postgres://root:secret@127.0.0.1:26257/defaultdb?sslmode=disable" "postgres://root:secret@127.0.0.1:26257/defaultdb?sslmode=prefer"
); );
assert_eq!( assert_eq!(
redacted_connection_url_for_endpoint(&config, &config.host, config.port), redacted_connection_url_for_endpoint(&config, &config.host, config.port),
"postgres://127.0.0.1:26257/defaultdb?sslmode=disable" "postgres://127.0.0.1:26257/defaultdb?sslmode=prefer"
); );
} }
@@ -4639,7 +4639,7 @@ mod tests {
assert_eq!( assert_eq!(
connection_url_for_endpoint(&config, &config.host, config.port), connection_url_for_endpoint(&config, &config.host, config.port),
"postgres://gaussdb:secret@127.0.0.1:3306/postgres?sslmode=disable" "postgres://gaussdb:secret@127.0.0.1:3306/postgres?sslmode=prefer"
); );
} }
@@ -4681,7 +4681,7 @@ mod tests {
assert_eq!( assert_eq!(
connection_url_for_endpoint(&config, &config.host, config.port), connection_url_for_endpoint(&config, &config.host, config.port),
"postgres://gaussdb:secret@127.0.0.1:3306/postgres?sslmode=disable&application_name=dbx" "postgres://gaussdb:secret@127.0.0.1:3306/postgres?sslmode=prefer&application_name=dbx"
); );
} }
+15 -14
View File
@@ -1700,8 +1700,9 @@ fn normalize_postgres_url_params(value: &str, force_tls: bool) -> String {
if connection_options.is_empty() { if connection_options.is_empty() {
if !parts.iter().any(|part| url_param_key_is(part, "sslmode")) { if !parts.iter().any(|part| url_param_key_is(part, "sslmode")) {
// TLS is opt-in in the connection form; avoid tokio-postgres' implicit prefer mode. // Match libpq/JDBC: absent mode prefers TLS and falls back to plaintext.
parts.insert(0, if force_tls { "sslmode=require" } else { "sslmode=disable" }.to_string()); // Explicit ssl toggle still forces require; users can opt into disable.
parts.insert(0, if force_tls { "sslmode=require" } else { "sslmode=prefer" }.to_string());
} }
return parts.join("&"); return parts.join("&");
} }
@@ -1729,7 +1730,7 @@ fn normalize_postgres_url_params(value: &str, force_tls: bool) -> String {
} }
if !parts.iter().any(|part| url_param_key_is(part, "sslmode")) { if !parts.iter().any(|part| url_param_key_is(part, "sslmode")) {
parts.insert(0, if force_tls { "sslmode=require" } else { "sslmode=disable" }.to_string()); parts.insert(0, if force_tls { "sslmode=require" } else { "sslmode=prefer" }.to_string());
} }
parts.join("&") parts.join("&")
@@ -2120,7 +2121,7 @@ mod tests {
config.db_type = DatabaseType::Postgres; config.db_type = DatabaseType::Postgres;
assert_eq!(config.effective_database(), Some(" analytics ")); assert_eq!(config.effective_database(), Some(" analytics "));
assert_eq!(config.connection_url(), "postgres://root:secret@10.1.2.3:2883/%20analytics%20?sslmode=disable"); assert_eq!(config.connection_url(), "postgres://root:secret@10.1.2.3:2883/%20analytics%20?sslmode=prefer");
} }
#[test] #[test]
@@ -2681,11 +2682,11 @@ mod tests {
} }
#[test] #[test]
fn postgres_url_disables_tls_by_default() { fn postgres_url_prefers_tls_by_default() {
let mut config = mysql_config("postgres", "secret", Some("test")); let mut config = mysql_config("postgres", "secret", Some("test"));
config.db_type = DatabaseType::Postgres; config.db_type = DatabaseType::Postgres;
assert_eq!(config.connection_url(), "postgres://postgres:secret@10.1.2.3:2883/test?sslmode=disable"); assert_eq!(config.connection_url(), "postgres://postgres:secret@10.1.2.3:2883/test?sslmode=prefer");
} }
#[test] #[test]
@@ -2719,7 +2720,7 @@ mod tests {
assert_eq!( assert_eq!(
config.connection_url(), config.connection_url(),
"postgres://postgres:secret@10.1.2.3:2883/test?sslmode=disable&options=%2Dc%20search%5Fpath%3Dpublic" "postgres://postgres:secret@10.1.2.3:2883/test?sslmode=prefer&options=%2Dc%20search%5Fpath%3Dpublic"
); );
let pg_config = tokio_postgres::Config::from_str(&config.connection_url()).unwrap(); let pg_config = tokio_postgres::Config::from_str(&config.connection_url()).unwrap();
assert_eq!(pg_config.get_options(), Some("-c search_path=public")); assert_eq!(pg_config.get_options(), Some("-c search_path=public"));
@@ -2733,7 +2734,7 @@ mod tests {
assert_eq!( assert_eq!(
config.connection_url(), config.connection_url(),
"postgres://postgres:secret@10.1.2.3:2883/test?sslmode=disable&options=%2Dc%20search%5Fpath%3Dapp" "postgres://postgres:secret@10.1.2.3:2883/test?sslmode=prefer&options=%2Dc%20search%5Fpath%3Dapp"
); );
let pg_config = tokio_postgres::Config::from_str(&config.connection_url()).unwrap(); let pg_config = tokio_postgres::Config::from_str(&config.connection_url()).unwrap();
assert_eq!(pg_config.get_options(), Some("-c search_path=app")); assert_eq!(pg_config.get_options(), Some("-c search_path=app"));
@@ -2767,7 +2768,7 @@ mod tests {
assert_eq!( assert_eq!(
config.connection_url(), config.connection_url(),
"postgres://postgres:secret@10.1.2.3:2883/test?sslmode=disable&options=%2Dc%20statement%5Ftimeout%3D5000%20%2Dc%20TimeZone%3DUTC" "postgres://postgres:secret@10.1.2.3:2883/test?sslmode=prefer&options=%2Dc%20statement%5Ftimeout%3D5000%20%2Dc%20TimeZone%3DUTC"
); );
} }
@@ -2779,7 +2780,7 @@ mod tests {
assert_eq!( assert_eq!(
config.connection_url(), config.connection_url(),
"postgres://postgres:secret@10.1.2.3:2883/test?sslmode=disable&options=-c%20TimeZone%3DUTC" "postgres://postgres:secret@10.1.2.3:2883/test?sslmode=prefer&options=-c%20TimeZone%3DUTC"
); );
} }
@@ -2788,7 +2789,7 @@ mod tests {
let mut config = mysql_config("root", "secret", None); let mut config = mysql_config("root", "secret", None);
config.db_type = DatabaseType::Postgres; config.db_type = DatabaseType::Postgres;
assert_eq!(config.connection_url(), "postgres://root:secret@10.1.2.3:2883/postgres?sslmode=disable"); assert_eq!(config.connection_url(), "postgres://root:secret@10.1.2.3:2883/postgres?sslmode=prefer");
} }
#[test] #[test]
@@ -2796,7 +2797,7 @@ mod tests {
let mut config = mysql_config("root", "secret", Some("")); let mut config = mysql_config("root", "secret", Some(""));
config.db_type = DatabaseType::Postgres; config.db_type = DatabaseType::Postgres;
assert_eq!(config.connection_url(), "postgres://root:secret@10.1.2.3:2883/postgres?sslmode=disable"); assert_eq!(config.connection_url(), "postgres://root:secret@10.1.2.3:2883/postgres?sslmode=prefer");
} }
#[test] #[test]
@@ -2804,7 +2805,7 @@ mod tests {
let mut config = mysql_config("awsuser", "secret", Some("")); let mut config = mysql_config("awsuser", "secret", Some(""));
config.db_type = DatabaseType::Redshift; config.db_type = DatabaseType::Redshift;
assert_eq!(config.connection_url(), "postgres://awsuser:secret@10.1.2.3:2883/dev?sslmode=disable"); assert_eq!(config.connection_url(), "postgres://awsuser:secret@10.1.2.3:2883/dev?sslmode=prefer");
} }
#[test] #[test]
@@ -2813,7 +2814,7 @@ mod tests {
config.db_type = DatabaseType::Postgres; config.db_type = DatabaseType::Postgres;
config.driver_profile = Some("cockroachdb".to_string()); config.driver_profile = Some("cockroachdb".to_string());
assert_eq!(config.connection_url(), "postgres://root:secret@10.1.2.3:2883/defaultdb?sslmode=disable"); assert_eq!(config.connection_url(), "postgres://root:secret@10.1.2.3:2883/defaultdb?sslmode=prefer");
} }
#[test] #[test]