mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
Tighten Guardian denial context change
This commit is contained in:
@@ -283,22 +283,15 @@ async fn run_guardian_review(
|
||||
approval_request_source: GuardianApprovalRequestSource,
|
||||
external_cancel: Option<CancellationToken>,
|
||||
) -> ReviewDecision {
|
||||
let unattributed_network_target = match &request {
|
||||
GuardianApprovalRequest::NetworkAccess {
|
||||
target,
|
||||
trigger: None,
|
||||
..
|
||||
} => Some(target.clone()),
|
||||
GuardianApprovalRequest::Shell { .. }
|
||||
| GuardianApprovalRequest::ExecCommand { .. }
|
||||
| GuardianApprovalRequest::ApplyPatch { .. }
|
||||
| GuardianApprovalRequest::NetworkAccess {
|
||||
trigger: Some(_), ..
|
||||
}
|
||||
| GuardianApprovalRequest::McpToolCall { .. }
|
||||
| GuardianApprovalRequest::RequestPermissions { .. } => None,
|
||||
#[cfg(unix)]
|
||||
GuardianApprovalRequest::Execve { .. } => None,
|
||||
let unattributed_network_target = if let GuardianApprovalRequest::NetworkAccess {
|
||||
target,
|
||||
trigger: None,
|
||||
..
|
||||
} = &request
|
||||
{
|
||||
Some(target.clone())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let target_item_id = guardian_request_target_item_id(&request).map(str::to_string);
|
||||
let assessment_turn_id = guardian_request_turn_id(&request, &turn.sub_id).to_string();
|
||||
@@ -577,20 +570,11 @@ async fn run_guardian_review(
|
||||
rationales.insert(review_id.clone(), rejection);
|
||||
}
|
||||
}
|
||||
let unattributed_network_denial: Option<codex_protocol::models::ResponseItem> =
|
||||
if !approved && let Some(target) = unattributed_network_target {
|
||||
let rejection = guardian_rejection_message(session.as_ref(), &review_id).await;
|
||||
Some(ContextualUserFragment::into(
|
||||
GuardianNetworkAccessDenied::new(&target, &rejection),
|
||||
))
|
||||
} else {
|
||||
None
|
||||
};
|
||||
session
|
||||
.send_event(
|
||||
turn.as_ref(),
|
||||
EventMsg::GuardianAssessment(GuardianAssessmentEvent {
|
||||
id: review_id,
|
||||
id: review_id.clone(),
|
||||
target_item_id,
|
||||
turn_id: assessment_turn_id.clone(),
|
||||
started_at_ms,
|
||||
@@ -605,7 +589,10 @@ async fn run_guardian_review(
|
||||
)
|
||||
.await;
|
||||
|
||||
if let Some(denial) = unattributed_network_denial {
|
||||
if !approved && let Some(target) = unattributed_network_target {
|
||||
let rejection = guardian_rejection_message(session.as_ref(), &review_id).await;
|
||||
let denial =
|
||||
ContextualUserFragment::into(GuardianNetworkAccessDenied::new(&target, &rejection));
|
||||
session
|
||||
.record_conversation_items(turn.as_ref(), std::slice::from_ref(&denial))
|
||||
.await;
|
||||
|
||||
@@ -109,13 +109,7 @@ async fn guardian_receives_all_possible_triggers_for_concurrent_network_requests
|
||||
ev_response_created("resp-network-guardian"),
|
||||
ev_assistant_message(
|
||||
"msg-network-guardian",
|
||||
&json!({
|
||||
"risk_level": "high",
|
||||
"user_authorization": "low",
|
||||
"outcome": "deny",
|
||||
"rationale": denial_rationale,
|
||||
})
|
||||
.to_string(),
|
||||
&json!({"outcome": "deny", "rationale": denial_rationale}).to_string(),
|
||||
),
|
||||
ev_completed("resp-network-guardian"),
|
||||
]),
|
||||
@@ -184,11 +178,12 @@ async fn guardian_receives_all_possible_triggers_for_concurrent_network_requests
|
||||
.contains("Approve if at least one candidate")
|
||||
);
|
||||
assert!(responses.requests().into_iter().any(|request| {
|
||||
request.message_input_texts("developer").iter().any(|text| {
|
||||
text.contains("<guardian_network_access_denied>")
|
||||
&& text.contains(NETWORK_TEST_TARGET)
|
||||
&& text.contains(denial_rationale)
|
||||
})
|
||||
request.body_json()["client_metadata"]["x-openai-subagent"].as_str() != Some("guardian")
|
||||
&& request.message_input_texts("developer").iter().any(|text| {
|
||||
text.contains("<guardian_network_access_denied>")
|
||||
&& text.contains(NETWORK_TEST_TARGET)
|
||||
&& text.contains(denial_rationale)
|
||||
})
|
||||
}));
|
||||
|
||||
Ok(())
|
||||
|
||||
Reference in New Issue
Block a user