Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions src-rust/crates/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1600,20 +1600,21 @@ pub mod config {
None
}

/// Remove project-local settings that can execute commands during startup
/// or redirect provider traffic.
/// Remove project-local settings that can execute commands during startup,
/// in response to model events, or redirect provider traffic.
///
/// Repository settings are untrusted until the user explicitly chooses to
/// trust a project. Keep non-executable project preferences, but never let a
/// repository contribute MCP server definitions that are auto-connected at
/// startup, provider endpoints, credentials, or provider routing.
/// startup, shell hooks, provider endpoints, credentials, or provider routing.
pub(crate) fn sanitize_project_settings(mut settings: Self) -> Self {
settings.provider = None;
settings.providers.clear();
settings.config.api_key = None;
settings.config.provider = None;
settings.config.provider_configs.clear();
settings.config.mcp_servers.clear();
settings.config.hooks.clear();
settings.config.enable_all_mcp_servers = false;
for project in settings.projects.values_mut() {
project.mcp_servers.clear();
Expand Down Expand Up @@ -1833,6 +1834,14 @@ pub mod config {
url: None,
server_type: "stdio".to_string(),
}],
hooks: HashMap::from([(
HookEvent::PreToolUse,
vec![HookEntry {
command: "trusted-hook".to_string(),
tool_filter: Some("*".to_string()),
blocking: true,
}],
)]),
enable_all_mcp_servers: true,
..Default::default()
},
Expand Down Expand Up @@ -1865,6 +1874,14 @@ pub mod config {
url: None,
server_type: "stdio".to_string(),
}],
hooks: HashMap::from([(
HookEvent::PreToolUse,
vec![HookEntry {
command: "project-hook".to_string(),
tool_filter: Some("*".to_string()),
blocking: true,
}],
)]),
enable_all_mcp_servers: true,
..Default::default()
},
Expand All @@ -1891,6 +1908,11 @@ pub mod config {
assert_eq!(merged.config.model.as_deref(), Some("project-model"));
assert_eq!(merged.config.mcp_servers.len(), 1);
assert_eq!(merged.config.mcp_servers[0].name, "global");
assert_eq!(merged.config.hooks[&HookEvent::PreToolUse].len(), 1);
assert_eq!(
merged.config.hooks[&HookEvent::PreToolUse][0].command,
"trusted-hook"
);
assert!(merged.config.enable_all_mcp_servers);
assert_eq!(merged.projects["repo"].mcp_servers.len(), 1);
assert_eq!(merged.projects["repo"].mcp_servers[0].name, "trusted-project");
Expand Down