mirror of
https://github.com/openai/codex.git
synced 2026-11-17 14:58:36 +00:00
Add enterprise IdP identity resolution for MCP OAuth (#40739)
## What changed - Resolve stored enterprise IdP sessions against discovered authorization metadata, requiring the configured issuer, public-client authentication, and supported ID-JAG token exchange capabilities. - Bind OIDC identity claims and MCP resource indicators to their configured issuer, client, and server, and require reauthentication when pinned keyring credentials are removed or replaced. - Hold the credential lock while rereading refresh tokens, and isolate enterprise credentials by reserved namespace and Codex home. ## Testing - Cover metadata and claim validation, resource binding, credential replacement and keyring failures, refresh locking, expired ID tokens, and credential namespace isolation. GitOrigin-RevId: edce3c6159f7d6831edf72e9608b3fc3f5823c83
This commit is contained in:
1 parent
75cb7c903d
commit
9b4a0f8a0a
12 files changed
+932
-14
No files matched your search
@@ -0,0 +1,155 @@
|
||||
//! An enterprise IdP session is independent of Codex account authentication.
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
use anyhow::Context;
|
||||
use anyhow::Result;
|
||||
use anyhow::anyhow;
|
||||
use anyhow::bail;
|
||||
use codex_exec_server::HttpClient;
|
||||
use codex_keyring_store::DefaultKeyringStore;
|
||||
use codex_keyring_store::KeyringStore;
|
||||
use oauth2::TokenResponse;
|
||||
use rmcp::transport::AuthorizationManager;
|
||||
|
||||
use crate::ema_auth_policy::advertised_capability;
|
||||
use crate::ema_auth_policy::ema_reauthentication_required;
|
||||
use crate::ema_auth_policy::validate_ema_oauth_endpoint;
|
||||
use crate::ema_auth_policy::validate_ema_public_client_auth;
|
||||
use crate::ema_claims::ID_JAG_TOKEN_TYPE;
|
||||
use crate::ema_exchange::TOKEN_EXCHANGE_GRANT_TYPE;
|
||||
use crate::http_client_adapter::StreamableHttpRedirectMode;
|
||||
use crate::oauth::RefreshCredentialLock;
|
||||
use crate::oauth::StoredOAuthCredentialSnapshot;
|
||||
use crate::oauth::StoredOAuthTokens;
|
||||
use crate::oauth::stored_oidc_identity;
|
||||
use crate::oauth_http_client::OAuthHttpClientAdapter;
|
||||
use crate::utils::build_default_headers;
|
||||
|
||||
pub struct EmaIdpIdentityRequest<'a> {
|
||||
pub issuer: &'a str,
|
||||
pub client_id: &'a str,
|
||||
pub credentials: &'a StoredOAuthCredentialSnapshot,
|
||||
pub http_client: Arc<dyn HttpClient>,
|
||||
pub redirect_mode: StreamableHttpRedirectMode,
|
||||
}
|
||||
|
||||
/// An opaque IdP refresh token whose credential lock is held through token exchange.
|
||||
#[allow(dead_code)]
|
||||
pub struct EmaIdpIdentity {
|
||||
pub(crate) token_endpoint: String,
|
||||
pub(crate) refresh_token: String,
|
||||
pub(crate) credential_lock: RefreshCredentialLock,
|
||||
}
|
||||
|
||||
/// Returns whether stored credentials contain a refresh token bound to the configured login.
|
||||
pub fn stored_ema_identity_is_usable(
|
||||
tokens: &StoredOAuthTokens,
|
||||
issuer: &str,
|
||||
client_id: &str,
|
||||
) -> bool {
|
||||
tokens.url == issuer
|
||||
&& tokens.bound_issuer() == Some(issuer)
|
||||
&& tokens.client_id == client_id
|
||||
&& tokens.has_refresh_token()
|
||||
&& stored_oidc_identity(tokens).is_ok()
|
||||
}
|
||||
|
||||
/// Resolve a stored refresh-token subject against the configured enterprise IdP metadata.
|
||||
pub async fn resolve_ema_idp_identity(
|
||||
request: EmaIdpIdentityRequest<'_>,
|
||||
) -> Result<EmaIdpIdentity> {
|
||||
resolve_ema_idp_identity_in(request, &DefaultKeyringStore).await
|
||||
}
|
||||
|
||||
async fn resolve_ema_idp_identity_in<K: KeyringStore + Clone + 'static>(
|
||||
request: EmaIdpIdentityRequest<'_>,
|
||||
keyring_store: &K,
|
||||
) -> Result<EmaIdpIdentity> {
|
||||
if request.issuer.trim().is_empty() || request.client_id.trim().is_empty() {
|
||||
bail!("ema_auth requires a non-empty enterprise IdP issuer and client ID");
|
||||
}
|
||||
validate_ema_oauth_endpoint(request.issuer, "enterprise IdP issuer")?;
|
||||
let credentials = request.credentials.credentials();
|
||||
if credentials.url != request.issuer
|
||||
|| credentials.bound_issuer() != Some(request.issuer)
|
||||
|| credentials.client_id != request.client_id
|
||||
{
|
||||
bail!("stored enterprise IdP credentials do not match the configured issuer and client");
|
||||
}
|
||||
stored_oidc_identity(credentials)?;
|
||||
let client = OAuthHttpClientAdapter::new_with_redirect_mode(
|
||||
request.http_client,
|
||||
build_default_headers(/*http_headers*/ None, /*env_http_headers*/ None)?,
|
||||
request.issuer,
|
||||
/*has_configured_headers*/ false,
|
||||
request.redirect_mode,
|
||||
)?;
|
||||
let mut manager = AuthorizationManager::new_with_oauth_http_client(
|
||||
request.issuer.to_string(),
|
||||
Arc::new(client),
|
||||
)
|
||||
.await
|
||||
.context("failed to create enterprise IdP metadata discovery client")?;
|
||||
manager.set_allow_missing_issuer(false);
|
||||
let metadata = manager
|
||||
.resolve_metadata()
|
||||
.await
|
||||
.context("failed to discover enterprise IdP authorization metadata")?
|
||||
.metadata;
|
||||
if metadata.issuer.as_deref() != Some(request.issuer) {
|
||||
bail!("enterprise IdP authorization metadata issuer does not match configuration");
|
||||
}
|
||||
validate_ema_oauth_endpoint(&metadata.token_endpoint, "enterprise IdP token endpoint")?;
|
||||
for (name, expected) in [
|
||||
(
|
||||
"identity_chaining_requested_token_types_supported",
|
||||
ID_JAG_TOKEN_TYPE,
|
||||
),
|
||||
("grant_types_supported", TOKEN_EXCHANGE_GRANT_TYPE),
|
||||
] {
|
||||
if advertised_capability(metadata.additional_fields.get(name), expected, name)?
|
||||
== Some(false)
|
||||
{
|
||||
bail!(
|
||||
"enterprise IdP does not advertise the required ID-JAG token exchange capability"
|
||||
);
|
||||
}
|
||||
}
|
||||
validate_ema_public_client_auth(
|
||||
metadata
|
||||
.additional_fields
|
||||
.get("token_endpoint_auth_methods_supported"),
|
||||
"enterprise IdP",
|
||||
)?;
|
||||
let credential_lock =
|
||||
RefreshCredentialLock::acquire_for_server(&credentials.server_name, &credentials.url)
|
||||
.await?;
|
||||
let snapshot = request.credentials.clone();
|
||||
let keyring_store = keyring_store.clone();
|
||||
// The worker retains the guard even if its caller stops waiting for the reread.
|
||||
tokio::task::spawn_blocking(move || {
|
||||
let latest = snapshot.load_ema_credentials(&keyring_store)?;
|
||||
let refresh_token = latest
|
||||
.token_response
|
||||
.0
|
||||
.refresh_token()
|
||||
.filter(|token| !token.secret().trim().is_empty())
|
||||
.ok_or_else(|| {
|
||||
ema_reauthentication_required(
|
||||
"enterprise IdP session has no refresh token; sign in again",
|
||||
)
|
||||
})?;
|
||||
Ok(EmaIdpIdentity {
|
||||
token_endpoint: metadata.token_endpoint,
|
||||
refresh_token: refresh_token.secret().to_string(),
|
||||
credential_lock,
|
||||
})
|
||||
})
|
||||
.await
|
||||
.map_err(|_| anyhow!("enterprise IdP credential reread task failed"))?
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "ema_identity_tests.rs"]
|
||||
mod tests;
|
||||
Reference in new issue
Block a user