github/dbx
4
0 Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-11-15 06:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(jdbc): route UI connections through transport endpoint

Browse Source
This commit is contained in:
wyeye authored and GitHub committed 2026-08-18 12:47:52 +08:00
1 parent 4d32bc4981
commit 3bb57b9c90
4 files changed
+272 -128
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src-tauri/src/commands/connection.rs
+69 -25
View File
@@ -29,10 +29,24 @@ fn gaussdb_m_jdbc_command_config(config: &ConnectionConfig, host: &str, port: u1
gaussdb_uses_m_jdbc_driver(config).then(|| gaussdb_m_jdbc_config_for_endpoint(config, host, port))
}
fn mongo_legacy_connect_params(config: &ConnectionConfig, host: &str, port: u16) -> serde_json::Value {
serde_json::json!({
"connection": agent_connect_params(config, host, port, config.effective_database().unwrap_or(""))
})
fn jdbc_command_config_for_endpoint(
config: &ConnectionConfig,
host: &str,
port: u16,
) -> Result<ConnectionConfig, String> {
let mut jdbc_config = config.clone();
if host != config.host || port != config.port {
if let Some(ref url) = jdbc_config.connection_string {
jdbc_config.connection_string = Some(rewrite_jdbc_url_host(url, host, port)?);
}
}
Ok(jdbc_config)
}
fn mongo_legacy_connect_params(config: &ConnectionConfig, host: &str, port: u16) -> Result<serde_json::Value, String> {
Ok(serde_json::json!({
"connection": agent_connect_params(config, host, port, config.effective_database().unwrap_or(""))?
}))
}
fn mongo_legacy_fallback_error(native_error: &str, stage: &str, fallback_error: &str) -> String {
@@ -96,7 +110,7 @@ async fn test_agent_connection(
host: &str,
port: u16,
) -> Result<ConnectionTestResult, String> {
let connect_params = agent_connect_params(config, host, port, config.database.as_deref().unwrap_or(""));
let connect_params = agent_connect_params(config, host, port, config.database.as_deref().unwrap_or(""))?;
let result = state
.agent_manager
.call_daemon_method_with_timeout::<serde_json::Value>(
@@ -123,7 +137,7 @@ async fn test_agent_connection(
host,
port,
alternate_config.database.as_deref().unwrap_or(""),
),
)?,
Some(agent_connect_timeout(&alternate_config)),
)
.await
@@ -159,7 +173,7 @@ async fn connect_agent_pool(
host: &str,
port: u16,
) -> Result<PoolKind, String> {
let connect_params = agent_connect_params(config, host, port, config.effective_database().unwrap_or(""));
let connect_params = agent_connect_params(config, host, port, config.effective_database().unwrap_or(""))?;
let mut client = state.agent_manager.spawn(&config.db_type, config.driver_profile.as_deref()).await?;
let connect_result = client
.call_method_with_timeout::<serde_json::Value>(
@@ -179,7 +193,7 @@ async fn connect_agent_pool(
host,
port,
alternate_config.effective_database().unwrap_or(""),
),
)?,
Some(agent_connect_timeout(&alternate_config)),
)
.await
@@ -199,9 +213,10 @@ mod tests {
#[cfg(feature = "mq-admin")]
use super::load_connection_configs;
use super::{
connect_sqlite_from_config, gaussdb_m_jdbc_command_config, mark_mongo_legacy_driver,
mongo_legacy_connect_params, mongo_legacy_fallback_error, persist_mongo_legacy_driver_profile,
save_connection_configs, sync_connection_configs, MONGO_LEGACY_DRIVER_LABEL, MONGO_LEGACY_DRIVER_PROFILE,
connect_sqlite_from_config, gaussdb_m_jdbc_command_config, jdbc_command_config_for_endpoint,
mark_mongo_legacy_driver, mongo_legacy_connect_params, mongo_legacy_fallback_error,
persist_mongo_legacy_driver_profile, save_connection_configs, sync_connection_configs,
MONGO_LEGACY_DRIVER_LABEL, MONGO_LEGACY_DRIVER_PROFILE,
};
use dbx_core::connection::{AppState, PoolKind};
use dbx_core::models::connection::{AttachedDatabaseConfig, ConnectionConfig, DatabaseType};
@@ -417,11 +432,42 @@ mod tests {
assert!(gaussdb_m_jdbc_command_config(&config, "127.0.0.1", 18000).is_none());
}
#[test]
fn jdbc_command_config_rewrites_url_for_transport_endpoint() {
let mut config = mongodb_config();
config.db_type = DatabaseType::Jdbc;
config.host = "db.example.test".to_string();
config.port = 3306;
config.connection_string = Some("jdbc:mysql://db.example.test:3306".to_string());
let tunneled = jdbc_command_config_for_endpoint(&config, "127.0.0.1", 45678).unwrap();
assert_eq!(tunneled.connection_string.as_deref(), Some("jdbc:mysql://127.0.0.1:45678"));
let direct = jdbc_command_config_for_endpoint(&config, &config.host, config.port).unwrap();
assert_eq!(direct.connection_string, config.connection_string);
}
#[test]
fn jdbc_command_config_rejects_named_instance_url_for_transport_endpoint() {
let mut config = mongodb_config();
config.db_type = DatabaseType::Jdbc;
config.host = "db.example.test".to_string();
config.port = 1433;
config.connection_string =
Some(r"jdbc:sqlserver://db.example.test\SQLEXPRESS:1433;databaseName=app".to_string());
let err = jdbc_command_config_for_endpoint(&config, "127.0.0.1", 45678).unwrap_err();
assert!(err.to_lowercase().contains("named instance"), "{err}");
let direct = jdbc_command_config_for_endpoint(&config, &config.host, config.port).unwrap();
assert_eq!(direct.connection_string, config.connection_string);
}
#[test]
fn mongo_legacy_connect_params_preserve_auth_options() {
let config = mongodb_config();
let params = mongo_legacy_connect_params(&config, "172.22.4.42", 27017);
let params = mongo_legacy_connect_params(&config, "172.22.4.42", 27017).unwrap();
assert_eq!(params["connection"]["database"], "RestCloud_V45PUB_Gateway");
assert_eq!(params["connection"]["url_params"], "authSource=admin&authMechanism=SCRAM-SHA-1");
@@ -1071,7 +1117,7 @@ async fn test_connection_with_info_inner(
let am = &state.agent_manager;
let mut client = am.spawn(&config.db_type, config.driver_profile.as_deref()).await?;
client
.connect(mongo_legacy_connect_params(&config, &host, port))
.connect(mongo_legacy_connect_params(&config, &host, port)?)
.await
.map_err(|err| mongo_legacy_error_with_auth_hint(&err))?;
client.disconnect().await.ok();
@@ -1092,7 +1138,7 @@ async fn test_connection_with_info_inner(
if should_retry_mongo_with_legacy_driver(&native_err) {
let mut client =
spawn_mongo_legacy_fallback_agent(state.as_ref(), &config.db_type, &native_err).await?;
client.connect(mongo_legacy_connect_params(&config, &host, port)).await.map_err(|err| {
client.connect(mongo_legacy_connect_params(&config, &host, port)?).await.map_err(|err| {
mongo_legacy_fallback_error(
&native_err,
"Fallback with MongoDB (Legacy) driver failed",
@@ -1326,7 +1372,7 @@ async fn test_connection_with_info_inner(
}
}
DatabaseType::PrestoSql => {
let jdbc_config = prestosql_jdbc_config_for_endpoint(&config, &host, port);
let jdbc_config = prestosql_jdbc_config_for_endpoint(&config, &host, port)?;
match state.test_external_driver_with_info("jdbc", &jdbc_config).await {
Ok(details) => {
database_info = details.database_info;
@@ -1336,12 +1382,7 @@ async fn test_connection_with_info_inner(
}
}
DatabaseType::Jdbc => {
let mut jdbc_config = config.clone();
if host != config.host || port != config.port {
if let Some(ref url) = jdbc_config.connection_string {
jdbc_config.connection_string = Some(rewrite_jdbc_url_host(url, &host, port));
}
}
let jdbc_config = jdbc_command_config_for_endpoint(&config, &host, port)?;
match state.test_external_driver_with_info("jdbc", &jdbc_config).await {
Ok(details) => {
database_info = details.database_info;
@@ -1457,7 +1498,7 @@ pub async fn connect_db(
state.agent_manager.spawn(&db_config.db_type, Some(MONGO_LEGACY_DRIVER_PROFILE)).await?;
state.ensure_current_connection_attempt(&id, Some(attempt)).await?;
client
.connect(mongo_legacy_connect_params(&db_config, &host, port))
.connect(mongo_legacy_connect_params(&db_config, &host, port)?)
.await
.map_err(|err| mongo_legacy_error_with_auth_hint(&err))?;
state.ensure_current_connection_attempt(&id, Some(attempt)).await?;
@@ -1507,7 +1548,7 @@ pub async fn connect_db(
spawn_mongo_legacy_fallback_agent(state.inner().as_ref(), &db_config.db_type, &native_err)
.await?;
state.ensure_current_connection_attempt(&id, Some(attempt)).await?;
client.connect(mongo_legacy_connect_params(&db_config, &host, port)).await.map_err(|err| {
client.connect(mongo_legacy_connect_params(&db_config, &host, port)?).await.map_err(|err| {
mongo_legacy_fallback_error(
&native_err,
"Fallback with MongoDB (Legacy) driver failed",
@@ -1717,10 +1758,13 @@ pub async fn connect_db(
connect_agent_pool(state.inner(), &db_config, &host, port).await?
}
DatabaseType::PrestoSql => {
let jdbc_config = prestosql_jdbc_config_for_endpoint(&db_config, &host, port);
let jdbc_config = prestosql_jdbc_config_for_endpoint(&db_config, &host, port)?;
state.external_driver_pool("jdbc", &jdbc_config).await?
}
DatabaseType::Jdbc => {
let jdbc_config = jdbc_command_config_for_endpoint(&db_config, &host, port)?;
state.external_driver_pool("jdbc", &jdbc_config).await?
}
DatabaseType::Jdbc => state.external_driver_pool("jdbc", &db_config).await?,
#[cfg(feature = "mq-admin")]
DatabaseType::Mqtt => {
let mqtt_config = dbx_core::mqtt::types::MqttConnectionConfig::from_connection(&db_config)?;