mirror of
https://github.com/openai/codex.git
synced 2026-05-16 01:02:48 +00:00
## Summary This PR moves Codex backend request authentication from direct bearer-token handling to `AuthProvider`. The new `codex-auth-provider` crate defines the shared request-auth trait. `CodexAuth::provider()` returns a provider that can apply all headers needed for the selected auth mode. This lets ChatGPT token auth and AgentIdentity auth share the same callsite path: - ChatGPT token auth applies bearer auth plus account/FedRAMP headers where needed. - AgentIdentity auth applies AgentAssertion plus account/FedRAMP headers where needed. Reference old stack: https://github.com/openai/codex/pull/17387/changes ## Callsite Migration | Area | Change | | --- | --- | | backend-client | accepts an `AuthProvider` instead of a raw token/header | | chatgpt client/connectors | applies auth through `CodexAuth::provider()` | | cloud tasks | keeps Codex-backend gating, applies auth through provider | | cloud requirements | uses Codex-backend auth checks and provider headers | | app-server remote control | applies provider headers for backend calls | | MCP Apps/connectors | gates on `uses_codex_backend()` and keys caches from generic account getters | | model refresh | treats AgentIdentity as Codex-backend auth | | OpenAI file upload path | rejects non-Codex-backend auth before applying headers | | core client setup | keeps model-provider auth flow and allows AgentIdentity through provider-backed OpenAI auth | ## Stack 1. https://github.com/openai/codex/pull/18757: full revert 2. https://github.com/openai/codex/pull/18871: isolated Agent Identity crate 3. https://github.com/openai/codex/pull/18785: explicit AgentIdentity auth mode and startup task allocation 4. This PR: migrate Codex backend auth callsites through AuthProvider 5. https://github.com/openai/codex/pull/18904: accept AgentIdentity JWTs and load `CODEX_AGENT_IDENTITY` ## Testing Tests: targeted Rust checks, cargo-shear, Bazel lock check, and CI.
82 lines
2.8 KiB
Rust
82 lines
2.8 KiB
Rust
use async_trait::async_trait;
|
|
use codex_client::Request;
|
|
use codex_client::TransportError;
|
|
use http::HeaderMap;
|
|
use std::sync::Arc;
|
|
|
|
/// Error returned while applying authentication to an outbound request.
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum AuthError {
|
|
#[error("request auth build error: {0}")]
|
|
Build(String),
|
|
#[error("transient auth error: {0}")]
|
|
Transient(String),
|
|
}
|
|
|
|
impl From<AuthError> for TransportError {
|
|
fn from(error: AuthError) -> Self {
|
|
match error {
|
|
AuthError::Build(message) => TransportError::Build(message),
|
|
AuthError::Transient(message) => TransportError::Network(message),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Applies authentication to API requests.
|
|
///
|
|
/// Header-only providers can implement `add_auth_headers`; providers that sign
|
|
/// complete requests can override `apply_auth`.
|
|
#[async_trait]
|
|
pub trait AuthProvider: Send + Sync {
|
|
/// Adds any auth headers that are available without request body access.
|
|
///
|
|
/// Implementations should be cheap and non-blocking. This method is also
|
|
/// used by telemetry and non-HTTP request paths.
|
|
fn add_auth_headers(&self, headers: &mut HeaderMap);
|
|
|
|
/// Returns any auth headers that are available without request body access.
|
|
fn to_auth_headers(&self) -> HeaderMap {
|
|
let mut headers = HeaderMap::new();
|
|
self.add_auth_headers(&mut headers);
|
|
headers
|
|
}
|
|
|
|
/// Applies auth to a complete outbound request and returns the request to send.
|
|
///
|
|
/// The input `request` is moved into this method. Implementations may mutate
|
|
/// the owned request, or replace it entirely, before returning.
|
|
///
|
|
/// Header-only auth providers can rely on the default implementation.
|
|
/// Request-signing providers can override this to inspect the final URL,
|
|
/// headers, and body bytes before the transport sends the request.
|
|
///
|
|
/// Callers must always use the returned request as authoritative.
|
|
/// If this returns [`AuthError`], the request should not be sent.
|
|
async fn apply_auth(&self, request: Request) -> Result<Request, AuthError> {
|
|
let mut request = request;
|
|
self.add_auth_headers(&mut request.headers);
|
|
Ok(request)
|
|
}
|
|
}
|
|
|
|
/// Shared auth handle passed through API clients.
|
|
pub type SharedAuthProvider = Arc<dyn AuthProvider>;
|
|
|
|
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
|
|
pub struct AuthHeaderTelemetry {
|
|
pub attached: bool,
|
|
pub name: Option<&'static str>,
|
|
}
|
|
|
|
pub fn auth_header_telemetry(auth: &dyn AuthProvider) -> AuthHeaderTelemetry {
|
|
let mut headers = HeaderMap::new();
|
|
auth.add_auth_headers(&mut headers);
|
|
let name = headers
|
|
.contains_key(http::header::AUTHORIZATION)
|
|
.then_some("authorization");
|
|
AuthHeaderTelemetry {
|
|
attached: name.is_some(),
|
|
name,
|
|
}
|
|
}
|