mirror of
https://github.com/openai/codex.git
synced 2026-11-07 20:30:33 +00:00
smurching-oai
f3a90545ae
## What changed - Add loaders that select `config_server` when configured and otherwise use the existing ChatGPT bundle source. Fetch custom bundles from `<base_url>/codex/config/bundle` without redirects or request logging. - Support optional OAuth sessions without interactive login during bundle fetches, recover credentials after a `401`, and scope cached bundles to the endpoint and authorization identity. - Restrict bootstrap network access to configuration and OAuth endpoints using local administrator rules when available. - Return generic bundle validation errors so invalid TOML, requirements, and provider settings do not expose configuration contents. ## Testing Add tests for missing configuration-server sign-in, replacement OAuth credentials, endpoint-specific cache reuse, and validation errors that omit sensitive values while preserving cached bundles. GitOrigin-RevId: 56590a9e66340540666ca21590bef46c495e0e33
70 lines
2.3 KiB
Rust
70 lines
2.3 KiB
Rust
//! Trusted enrollment settings for a customer-hosted configuration server.
|
|
//!
|
|
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use std::fmt;
|
|
|
|
pub use codex_model_provider_info::OAuthSessionConfig as ConfigServerOAuth;
|
|
|
|
#[derive(Clone, PartialEq, Eq, Deserialize, Serialize)]
|
|
#[serde(try_from = "ConfigServerInput")]
|
|
pub struct ConfigServer {
|
|
pub base_url: String,
|
|
// Boxing keeps config-loader futures small.
|
|
pub oauth: Option<Box<ConfigServerOAuth>>,
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
#[serde(deny_unknown_fields)]
|
|
struct ConfigServerInput {
|
|
base_url: String,
|
|
oauth: Option<Box<ConfigServerOAuth>>,
|
|
}
|
|
|
|
impl TryFrom<ConfigServerInput> for ConfigServer {
|
|
type Error = String;
|
|
|
|
fn try_from(input: ConfigServerInput) -> Result<Self, Self::Error> {
|
|
let service = Self {
|
|
base_url: input.base_url,
|
|
oauth: input.oauth,
|
|
};
|
|
service.validated_base_url()?;
|
|
Ok(service)
|
|
}
|
|
}
|
|
|
|
impl ConfigServer {
|
|
/// Validates the trusted settings and returns the normalized base URL.
|
|
pub fn validated_base_url(&self) -> Result<String, String> {
|
|
let validate_https_url = |value: &str| {
|
|
codex_http_client::validate_endpoint_url(value, "config_server")
|
|
.ok()
|
|
.filter(|url| url.scheme() == "https")
|
|
.ok_or("config_server URLs must use HTTPS without userinfo or fragments")
|
|
};
|
|
let endpoint = validate_https_url(&self.base_url)?;
|
|
if endpoint.query().is_some() {
|
|
return Err("config_server.base_url must not contain a query".into());
|
|
}
|
|
if let Some(oauth) = &self.oauth {
|
|
validate_https_url(&oauth.authorization_url)?;
|
|
validate_https_url(&oauth.token_url)?;
|
|
if let Some(url) = &oauth.device_authorization_url {
|
|
validate_https_url(url)?;
|
|
}
|
|
if oauth.client_id.trim().is_empty() || oauth.redirect_port == Some(0) {
|
|
return Err("config_server OAuth requires a client ID and a nonzero redirect port when specified".into());
|
|
}
|
|
}
|
|
Ok(endpoint.into())
|
|
}
|
|
}
|
|
|
|
impl fmt::Debug for ConfigServer {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
f.debug_struct("ConfigServer").finish_non_exhaustive()
|
|
}
|
|
}
|