From a79c547d0aca3659e51c5366c8f874517058e49d Mon Sep 17 00:00:00 2001 From: Eva Wong Date: Wed, 18 Mar 2026 12:31:39 -0700 Subject: [PATCH] Fail closed for invalid managed profile security keys --- codex-rs/core/src/config_loader/macos.rs | 15 +++++++++++++-- codex-rs/core/src/config_loader/tests.rs | 8 ++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/codex-rs/core/src/config_loader/macos.rs b/codex-rs/core/src/config_loader/macos.rs index fe4e3c4015..98899ca47d 100644 --- a/codex-rs/core/src/config_loader/macos.rs +++ b/codex-rs/core/src/config_loader/macos.rs @@ -194,7 +194,7 @@ fn parse_managed_config_base64(encoded: &str) -> io::Result bool { matches!( - managed_entry_top_level_key(dropped_entry), + managed_entry_leaf_key(dropped_entry), "approval_policy" | "sandbox_mode" ) } @@ -261,11 +261,22 @@ fn is_invalid_security_managed_requirements_entry(dropped_entry: &str) -> bool { } fn managed_entry_top_level_key(dropped_entry: &str) -> &str { + let path = managed_entry_path(dropped_entry); + path.split(['.', '[']).next().unwrap_or(path) +} + +fn managed_entry_leaf_key(dropped_entry: &str) -> &str { + let path = managed_entry_path(dropped_entry); + let leaf = path.rsplit('.').next().unwrap_or(path); + leaf.split('[').next().unwrap_or(leaf) +} + +fn managed_entry_path(dropped_entry: &str) -> &str { let path = dropped_entry .split_once(':') .map_or(dropped_entry, |(path, _)| path) .trim(); - path.split(['.', '[']).next().unwrap_or(path) + path } fn decode_managed_preferences_base64(encoded: &str) -> io::Result { diff --git a/codex-rs/core/src/config_loader/tests.rs b/codex-rs/core/src/config_loader/tests.rs index 9aec2045b3..6941fabe58 100644 --- a/codex-rs/core/src/config_loader/tests.rs +++ b/codex-rs/core/src/config_loader/tests.rs @@ -482,6 +482,14 @@ async fn managed_preferences_invalid_security_config_entry_fails_closed() -> any "sandbox_mode = \"bogus\"\nmodel = \"managed\"\n", "sandbox_mode", ), + ( + "[profiles.team]\napproval_policy = \"bogus\"\n", + "profiles.team.approval_policy", + ), + ( + "[profiles.team]\nsandbox_mode = \"bogus\"\n", + "profiles.team.sandbox_mode", + ), ] { let tmp = tempdir()?; let err = load_config_layers_state(