mirror of
https://github.com/openai/codex.git
synced 2026-09-04 15:08:45 +00:00
94ebae725e
## Why Remote environment connections need to honor Codex's effective outbound proxy policy, including when a rendezvous connection reconnects. ## What changed - Pass the configured `HttpClientFactory` into remote environment transports and use `WebSocketConnector` for exec-server and rendezvous WebSockets. - Resolve proxy routes asynchronously so these connections can use the configured system proxy. - Add connector options that preserve Tungstenite's default TLS behavior and enable `TCP_NODELAY` for latency-sensitive rendezvous traffic. ## Testing - Verify prepared remote environments connect through a configured system proxy. - Verify initial and reconnected encrypted relay peers use the system proxy. - Cover default TLS selection and opt-in `TCP_NODELAY` behavior in the WebSocket client. GitOrigin-RevId: 8a8da2116e37cb3a891269d0c0b037986fecdd3c
67 lines
2.3 KiB
Rust
67 lines
2.3 KiB
Rust
use codex_http_client::HttpClientFactory;
|
|
|
|
use crate::EnvironmentManager;
|
|
use crate::ExecServerError;
|
|
use crate::ExecServerRuntimePaths;
|
|
use crate::environment_provider::EnvironmentDefault;
|
|
use crate::environment_provider::EnvironmentProviderSnapshot;
|
|
use crate::remote::NoiseRendezvousEnvironmentConfig;
|
|
|
|
#[derive(Debug)]
|
|
pub(crate) enum PreparedEnvironmentSource {
|
|
Noise(NoiseRendezvousEnvironmentConfig),
|
|
Snapshot(EnvironmentProviderSnapshot),
|
|
}
|
|
|
|
/// Holds discovered execution environments before their HTTP policy is resolved.
|
|
///
|
|
/// Preparing environments does not start remote connections. Callers can inspect
|
|
/// the default environment to choose config-loading behavior and then build the
|
|
/// manager with the effective outbound HTTP policy.
|
|
#[derive(Debug)]
|
|
pub struct PreparedEnvironmentManager {
|
|
pub(crate) source: PreparedEnvironmentSource,
|
|
}
|
|
|
|
impl PreparedEnvironmentManager {
|
|
/// Returns whether the discovered default environment is remote.
|
|
pub fn default_environment_is_remote(&self) -> bool {
|
|
match &self.source {
|
|
PreparedEnvironmentSource::Noise(_) => true,
|
|
PreparedEnvironmentSource::Snapshot(snapshot) => match &snapshot.default {
|
|
EnvironmentDefault::Disabled => false,
|
|
EnvironmentDefault::EnvironmentId(default_id) => snapshot
|
|
.environments
|
|
.iter()
|
|
.any(|(environment_id, _)| environment_id == default_id),
|
|
},
|
|
}
|
|
}
|
|
|
|
/// Builds the manager and starts remote connections using the supplied policy.
|
|
pub fn build(
|
|
self,
|
|
local_runtime_paths: Option<ExecServerRuntimePaths>,
|
|
http_client_factory: HttpClientFactory,
|
|
) -> Result<EnvironmentManager, ExecServerError> {
|
|
match self.source {
|
|
PreparedEnvironmentSource::Noise(config) => {
|
|
EnvironmentManager::from_noise_environment_config(
|
|
config,
|
|
local_runtime_paths,
|
|
http_client_factory,
|
|
)
|
|
}
|
|
PreparedEnvironmentSource::Snapshot(snapshot) => EnvironmentManager::from_snapshot(
|
|
snapshot,
|
|
local_runtime_paths,
|
|
http_client_factory,
|
|
),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "environment_bootstrap_tests.rs"]
|
|
mod tests;
|