mirror of
https://github.com/openai/codex.git
synced 2026-04-24 14:45:27 +00:00
New config key: [network_proxy.policy].allow_unix_sockets (string array), stored/edited via network_proxy.rs.
Entries support:
SSH_AUTH_SOCK / ${SSH_AUTH_SOCK}
preset aliases: ssh-agent, ssh_auth_sock, ssh_auth_socket
Entries are resolved at runtime to canonical absolute socket paths before generating Seatbelt rules.
macOS Seatbelt integration
seatbelt.rs now:
allows only loopback proxy ports (localhost:<port>) + explicitly allowed unix socket paths
does not emit per-domain (remote tcp ...) rules (those break under sandbox-exec)
Unix socket allowlist resolution is done via network_proxy::resolve_unix_socket_allowlist(...).
Prompt-on-deny UX (TUI)
When an exec approval happens and the command appears to need the SSH agent socket (ssh/scp/sftp/ssh-add, or git with ssh-style remotes), and the socket isn’t already allowed:
TUI shows an approval modal for the unix socket.
Allow for session: writes the resolved socket path to config (and removes it on exit, like session domain approvals).
Allow always: writes SSH_AUTH_SOCK to allow_unix_sockets for portability across restarts.
244 lines
9.3 KiB
Rust
244 lines
9.3 KiB
Rust
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
|
|
use async_trait::async_trait;
|
|
use codex_async_utils::CancelErr;
|
|
use codex_async_utils::OrCancelExt;
|
|
use codex_protocol::user_input::UserInput;
|
|
use tokio_util::sync::CancellationToken;
|
|
use tracing::error;
|
|
use uuid::Uuid;
|
|
|
|
use crate::codex::TurnContext;
|
|
use crate::exec::ExecToolCallOutput;
|
|
use crate::exec::SandboxType;
|
|
use crate::exec::StdoutStream;
|
|
use crate::exec::StreamOutput;
|
|
use crate::exec::execute_exec_env;
|
|
use crate::exec_env::create_env;
|
|
use crate::parse_command::parse_command;
|
|
use crate::protocol::EventMsg;
|
|
use crate::protocol::ExecCommandBeginEvent;
|
|
use crate::protocol::ExecCommandEndEvent;
|
|
use crate::protocol::ExecCommandSource;
|
|
use crate::protocol::TaskStartedEvent;
|
|
use crate::sandboxing::ExecEnv;
|
|
use crate::sandboxing::SandboxPermissions;
|
|
use crate::state::TaskKind;
|
|
use crate::tools::format_exec_output_str;
|
|
use crate::user_shell_command::user_shell_command_record_item;
|
|
|
|
use super::SessionTask;
|
|
use super::SessionTaskContext;
|
|
|
|
const USER_SHELL_TIMEOUT_MS: u64 = 60 * 60 * 1000; // 1 hour
|
|
|
|
#[derive(Clone)]
|
|
pub(crate) struct UserShellCommandTask {
|
|
command: String,
|
|
}
|
|
|
|
impl UserShellCommandTask {
|
|
pub(crate) fn new(command: String) -> Self {
|
|
Self { command }
|
|
}
|
|
}
|
|
|
|
#[async_trait]
|
|
impl SessionTask for UserShellCommandTask {
|
|
fn kind(&self) -> TaskKind {
|
|
TaskKind::Regular
|
|
}
|
|
|
|
async fn run(
|
|
self: Arc<Self>,
|
|
session: Arc<SessionTaskContext>,
|
|
turn_context: Arc<TurnContext>,
|
|
_input: Vec<UserInput>,
|
|
cancellation_token: CancellationToken,
|
|
) -> Option<String> {
|
|
let event = EventMsg::TaskStarted(TaskStartedEvent {
|
|
model_context_window: turn_context.client.get_model_context_window(),
|
|
});
|
|
let session = session.clone_session();
|
|
session.send_event(turn_context.as_ref(), event).await;
|
|
|
|
// Execute the user's script under their default shell when known; this
|
|
// allows commands that use shell features (pipes, &&, redirects, etc.).
|
|
// We do not source rc files or otherwise reformat the script.
|
|
let use_login_shell = true;
|
|
let command = session
|
|
.user_shell()
|
|
.derive_exec_args(&self.command, use_login_shell);
|
|
|
|
let call_id = Uuid::new_v4().to_string();
|
|
let raw_command = self.command.clone();
|
|
let cwd = turn_context.cwd.clone();
|
|
|
|
let parsed_cmd = parse_command(&command);
|
|
session
|
|
.send_event(
|
|
turn_context.as_ref(),
|
|
EventMsg::ExecCommandBegin(ExecCommandBeginEvent {
|
|
call_id: call_id.clone(),
|
|
process_id: None,
|
|
turn_id: turn_context.sub_id.clone(),
|
|
command: command.clone(),
|
|
cwd: cwd.clone(),
|
|
parsed_cmd: parsed_cmd.clone(),
|
|
source: ExecCommandSource::UserShell,
|
|
interaction_input: None,
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let exec_env = ExecEnv {
|
|
command: command.clone(),
|
|
cwd: cwd.clone(),
|
|
env: create_env(
|
|
&turn_context.shell_environment_policy,
|
|
&turn_context.sandbox_policy,
|
|
&turn_context.network_proxy,
|
|
),
|
|
expiration: USER_SHELL_TIMEOUT_MS.into(),
|
|
sandbox: SandboxType::None,
|
|
sandbox_permissions: SandboxPermissions::UseDefault,
|
|
justification: None,
|
|
arg0: None,
|
|
};
|
|
|
|
let stdout_stream = Some(StdoutStream {
|
|
sub_id: turn_context.sub_id.clone(),
|
|
call_id: call_id.clone(),
|
|
tx_event: session.get_tx_event(),
|
|
});
|
|
|
|
let exec_result = execute_exec_env(exec_env, &turn_context.sandbox_policy, stdout_stream)
|
|
.or_cancel(&cancellation_token)
|
|
.await;
|
|
|
|
match exec_result {
|
|
Err(CancelErr::Cancelled) => {
|
|
let aborted_message = "command aborted by user".to_string();
|
|
let exec_output = ExecToolCallOutput {
|
|
exit_code: -1,
|
|
stdout: StreamOutput::new(String::new()),
|
|
stderr: StreamOutput::new(aborted_message.clone()),
|
|
aggregated_output: StreamOutput::new(aborted_message.clone()),
|
|
duration: Duration::ZERO,
|
|
timed_out: false,
|
|
};
|
|
let output_items = [user_shell_command_record_item(
|
|
&raw_command,
|
|
&exec_output,
|
|
&turn_context,
|
|
)];
|
|
session
|
|
.record_conversation_items(turn_context.as_ref(), &output_items)
|
|
.await;
|
|
session
|
|
.send_event(
|
|
turn_context.as_ref(),
|
|
EventMsg::ExecCommandEnd(ExecCommandEndEvent {
|
|
call_id,
|
|
process_id: None,
|
|
turn_id: turn_context.sub_id.clone(),
|
|
command: command.clone(),
|
|
cwd: cwd.clone(),
|
|
parsed_cmd: parsed_cmd.clone(),
|
|
source: ExecCommandSource::UserShell,
|
|
interaction_input: None,
|
|
stdout: String::new(),
|
|
stderr: aborted_message.clone(),
|
|
aggregated_output: aborted_message.clone(),
|
|
exit_code: -1,
|
|
duration: Duration::ZERO,
|
|
formatted_output: aborted_message,
|
|
}),
|
|
)
|
|
.await;
|
|
}
|
|
Ok(Ok(output)) => {
|
|
session
|
|
.send_event(
|
|
turn_context.as_ref(),
|
|
EventMsg::ExecCommandEnd(ExecCommandEndEvent {
|
|
call_id: call_id.clone(),
|
|
process_id: None,
|
|
turn_id: turn_context.sub_id.clone(),
|
|
command: command.clone(),
|
|
cwd: cwd.clone(),
|
|
parsed_cmd: parsed_cmd.clone(),
|
|
source: ExecCommandSource::UserShell,
|
|
interaction_input: None,
|
|
stdout: output.stdout.text.clone(),
|
|
stderr: output.stderr.text.clone(),
|
|
aggregated_output: output.aggregated_output.text.clone(),
|
|
exit_code: output.exit_code,
|
|
duration: output.duration,
|
|
formatted_output: format_exec_output_str(
|
|
&output,
|
|
turn_context.truncation_policy,
|
|
),
|
|
}),
|
|
)
|
|
.await;
|
|
|
|
let output_items = [user_shell_command_record_item(
|
|
&raw_command,
|
|
&output,
|
|
&turn_context,
|
|
)];
|
|
session
|
|
.record_conversation_items(turn_context.as_ref(), &output_items)
|
|
.await;
|
|
}
|
|
Ok(Err(err)) => {
|
|
error!("user shell command failed: {err:?}");
|
|
let message = format!("execution error: {err:?}");
|
|
let exec_output = ExecToolCallOutput {
|
|
exit_code: -1,
|
|
stdout: StreamOutput::new(String::new()),
|
|
stderr: StreamOutput::new(message.clone()),
|
|
aggregated_output: StreamOutput::new(message.clone()),
|
|
duration: Duration::ZERO,
|
|
timed_out: false,
|
|
};
|
|
session
|
|
.send_event(
|
|
turn_context.as_ref(),
|
|
EventMsg::ExecCommandEnd(ExecCommandEndEvent {
|
|
call_id,
|
|
process_id: None,
|
|
turn_id: turn_context.sub_id.clone(),
|
|
command,
|
|
cwd,
|
|
parsed_cmd,
|
|
source: ExecCommandSource::UserShell,
|
|
interaction_input: None,
|
|
stdout: exec_output.stdout.text.clone(),
|
|
stderr: exec_output.stderr.text.clone(),
|
|
aggregated_output: exec_output.aggregated_output.text.clone(),
|
|
exit_code: exec_output.exit_code,
|
|
duration: exec_output.duration,
|
|
formatted_output: format_exec_output_str(
|
|
&exec_output,
|
|
turn_context.truncation_policy,
|
|
),
|
|
}),
|
|
)
|
|
.await;
|
|
let output_items = [user_shell_command_record_item(
|
|
&raw_command,
|
|
&exec_output,
|
|
&turn_context,
|
|
)];
|
|
session
|
|
.record_conversation_items(turn_context.as_ref(), &output_items)
|
|
.await;
|
|
}
|
|
}
|
|
None
|
|
}
|
|
}
|