mirror of
https://github.com/openai/codex.git
synced 2026-11-22 15:15:18 +00:00
Prompt before trusting local project directories (#36960)
## Why Trusting a directory enables project-local config, hooks, and exec policies, which can increase exposure to prompt injection. Require an explicit decision instead of automatically trusting projects whose trust level is unset. ## What changed - Add a directory-trust step to TUI onboarding, with options to trust and continue or quit. - Apply trust to the Git repository root when starting from a subdirectory, persist the decision, and reload config before continuing. - Keep the prompt active and show the config error when trust cannot be persisted. Skip the prompt for remote workspaces and projects with an explicit trust level. ## Testing - Cover trust-screen rendering, keyboard selection, persistence failures, and prompt visibility for explicit trust and Windows sandbox states. GitOrigin-RevId: 850e6f54aec84d584cd161348ecdb1da89aaabd4
This commit is contained in:
1 parent
92689b6b7b
commit
17801b4206
12 files changed
+690
-388
No files matched your search
@@ -1488,8 +1488,7 @@ impl ConfigBuilder {
|
||||
vec![lock_layer],
|
||||
config_layer_stack.requirements().clone(),
|
||||
config_layer_stack.requirements_toml().clone(),
|
||||
)?
|
||||
.with_project_root(config_layer_stack.project_root().cloned());
|
||||
)?;
|
||||
let mut config = Config::load_config_with_layer_stack(
|
||||
LOCAL_FS.as_ref(),
|
||||
lock_config_toml,
|
||||
@@ -1799,7 +1798,6 @@ impl Config {
|
||||
.requirements_toml()
|
||||
.clone(),
|
||||
)?
|
||||
.with_project_root(refreshed_config.config_layer_stack.project_root().cloned())
|
||||
.with_user_and_project_exec_policy_rules_ignored(
|
||||
refreshed_config
|
||||
.config_layer_stack
|
||||
@@ -3348,21 +3346,12 @@ impl Config {
|
||||
.into_iter()
|
||||
.map(|path| AbsolutePathBuf::resolve_path_against_base(path, resolved_cwd.as_path()))
|
||||
.collect();
|
||||
let project_root = config_layer_stack
|
||||
.project_root()
|
||||
.cloned()
|
||||
.unwrap_or_else(|| resolved_cwd.clone());
|
||||
let repo_root = resolve_root_git_project_for_trust(fs, &resolved_cwd).await;
|
||||
let active_project = cfg
|
||||
.get_active_project(
|
||||
resolved_cwd.as_path(),
|
||||
Some(project_root.as_path()),
|
||||
repo_root.as_ref().map(AbsolutePathBuf::as_path),
|
||||
)
|
||||
.or_else(|| {
|
||||
repo_root.as_ref().and_then(|repo_root| {
|
||||
cfg.get_active_project(repo_root.as_path(), /*repo_root*/ None)
|
||||
})
|
||||
})
|
||||
.unwrap_or(ProjectConfig { trust_level: None });
|
||||
let permission_config_syntax = resolve_permission_config_syntax(
|
||||
&config_layer_stack,
|
||||
|
||||
Reference in new issue
Block a user