feat(connection): show server versions for more datasources

This commit is contained in:
二丫讲梵 authored and GitHub committed 2026-08-26 18:29:13 +08:00
1 parent fb907a5866
commit 25ea7b21eb
20 files changed
+408 -38

No files matched your search

+15 -1
View File
@@ -13,6 +13,20 @@ import (
"github.com/go-zookeeper/zk" "github.com/go-zookeeper/zk"
) )
func TestParseServerVersionTrimsBuiltOnSuffix(t *testing.T) {
srvr := "Zookeeper version: 3.6.1--104dcb3dcae0bf1bca4b4a00b2d76f2b5f6d79c, built on 04/21/2020 15:01 GMT\n"
if got := parseServerVersion(srvr); got != "3.6.1--104dcb3dcae0bf1bca4b4a00b2d76f2b5f6d79c" {
t.Fatalf("srvr version = %q", got)
}
envi := "zookeeper.version=3.8.4-9a6b1d5e9c0f, built on 2024-01-01 00:00 GMT\n"
if got := parseServerVersion(envi); got != "3.8.4-9a6b1d5e9c0f" {
t.Fatalf("envi version = %q", got)
}
if got := parseServerVersion("Latency min/avg/max: 0/0/0\n"); got != "" {
t.Fatalf("unrelated line parsed as version %q", got)
}
}
func TestHandshakeAndRPCFailures(t *testing.T) { func TestHandshakeAndRPCFailures(t *testing.T) {
service := newServer() service := newServer()
response, shutdown := service.handleRequest([]byte(`{"jsonrpc":"2.0","id":1,"method":"handshake","params":{}}`)) response, shutdown := service.handleRequest([]byte(`{"jsonrpc":"2.0","id":1,"method":"handshake","params":{}}`))
@@ -20,7 +34,7 @@ func TestHandshakeAndRPCFailures(t *testing.T) {
t.Fatalf("handshake response = %#v, shutdown=%v", response, shutdown) t.Fatalf("handshake response = %#v, shutdown=%v", response, shutdown)
} }
handshake, ok := response.Result.(handshakeResult) handshake, ok := response.Result.(handshakeResult)
if !ok || handshake.ProtocolVersion != 1 || handshake.AgentProtocolVersion != 1 || strings.Join(handshake.Capabilities, ",") != "connect,test_connection,kv" { if !ok || handshake.ProtocolVersion != 1 || handshake.AgentProtocolVersion != 1 || strings.Join(handshake.Capabilities, ",") != "connect,test_connection,connection_info,kv" {
t.Fatalf("unexpected handshake: %#v", response.Result) t.Fatalf("unexpected handshake: %#v", response.Result)
} }
+87 -2
View File
@@ -111,13 +111,14 @@ func (service *server) connect(params json.RawMessage) (map[string]bool, error)
} }
previousClient := service.activeClient previousClient := service.activeClient
service.activeClient = nextClient service.activeClient = nextClient
service.activeConfig = config
if previousClient != nil { if previousClient != nil {
previousClient.Close() previousClient.Close()
} }
return map[string]bool{"ok": true}, nil return map[string]bool{"ok": true}, nil
} }
func (service *server) testConnection(params json.RawMessage) (map[string]bool, error) { func (service *server) testConnection(params json.RawMessage) (map[string]any, error) {
config, err := decodeConnectionConfig(params) config, err := decodeConnectionConfig(params)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -127,7 +128,22 @@ func (service *server) testConnection(params json.RawMessage) (map[string]bool,
return nil, err return nil, err
} }
probe.Close() probe.Close()
return map[string]bool{"ok": true}, nil result := map[string]any{"ok": true}
if info := databaseInfo(config); info != nil {
result["databaseInfo"] = info
}
return result, nil
}
func (service *server) connectionInfo() (map[string]any, error) {
if _, err := service.requireClient(); err != nil {
return nil, err
}
result := map[string]any{}
if info := databaseInfo(service.activeConfig); info != nil {
result["databaseInfo"] = info
}
return result, nil
} }
func openClient(config connectionConfig) (*clientSession, error) { func openClient(config connectionConfig) (*clientSession, error) {
@@ -272,6 +288,74 @@ func connectionString(config connectionConfig) string {
return net.JoinHostPort(strings.Trim(host, "[]"), strconv.Itoa(port)) return net.JoinHostPort(strings.Trim(host, "[]"), strconv.Itoa(port))
} }
func databaseInfo(config connectionConfig) map[string]any {
info := map[string]any{"productName": "ZooKeeper"}
target, err := parseConnectTarget(connectionString(config))
if err != nil {
return info
}
if version := detectServerVersion(target.Servers, millisecondsOrDefault(config.ConnectionTimeoutMS, defaultConnectionTimeout)); version != "" {
info["productVersion"] = version
}
return info
}
func detectServerVersion(servers []string, timeout time.Duration) string {
deadline := timeout
if deadline <= 0 || deadline > 2*time.Second {
deadline = 2 * time.Second
}
for _, server := range servers {
address, err := endpointAddress(server)
if err != nil {
continue
}
// ZooKeeper 3.5+ whitelists only "srvr" by default; "envi"/"stat"
// are opt-in, so probe srvr first for default-config clusters.
for _, command := range []string{"srvr", "envi", "stat"} {
connection, err := net.DialTimeout("tcp", address, deadline)
if err != nil {
continue
}
_ = connection.SetDeadline(time.Now().Add(deadline))
if _, err := connection.Write([]byte(command)); err != nil {
connection.Close()
continue
}
buffer := make([]byte, 16*1024)
count, _ := connection.Read(buffer)
if version := parseServerVersion(string(buffer[:count])); version != "" {
connection.Close()
return version
}
connection.Close()
}
}
return ""
}
func parseServerVersion(response string) string {
for _, line := range strings.Split(response, "\n") {
line = strings.TrimSpace(line)
parts := strings.SplitN(line, "=", 2)
if len(parts) != 2 {
parts = strings.SplitN(line, ":", 2)
}
key := strings.ToLower(strings.TrimSpace(parts[0]))
key = strings.NewReplacer(" ", ".", "_", ".").Replace(key)
if len(parts) == 2 && key == "zookeeper.version" {
version := strings.TrimSpace(parts[1])
// Drop the ", built on ..." suffix envi/stat/srvr carry so only
// the version itself is shown.
if idx := strings.Index(version, ","); idx >= 0 {
version = strings.TrimSpace(version[:idx])
}
return version
}
}
return ""
}
func parseConnectTarget(value string) (connectTarget, error) { func parseConnectTarget(value string) (connectTarget, error) {
connectString := strings.TrimSpace(strings.TrimPrefix(value, "zookeeper://")) connectString := strings.TrimSpace(strings.TrimPrefix(value, "zookeeper://"))
slash := strings.Index(connectString, "/") slash := strings.Index(connectString, "/")
@@ -460,6 +544,7 @@ func (service *server) closeClient() {
service.activeClient.Close() service.activeClient.Close()
service.activeClient = nil service.activeClient = nil
} }
service.activeConfig = connectionConfig{}
} }
func (session *clientSession) Close() { func (session *clientSession) Close() {
+5 -1
View File
@@ -13,7 +13,7 @@ const (
maxRPCMessageBytes = 32 * 1024 * 1024 maxRPCMessageBytes = 32 * 1024 * 1024
) )
var capabilities = []string{"connect", "test_connection", "kv"} var capabilities = []string{"connect", "test_connection", "connection_info", "kv"}
type rpcRequest struct { type rpcRequest struct {
ID json.RawMessage `json:"id"` ID json.RawMessage `json:"id"`
@@ -41,6 +41,7 @@ type handshakeResult struct {
type server struct { type server struct {
activeClient znodeClient activeClient znodeClient
activeConfig connectionConfig
statLookupConcurrency int statLookupConcurrency int
} }
@@ -104,6 +105,9 @@ func (service *server) dispatch(method string, params json.RawMessage) (any, boo
case "test_connection": case "test_connection":
result, err := service.testConnection(params) result, err := service.testConnection(params)
return result, false, err return result, false, err
case "connection_info":
result, err := service.connectionInfo()
return result, false, err
case "kv_list_prefix": case "kv_list_prefix":
result, err := service.listPrefix(params) result, err := service.listPrefix(params)
return result, false, err return result, false, err
+1 -1
View File
@@ -963,7 +963,7 @@ export default {
configuredDescription: "Shows information known from the form first. A successful test adds server version and driver metadata.", configuredDescription: "Shows information known from the form first. A successful test adds server version and driver metadata.",
testedDescription: "This information comes from the connection used by the latest successful test.", testedDescription: "This information comes from the connection used by the latest successful test.",
productName: "DBMS", productName: "DBMS",
productVersion: "DBMS version", productVersion: "Server version",
currentDatabase: "Current database", currentDatabase: "Current database",
serverComment: "Server comment", serverComment: "Server comment",
serverCharset: "Server charset", serverCharset: "Server charset",
+1 -1
View File
@@ -1008,7 +1008,7 @@ export default withEnglishFallback({
configuredDescription: "Muestra primero la información que se puede determinar desde el formulario; después de una prueba exitosa, se complementa con la versión devuelta por el servidor y los metadatos del controlador.", configuredDescription: "Muestra primero la información que se puede determinar desde el formulario; después de una prueba exitosa, se complementa con la versión devuelta por el servidor y los metadatos del controlador.",
testedDescription: "La siguiente información proviene de la conexión utilizada para esta prueba exitosa.", testedDescription: "La siguiente información proviene de la conexión utilizada para esta prueba exitosa.",
productName: "Sistema de gestión de bases de datos", productName: "Sistema de gestión de bases de datos",
productVersion: "Versión de la base de datos", productVersion: "Versión del servidor",
currentDatabase: "Base de datos actual", currentDatabase: "Base de datos actual",
serverComment: "Comentario del servidor", serverComment: "Comentario del servidor",
serverCharset: "Conjunto de caracteres del servidor", serverCharset: "Conjunto de caracteres del servidor",
+1 -1
View File
@@ -1006,7 +1006,7 @@ export default withEnglishFallback({
configuredDescription: "Mostra prima le informazioni determinabili dal modulo; dopo un test riuscito, vengono aggiunte la versione restituita dal server e i metadati del driver.", configuredDescription: "Mostra prima le informazioni determinabili dal modulo; dopo un test riuscito, vengono aggiunte la versione restituita dal server e i metadati del driver.",
testedDescription: "Le seguenti informazioni provengono dalla connessione utilizzata per questo test riuscito.", testedDescription: "Le seguenti informazioni provengono dalla connessione utilizzata per questo test riuscito.",
productName: "Sistema di gestione database", productName: "Sistema di gestione database",
productVersion: "Versione database", productVersion: "Versione del server",
currentDatabase: "Database corrente", currentDatabase: "Database corrente",
serverComment: "Commento server", serverComment: "Commento server",
serverCharset: "Set di caratteri del server", serverCharset: "Set di caratteri del server",
+1 -1
View File
@@ -1006,7 +1006,7 @@ export default withEnglishFallback({
configuredDescription: "まずフォームで確定可能な情報を表示します。テスト成功後、サーバーから返されたバージョンとドライバーのメタデータが補足されます。", configuredDescription: "まずフォームで確定可能な情報を表示します。テスト成功後、サーバーから返されたバージョンとドライバーのメタデータが補足されます。",
testedDescription: "以下の情報は、今回の成功したテストで使用された接続からのものです。", testedDescription: "以下の情報は、今回の成功したテストで使用された接続からのものです。",
productName: "データベース管理システム", productName: "データベース管理システム",
productVersion: "データベースバージョン", productVersion: "サーバーバージョン",
currentDatabase: "現在のデータベース", currentDatabase: "現在のデータベース",
serverComment: "サーバーコメント", serverComment: "サーバーコメント",
serverCharset: "サーバー文字セット", serverCharset: "サーバー文字セット",
+1 -1
View File
@@ -855,7 +855,7 @@ export default withEnglishFallback({
configuredDescription: "먼저 양식에서 알려진 정보를 표시합니다. 성공적인 테스트는 서버 버전과 드라이버 메타데이터를 추가합니다.", configuredDescription: "먼저 양식에서 알려진 정보를 표시합니다. 성공적인 테스트는 서버 버전과 드라이버 메타데이터를 추가합니다.",
testedDescription: "이 정보는 가장 최근 성공한 테스트에 사용된 연결에서 가져왔습니다.", testedDescription: "이 정보는 가장 최근 성공한 테스트에 사용된 연결에서 가져왔습니다.",
productName: "DBMS", productName: "DBMS",
productVersion: "DBMS 버전", productVersion: "서버 버전",
currentDatabase: "현재 데이터베이스", currentDatabase: "현재 데이터베이스",
serverComment: "서버 주석", serverComment: "서버 주석",
serverCharset: "서버 문자셋", serverCharset: "서버 문자셋",
+1 -1
View File
@@ -1007,7 +1007,7 @@ export default withEnglishFallback({
configuredDescription: "Exibe as informações que podem ser determinadas no formulário; após um teste bem-sucedido, serão complementadas com a versão e os metadados do driver retornados pelo servidor.", configuredDescription: "Exibe as informações que podem ser determinadas no formulário; após um teste bem-sucedido, serão complementadas com a versão e os metadados do driver retornados pelo servidor.",
testedDescription: "As informações abaixo são da conexão usada neste teste bem-sucedido.", testedDescription: "As informações abaixo são da conexão usada neste teste bem-sucedido.",
productName: "Sistema de Gerenciamento de Banco de Dados", productName: "Sistema de Gerenciamento de Banco de Dados",
productVersion: "Versão do banco de dados", productVersion: "Versão do servidor",
currentDatabase: "Banco de dados atual", currentDatabase: "Banco de dados atual",
serverComment: "Descrição do servidor", serverComment: "Descrição do servidor",
serverCharset: "Charset do servidor", serverCharset: "Charset do servidor",
+1 -1
View File
@@ -887,7 +887,7 @@ export default withEnglishFallback({
configuredDescription: "先显示表单中可确定的信息;测试成功后会补充服务器返回的版本和驱动元数据。", configuredDescription: "先显示表单中可确定的信息;测试成功后会补充服务器返回的版本和驱动元数据。",
testedDescription: "以下信息来自本次成功测试使用的连接。", testedDescription: "以下信息来自本次成功测试使用的连接。",
productName: "数据库管理系统", productName: "数据库管理系统",
productVersion: "数据库版本", productVersion: "服务端版本",
currentDatabase: "当前数据库", currentDatabase: "当前数据库",
serverComment: "服务器说明", serverComment: "服务器说明",
serverCharset: "服务器字符集", serverCharset: "服务器字符集",
+1 -1
View File
@@ -1006,7 +1006,7 @@ export default withEnglishFallback({
configuredDescription: "先顯示表單中可確定的資訊;測試成功後會補充伺服器回傳的版本和驅動元數據。", configuredDescription: "先顯示表單中可確定的資訊;測試成功後會補充伺服器回傳的版本和驅動元數據。",
testedDescription: "以下資訊來自本次成功測試使用的連線。", testedDescription: "以下資訊來自本次成功測試使用的連線。",
productName: "資料庫管理系統", productName: "資料庫管理系統",
productVersion: "資料庫版本", productVersion: "伺服器版本",
currentDatabase: "目前資料庫", currentDatabase: "目前資料庫",
serverComment: "伺服器說明", serverComment: "伺服器說明",
serverCharset: "伺服器字元集", serverCharset: "伺服器字元集",
+74 -1
View File
@@ -173,9 +173,21 @@ impl PoolKind {
enum ConnectionDatabaseInfoSource { enum ConnectionDatabaseInfoSource {
Agent(Arc<db::agent_driver::PooledAgentClient>), Agent(Arc<db::agent_driver::PooledAgentClient>),
ExternalDriver { config: Arc<ConnectionConfig>, session: Arc<PluginDriverSession> }, MongoAgent(Arc<db::agent_driver::PooledAgentClient>, Option<String>),
ExternalDriver {
config: Arc<ConnectionConfig>,
session: Arc<PluginDriverSession>,
},
NativeMysql(db::mysql::MySqlPool), NativeMysql(db::mysql::MySqlPool),
NativeHBase(db::hbase_driver::HBaseClient), NativeHBase(db::hbase_driver::HBaseClient),
NativeMongo(mongodb::Client, Option<String>),
Meilisearch(db::meilisearch_driver::MeilisearchClient),
VictoriaMetrics(db::victoriametrics_driver::VictoriaMetricsClient),
Redis(String),
Nacos,
Consul(Box<crate::consul::ConsulClient>),
#[cfg(feature = "mq-admin")]
MessageQueue,
} }
/// Held connection for a manual transaction session /// Held connection for a manual transaction session
@@ -4275,6 +4287,9 @@ impl AppState {
let source = { let source = {
let connections = self.connections.read().await; let connections = self.connections.read().await;
match connections.get(&pool_key) { match connections.get(&pool_key) {
Some(PoolKind::Agent(client)) if config.db_type == DatabaseType::MongoDb => {
Some(ConnectionDatabaseInfoSource::MongoAgent(client.clone(), database.map(str::to_string)))
}
Some(PoolKind::Agent(client)) => Some(ConnectionDatabaseInfoSource::Agent(client.clone())), Some(PoolKind::Agent(client)) => Some(ConnectionDatabaseInfoSource::Agent(client.clone())),
Some(PoolKind::ExternalDriver { config, session, .. }) => { Some(PoolKind::ExternalDriver { config, session, .. }) => {
Some(ConnectionDatabaseInfoSource::ExternalDriver { Some(ConnectionDatabaseInfoSource::ExternalDriver {
@@ -4284,6 +4299,18 @@ impl AppState {
} }
Some(PoolKind::Mysql(pool, _)) => Some(ConnectionDatabaseInfoSource::NativeMysql(pool.clone())), Some(PoolKind::Mysql(pool, _)) => Some(ConnectionDatabaseInfoSource::NativeMysql(pool.clone())),
Some(PoolKind::HBase(client)) => Some(ConnectionDatabaseInfoSource::NativeHBase(client.clone())), Some(PoolKind::HBase(client)) => Some(ConnectionDatabaseInfoSource::NativeHBase(client.clone())),
Some(PoolKind::MongoDb(client)) => {
Some(ConnectionDatabaseInfoSource::NativeMongo(client.clone(), database.map(str::to_string)))
}
Some(PoolKind::Meilisearch(client)) => Some(ConnectionDatabaseInfoSource::Meilisearch(client.clone())),
Some(PoolKind::VictoriaMetrics(client)) => {
Some(ConnectionDatabaseInfoSource::VictoriaMetrics(client.clone()))
}
Some(PoolKind::Redis(_)) => Some(ConnectionDatabaseInfoSource::Redis(pool_key.clone())),
Some(PoolKind::Nacos) => Some(ConnectionDatabaseInfoSource::Nacos),
Some(PoolKind::Consul(client)) => Some(ConnectionDatabaseInfoSource::Consul(Box::new(client.clone()))),
#[cfg(feature = "mq-admin")]
Some(PoolKind::MessageQueue) => Some(ConnectionDatabaseInfoSource::MessageQueue),
_ => None, _ => None,
} }
}; };
@@ -4293,6 +4320,17 @@ impl AppState {
let mut agent = client.lock().await; let mut agent = client.lock().await;
Ok(agent.connection_info(Some(db::connection_timeout())).await?.database_info) Ok(agent.connection_info(Some(db::connection_timeout())).await?.database_info)
} }
Some(ConnectionDatabaseInfoSource::MongoAgent(client, database)) => {
let mut agent = client.lock().await;
let version = agent.mongo_server_version::<String>(database.as_deref().unwrap_or("admin")).await?;
Ok(Some(DatabaseConnectionInfo {
product_name: Some("MongoDB".to_string()),
product_version: Some(version),
current_database: database,
driver_name: Some("MongoDB legacy Agent".to_string()),
..Default::default()
}))
}
Some(ConnectionDatabaseInfoSource::ExternalDriver { config, session }) => { Some(ConnectionDatabaseInfoSource::ExternalDriver { config, session }) => {
let response = session let response = session
.invoke_with_timeout::<serde_json::Value>( .invoke_with_timeout::<serde_json::Value>(
@@ -4309,6 +4347,41 @@ impl AppState {
Some(ConnectionDatabaseInfoSource::NativeHBase(client)) => { Some(ConnectionDatabaseInfoSource::NativeHBase(client)) => {
db::hbase_driver::database_connection_info(&client).await db::hbase_driver::database_connection_info(&client).await
} }
Some(ConnectionDatabaseInfoSource::NativeMongo(client, database)) => {
db::mongo_driver::database_connection_info(&client, database.as_deref()).await.map(Some)
}
Some(ConnectionDatabaseInfoSource::Meilisearch(client)) => {
db::meilisearch_driver::database_connection_info(&client).await.map(Some)
}
Some(ConnectionDatabaseInfoSource::VictoriaMetrics(client)) => {
db::victoriametrics_driver::database_connection_info(&client, db::connection_timeout()).await.map(Some)
}
Some(ConnectionDatabaseInfoSource::Redis(pool_key)) => {
let connections = self.connections.read().await;
match connections.get(&pool_key) {
Some(PoolKind::Redis(redis)) => db::redis_driver::database_connection_info(redis).await.map(Some),
_ => Ok(None),
}
}
Some(ConnectionDatabaseInfoSource::Nacos) => {
let admin_config = self.nacos_admin_config_for_connection(connection_id, &config).await?;
let admin = self.nacos_registry.get_or_build_config(connection_id, admin_config).await?;
Ok(crate::nacos::service::database_info_from_connection(&admin.test_connection().await?))
}
Some(ConnectionDatabaseInfoSource::Consul(client)) => {
let identity = client.agent_self().await?;
Ok(Some(DatabaseConnectionInfo {
product_name: Some("Consul".to_string()),
product_version: identity.version,
server_comment: Some(format!("Agent {}", identity.node)),
driver_name: Some("Consul HTTP API".to_string()),
..Default::default()
}))
}
#[cfg(feature = "mq-admin")]
Some(ConnectionDatabaseInfoSource::MessageQueue) => {
Ok(crate::mq::service::mq_database_connection_info(self, connection_id).await?)
}
None => Ok(None), None => Ok(None),
} }
} }
@@ -8,6 +8,7 @@ use std::time::{Duration, Instant};
use super::{http_client_builder, ColumnInfo}; use super::{http_client_builder, ColumnInfo};
use crate::db::document_result::DocumentQueryResult; use crate::db::document_result::DocumentQueryResult;
use crate::models::connection::DatabaseConnectionInfo;
use crate::types::QueryResult; use crate::types::QueryResult;
const PATH_SEGMENT_ENCODE_SET: &AsciiSet = &CONTROLS const PATH_SEGMENT_ENCODE_SET: &AsciiSet = &CONTROLS
@@ -178,6 +179,22 @@ pub async fn test_connection(client: &MeilisearchClient, _timeout: Duration) ->
Ok(()) Ok(())
} }
pub async fn database_connection_info(client: &MeilisearchClient) -> Result<DatabaseConnectionInfo, String> {
let response =
client.get("/version").send().await.map_err(|error| format!("Meilisearch request failed: {error}"))?;
let value = response_json(response, "version lookup").await?;
Ok(DatabaseConnectionInfo {
product_name: Some("Meilisearch".to_string()),
product_version: value
.get("pkgVersion")
.or_else(|| value.get("version"))
.and_then(Value::as_str)
.map(str::to_string),
driver_name: Some("Meilisearch HTTP API".to_string()),
..Default::default()
})
}
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
struct IndexInfoResponse { struct IndexInfoResponse {
+15
View File
@@ -10,6 +10,7 @@ use serde::{Deserialize, Serialize};
use super::with_connection_timeout; use super::with_connection_timeout;
use crate::document_ops::{MongoGridFsBucketInfo, MongoGridFsFileInfo}; use crate::document_ops::{MongoGridFsBucketInfo, MongoGridFsFileInfo};
use crate::models::connection::DatabaseConnectionInfo;
use crate::types::IndexInfo; use crate::types::IndexInfo;
use futures::{io::AsyncReadExt, io::AsyncWriteExt, TryStreamExt}; use futures::{io::AsyncReadExt, io::AsyncWriteExt, TryStreamExt};
use percent_encoding::percent_decode_str; use percent_encoding::percent_decode_str;
@@ -239,6 +240,20 @@ pub async fn server_version(client: &Client, database: &str) -> Result<String, S
server_version_from_build_info(&result) server_version_from_build_info(&result)
} }
pub async fn database_connection_info(
client: &Client,
database: Option<&str>,
) -> Result<DatabaseConnectionInfo, String> {
let version = server_version(client, database.unwrap_or("admin")).await?;
Ok(DatabaseConnectionInfo {
product_name: Some("MongoDB".to_string()),
product_version: Some(version),
current_database: database.map(str::to_string),
driver_name: Some("MongoDB Rust driver".to_string()),
..Default::default()
})
}
pub async fn run_command(client: &Client, database: &str, command_json: &str) -> Result<MongoDocumentResult, String> { pub async fn run_command(client: &Client, database: &str, command_json: &str) -> Result<MongoDocumentResult, String> {
let value: serde_json::Value = let value: serde_json::Value =
serde_json::from_str(command_json).map_err(|error| format!("Invalid MongoDB command JSON: {error}"))?; serde_json::from_str(command_json).map_err(|error| format!("Invalid MongoDB command JSON: {error}"))?;
+36 -1
View File
@@ -1,4 +1,4 @@
use crate::models::connection::ConnectionConfig; use crate::models::connection::{ConnectionConfig, DatabaseConnectionInfo};
use base64::Engine; use base64::Engine;
use redis::{ use redis::{
aio::ConnectionLike, aio::ConnectionLike,
@@ -749,6 +749,41 @@ pub async fn test_connection(connection: &RedisConnection) -> Result<(), String>
} }
} }
/// Read the Redis server identity without making metadata unavailable when the
/// INFO command is disabled by ACL or server policy.
pub async fn database_connection_info(connection: &RedisConnection) -> Result<DatabaseConnectionInfo, String> {
match connection {
RedisConnection::Direct(con) => {
let mut con = con.lock().await;
redis_database_connection_info(&mut *con).await
}
RedisConnection::Cluster(pool) => {
let mut con = cluster_any_connection(pool).await?;
redis_database_connection_info(&mut con).await
}
}
}
async fn redis_database_connection_info<C>(con: &mut C) -> Result<DatabaseConnectionInfo, String>
where
C: ConnectionLike + Send + Sync + Unpin,
{
let info =
tokio::time::timeout(super::connection_timeout(), redis::cmd("INFO").arg("server").query_async::<String>(con))
.await
.map_err(|_| format!("Redis INFO command timed out ({}s)", super::CONNECTION_TIMEOUT_SECS))?
.map_err(|error| format!("Redis INFO command failed: {error}"))?;
let product_version = info.lines().find_map(|line| {
let (key, value) = line.trim().split_once(':')?;
(key.eq_ignore_ascii_case("redis_version") && !value.trim().is_empty()).then(|| value.trim().to_string())
});
Ok(DatabaseConnectionInfo {
product_name: Some("Redis".to_string()),
product_version,
..DatabaseConnectionInfo::default()
})
}
async fn redis_ping<C>(con: &mut C, label: &str) -> Result<(), String> async fn redis_ping<C>(con: &mut C, label: &str) -> Result<(), String>
where where
C: ConnectionLike + Send + Sync + Unpin, C: ConnectionLike + Send + Sync + Unpin,
@@ -8,6 +8,7 @@ use std::time::{Duration, Instant};
use super::with_connection_timeout; use super::with_connection_timeout;
use crate::models::connection::ConnectionConfig; use crate::models::connection::ConnectionConfig;
use crate::models::connection::DatabaseConnectionInfo;
use crate::types::{ColumnInfo, DatabaseInfo, ObjectStatistics, QueryResult, TableInfo}; use crate::types::{ColumnInfo, DatabaseInfo, ObjectStatistics, QueryResult, TableInfo};
const DEFAULT_API_PATH: &str = "/prometheus"; const DEFAULT_API_PATH: &str = "/prometheus";
@@ -182,6 +183,24 @@ pub async fn test_connection(client: &VictoriaMetricsClient, timeout: Duration)
parse_api_response::<Value>(response).await.map(|_| ()) parse_api_response::<Value>(response).await.map(|_| ())
} }
pub async fn database_connection_info(
client: &VictoriaMetricsClient,
timeout: Duration,
) -> Result<DatabaseConnectionInfo, String> {
let request = client.request(client.http.get(client.endpoint("/api/v1/status/buildinfo")));
let response = with_connection_timeout("VictoriaMetrics", timeout, async {
request.send().await.map_err(|error| format!("VictoriaMetrics connection failed: {error}"))
})
.await?;
let value = parse_api_response::<Value>(response).await?;
Ok(DatabaseConnectionInfo {
product_name: Some("VictoriaMetrics".to_string()),
product_version: value.get("version").and_then(Value::as_str).map(str::to_string),
driver_name: Some("VictoriaMetrics HTTP API".to_string()),
..Default::default()
})
}
pub async fn list_databases(client: &VictoriaMetricsClient) -> Result<Vec<DatabaseInfo>, String> { pub async fn list_databases(client: &VictoriaMetricsClient) -> Result<Vec<DatabaseInfo>, String> {
Ok(vec![DatabaseInfo { name: client.database_label.clone(), ..Default::default() }]) Ok(vec![DatabaseInfo { name: client.database_label.clone(), ..Default::default() }])
} }
+21
View File
@@ -38,6 +38,27 @@ pub async fn mq_test_connection_core(state: &AppState, conn_id: &str) -> Result<
} }
} }
/// Convert the adapter's cluster probe into the common connection metadata
/// shown by the desktop and web connection views.
pub async fn mq_database_connection_info(
state: &AppState,
conn_id: &str,
) -> Result<Option<crate::models::connection::DatabaseConnectionInfo>, String> {
let info = mq_test_connection_core(state, conn_id).await?;
let product_name = match info.system_kind {
MqSystemKind::Pulsar => "Pulsar",
MqSystemKind::Kafka => "Kafka",
MqSystemKind::RocketMq => "RocketMQ",
MqSystemKind::RabbitMq => "RabbitMQ",
};
Ok(Some(crate::models::connection::DatabaseConnectionInfo {
product_name: Some(product_name.to_string()),
product_version: info.server_version,
driver_name: Some("Message Queue Admin API".to_string()),
..Default::default()
}))
}
// ---- Tenants ---- // ---- Tenants ----
pub async fn mq_list_tenants_core(state: &AppState, conn_id: &str) -> Result<Vec<TenantInfo>, String> { pub async fn mq_list_tenants_core(state: &AppState, conn_id: &str) -> Result<Vec<TenantInfo>, String> {
+10 -1
View File
@@ -1,9 +1,18 @@
use std::future::Future; use std::future::Future;
use crate::connection::AppState; use crate::connection::AppState;
use crate::models::connection::DatabaseType; use crate::models::connection::{DatabaseConnectionInfo, DatabaseType};
use crate::nacos::types::*; use crate::nacos::types::*;
pub fn database_info_from_connection(info: &NacosConnectionInfo) -> Option<DatabaseConnectionInfo> {
let product_version = info.server_version.clone().filter(|value| !value.trim().is_empty());
Some(DatabaseConnectionInfo {
product_name: Some("Nacos".to_string()),
product_version,
..DatabaseConnectionInfo::default()
})
}
async fn refresh_access_control_after_mutation(admin: &std::sync::Arc<dyn crate::nacos::port::NacosAdmin>) { async fn refresh_access_control_after_mutation(admin: &std::sync::Arc<dyn crate::nacos::port::NacosAdmin>) {
admin.invalidate_access_control_capabilities(); admin.invalidate_access_control_capabilities();
let _ = admin.refresh_access_control_capabilities().await; let _ = admin.refresh_access_control_capabilities().await;
+8 -2
View File
@@ -260,11 +260,15 @@ async fn run_temporary_connection_test(
) -> Result<ConnectionTestResult, String> { ) -> Result<ConnectionTestResult, String> {
let temp_id = format!("{TEST_PROBE_ID_PREFIX}{}", uuid::Uuid::new_v4()); let temp_id = format!("{TEST_PROBE_ID_PREFIX}{}", uuid::Uuid::new_v4());
app.configs.write().await.insert(temp_id.clone(), config.clone()); app.configs.write().await.insert(temp_id.clone(), config.clone());
let mut nacos_database_info = None;
let pool_result = if config.db_type == DatabaseType::Nacos { let pool_result = if config.db_type == DatabaseType::Nacos {
match app.nacos_admin_config_for_connection(&temp_id, &config).await { match app.nacos_admin_config_for_connection(&temp_id, &config).await {
Ok(admin_config) => match app.nacos_registry.build_transient_config(admin_config).await { Ok(admin_config) => match app.nacos_registry.build_transient_config(admin_config).await {
Ok(adapter) => adapter.test_connection_with_scope_validation().await.map(|_| temp_id.clone()), Ok(adapter) => adapter.test_connection_with_scope_validation().await.map(|info| {
nacos_database_info = dbx_core::nacos::service::database_info_from_connection(&info);
temp_id.clone()
}),
Err(error) => Err(error), Err(error) => Err(error),
}, },
Err(error) => Err(error), Err(error) => Err(error),
@@ -272,7 +276,9 @@ async fn run_temporary_connection_test(
} else { } else {
app.get_or_create_pool(&temp_id, config.database.as_deref()).await app.get_or_create_pool(&temp_id, config.database.as_deref()).await
}; };
let database_info = if include_database_info && config.db_type != DatabaseType::Nacos { let database_info = if include_database_info && config.db_type == DatabaseType::Nacos {
nacos_database_info
} else if include_database_info {
match &pool_result { match &pool_result {
Ok(_) => match app.connection_database_info(&temp_id, config.database.as_deref()).await { Ok(_) => match app.connection_database_info(&temp_id, config.database.as_deref()).await {
Ok(info) => info, Ok(info) => info,
+93 -21
View File
@@ -1024,17 +1024,30 @@ async fn test_redis_connection(
host: &str, host: &str,
port: u16, port: u16,
connect_timeout: std::time::Duration, connect_timeout: std::time::Duration,
) -> Result<String, String> { ) -> Result<Option<DatabaseConnectionInfo>, String> {
// Connection tests must exercise the same Redis lifecycle as a saved connection, // Connection tests must exercise the same Redis lifecycle as a saved connection,
// including compatibility auth, TLS, and database selection. // including compatibility auth, TLS, and database selection.
if config.uses_redis_cluster() { if config.uses_redis_cluster() {
drop(state.connect_redis_cluster(tunnel_id, config).await?); let connection =
} else if config.uses_redis_sentinel() { db::redis_driver::RedisConnection::Cluster(state.connect_redis_cluster(tunnel_id, config).await?);
drop(state.connect_redis_sentinel(tunnel_id, config).await?); let info = db::redis_driver::database_connection_info(&connection).await.ok();
} else { drop(connection);
drop(db::redis_driver::connect_standalone(config, host, port, connect_timeout).await?); return Ok(info);
} }
Ok("Connection successful".to_string()) if config.uses_redis_sentinel() {
let connection = db::redis_driver::RedisConnection::Direct(tokio::sync::Mutex::new(
state.connect_redis_sentinel(tunnel_id, config).await?,
));
let info = db::redis_driver::database_connection_info(&connection).await.ok();
drop(connection);
return Ok(info);
}
let connection = db::redis_driver::RedisConnection::Direct(tokio::sync::Mutex::new(
db::redis_driver::connect_standalone(config, host, port, connect_timeout).await?,
));
let info = db::redis_driver::database_connection_info(&connection).await.ok();
drop(connection);
Ok(info)
} }
#[tauri::command] #[tauri::command]
@@ -1173,7 +1186,13 @@ async fn test_connection_with_info_inner(
DatabaseType::Redis => { DatabaseType::Redis => {
// Keep the result inside the outer lifecycle so temporary transports // Keep the result inside the outer lifecycle so temporary transports
// are reset after both successful and failed Redis tests. // are reset after both successful and failed Redis tests.
test_redis_connection(state, &tunnel_id, &config, &host, port, connect_timeout).await match test_redis_connection(state, &tunnel_id, &config, &host, port, connect_timeout).await {
Ok(info) => {
database_info = info;
Ok("Connection successful".to_string())
}
Err(error) => Err(error),
}
} }
#[cfg(feature = "duckdb-sidecar")] #[cfg(feature = "duckdb-sidecar")]
DatabaseType::DuckDb => { DatabaseType::DuckDb => {
@@ -1191,8 +1210,19 @@ async fn test_connection_with_info_inner(
.connect(mongo_legacy_connect_params(&config, &host, port)?) .connect(mongo_legacy_connect_params(&config, &host, port)?)
.await .await
.map_err(|err| mongo_legacy_error_with_auth_hint(&err))?; .map_err(|err| mongo_legacy_error_with_auth_hint(&err))?;
let version = client
.mongo_server_version::<String>(config.effective_database().unwrap_or("admin"))
.await
.ok();
client.disconnect().await.ok(); client.disconnect().await.ok();
return Ok(ConnectionTestResult::success("Connection successful (via legacy driver)")); return Ok(ConnectionTestResult::success("Connection successful (via legacy driver)")
.with_database_info(version.map(|product_version| DatabaseConnectionInfo {
product_name: Some("MongoDB".to_string()),
product_version: Some(product_version),
current_database: config.effective_database().map(str::to_string),
driver_name: Some("MongoDB legacy Agent".to_string()),
..Default::default()
})));
} }
let native_err = match db::mongo_driver::connect_with_oidc( let native_err = match db::mongo_driver::connect_with_oidc(
@@ -1212,7 +1242,15 @@ async fn test_connection_with_info_inner(
) )
.await .await
{ {
Ok(()) => return Ok(ConnectionTestResult::success("Connection successful")), Ok(()) => {
let info =
db::mongo_driver::database_connection_info(&client, config.effective_database())
.await
.ok();
return Ok(
ConnectionTestResult::success("Connection successful").with_database_info(info)
);
}
Err(e) => e, Err(e) => e,
} }
} }
@@ -1228,7 +1266,18 @@ async fn test_connection_with_info_inner(
&mongo_legacy_error_with_auth_hint(&err), &mongo_legacy_error_with_auth_hint(&err),
) )
})?; })?;
let version = client
.mongo_server_version::<String>(config.effective_database().unwrap_or("admin"))
.await
.ok();
client.disconnect().await.ok(); client.disconnect().await.ok();
database_info = version.map(|product_version| DatabaseConnectionInfo {
product_name: Some("MongoDB".to_string()),
product_version: Some(product_version),
current_database: config.effective_database().map(str::to_string),
driver_name: Some("MongoDB legacy Agent".to_string()),
..Default::default()
});
Ok("Connection successful (via legacy driver)".to_string()) Ok("Connection successful (via legacy driver)".to_string())
} else { } else {
Err(native_err) Err(native_err)
@@ -1301,9 +1350,9 @@ async fn test_connection_with_info_inner(
config.external_config.as_ref(), config.external_config.as_ref(),
connect_timeout, connect_timeout,
)?; )?;
db::meilisearch_driver::test_connection(&client, connect_timeout) db::meilisearch_driver::test_connection(&client, connect_timeout).await?;
.await database_info = db::meilisearch_driver::database_connection_info(&client).await.ok();
.map(|_| "Connection successful".to_string()) Ok("Connection successful".to_string())
} }
DatabaseType::Hbase => { DatabaseType::Hbase => {
let client = db::hbase_driver::HBaseClient::new( let client = db::hbase_driver::HBaseClient::new(
@@ -1313,9 +1362,9 @@ async fn test_connection_with_info_inner(
false, false,
connect_timeout, connect_timeout,
)?; )?;
db::hbase_driver::test_connection(&client, connect_timeout) db::hbase_driver::test_connection(&client, connect_timeout).await?;
.await database_info = db::hbase_driver::database_connection_info(&client).await.ok().flatten();
.map(|_| "Connection successful".to_string()) Ok("Connection successful".to_string())
} }
DatabaseType::Qdrant | DatabaseType::Milvus | DatabaseType::Weaviate | DatabaseType::ChromaDb => { DatabaseType::Qdrant | DatabaseType::Milvus | DatabaseType::Weaviate | DatabaseType::ChromaDb => {
let kind = match config.db_type { let kind = match config.db_type {
@@ -1388,14 +1437,16 @@ async fn test_connection_with_info_inner(
DatabaseType::VictoriaMetrics => { DatabaseType::VictoriaMetrics => {
let client = let client =
db::victoriametrics_driver::VictoriaMetricsClient::new_for_config(&url, &config, connect_timeout)?; db::victoriametrics_driver::VictoriaMetricsClient::new_for_config(&url, &config, connect_timeout)?;
db::victoriametrics_driver::test_connection(&client, connect_timeout) db::victoriametrics_driver::test_connection(&client, connect_timeout).await?;
.await database_info =
.map(|_| "Connection successful".to_string()) db::victoriametrics_driver::database_connection_info(&client, connect_timeout).await.ok();
Ok("Connection successful".to_string())
} }
DatabaseType::Nacos => { DatabaseType::Nacos => {
let admin_config = state.nacos_admin_config_for_connection(connection_id, &config).await?; let admin_config = state.nacos_admin_config_for_connection(connection_id, &config).await?;
let adapter = state.nacos_registry.build_transient_config(admin_config).await?; let adapter = state.nacos_registry.build_transient_config(admin_config).await?;
adapter.test_connection_with_scope_validation().await?; let info = adapter.test_connection_with_scope_validation().await?;
database_info = dbx_core::nacos::service::database_info_from_connection(&info);
Ok("Connection successful".to_string()) Ok("Connection successful".to_string())
} }
DatabaseType::Consul => { DatabaseType::Consul => {
@@ -1413,6 +1464,13 @@ async fn test_connection_with_info_inner(
} else { } else {
client.agent_self().await.ok() client.agent_self().await.ok()
}; };
database_info = identity.as_ref().map(|identity| DatabaseConnectionInfo {
product_name: Some("Consul".to_string()),
product_version: identity.version.clone(),
server_comment: Some(format!("Agent {}", identity.node)),
driver_name: Some("Consul HTTP API".to_string()),
..Default::default()
});
Ok(identity Ok(identity
.map(|identity| format!("Connection successful (Agent: {} at {})", identity.node, identity.address)) .map(|identity| format!("Connection successful (Agent: {} at {})", identity.node, identity.address))
.unwrap_or_else(|| { .unwrap_or_else(|| {
@@ -1426,7 +1484,21 @@ async fn test_connection_with_info_inner(
let mqc = state.mq_admin_config_for_connection(connection_id, &config).await?; let mqc = state.mq_admin_config_for_connection(connection_id, &config).await?;
let agent_launch = dbx_core::mq::service::resolve_mq_agent_launch_spec(&mqc, state); let agent_launch = dbx_core::mq::service::resolve_mq_agent_launch_spec(&mqc, state);
let adapter = state.mq_registry.build_transient_config(mqc, agent_launch).await?; let adapter = state.mq_registry.build_transient_config(mqc, agent_launch).await?;
adapter.test_connection().await?; let info = adapter.test_connection().await?;
database_info = Some(DatabaseConnectionInfo {
product_name: Some(
match info.system_kind {
dbx_core::mq::types::MqSystemKind::Pulsar => "Pulsar",
dbx_core::mq::types::MqSystemKind::Kafka => "Kafka",
dbx_core::mq::types::MqSystemKind::RocketMq => "RocketMQ",
dbx_core::mq::types::MqSystemKind::RabbitMq => "RabbitMQ",
}
.to_string(),
),
product_version: info.server_version,
driver_name: Some("Message Queue Admin API".to_string()),
..Default::default()
});
Ok("Connection successful".to_string()) Ok("Connection successful".to_string())
} }
#[cfg(not(feature = "mq-admin"))] #[cfg(not(feature = "mq-admin"))]