mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
Centralize permission request preparation and approval actions (#57260)
## What changed Introduce `PreparedPermissionRequest` to encapsulate argument parsing, path resolution, permission normalization, and approval action construction. Pass the prepared request, including the selected environment ID, into session permission handling. ## Testing Extend the selected-environment path resolution test to assert that the prepared approval action carries the expected environment, reason, and resolved permissions, matching the emitted permission request. GitOrigin-RevId: ebd34fad0e5d4c9f98330d17a6254325526b8c78
This commit is contained in:
@@ -71,6 +71,7 @@ pub use mcp_resource::ListMcpResourcesHandler;
|
||||
pub use mcp_resource::ReadMcpResourceHandler;
|
||||
pub use new_context_window::NewContextWindowHandler;
|
||||
pub use plan::PlanHandler;
|
||||
pub(crate) use request_permissions::PreparedPermissionRequest;
|
||||
pub use request_permissions::RequestPermissionsHandler;
|
||||
pub use request_plugin_install::RequestPluginInstallHandler;
|
||||
pub use request_user_input::RequestUserInputHandler;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
use codex_protocol::permissions::FileSystemSandboxPolicyContext;
|
||||
use codex_protocol::request_permissions::RequestPermissionProfile;
|
||||
use codex_protocol::request_permissions::RequestPermissionsArgs;
|
||||
use codex_sandboxing::policy_transforms::normalize_additional_permissions_with_context;
|
||||
use codex_utils_path_uri::LegacyAppPathString;
|
||||
use serde_json::Value;
|
||||
|
||||
use crate::function_tool::FunctionCallError;
|
||||
use crate::session::turn_context::TurnEnvironment;
|
||||
use crate::tools::context::FunctionToolOutput;
|
||||
use crate::tools::context::ToolEnvironments;
|
||||
use crate::tools::context::ToolInvocation;
|
||||
@@ -18,12 +20,65 @@ use crate::tools::handlers::shell_spec::request_permissions_tool_description;
|
||||
use crate::tools::registry::CoreToolRuntime;
|
||||
use crate::tools::registry::ToolExecutor;
|
||||
use crate::tools::registry::with_updated_function_input;
|
||||
use crate::tools::sandboxing::ApprovalAction;
|
||||
use codex_tools::ToolName;
|
||||
use codex_tools::ToolSpec;
|
||||
use serde::Deserialize;
|
||||
|
||||
pub struct RequestPermissionsHandler;
|
||||
|
||||
/// Literal paths are resolved in the selected environment. Entries such as
|
||||
/// `project_roots` stay symbolic until the grant is applied.
|
||||
pub(crate) struct PreparedPermissionRequest {
|
||||
pub(crate) environment_id: String,
|
||||
pub(crate) reason: Option<String>,
|
||||
pub(crate) permissions: RequestPermissionProfile,
|
||||
}
|
||||
|
||||
impl PreparedPermissionRequest {
|
||||
/// The caller selects the executor from the tool arguments before resolving permission paths.
|
||||
pub(crate) fn parse(
|
||||
arguments: &str,
|
||||
turn_environment: &TurnEnvironment,
|
||||
) -> Result<Self, FunctionCallError> {
|
||||
let sandbox_context =
|
||||
turn_environment.sandbox_context(/*additional_permissions*/ None);
|
||||
let context = sandbox_context.policy_context();
|
||||
let mut arguments: Value = parse_arguments(arguments)?;
|
||||
resolve_permission_path_strings(&mut arguments, &context)?;
|
||||
let mut args: RequestPermissionsArgs =
|
||||
serde_json::from_value(arguments).map_err(|err| {
|
||||
FunctionCallError::RespondToModel(format!(
|
||||
"failed to parse function arguments: {err}"
|
||||
))
|
||||
})?;
|
||||
args.permissions =
|
||||
normalize_additional_permissions_with_context(args.permissions.into(), &context)
|
||||
.map(RequestPermissionProfile::from)
|
||||
.map_err(FunctionCallError::RespondToModel)?;
|
||||
if args.permissions.is_empty() {
|
||||
return Err(FunctionCallError::RespondToModel(
|
||||
"request_permissions requires at least one permission".to_string(),
|
||||
));
|
||||
}
|
||||
Ok(Self {
|
||||
environment_id: turn_environment.selection.environment_id.clone(),
|
||||
reason: args.reason,
|
||||
permissions: args.permissions,
|
||||
})
|
||||
}
|
||||
|
||||
pub(crate) fn approval_action(&self, call_id: &str, turn_id: &str) -> ApprovalAction {
|
||||
ApprovalAction::RequestPermissions {
|
||||
id: call_id.to_owned(),
|
||||
environment_id: self.environment_id.clone(),
|
||||
turn_id: turn_id.to_owned(),
|
||||
reason: self.reason.clone(),
|
||||
permissions: self.permissions.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize)]
|
||||
struct RequestPermissionsEnvironmentArgs {
|
||||
#[serde(alias = "environmentId")]
|
||||
@@ -72,33 +127,12 @@ impl RequestPermissionsHandler {
|
||||
};
|
||||
|
||||
let turn_environment = selected_executor(&environments, &step_context.environments)?;
|
||||
let sandbox_context =
|
||||
turn_environment.sandbox_context(/*additional_permissions*/ None);
|
||||
let context = sandbox_context.policy_context();
|
||||
let mut arguments: Value = parse_arguments(&arguments)?;
|
||||
resolve_permission_path_strings(&mut arguments, &context)?;
|
||||
let mut args: RequestPermissionsArgs =
|
||||
serde_json::from_value(arguments).map_err(|err| {
|
||||
FunctionCallError::RespondToModel(format!(
|
||||
"failed to parse function arguments: {err}"
|
||||
))
|
||||
})?;
|
||||
args.permissions =
|
||||
normalize_additional_permissions_with_context(args.permissions.into(), &context)
|
||||
.map(codex_protocol::request_permissions::RequestPermissionProfile::from)
|
||||
.map_err(FunctionCallError::RespondToModel)?;
|
||||
if args.permissions.is_empty() {
|
||||
return Err(FunctionCallError::RespondToModel(
|
||||
"request_permissions requires at least one permission".to_string(),
|
||||
));
|
||||
}
|
||||
|
||||
let request = PreparedPermissionRequest::parse(&arguments, turn_environment)?;
|
||||
let response = session
|
||||
.request_permissions_for_environment(
|
||||
&step_context,
|
||||
call_id,
|
||||
args,
|
||||
turn_environment.selection(),
|
||||
request,
|
||||
cancellation_token,
|
||||
)
|
||||
.await
|
||||
|
||||
Reference in New Issue
Block a user