clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-24 22:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

using RW locks

Browse Source
This commit is contained in:
kevin zhao
2025-11-20 20:09:30 -05:00
parent 8fb06a9d5b
commit a2528c3675
4 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
codex-rs/core/src/codex.rs
View File

@@ -289,7 +289,7 @@ pub(crate) struct TurnContext {
pub(crate) final_output_json_schema: Option<Value>,
pub(crate) codex_linux_sandbox_exe: Option<PathBuf>,
pub(crate) tool_call_gate: Arc<ReadinessFlag>,
pub(crate) exec_policy: Arc<ExecPolicy>,
pub(crate) exec_policy: Arc<RwLock<ExecPolicy>>,
pub(crate) truncation_policy: TruncationPolicy,
}
@@ -347,7 +347,7 @@ pub(crate) struct SessionConfiguration {
/// Set of feature flags for this session
features: Features,
/// Execpolicy policy, applied only when enabled by feature flag.
exec_policy: Arc<ExecPolicy>,
exec_policy: Arc<RwLock<ExecPolicy>>,
// TODO(pakrym): Remove config from here
original_config_do_not_use: Arc<Config>,
@@ -884,19 +884,17 @@ impl Session {
return Err(ExecPolicyUpdateError::FeatureDisabled);
}
let policy = crate::exec_policy::append_allow_prefix_rule_and_update(
crate::exec_policy::append_allow_prefix_rule_and_update(
&codex_home,
current_policy,
&current_policy,
prefix,
)?;
let mut state = self.state.lock().await;
state.session_configuration.exec_policy = policy;
)
.await?;
Ok(())
}
pub(crate) async fn current_exec_policy(&self) -> Arc<ExecPolicy> {
pub(crate) async fn current_exec_policy(&self) -> Arc<RwLock<ExecPolicy>> {
let state = self.state.lock().await;
state.session_configuration.exec_policy.clone()
}
@@ -2844,7 +2842,7 @@ mod tests {
cwd: config.cwd.clone(),
original_config_do_not_use: Arc::clone(&config),
features: Features::default(),
exec_policy: Arc::new(ExecPolicy::empty()),
exec_policy: Arc::new(RwLock::new(ExecPolicy::empty())),
session_source: SessionSource::Exec,
};
@@ -2922,7 +2920,7 @@ mod tests {
cwd: config.cwd.clone(),
original_config_do_not_use: Arc::clone(&config),
features: Features::default(),
exec_policy: Arc::new(ExecPolicy::empty()),
exec_policy: Arc::new(RwLock::new(ExecPolicy::empty())),
session_source: SessionSource::Exec,
};

56
codex-rs/core/src/exec_policy.rs
View File

@@ -15,6 +15,7 @@ use codex_protocol::protocol::AskForApproval;
use codex_protocol::protocol::SandboxPolicy;
use thiserror::Error;
use tokio::fs;
use tokio::sync::RwLock;
use crate::bash::parse_shell_lc_plain_commands;
use crate::features::Feature;
@@ -67,9 +68,9 @@ pub enum ExecPolicyUpdateError {
pub(crate) async fn exec_policy_for(
features: &Features,
codex_home: &Path,
) -> Result<Arc<Policy>, ExecPolicyError> {
) -> Result<Arc<RwLock<Policy>>, ExecPolicyError> {
if !features.enabled(Feature::ExecPolicy) {
return Ok(Arc::new(Policy::empty()));
return Ok(Arc::new(RwLock::new(Policy::empty())));
}
let policy_dir = codex_home.join(POLICY_DIR_NAME);
@@ -93,7 +94,7 @@ pub(crate) async fn exec_policy_for(
})?;
}
let policy = Arc::new(parser.build());
let policy = Arc::new(RwLock::new(parser.build()));
tracing::debug!(
"loaded execpolicy from {} files in {}",
policy_paths.len(),
@@ -107,11 +108,11 @@ pub(crate) fn default_policy_path(codex_home: &Path) -> PathBuf {
codex_home.join(POLICY_DIR_NAME).join(DEFAULT_POLICY_FILE)
}
pub(crate) fn append_allow_prefix_rule_and_update(
pub(crate) async fn append_allow_prefix_rule_and_update(
codex_home: &Path,
mut current_policy: Arc<Policy>,
current_policy: &Arc<RwLock<Policy>>,
prefix: &[String],
) -> Result<Arc<Policy>, ExecPolicyUpdateError> {
) -> Result<(), ExecPolicyUpdateError> {
let policy_path = default_policy_path(codex_home);
append_allow_prefix_rule(&policy_path, prefix).map_err(|source| {
ExecPolicyUpdateError::AppendRule {
@@ -120,9 +121,12 @@ pub(crate) fn append_allow_prefix_rule_and_update(
}
})?;
Arc::make_mut(&mut current_policy).add_prefix_rule(prefix, Decision::Allow)?;
current_policy
.write()
.await
.add_prefix_rule(prefix, Decision::Allow)?;
Ok(current_policy)
Ok(())
}
fn requirement_from_decision(
@@ -267,7 +271,7 @@ mod tests {
let commands = [vec!["rm".to_string()]];
assert!(matches!(
policy.check_multiple(commands.iter()),
policy.read().await.check_multiple(commands.iter()),
Evaluation::NoMatch { .. }
));
assert!(!temp_dir.path().join(POLICY_DIR_NAME).exists());
@@ -301,7 +305,7 @@ mod tests {
.expect("policy result");
let command = [vec!["rm".to_string()]];
assert!(matches!(
policy.check_multiple(command.iter()),
policy.read().await.check_multiple(command.iter()),
Evaluation::Match { .. }
));
}
@@ -320,7 +324,7 @@ mod tests {
.expect("policy result");
let command = [vec!["ls".to_string()]];
assert!(matches!(
policy.check_multiple(command.iter()),
policy.read().await.check_multiple(command.iter()),
Evaluation::NoMatch { .. }
));
}
@@ -433,18 +437,21 @@ prefix_rule(pattern=["rm"], decision="forbidden")
);
}
#[test]
fn append_allow_prefix_rule_updates_policy_and_file() {
#[tokio::test]
async fn append_allow_prefix_rule_updates_policy_and_file() {
let codex_home = tempdir().expect("create temp dir");
let current_policy = Arc::new(Policy::empty());
let current_policy = Arc::new(RwLock::new(Policy::empty()));
let prefix = vec!["echo".to_string(), "hello".to_string()];
let updated_policy =
append_allow_prefix_rule_and_update(codex_home.path(), current_policy, &prefix)
.expect("update policy");
append_allow_prefix_rule_and_update(codex_home.path(), &current_policy, &prefix)
.await
.expect("update policy");
let evaluation =
updated_policy.check(&["echo".to_string(), "hello".to_string(), "world".to_string()]);
let evaluation = current_policy.read().await.check(&[
"echo".to_string(),
"hello".to_string(),
"world".to_string(),
]);
assert!(matches!(
evaluation,
Evaluation::Match {
@@ -457,16 +464,17 @@ prefix_rule(pattern=["rm"], decision="forbidden")
.expect("policy file should have been created");
assert_eq!(
contents,
"prefix_rule(pattern=[\"echo\", \"hello\"], decision=\"allow\")\n"
"prefix_rule(pattern=[\"echo\",\"hello\"], decision=\"allow\")\n"
);
}
#[test]
fn append_allow_prefix_rule_rejects_empty_prefix() {
#[tokio::test]
async fn append_allow_prefix_rule_rejects_empty_prefix() {
let codex_home = tempdir().expect("create temp dir");
let current_policy = Arc::new(Policy::empty());
let current_policy = Arc::new(RwLock::new(Policy::empty()));
let result = append_allow_prefix_rule_and_update(codex_home.path(), current_policy, &[]);
let result =
append_allow_prefix_rule_and_update(codex_home.path(), &current_policy, &[]).await;
assert!(matches!(
result,

3
codex-rs/core/src/tools/handlers/shell.rs
View File

@@ -232,6 +232,7 @@ impl ShellHandler {
emitter.begin(event_ctx).await;
let exec_policy = session.current_exec_policy().await;
let exec_policy = exec_policy.read().await;
let req = ShellRequest {
command: exec_params.command.clone(),
cwd: exec_params.cwd.clone(),
@@ -240,7 +241,7 @@ impl ShellHandler {
with_escalated_permissions: exec_params.with_escalated_permissions,
justification: exec_params.justification.clone(),
approval_requirement: create_approval_requirement_for_command(
exec_policy.as_ref(),
&exec_policy,
&exec_params.command,
turn.approval_policy,
&turn.sandbox_policy,

3
codex-rs/core/src/unified_exec/session_manager.rs
View File

@@ -555,6 +555,7 @@ impl UnifiedExecSessionManager {
let mut orchestrator = ToolOrchestrator::new();
let mut runtime = UnifiedExecRuntime::new(self);
let exec_policy = context.session.current_exec_policy().await;
let exec_policy = exec_policy.read().await;
let req = UnifiedExecToolRequest::new(
command.to_vec(),
cwd,
@@ -562,7 +563,7 @@ impl UnifiedExecSessionManager {
with_escalated_permissions,
justification,
create_approval_requirement_for_command(
exec_policy.as_ref(),
&exec_policy,
command,
context.turn.approval_policy,
&context.turn.sandbox_policy,