mirror of
https://github.com/openai/codex.git
synced 2026-10-20 17:38:45 +00:00
Ruslan Nigmatullin
725b3a44f8
## What changed - Accept only `http://` and `https://` gRPC endpoints for app server `--code-mode-host` connections. - Limit the standalone code-mode host to stdio and gRPC listeners. - Remove the WebSocket session provider, dual-WebSocket negotiation, transport lanes, and related dependencies and tests. - Keep coverage for shared and prewarmed gRPC hosts and reject WebSocket host URLs in CLI parsing tests. GitOrigin-RevId: 8792604e79ffd54ce776074a4dc3f7d55e63752a
84 lines
2.5 KiB
Rust
84 lines
2.5 KiB
Rust
use std::ffi::OsStr;
|
|
|
|
use clap::Args;
|
|
use clap::builder::TypedValueParser;
|
|
use clap::error::ErrorKind;
|
|
use url::Url;
|
|
|
|
/// Selects the code-mode host for a single app-server process.
|
|
#[derive(Args, Debug, Clone, Default, PartialEq, Eq)]
|
|
pub struct AppServerCodeModeHostArgs {
|
|
/// Connect to a remote code-mode host instead of starting a local host.
|
|
#[arg(
|
|
long = "code-mode-host",
|
|
value_name = "URL",
|
|
value_parser = RedactedHostUrlParser
|
|
)]
|
|
pub code_mode_host: Option<Url>,
|
|
}
|
|
|
|
/// Process-scoped transport used to reach the code-mode host.
|
|
#[derive(Debug, Clone, Default, PartialEq, Eq)]
|
|
pub enum CodeModeHostTransport {
|
|
/// Start and own the default local code-mode host.
|
|
#[default]
|
|
Local,
|
|
/// Share an HTTP/2 gRPC connection to the specified remote code-mode host.
|
|
Grpc(Url),
|
|
}
|
|
|
|
impl From<AppServerCodeModeHostArgs> for CodeModeHostTransport {
|
|
fn from(args: AppServerCodeModeHostArgs) -> Self {
|
|
match args.code_mode_host {
|
|
Some(url) => Self::Grpc(url),
|
|
None => Self::Local,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
struct RedactedHostUrlParser;
|
|
|
|
impl TypedValueParser for RedactedHostUrlParser {
|
|
type Value = Url;
|
|
|
|
fn parse_ref(
|
|
&self,
|
|
command: &clap::Command,
|
|
_argument: Option<&clap::Arg>,
|
|
value: &OsStr,
|
|
) -> Result<Self::Value, clap::Error> {
|
|
let value = value.to_str().ok_or_else(|| {
|
|
clap::Error::raw(
|
|
ErrorKind::InvalidUtf8,
|
|
"code-mode host URL must contain valid UTF-8",
|
|
)
|
|
.with_cmd(command)
|
|
})?;
|
|
|
|
parse_host_url(value)
|
|
.map_err(|error| clap::Error::raw(ErrorKind::ValueValidation, error).with_cmd(command))
|
|
}
|
|
}
|
|
|
|
fn parse_host_url(value: &str) -> Result<Url, String> {
|
|
let url = Url::parse(value).map_err(|error| format!("invalid code-mode host URL: {error}"))?;
|
|
if !matches!(url.scheme(), "http" | "https") || url.host_str().is_none() {
|
|
return Err("code-mode host URL must use http:// or https:// with a host".to_string());
|
|
}
|
|
if url.fragment().is_some() {
|
|
return Err("code-mode host URL must not contain a fragment".to_string());
|
|
}
|
|
if !url.username().is_empty() || url.password().is_some() {
|
|
return Err("gRPC code-mode host URL must not contain credentials".to_string());
|
|
}
|
|
if url.path() != "/" || url.query().is_some() {
|
|
return Err("gRPC code-mode host URL must not contain a path or query".to_string());
|
|
}
|
|
Ok(url)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "code_mode_host_tests.rs"]
|
|
mod tests;
|