mirror of
https://github.com/openai/codex.git
synced 2026-10-27 08:01:52 +00:00
## Why Drive-shaped POSIX paths such as `/C:/workspace` can be mistaken for Windows paths when an automatic approval request converts them from `PathUri`. ## What changed - Keep approval paths as `PathUri` values together with their environment ID until the automatic review request is built. - Recover host-native paths for local working directories when strict conversion cannot determine the path convention. - Continue rejecting incompatible paths from remote environments. ## Testing Add coverage for drive-shaped local POSIX paths, foreign remote paths, and preserving apply-patch path URIs while building approval actions. GitOrigin-RevId: 3fd31cfb4e8b46f9968ff66d5e986ca777430185
331 lines
11 KiB
Rust
331 lines
11 KiB
Rust
//! Central approval policy-stage execution and reviewer routing.
|
|
|
|
use std::sync::Arc;
|
|
|
|
use crate::guardian::guardian_rejection_message;
|
|
use crate::guardian::guardian_timeout_message;
|
|
use crate::guardian::new_guardian_review_id;
|
|
use crate::guardian::review_approval_request;
|
|
use crate::guardian::routes_approval_to_guardian_with_reviewer;
|
|
use crate::hook_runtime::run_permission_request_hooks;
|
|
use crate::sandboxing::SandboxPermissions;
|
|
use crate::session::session::Session;
|
|
use crate::session::turn_context::TurnContext;
|
|
use crate::tools::flat_tool_name;
|
|
use crate::tools::sandboxing::ApprovalCtx;
|
|
use crate::tools::sandboxing::ToolCtx;
|
|
use crate::tools::sandboxing::ToolError;
|
|
use crate::tools::sandboxing::ToolRuntime;
|
|
use codex_config::types::ApprovalsReviewer;
|
|
use codex_hooks::PermissionRequestDecision;
|
|
use codex_otel::ToolDecisionSource;
|
|
use codex_protocol::models::AdditionalPermissionProfile;
|
|
use codex_protocol::protocol::NetworkPolicyRuleAction;
|
|
use codex_protocol::protocol::ReviewDecision;
|
|
use codex_utils_absolute_path::AbsolutePathBuf;
|
|
use codex_utils_path_uri::PathUri;
|
|
|
|
#[derive(Clone, Debug, PartialEq)]
|
|
pub(crate) enum ApprovalAction {
|
|
Shell {
|
|
id: String,
|
|
environment_id: String,
|
|
command: Vec<String>,
|
|
cwd: PathUri,
|
|
sandbox_permissions: SandboxPermissions,
|
|
additional_permissions: Option<AdditionalPermissionProfile>,
|
|
justification: Option<String>,
|
|
},
|
|
ExecCommand {
|
|
id: String,
|
|
environment_id: String,
|
|
command: Vec<String>,
|
|
cwd: PathUri,
|
|
sandbox_permissions: SandboxPermissions,
|
|
additional_permissions: Option<AdditionalPermissionProfile>,
|
|
justification: Option<String>,
|
|
tty: bool,
|
|
},
|
|
ApplyPatch {
|
|
id: String,
|
|
environment_id: String,
|
|
cwd: PathUri,
|
|
files: Vec<PathUri>,
|
|
patch: String,
|
|
},
|
|
}
|
|
|
|
impl ApprovalAction {
|
|
fn into_guardian_request(self) -> std::io::Result<crate::guardian::GuardianApprovalRequest> {
|
|
Ok(match self {
|
|
Self::Shell {
|
|
id,
|
|
environment_id,
|
|
command,
|
|
cwd,
|
|
sandbox_permissions,
|
|
additional_permissions,
|
|
justification,
|
|
} => crate::guardian::GuardianApprovalRequest::Shell {
|
|
id,
|
|
command,
|
|
cwd: guardian_cwd(&environment_id, cwd)?,
|
|
sandbox_permissions,
|
|
additional_permissions,
|
|
justification,
|
|
},
|
|
Self::ExecCommand {
|
|
id,
|
|
environment_id,
|
|
command,
|
|
cwd,
|
|
sandbox_permissions,
|
|
additional_permissions,
|
|
justification,
|
|
tty,
|
|
} => crate::guardian::GuardianApprovalRequest::ExecCommand {
|
|
id,
|
|
command,
|
|
cwd: guardian_cwd(&environment_id, cwd)?,
|
|
sandbox_permissions,
|
|
additional_permissions,
|
|
justification,
|
|
tty,
|
|
},
|
|
Self::ApplyPatch {
|
|
id,
|
|
environment_id,
|
|
cwd,
|
|
files,
|
|
patch,
|
|
} => crate::guardian::GuardianApprovalRequest::ApplyPatch {
|
|
id,
|
|
cwd: guardian_cwd(&environment_id, cwd)?,
|
|
files: files
|
|
.into_iter()
|
|
.map(|path| path.to_abs_path())
|
|
.collect::<std::io::Result<Vec<_>>>()?,
|
|
patch,
|
|
},
|
|
})
|
|
}
|
|
}
|
|
|
|
fn guardian_cwd(environment_id: &str, cwd: PathUri) -> std::io::Result<AbsolutePathBuf> {
|
|
match cwd.to_abs_path() {
|
|
Ok(cwd) => Ok(cwd),
|
|
Err(err) if environment_id != codex_exec_server::LOCAL_ENVIRONMENT_ID => Err(err),
|
|
Err(_) => {
|
|
let cwd_display = cwd.to_string();
|
|
let path = cwd.to_url().to_file_path().map_err(|()| {
|
|
std::io::Error::new(
|
|
std::io::ErrorKind::InvalidInput,
|
|
format!("local cwd URI `{cwd_display}` is not a host-native path"),
|
|
)
|
|
})?;
|
|
AbsolutePathBuf::from_absolute_path_checked(path).map_err(|err| {
|
|
std::io::Error::new(
|
|
std::io::ErrorKind::InvalidInput,
|
|
format!("local cwd URI `{cwd_display}` is not absolute: {err}"),
|
|
)
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
pub(super) enum ApprovalReviewer {
|
|
Guardian,
|
|
User,
|
|
}
|
|
|
|
impl ApprovalReviewer {
|
|
pub(super) fn for_turn(turn: &TurnContext) -> Self {
|
|
Self::for_reviewer(turn, turn.config.approvals_reviewer)
|
|
}
|
|
|
|
fn for_reviewer(turn: &TurnContext, reviewer: ApprovalsReviewer) -> Self {
|
|
if routes_approval_to_guardian_with_reviewer(turn, reviewer) {
|
|
Self::Guardian
|
|
} else {
|
|
Self::User
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
|
enum ApprovalResolutionSource {
|
|
Hook,
|
|
Guardian,
|
|
User,
|
|
}
|
|
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
struct ApprovalResolution {
|
|
decision: ReviewDecision,
|
|
rejection: Option<String>,
|
|
source: ApprovalResolutionSource,
|
|
}
|
|
|
|
impl ApprovalResolution {
|
|
fn into_tool_result(self) -> Result<ReviewDecision, ToolError> {
|
|
if let Some(rejection) = self.rejection {
|
|
Err(ToolError::Rejected(rejection))
|
|
} else {
|
|
Ok(self.decision)
|
|
}
|
|
}
|
|
}
|
|
|
|
pub(super) async fn resolve_tool_apporval<Rq, Out, T>(
|
|
tool: &mut T,
|
|
req: &Rq,
|
|
permission_request_run_id: &str,
|
|
ctx: ApprovalCtx<'_>,
|
|
tool_ctx: &ToolCtx,
|
|
reviewer: ApprovalReviewer,
|
|
otel: &codex_otel::SessionTelemetry,
|
|
) -> Result<ReviewDecision, ToolError>
|
|
where
|
|
T: ToolRuntime<Rq, Out>,
|
|
{
|
|
if let Some(permission_request) = tool.permission_request_payload(req) {
|
|
match run_permission_request_hooks(
|
|
ctx.session,
|
|
ctx.turn,
|
|
permission_request_run_id,
|
|
permission_request,
|
|
)
|
|
.await
|
|
{
|
|
Some(PermissionRequestDecision::Allow) => {
|
|
let resolution = ApprovalResolution {
|
|
decision: ReviewDecision::Approved,
|
|
rejection: None,
|
|
source: ApprovalResolutionSource::Hook,
|
|
};
|
|
record_resolution(otel, tool_ctx, &resolution);
|
|
return resolution.into_tool_result();
|
|
}
|
|
Some(PermissionRequestDecision::Deny { message }) => {
|
|
let resolution = ApprovalResolution {
|
|
decision: ReviewDecision::Denied,
|
|
rejection: Some(message),
|
|
source: ApprovalResolutionSource::Hook,
|
|
};
|
|
record_resolution(otel, tool_ctx, &resolution);
|
|
return resolution.into_tool_result();
|
|
}
|
|
None => {}
|
|
}
|
|
}
|
|
|
|
let resolution = match reviewer {
|
|
ApprovalReviewer::Guardian => {
|
|
let review_id = new_guardian_review_id();
|
|
let action = match tool
|
|
.approval_action(req, &ctx)
|
|
.and_then(ApprovalAction::into_guardian_request)
|
|
{
|
|
Ok(action) => action,
|
|
Err(err) => {
|
|
tracing::error!(%err, "failed to build automatic approval action");
|
|
let resolution = ApprovalResolution {
|
|
decision: ReviewDecision::Abort,
|
|
rejection: Some(
|
|
"automatic approval review could not prepare the action".to_string(),
|
|
),
|
|
source: ApprovalResolutionSource::Guardian,
|
|
};
|
|
record_resolution(otel, tool_ctx, &resolution);
|
|
return resolution.into_tool_result();
|
|
}
|
|
};
|
|
let decision = review_approval_request(
|
|
ctx.session,
|
|
ctx.turn,
|
|
review_id.clone(),
|
|
action,
|
|
ctx.retry_reason.clone(),
|
|
)
|
|
.await;
|
|
normalize_guardian(ctx.session, review_id, decision).await
|
|
}
|
|
ApprovalReviewer::User => ApprovalResolution {
|
|
decision: tool.start_approval_async(req, ctx.clone()).await,
|
|
rejection: None,
|
|
source: ApprovalResolutionSource::User,
|
|
},
|
|
};
|
|
let resolution = normalize_user_rejection(resolution);
|
|
record_resolution(otel, tool_ctx, &resolution);
|
|
resolution.into_tool_result()
|
|
}
|
|
|
|
async fn normalize_guardian(
|
|
session: &Arc<Session>,
|
|
review_id: String,
|
|
decision: ReviewDecision,
|
|
) -> ApprovalResolution {
|
|
let rejection = match &decision {
|
|
ReviewDecision::Approved
|
|
| ReviewDecision::ApprovedForSession
|
|
| ReviewDecision::ApprovedExecpolicyAmendment { .. } => None,
|
|
ReviewDecision::NetworkPolicyAmendment {
|
|
network_policy_amendment,
|
|
} if network_policy_amendment.action == NetworkPolicyRuleAction::Allow => None,
|
|
ReviewDecision::TimedOut => Some(guardian_timeout_message()),
|
|
ReviewDecision::NetworkPolicyAmendment { .. }
|
|
| ReviewDecision::Denied
|
|
| ReviewDecision::Abort => {
|
|
Some(guardian_rejection_message(session.as_ref(), &review_id).await)
|
|
}
|
|
};
|
|
ApprovalResolution {
|
|
decision,
|
|
rejection,
|
|
source: ApprovalResolutionSource::Guardian,
|
|
}
|
|
}
|
|
|
|
fn normalize_user_rejection(mut resolution: ApprovalResolution) -> ApprovalResolution {
|
|
if resolution.source == ApprovalResolutionSource::User {
|
|
resolution.rejection = match &resolution.decision {
|
|
ReviewDecision::Approved
|
|
| ReviewDecision::ApprovedForSession
|
|
| ReviewDecision::ApprovedExecpolicyAmendment { .. } => None,
|
|
ReviewDecision::NetworkPolicyAmendment {
|
|
network_policy_amendment,
|
|
} if network_policy_amendment.action == NetworkPolicyRuleAction::Allow => None,
|
|
ReviewDecision::NetworkPolicyAmendment { .. }
|
|
| ReviewDecision::Denied
|
|
| ReviewDecision::Abort => Some("rejected by user".to_string()),
|
|
ReviewDecision::TimedOut => Some("approval request timed out".to_string()),
|
|
};
|
|
}
|
|
resolution
|
|
}
|
|
|
|
fn record_resolution(
|
|
otel: &codex_otel::SessionTelemetry,
|
|
tool_ctx: &ToolCtx,
|
|
resolution: &ApprovalResolution,
|
|
) {
|
|
let source = match resolution.source {
|
|
ApprovalResolutionSource::Hook => ToolDecisionSource::Config,
|
|
ApprovalResolutionSource::Guardian => ToolDecisionSource::AutomatedReviewer,
|
|
ApprovalResolutionSource::User => ToolDecisionSource::User,
|
|
};
|
|
let tool_name = flat_tool_name(&tool_ctx.tool_name);
|
|
otel.tool_decision(
|
|
tool_name.as_ref(),
|
|
&tool_ctx.call_id,
|
|
&resolution.decision,
|
|
source,
|
|
);
|
|
}
|
|
|
|
#[cfg(all(test, unix))]
|
|
#[path = "approvals_tests.rs"]
|
|
mod tests;
|