mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
Add opt-in OAuth discovery to config server loaders (#62432)
## What changed Allow config server bundle and auth loaders to discover authorization and token endpoints, plus an optional device authorization endpoint, from OAuth metadata when callers enable discovery and omit `config_server.oauth`. Discovery uses the bootstrap HTTP policy, times out after five seconds, and keeps the discovered settings in memory. Existing managed-config entry points pass `ConfigServerDiscovery::Disabled`. If bundle loader initialization fails, report the error on the first read and retry on later reads until a loader and its refresh worker can start. ## Testing Add tests for endpoint parsing and defaults, the discovery timeout, explicit OAuth precedence, disabled discovery, and local network policy. GitOrigin-RevId: 7cb72054147ec34f985d55dfe708fccfafcb4ba3
This commit is contained in:
@@ -199,7 +199,7 @@ impl ConfigManager {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub(crate) fn update_managed_config_loader(
|
||||
pub(crate) async fn update_managed_config_loader(
|
||||
&self,
|
||||
auth_manager: Arc<AuthManager>,
|
||||
config: &Config,
|
||||
@@ -222,7 +222,8 @@ impl ConfigManager {
|
||||
.http_client_factory()
|
||||
.with_network_policy(self.local_network_policy.policy()),
|
||||
config.config_layer_stack.requirements_toml(),
|
||||
);
|
||||
)
|
||||
.await;
|
||||
if let Ok(mut guard) = self.cloud_config_bundle.write() {
|
||||
guard.retire_ema_policy();
|
||||
*guard = loader;
|
||||
@@ -437,7 +438,7 @@ impl ConfigManager {
|
||||
AuthManager::shared_from_config(&bootstrap, /*enable_codex_api_key_env*/ false)
|
||||
.await
|
||||
.map_err(std::io::Error::other)?;
|
||||
self.update_managed_config_loader(auth, &bootstrap);
|
||||
self.update_managed_config_loader(auth, &bootstrap).await;
|
||||
let config = self.load_latest_config(cwd).await;
|
||||
Ok(CloudStartupConfig { bootstrap, config })
|
||||
}
|
||||
|
||||
@@ -126,7 +126,9 @@ pub(super) async fn configure(
|
||||
)
|
||||
.await
|
||||
.map_err(IoError::other)?;
|
||||
config_manager.update_managed_config_loader(bootstrap_auth_manager, &bootstrap_config);
|
||||
config_manager
|
||||
.update_managed_config_loader(bootstrap_auth_manager, &bootstrap_config)
|
||||
.await;
|
||||
let policy_config = config_manager
|
||||
.load_startup_config(Some(config.cwd.to_path_buf()))
|
||||
.await?
|
||||
@@ -165,7 +167,9 @@ pub(super) async fn configure(
|
||||
config.application_auth_route_config = policy_config.application_auth_route_config;
|
||||
config.forced_login_method = policy_config.forced_login_method;
|
||||
config.forced_chatgpt_workspace_id = policy_config.forced_chatgpt_workspace_id;
|
||||
config_manager.update_managed_config_loader(policy_auth_manager, config);
|
||||
config_manager
|
||||
.update_managed_config_loader(policy_auth_manager, config)
|
||||
.await;
|
||||
codex_login::default_client::set_default_client_residency_requirement(
|
||||
config.enforce_residency.value(),
|
||||
);
|
||||
|
||||
@@ -608,7 +608,9 @@ pub async fn run_main_with_transport_options(
|
||||
AuthManager::shared_from_config(&config, /*enable_codex_api_key_env*/ false)
|
||||
.await
|
||||
.map_err(std::io::Error::other)?;
|
||||
config_manager.update_managed_config_loader(auth_manager.clone(), &config);
|
||||
config_manager
|
||||
.update_managed_config_loader(auth_manager.clone(), &config)
|
||||
.await;
|
||||
config_manager
|
||||
.sync_default_client_residency_requirement()
|
||||
.await;
|
||||
|
||||
@@ -963,7 +963,8 @@ impl AccountRequestProcessor {
|
||||
.await
|
||||
.map_err(|err| internal_error(format!("failed to set external auth: {err}")))?;
|
||||
self.config_manager
|
||||
.update_managed_config_loader(self.auth_manager.clone(), &self.config);
|
||||
.update_managed_config_loader(self.auth_manager.clone(), &self.config)
|
||||
.await;
|
||||
self.config_manager
|
||||
.sync_default_client_residency_requirement()
|
||||
.await;
|
||||
@@ -1040,7 +1041,8 @@ impl AccountRequestProcessor {
|
||||
.invalidate_mcp_runtimes_for(McpRefreshReason::AccountAuthReloaded)
|
||||
.await;
|
||||
self.config_manager
|
||||
.update_managed_config_loader(self.auth_manager.clone(), &self.config);
|
||||
.update_managed_config_loader(self.auth_manager.clone(), &self.config)
|
||||
.await;
|
||||
self.config_manager
|
||||
.sync_default_client_residency_requirement()
|
||||
.await;
|
||||
@@ -1583,7 +1585,9 @@ pub(crate) async fn logout_configured_account(
|
||||
.reload_with_cached_auth()
|
||||
.await
|
||||
.map_err(|err| internal_error(format!("logout failed: {err}")))?;
|
||||
config_manager.update_managed_config_loader(Arc::clone(auth_manager), fallback_config);
|
||||
config_manager
|
||||
.update_managed_config_loader(Arc::clone(auth_manager), fallback_config)
|
||||
.await;
|
||||
let config = config_manager
|
||||
.load_latest_config(/*fallback_cwd*/ None)
|
||||
.await;
|
||||
|
||||
@@ -228,7 +228,8 @@ impl AccountRequestProcessor {
|
||||
|
||||
async fn reload_workspace_config(&self) {
|
||||
self.config_manager
|
||||
.update_managed_config_loader(self.auth_manager.clone(), &self.config);
|
||||
.update_managed_config_loader(self.auth_manager.clone(), &self.config)
|
||||
.await;
|
||||
self.config_manager
|
||||
.sync_default_client_residency_requirement()
|
||||
.await;
|
||||
|
||||
@@ -143,7 +143,9 @@ async fn read_startup_config(
|
||||
set_default_client_residency_requirement(config.enforce_residency.value());
|
||||
let config = logout_configured_account(&manager, &auth, &config).await?;
|
||||
clear_account_configuration(&manager, &config).await?;
|
||||
manager.update_managed_config_loader(Arc::clone(&auth), &config);
|
||||
manager
|
||||
.update_managed_config_loader(Arc::clone(&auth), &config)
|
||||
.await;
|
||||
manager
|
||||
.load_latest_config(cwd)
|
||||
.await
|
||||
|
||||
Reference in New Issue
Block a user