mirror of
https://github.com/openai/codex.git
synced 2026-11-20 22:40:37 +00:00
Extend runtime auth to account, plugin, and file requests (#59564)
## What changed - Use the shared runtime and effective configuration for account API clients and remote plugin requests, including standalone plugin commands. - Support dual-header and assertion-only authentication for remote plugins and MCP file uploads when runtime agent instances are enabled. - Keep plugin credentials and caches scoped to the thread's account when resuming with different credentials. Bind request pools and multi-step plugin storage operations to the selected account so account replacement revokes stale operations. - Protect runtime credentials on cross-origin redirects while preserving configured routing policies and legacy authentication for custom backends. - Apply server-provided `upload_headers` to file storage uploads. ## Testing Add coverage for shared runtime registration, both authentication modes, configuration reloads, resumed-thread account selection, account replacement during plugin uploads and downloads, and credential stripping on redirects. Extend file upload tests to verify runtime assertions and storage-only upload headers. GitOrigin-RevId: 68aef81051a6f9bf919fffda52f372b108fce805
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
//! Build account API clients from the latest config and captured account authority.
|
||||
|
||||
use super::*;
|
||||
use futures::future::BoxFuture;
|
||||
|
||||
impl AccountRequestProcessor {
|
||||
// Keep config loading and runtime bootstrap out of request-handler future types.
|
||||
#[inline(never)]
|
||||
pub(super) fn backend_client<'a>(
|
||||
&'a self,
|
||||
auth: &'a CodexAuth,
|
||||
http_client_factory: codex_http_client::HttpClientFactory,
|
||||
) -> BoxFuture<'a, Result<BackendClient, JSONRPCErrorError>> {
|
||||
Box::pin(async move {
|
||||
let config = self.load_latest_config().await;
|
||||
let runtime = self
|
||||
.thread_manager
|
||||
.runtime_auth_for_config(&config)
|
||||
.map_err(|error| internal_error(error.to_string()))?;
|
||||
BackendClient::from_auth_with_runtime(
|
||||
config.chatgpt_base_url.clone(),
|
||||
auth,
|
||||
http_client_factory,
|
||||
runtime.as_ref(),
|
||||
/*headers*/ &Default::default(),
|
||||
)
|
||||
.await
|
||||
.map_err(|error| internal_error(error.to_string()))
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -111,11 +111,7 @@ impl AccountRequestProcessor {
|
||||
));
|
||||
}
|
||||
|
||||
Ok(BackendClient::from_auth(
|
||||
self.config.chatgpt_base_url.clone(),
|
||||
&auth,
|
||||
http_client_factory,
|
||||
))
|
||||
self.backend_client(&auth, http_client_factory).await
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -399,15 +399,23 @@ impl AccountRequestProcessor {
|
||||
let routing = if let Some(cached) = cached {
|
||||
cached
|
||||
} else {
|
||||
let runtime = self
|
||||
.thread_manager
|
||||
.runtime_auth_for_config(&config)
|
||||
.map_err(|_| WorkspaceRoutingError::DiscoveryFailed)?;
|
||||
let mut recovery = self.auth_manager.unauthorized_recovery();
|
||||
let mut discovery_auth = auth.clone();
|
||||
let mut discovery_generation = auth_state.generation;
|
||||
let response = loop {
|
||||
let client = BackendClient::from_auth(
|
||||
let client = BackendClient::from_auth_with_runtime(
|
||||
&config.chatgpt_base_url,
|
||||
&discovery_auth,
|
||||
config.http_client_factory(),
|
||||
);
|
||||
runtime.as_ref(),
|
||||
/*headers*/ &Default::default(),
|
||||
)
|
||||
.await
|
||||
.map_err(|_| WorkspaceRoutingError::DiscoveryFailed)?;
|
||||
match client.get_accounts_check().await {
|
||||
Ok(response) => break response,
|
||||
Err(error) => {
|
||||
|
||||
Reference in New Issue
Block a user