mirror of
https://github.com/openai/codex.git
synced 2026-10-19 17:28:46 +00:00
## Why Guardian V2 should not override a managed approval-reviewer policy that excludes the user reviewer. ## What changed - Force `features.guardianv2` off when `allowed_approvals_reviewers` does not include `user`, for both local requirements and cloud config bundles. - Preserve Guardian V2 when the user reviewer remains allowed or when only legacy Guardian feature settings are present. - Return the effective disabled value through `config/read`. ## Testing Added coverage for cloud requirements and the app-server config RPC. GitOrigin-RevId: 82b6d0aaf47fbaa58ae349d4e56777cd442f5807
111 lines
3.7 KiB
Rust
111 lines
3.7 KiB
Rust
use anyhow::Result;
|
|
use codex_config::CloudConfigBundleLoader;
|
|
use codex_config::test_support::CloudConfigBundleFixture;
|
|
use codex_features::Feature;
|
|
use codex_protocol::protocol::AskForApproval;
|
|
use core_test_support::responses::start_mock_server;
|
|
use core_test_support::test_codex::test_codex;
|
|
use pretty_assertions::assert_eq;
|
|
use std::sync::Arc;
|
|
use std::sync::RwLock;
|
|
use tempfile::TempDir;
|
|
|
|
#[tokio::test]
|
|
async fn refreshed_cloud_bundle_updates_later_sessions() -> Result<()> {
|
|
let server = start_mock_server().await;
|
|
let home = Arc::new(TempDir::new()?);
|
|
let initial_bundle = CloudConfigBundleFixture::enterprise_requirement(
|
|
r#"allowed_approval_policies = ["never"]"#,
|
|
)
|
|
.add_enterprise_config(r#"developer_instructions = "initial managed instructions""#)
|
|
.into_bundle();
|
|
let latest = Arc::new(RwLock::new(initial_bundle));
|
|
let getter_latest = Arc::clone(&latest);
|
|
let loader = CloudConfigBundleLoader::from_getter(move || {
|
|
let latest = Arc::clone(&getter_latest);
|
|
async move { Ok(Some(latest.read().expect("bundle state lock").clone())) }
|
|
});
|
|
|
|
let mut initial_builder = test_codex()
|
|
.with_home(Arc::clone(&home))
|
|
.with_cloud_config_bundle(loader.clone());
|
|
let initial = initial_builder.build_with_auto_env(&server).await?;
|
|
assert_eq!(
|
|
initial.session_configured.approval_policy,
|
|
AskForApproval::Never
|
|
);
|
|
assert_eq!(
|
|
initial
|
|
.codex
|
|
.config()
|
|
.await
|
|
.developer_instructions
|
|
.as_deref(),
|
|
Some("initial managed instructions")
|
|
);
|
|
|
|
*latest.write().expect("bundle state lock") = CloudConfigBundleFixture::enterprise_requirement(
|
|
r#"allowed_approval_policies = ["on-request"]"#,
|
|
)
|
|
.add_enterprise_config(r#"developer_instructions = "refreshed managed instructions""#)
|
|
.into_bundle();
|
|
|
|
let mut refreshed_builder = test_codex()
|
|
.with_home(home)
|
|
.with_cloud_config_bundle(loader);
|
|
let refreshed = refreshed_builder.build_with_auto_env(&server).await?;
|
|
assert_eq!(
|
|
refreshed.session_configured.approval_policy,
|
|
AskForApproval::OnRequest
|
|
);
|
|
assert_eq!(
|
|
refreshed
|
|
.codex
|
|
.config()
|
|
.await
|
|
.developer_instructions
|
|
.as_deref(),
|
|
Some("refreshed managed instructions")
|
|
);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn managed_guardian_v1_requirements_disable_guardian_v2() -> Result<()> {
|
|
let server = start_mock_server().await;
|
|
|
|
for (requirements, guardian_v2_enabled) in [
|
|
(r#"allowed_approvals_reviewers = ["auto_review"]"#, false),
|
|
(
|
|
r#"allowed_approvals_reviewers = ["guardian_subagent"]"#,
|
|
false,
|
|
),
|
|
(
|
|
r#"allowed_approvals_reviewers = ["auto_review", "user"]"#,
|
|
true,
|
|
),
|
|
("[features]\nguardian_approval = true\n", true),
|
|
("[features]\nauto_review = true\n", true),
|
|
] {
|
|
let mut builder = test_codex()
|
|
.with_pre_build_hook(|home| {
|
|
std::fs::write(home.join("config.toml"), "[features]\nguardianv2 = true\n")
|
|
.expect("Guardian v2 configuration should be written");
|
|
})
|
|
.with_cloud_config_bundle(
|
|
CloudConfigBundleFixture::loader_with_enterprise_requirement(requirements),
|
|
);
|
|
let test = builder.build_with_auto_env(&server).await?;
|
|
|
|
assert!(test.config.features.enabled(Feature::GuardianApproval));
|
|
assert_eq!(
|
|
test.config.features.enabled(Feature::GuardianV2),
|
|
guardian_v2_enabled,
|
|
"{requirements}"
|
|
);
|
|
}
|
|
|
|
Ok(())
|
|
}
|