mirror of
https://github.com/openai/codex.git
synced 2026-05-18 02:02:30 +00:00
## Why Remote exec-server now needs one executor websocket to serve multiple harness JSON-RPC sessions. Rendezvous routes by `stream_id`, and the exec-server side needs to use the same stable relay frame contract instead of a hand-rolled JSON shape. The relay protocol also needs to make ownership boundaries clear: harness and executor endpoints own sequencing, acks, retries, duplicate suppression, segmentation, and reassembly; rendezvous only routes frames. ## What Changed - Add the checked-in `codex.exec_server.relay.v1.RelayMessageFrame` proto plus generated prost bindings for `codex-exec-server`. - Encode remote harness/executor relay traffic as binary protobuf websocket frames while keeping local websocket JSON-RPC unchanged. - Demux executor-side relay streams into independent `ConnectionProcessor` sessions keyed by `stream_id`. - Add a programmatic `RemoteExecutorConfig::with_bearer_token(...)` constructor for non-CLI callers and integration tests. - Add an integration test that starts the remote executor against a fake registry/rendezvous websocket and verifies two virtual streams share one executor websocket without cross-talk, including per-stream reset behavior. - Document the remote relay envelope, sequence ranges, `ack`/`ack_bits`, and endpoint responsibilities in `exec-server/README.md`. ## Verification - `cargo test -p codex-exec-server --test relay multiplexed_remote_executor_routes_independent_virtual_streams -- --exact` - `cargo test -p codex-exec-server --test relay` - `cargo test -p codex-exec-server` passed outside the sandbox. The sandboxed run hit macOS `sandbox-exec: sandbox_apply: Operation not permitted` in filesystem sandbox tests.
337 lines
10 KiB
Rust
337 lines
10 KiB
Rust
use std::env;
|
|
use std::time::Duration;
|
|
|
|
use reqwest::StatusCode;
|
|
use serde::Deserialize;
|
|
use tokio::time::sleep;
|
|
use tokio_tungstenite::connect_async;
|
|
use tracing::warn;
|
|
|
|
use codex_utils_rustls_provider::ensure_rustls_crypto_provider;
|
|
|
|
use crate::ExecServerError;
|
|
use crate::ExecServerRuntimePaths;
|
|
use crate::relay::run_multiplexed_executor;
|
|
use crate::server::ConnectionProcessor;
|
|
|
|
pub const CODEX_EXEC_SERVER_REMOTE_BEARER_TOKEN_ENV_VAR: &str =
|
|
"CODEX_EXEC_SERVER_REMOTE_BEARER_TOKEN";
|
|
|
|
const ERROR_BODY_PREVIEW_BYTES: usize = 4096;
|
|
|
|
#[derive(Clone)]
|
|
struct ExecutorRegistryClient {
|
|
base_url: String,
|
|
bearer_token: String,
|
|
http: reqwest::Client,
|
|
}
|
|
|
|
impl std::fmt::Debug for ExecutorRegistryClient {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
f.debug_struct("ExecutorRegistryClient")
|
|
.field("base_url", &self.base_url)
|
|
.field("bearer_token", &"<redacted>")
|
|
.finish_non_exhaustive()
|
|
}
|
|
}
|
|
|
|
impl ExecutorRegistryClient {
|
|
fn new(base_url: String, bearer_token: String) -> Result<Self, ExecServerError> {
|
|
let base_url = normalize_base_url(base_url)?;
|
|
Ok(Self {
|
|
base_url,
|
|
bearer_token,
|
|
http: reqwest::Client::new(),
|
|
})
|
|
}
|
|
|
|
async fn register_executor(
|
|
&self,
|
|
executor_id: &str,
|
|
) -> Result<ExecutorRegistryExecutorRegistrationResponse, ExecServerError> {
|
|
let response = self
|
|
.http
|
|
.post(endpoint_url(
|
|
&self.base_url,
|
|
&format!("/cloud/executor/{executor_id}/register"),
|
|
))
|
|
.bearer_auth(&self.bearer_token)
|
|
.send()
|
|
.await?;
|
|
self.parse_json_response(response).await
|
|
}
|
|
|
|
async fn parse_json_response<R>(
|
|
&self,
|
|
response: reqwest::Response,
|
|
) -> Result<R, ExecServerError>
|
|
where
|
|
R: for<'de> Deserialize<'de>,
|
|
{
|
|
if response.status().is_success() {
|
|
return response.json::<R>().await.map_err(ExecServerError::from);
|
|
}
|
|
|
|
let status = response.status();
|
|
let body = response.text().await.unwrap_or_default();
|
|
if matches!(status, StatusCode::UNAUTHORIZED | StatusCode::FORBIDDEN) {
|
|
return Err(executor_registry_auth_error(status, &body));
|
|
}
|
|
|
|
Err(executor_registry_http_error(status, &body))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Eq, PartialEq, Deserialize)]
|
|
struct ExecutorRegistryExecutorRegistrationResponse {
|
|
executor_id: String,
|
|
url: String,
|
|
}
|
|
|
|
/// Configuration for registering an exec-server for remote use.
|
|
#[derive(Clone, Eq, PartialEq)]
|
|
pub struct RemoteExecutorConfig {
|
|
pub base_url: String,
|
|
pub executor_id: String,
|
|
pub name: String,
|
|
bearer_token: String,
|
|
}
|
|
|
|
impl std::fmt::Debug for RemoteExecutorConfig {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
f.debug_struct("RemoteExecutorConfig")
|
|
.field("base_url", &self.base_url)
|
|
.field("executor_id", &self.executor_id)
|
|
.field("name", &self.name)
|
|
.field("bearer_token", &"<redacted>")
|
|
.finish()
|
|
}
|
|
}
|
|
|
|
impl RemoteExecutorConfig {
|
|
pub fn new(base_url: String, executor_id: String) -> Result<Self, ExecServerError> {
|
|
Self::with_bearer_token(base_url, executor_id, read_remote_bearer_token_from_env()?)
|
|
}
|
|
|
|
pub fn with_bearer_token(
|
|
base_url: String,
|
|
executor_id: String,
|
|
bearer_token: String,
|
|
) -> Result<Self, ExecServerError> {
|
|
let executor_id = normalize_executor_id(executor_id)?;
|
|
let bearer_token = normalize_bearer_token(bearer_token)?;
|
|
Ok(Self {
|
|
base_url,
|
|
executor_id,
|
|
name: "codex-exec-server".to_string(),
|
|
bearer_token,
|
|
})
|
|
}
|
|
}
|
|
|
|
/// Register an exec-server for remote use and serve requests over the returned
|
|
/// rendezvous websocket.
|
|
pub async fn run_remote_executor(
|
|
config: RemoteExecutorConfig,
|
|
runtime_paths: ExecServerRuntimePaths,
|
|
) -> Result<(), ExecServerError> {
|
|
ensure_rustls_crypto_provider();
|
|
let client = ExecutorRegistryClient::new(config.base_url.clone(), config.bearer_token.clone())?;
|
|
let processor = ConnectionProcessor::new(runtime_paths);
|
|
let mut backoff = Duration::from_secs(1);
|
|
|
|
loop {
|
|
let response = client.register_executor(&config.executor_id).await?;
|
|
eprintln!(
|
|
"codex exec-server remote executor registered with executor_id {}",
|
|
response.executor_id
|
|
);
|
|
|
|
match connect_async(response.url.as_str()).await {
|
|
Ok((websocket, _)) => {
|
|
backoff = Duration::from_secs(1);
|
|
run_multiplexed_executor(websocket, processor.clone()).await;
|
|
}
|
|
Err(err) => {
|
|
warn!("failed to connect remote exec-server websocket: {err}");
|
|
}
|
|
}
|
|
|
|
sleep(backoff).await;
|
|
backoff = (backoff * 2).min(Duration::from_secs(30));
|
|
}
|
|
}
|
|
|
|
fn read_remote_bearer_token_from_env() -> Result<String, ExecServerError> {
|
|
read_remote_bearer_token_from_env_with(|name| env::var(name))
|
|
}
|
|
|
|
fn read_remote_bearer_token_from_env_with<F>(get_var: F) -> Result<String, ExecServerError>
|
|
where
|
|
F: FnOnce(&str) -> Result<String, env::VarError>,
|
|
{
|
|
let bearer_token = get_var(CODEX_EXEC_SERVER_REMOTE_BEARER_TOKEN_ENV_VAR).map_err(|_| {
|
|
ExecServerError::ExecutorRegistryAuth(format!(
|
|
"executor registry bearer token environment variable `{CODEX_EXEC_SERVER_REMOTE_BEARER_TOKEN_ENV_VAR}` is not set"
|
|
))
|
|
})?;
|
|
normalize_bearer_token(bearer_token)
|
|
}
|
|
|
|
fn normalize_bearer_token(bearer_token: String) -> Result<String, ExecServerError> {
|
|
let bearer_token = bearer_token.trim().to_string();
|
|
if bearer_token.is_empty() {
|
|
return Err(ExecServerError::ExecutorRegistryAuth(format!(
|
|
"executor registry bearer token environment variable `{CODEX_EXEC_SERVER_REMOTE_BEARER_TOKEN_ENV_VAR}` is empty"
|
|
)));
|
|
}
|
|
Ok(bearer_token)
|
|
}
|
|
|
|
fn normalize_executor_id(executor_id: String) -> Result<String, ExecServerError> {
|
|
let executor_id = executor_id.trim().to_string();
|
|
if executor_id.is_empty() {
|
|
return Err(ExecServerError::ExecutorRegistryConfig(
|
|
"executor id is required for remote exec-server registration".to_string(),
|
|
));
|
|
}
|
|
Ok(executor_id)
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
struct RegistryErrorBody {
|
|
error: Option<RegistryError>,
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
struct RegistryError {
|
|
code: Option<String>,
|
|
message: Option<String>,
|
|
}
|
|
|
|
fn normalize_base_url(base_url: String) -> Result<String, ExecServerError> {
|
|
let trimmed = base_url.trim().trim_end_matches('/').to_string();
|
|
if trimmed.is_empty() {
|
|
return Err(ExecServerError::ExecutorRegistryConfig(
|
|
"executor registry base URL is required".to_string(),
|
|
));
|
|
}
|
|
Ok(trimmed)
|
|
}
|
|
|
|
fn endpoint_url(base_url: &str, path: &str) -> String {
|
|
format!("{base_url}/{}", path.trim_start_matches('/'))
|
|
}
|
|
|
|
fn executor_registry_auth_error(status: StatusCode, body: &str) -> ExecServerError {
|
|
let message = registry_error_message(body).unwrap_or_else(|| "empty error body".to_string());
|
|
ExecServerError::ExecutorRegistryAuth(format!(
|
|
"executor registry authentication failed ({status}): {message}"
|
|
))
|
|
}
|
|
|
|
fn executor_registry_http_error(status: StatusCode, body: &str) -> ExecServerError {
|
|
let parsed = serde_json::from_str::<RegistryErrorBody>(body).ok();
|
|
let (code, message) = parsed
|
|
.and_then(|body| body.error)
|
|
.map(|error| {
|
|
(
|
|
error.code,
|
|
error.message.unwrap_or_else(|| {
|
|
preview_error_body(body).unwrap_or_else(|| "empty error body".to_string())
|
|
}),
|
|
)
|
|
})
|
|
.unwrap_or_else(|| {
|
|
(
|
|
None,
|
|
preview_error_body(body)
|
|
.unwrap_or_else(|| "empty or malformed error body".to_string()),
|
|
)
|
|
});
|
|
ExecServerError::ExecutorRegistryHttp {
|
|
status,
|
|
code,
|
|
message,
|
|
}
|
|
}
|
|
|
|
fn registry_error_message(body: &str) -> Option<String> {
|
|
serde_json::from_str::<RegistryErrorBody>(body)
|
|
.ok()
|
|
.and_then(|body| body.error)
|
|
.and_then(|error| error.message)
|
|
.or_else(|| preview_error_body(body))
|
|
}
|
|
|
|
fn preview_error_body(body: &str) -> Option<String> {
|
|
let trimmed = body.trim();
|
|
if trimmed.is_empty() {
|
|
return None;
|
|
}
|
|
Some(trimmed.chars().take(ERROR_BODY_PREVIEW_BYTES).collect())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use pretty_assertions::assert_eq;
|
|
use wiremock::Mock;
|
|
use wiremock::MockServer;
|
|
use wiremock::ResponseTemplate;
|
|
use wiremock::matchers::header;
|
|
use wiremock::matchers::method;
|
|
use wiremock::matchers::path;
|
|
|
|
use super::*;
|
|
|
|
#[tokio::test]
|
|
async fn register_executor_posts_with_bearer_token_header() {
|
|
let server = MockServer::start().await;
|
|
let config = RemoteExecutorConfig::with_bearer_token(
|
|
server.uri(),
|
|
"exec-requested".to_string(),
|
|
"registry-token".to_string(),
|
|
)
|
|
.expect("config");
|
|
Mock::given(method("POST"))
|
|
.and(path("/cloud/executor/exec-requested/register"))
|
|
.and(header("authorization", "Bearer registry-token"))
|
|
.respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!({
|
|
"executor_id": "exec-1",
|
|
"url": "wss://rendezvous.test/executor/exec-1?role=executor&sig=abc"
|
|
})))
|
|
.mount(&server)
|
|
.await;
|
|
let client = ExecutorRegistryClient::new(server.uri(), "registry-token".to_string())
|
|
.expect("client");
|
|
|
|
let response = client
|
|
.register_executor(&config.executor_id)
|
|
.await
|
|
.expect("register executor");
|
|
|
|
assert_eq!(
|
|
response,
|
|
ExecutorRegistryExecutorRegistrationResponse {
|
|
executor_id: "exec-1".to_string(),
|
|
url: "wss://rendezvous.test/executor/exec-1?role=executor&sig=abc".to_string(),
|
|
}
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn debug_output_redacts_bearer_token() {
|
|
let config = RemoteExecutorConfig::with_bearer_token(
|
|
"https://registry.example".to_string(),
|
|
"exec-1".to_string(),
|
|
"secret-token".to_string(),
|
|
)
|
|
.expect("config");
|
|
|
|
let debug = format!("{config:?}");
|
|
|
|
assert!(debug.contains("<redacted>"));
|
|
assert!(!debug.contains("secret-token"));
|
|
}
|
|
}
|