25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(mcp-bridge): bind call-plugin-tool to the connection's own plugin
Jinpydcd16e0d0ae3
diff --git a/src-tauri/src/commands/mcp_bridge.rs b/src-tauri/src/commands/mcp_bridge.rsindex 0ce7f24cb3..05ecb78894 100644--- a/src-tauri/src/commands/mcp_bridge.rs+++ b/src-tauri/src/commands/mcp_bridge.rs@@ -418,7 +418,8 @@ mod tests {ensure_mcp_mongo_pipeline_target_allowed_by_id, ensure_mcp_sql_database_switch_allowed,is_terminal_routed_exec, mongo_filter_is_effectively_unbounded, mongo_pipeline_has_write_stage,parse_content_length, plugin_connection_summaries, plugin_connection_summary, read_bridge_request,- resolve_connection, resolve_mongo_database, resolve_mongo_target_values, write_port_file, AppState,+ resolve_call_plugin_target, resolve_connection, resolve_mongo_database, resolve_mongo_target_values,+ write_port_file, AppState,};use dbx_core::models::connection::{ConnectionConfig, DatabaseType};use dbx_core::storage::{McpConnectionPolicy, McpDatabasePolicy, McpDatabaseScope, McpGlobalPolicy};@@ -465,6 +466,20 @@ mod tests {let _ = std::fs::remove_dir_all(root);}+ #[test]+ fn call_plugin_target_accepts_the_bound_plugin_with_or_without_an_echo() {+ assert_eq!(resolve_call_plugin_target(Some("io.dbx.ssh"), None).unwrap(), "io.dbx.ssh");+ assert_eq!(resolve_call_plugin_target(Some("io.dbx.ssh"), Some("io.dbx.ssh")).unwrap(), "io.dbx.ssh");+ }++ #[test]+ fn call_plugin_target_rejects_override_and_unbound_connections() {+ assert!(resolve_call_plugin_target(Some("io.dbx.ssh"), Some("io.dbx.files")).is_err());+ assert!(resolve_call_plugin_target(None, Some("io.dbx.ssh")).is_err());+ assert!(resolve_call_plugin_target(Some(""), Some("io.dbx.ssh")).is_err());+ assert_eq!(resolve_call_plugin_target(None, None).unwrap_err(), "connection is not bound to a plugin");+ }+#[test]fn content_length_parsing_tolerates_case_and_whitespace() {assert_eq!(parse_content_length("POST /x HTTP/1.1\r\nContent-Length: 12\r\n\r\n"), 12);@@ -1541,6 +1556,26 @@ async fn plugin_agent_mode_on(state: &Arc<AppState>, plugin_id: &str, connection.is_some_and(|mode| mode == "auto" || mode == "strict")}+/// `/call-plugin-tool` may only talk to the saved connection's own plugin:+/// the lifecycle payload (which carries the connection's credentials) is+/// built from the config, so honoring a request-named `plugin_id` would hand+/// connection A's secrets to plugin B's sidecar. Callers may repeat the+/// binding, never override it.+fn resolve_call_plugin_target(+ config_plugin_id: Option<&str>,+ request_plugin_id: Option<&str>,+) -> Result<String, String> {+ let bound = config_plugin_id+ .filter(|id| !id.is_empty())+ .ok_or_else(|| "connection is not bound to a plugin".to_string())?;+ if let Some(requested) = request_plugin_id {+ if requested != bound {+ return Err(format!("plugin_id {requested:?} does not match the connection's plugin {bound:?}"));+ }+ }+ Ok(bound.to_string())+}+/// POST /call-plugin-tool: runs a plugin MCP tool on the desktop app's own/// plugin session — the same sidecar process the workbench talks to. The/// connection's workbench tab is opened only when the call will route into@@ -1568,11 +1603,13 @@ async fn handle_call_plugin_tool(return;}};- let plugin_id = req.plugin_id.or_else(|| config.plugin_id.clone()).unwrap_or_default();- if plugin_id.is_empty() {- respond_error(stream, "400 Bad Request", "connection is not bound to a plugin").await;- return;- }+ let plugin_id = match resolve_call_plugin_target(config.plugin_id.as_deref(), req.plugin_id.as_deref()) {+ Ok(plugin_id) => plugin_id,+ Err(message) => {+ respond_error(stream, "400 Bad Request", &message).await;+ return;+ }+ };// The workbench tab only needs to exist when the forwarded call will// actually route into the visible terminal: an explicit runInTerminal,// or no flag plus the connection's terminal MCP mode being on (asked