mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Track MCP enterprise auth cancellation across config reloads (#55287)
## Why Configuration loading can finish before a pending startup is visible to the thread manager. Reloads need a cancellation scope that also covers these configuration snapshots. ## What changed - Capture an enterprise managed authentication (EMA) cancellation token before loading configuration and carry it through config layers, role overrides, runtime refreshes, and `McpConfig`. - Cancel the previous scope on MCP or user configuration reloads and cloud config loader changes, then create a fresh scope for subsequent loads. - Cancel the session's token when enterprise MCP authentication is disabled or a refresh leaves it unavailable. ## Testing Extend the MCP reload test to verify that existing thread and pending startup tokens are cancelled while a fresh startup receives an uncancelled token. GitOrigin-RevId: 5fc0658b74c360e7dc9ab3488339fcf19bfe9fae
This commit is contained in:
@@ -25,7 +25,9 @@ use std::collections::HashMap;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
use std::sync::Mutex;
|
||||
use std::sync::RwLock;
|
||||
use tokio_util::sync::CancellationToken;
|
||||
use toml::Value as TomlValue;
|
||||
use tracing::instrument;
|
||||
use tracing::warn;
|
||||
@@ -54,6 +56,8 @@ pub(crate) struct ConfigManager {
|
||||
local_network_policy: codex_http_client::NetworkPolicyController,
|
||||
network_policy_reload: Arc<tokio::sync::Semaphore>,
|
||||
network_policy_snapshot: Arc<RwLock<Option<Arc<ApplicationPolicySnapshot>>>>,
|
||||
/// Captured before config loading so a reload also revokes pending startups.
|
||||
mcp_ema_cancellation: Arc<Mutex<CancellationToken>>,
|
||||
}
|
||||
|
||||
/// Startup configuration, including whether loading had to fall back to defaults.
|
||||
@@ -99,6 +103,7 @@ impl ConfigManager {
|
||||
local_network_policy: Default::default(),
|
||||
network_policy_reload: Arc::new(tokio::sync::Semaphore::new(/*permits*/ 1)),
|
||||
network_policy_snapshot: Arc::default(),
|
||||
mcp_ema_cancellation: Arc::default(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,6 +111,24 @@ impl ConfigManager {
|
||||
self.codex_home.as_path()
|
||||
}
|
||||
|
||||
/// Retires EMA access for every config already loaded or being loaded.
|
||||
/// New loads resolve their own settings under the next cancellation scope.
|
||||
pub(crate) fn revoke_mcp_ema(&self) {
|
||||
let mut current = self
|
||||
.mcp_ema_cancellation
|
||||
.lock()
|
||||
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
||||
current.cancel();
|
||||
*current = CancellationToken::new();
|
||||
}
|
||||
|
||||
fn capture_mcp_ema_cancellation(&self) -> CancellationToken {
|
||||
self.mcp_ema_cancellation
|
||||
.lock()
|
||||
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
||||
.child_token()
|
||||
}
|
||||
|
||||
pub(crate) fn with_embedded_network_policy(
|
||||
mut self,
|
||||
policy: crate::in_process::EmbeddedNetworkPolicy,
|
||||
@@ -171,6 +194,7 @@ impl ConfigManager {
|
||||
} else {
|
||||
warn!("failed to update cloud config bundle loader");
|
||||
}
|
||||
self.revoke_mcp_ema();
|
||||
}
|
||||
|
||||
pub(crate) fn clear_cloud_config_bundle_loader(&self) {
|
||||
@@ -180,6 +204,7 @@ impl ConfigManager {
|
||||
} else {
|
||||
warn!("failed to clear cloud config bundle loader");
|
||||
}
|
||||
self.revoke_mcp_ema();
|
||||
}
|
||||
|
||||
pub(crate) async fn sync_default_client_residency_requirement(&self) {
|
||||
@@ -213,6 +238,7 @@ impl ConfigManager {
|
||||
/// Loads system, user, and runtime settings without discovering a project
|
||||
/// from the app-server process's working directory.
|
||||
pub(crate) async fn load_non_project_config(&self) -> std::io::Result<Config> {
|
||||
let mcp_ema_cancellation = self.capture_mcp_ema_cancellation();
|
||||
let policy_load = self.refresh_application_network_policy().await?;
|
||||
let mut config = ConfigBuilder::default()
|
||||
.codex_home(self.codex_home.clone())
|
||||
@@ -229,6 +255,9 @@ impl ConfigManager {
|
||||
self.apply_network_policy(&mut config);
|
||||
self.apply_runtime_feature_enablement(&mut config);
|
||||
self.apply_arg0_paths(&mut config);
|
||||
config.config_layer_stack = config
|
||||
.config_layer_stack
|
||||
.with_mcp_ema_cancellation(mcp_ema_cancellation);
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
@@ -237,6 +266,7 @@ impl ConfigManager {
|
||||
session_layers: &ConfigLayerStack,
|
||||
cwd: &Path,
|
||||
) -> std::io::Result<Config> {
|
||||
let mcp_ema_cancellation = self.capture_mcp_ema_cancellation();
|
||||
let codex_home = AbsolutePathBuf::from_absolute_path(&self.codex_home)?;
|
||||
let layers = self
|
||||
.load_config_layers_for_cwd(AbsolutePathBuf::from_absolute_path(cwd)?)
|
||||
@@ -251,6 +281,9 @@ impl ConfigManager {
|
||||
self.apply_network_policy(&mut config);
|
||||
self.apply_runtime_feature_enablement(&mut config);
|
||||
self.apply_arg0_paths(&mut config);
|
||||
config.config_layer_stack = config
|
||||
.config_layer_stack
|
||||
.with_mcp_ema_cancellation(mcp_ema_cancellation);
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
@@ -260,6 +293,7 @@ impl ConfigManager {
|
||||
session_layers: &ConfigLayerStack,
|
||||
cwd: &Path,
|
||||
) -> std::io::Result<Config> {
|
||||
let mcp_ema_cancellation = self.capture_mcp_ema_cancellation();
|
||||
let mut manager = self.clone();
|
||||
manager.thread_config_loader = Arc::new(codex_config::NoopThreadConfigLoader);
|
||||
let refreshed_layers = manager
|
||||
@@ -276,6 +310,9 @@ impl ConfigManager {
|
||||
self.apply_network_policy(&mut config);
|
||||
self.apply_runtime_feature_enablement(&mut config);
|
||||
self.apply_arg0_paths(&mut config);
|
||||
config.config_layer_stack = config
|
||||
.config_layer_stack
|
||||
.with_mcp_ema_cancellation(mcp_ema_cancellation);
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
@@ -365,6 +402,7 @@ impl ConfigManager {
|
||||
}
|
||||
|
||||
pub(crate) async fn load_default_config(&self) -> std::io::Result<Config> {
|
||||
let mcp_ema_cancellation = self.capture_mcp_ema_cancellation();
|
||||
let mut loader_overrides = self.loader_overrides.clone();
|
||||
loader_overrides.ignore_user_config = true;
|
||||
loader_overrides.ignore_project_config = true;
|
||||
@@ -381,6 +419,9 @@ impl ConfigManager {
|
||||
self.apply_network_policy(&mut config);
|
||||
self.apply_runtime_feature_enablement(&mut config);
|
||||
self.apply_arg0_paths(&mut config);
|
||||
config.config_layer_stack = config
|
||||
.config_layer_stack
|
||||
.with_mcp_ema_cancellation(mcp_ema_cancellation);
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
@@ -467,6 +508,7 @@ impl ConfigManager {
|
||||
mut typesafe_overrides: ConfigOverrides,
|
||||
fallback_cwd: Option<PathBuf>,
|
||||
) -> std::io::Result<Config> {
|
||||
let mcp_ema_cancellation = self.capture_mcp_ema_cancellation();
|
||||
let policy_load = self.refresh_application_network_policy().await?;
|
||||
let mut request_overrides = request_overrides.unwrap_or_default();
|
||||
if let Some(value) = request_overrides.remove("bypass_hook_trust") {
|
||||
@@ -502,6 +544,9 @@ impl ConfigManager {
|
||||
self.apply_network_policy(&mut config);
|
||||
self.apply_runtime_feature_enablement(&mut config);
|
||||
self.apply_arg0_paths(&mut config);
|
||||
config.config_layer_stack = config
|
||||
.config_layer_stack
|
||||
.with_mcp_ema_cancellation(mcp_ema_cancellation);
|
||||
Ok(config)
|
||||
}
|
||||
|
||||
|
||||
@@ -46,6 +46,7 @@ async fn reload_mcp_config_with_policy(
|
||||
config_manager: &ConfigManager,
|
||||
policy: ReloadPolicy,
|
||||
) -> io::Result<()> {
|
||||
config_manager.revoke_mcp_ema();
|
||||
let mut rejected = false;
|
||||
let mut load_error = None;
|
||||
let mut completed: Vec<Arc<CodexThread>> = Vec::new();
|
||||
@@ -401,6 +402,20 @@ enabled = false
|
||||
}
|
||||
}
|
||||
let thread = good_thread.expect("good test thread should exist");
|
||||
// Config loading can finish before a startup is visible to ThreadManager.
|
||||
let pending_startup = config_manager
|
||||
.load_for_cwd(
|
||||
/*request_overrides*/ None,
|
||||
ConfigOverrides::default(),
|
||||
Some(temp_dir.path().join("good")),
|
||||
)
|
||||
.await?;
|
||||
assert!(
|
||||
!pending_startup
|
||||
.config_layer_stack
|
||||
.mcp_ema_cancellation()
|
||||
.is_cancelled()
|
||||
);
|
||||
std::fs::write(
|
||||
temp_dir.path().join(codex_config::CONFIG_TOML_FILE),
|
||||
r#"
|
||||
@@ -412,6 +427,34 @@ enabled = false
|
||||
|
||||
reload_mcp_config(&thread_manager, &config_manager).await?;
|
||||
|
||||
assert!(
|
||||
pending_startup
|
||||
.config_layer_stack
|
||||
.mcp_ema_cancellation()
|
||||
.is_cancelled()
|
||||
);
|
||||
assert!(
|
||||
thread
|
||||
.config()
|
||||
.await
|
||||
.config_layer_stack
|
||||
.mcp_ema_cancellation()
|
||||
.is_cancelled()
|
||||
);
|
||||
let fresh_startup = config_manager
|
||||
.load_for_cwd(
|
||||
/*request_overrides*/ None,
|
||||
ConfigOverrides::default(),
|
||||
Some(temp_dir.path().join("good")),
|
||||
)
|
||||
.await?;
|
||||
assert!(
|
||||
!fresh_startup
|
||||
.config_layer_stack
|
||||
.mcp_ema_cancellation()
|
||||
.is_cancelled()
|
||||
);
|
||||
|
||||
assert!(
|
||||
thread
|
||||
.config()
|
||||
|
||||
@@ -374,6 +374,7 @@ pub(super) async fn reload_user_config(
|
||||
}
|
||||
|
||||
async fn reload_user_config_inner(config_manager: &ConfigManager, thread_manager: &ThreadManager) {
|
||||
config_manager.revoke_mcp_ema();
|
||||
if let Err(err) = config_manager.load_config_layers(/*cwd*/ None).await {
|
||||
tracing::warn!("failed to rebuild user config for runtime refresh: {err}");
|
||||
for thread_id in thread_manager.list_thread_ids().await {
|
||||
|
||||
Reference in New Issue
Block a user