fix(mcp): let the tool allowlist express plugin tools with wildcards
This commit is contained in:
1 parent
e7883a6466
commit
6f5511a732
15 files changed
+208
-3
No files matched your search
@@ -4073,7 +4073,19 @@ fn policy_allows_connection(
|
||||
}
|
||||
|
||||
fn policy_allows_tool(policy: &McpGlobalPolicy, tool_name: &str) -> bool {
|
||||
policy.allowed_tool_names.as_ref().is_none_or(|allowed| allowed.iter().any(|name| name == tool_name))
|
||||
let Some(allowed) = policy.allowed_tool_names.as_ref() else { return true };
|
||||
if allowed.iter().any(|name| name == tool_name) {
|
||||
return true;
|
||||
}
|
||||
// Plugin wildcard entries: plugin tool names are discovered from sidecars
|
||||
// at runtime, so a static settings list cannot name them individually —
|
||||
// `dbx_<prefix>__*` exposes every tool of one plugin, `dbx_*__*` every
|
||||
// plugin. Static tools never contain the `__` separator (guarded by
|
||||
// `is_plugin_tool_name`), so a wildcard cannot widen their access.
|
||||
let Some((prefix, _)) = tool_name.strip_prefix("dbx_").and_then(|rest| rest.split_once("__")) else {
|
||||
return false;
|
||||
};
|
||||
allowed.iter().any(|name| name == "dbx_*__*" || name == &format!("dbx_{prefix}__*"))
|
||||
}
|
||||
|
||||
fn database_scope_for_connection(
|
||||
@@ -5723,6 +5735,38 @@ mod tests {
|
||||
assert!(result_text(&unknown).contains("does not contribute MCP tools"), "{}", result_text(&unknown));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn plugin_tool_wildcards_match_only_the_plugin_namespace() {
|
||||
let per_plugin =
|
||||
McpGlobalPolicy { allowed_tool_names: Some(vec!["dbx_ssh__*".to_string()]), ..Default::default() };
|
||||
assert!(policy_allows_tool(&per_plugin, "dbx_ssh__sftp_list_dir"));
|
||||
assert!(policy_allows_tool(&per_plugin, "dbx_ssh__sftp_write_file"));
|
||||
assert!(!policy_allows_tool(&per_plugin, "dbx_kafka__kafka_topics_list"));
|
||||
assert!(
|
||||
!policy_allows_tool(&per_plugin, "dbx_execute_query"),
|
||||
"a plugin wildcard must never widen a static tool"
|
||||
);
|
||||
|
||||
let every_plugin = McpGlobalPolicy {
|
||||
allowed_tool_names: Some(vec!["dbx_plugin_list".to_string(), "dbx_*__*".to_string()]),
|
||||
..Default::default()
|
||||
};
|
||||
assert!(policy_allows_tool(&every_plugin, "dbx_kafka__kafka_topics_delete"));
|
||||
assert!(policy_allows_tool(&every_plugin, "dbx_ssh__sftp_list_dir"));
|
||||
assert!(policy_allows_tool(&every_plugin, "dbx_plugin_list"), "exact entries keep working beside the wildcard");
|
||||
assert!(!policy_allows_tool(&every_plugin, "dbx_execute_query"));
|
||||
|
||||
let explicit = McpGlobalPolicy {
|
||||
allowed_tool_names: Some(vec!["dbx_ssh__sftp_list_dir".to_string()]),
|
||||
..Default::default()
|
||||
};
|
||||
assert!(policy_allows_tool(&explicit, "dbx_ssh__sftp_list_dir"));
|
||||
assert!(
|
||||
!policy_allows_tool(&explicit, "dbx_ssh__sftp_write_file"),
|
||||
"no wildcard means per-tool gating stays exact"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn plugin_call_is_gated_by_the_flat_tool_allowlist() {
|
||||
// The meta tool itself is allowed, but the flat name of the targeted
|
||||
|
||||
Reference in new issue
Block a user