mirror of
https://github.com/openai/codex.git
synced 2026-11-16 22:00:36 +00:00
## What changed Support `model_providers.amazon-bedrock.aws.credential_export` with `command`, `args`, and `timeout_ms` to supply SigV4 signing credentials from a command's JSON output. Accept both flat credential-process output and nested STS `Credentials` objects. Cache credentials in memory, refresh before expiration, and share exports across sessions with matching AWS configuration. On recoverable authentication failures, run the optional `aws.auth_refresh` command before exporting fresh credentials, coalescing concurrent recovery attempts. Bound command execution time and output size, and keep credential values out of errors. Reject combining `aws.credential_export` with `aws.profile`. Bedrock setup and login reject changes while an exporter is configured, preserving configuration and saved credentials. ## Testing Add coverage for output formats, expiration, credential precedence, caching, concurrent recovery, command failures, and secret redaction. Integration tests verify request signing with rotated credentials, bounded recovery attempts, and setup/login rejection across configuration layers. GitOrigin-RevId: 4ef799f88ab5e3b2578f8f41a5e56e4f30e2cd81
72 lines
2.4 KiB
Rust
72 lines
2.4 KiB
Rust
use std::sync::Arc;
|
|
use std::sync::Mutex;
|
|
use std::sync::OnceLock;
|
|
use std::sync::Weak;
|
|
|
|
use codex_model_provider_info::ModelProviderAwsAuthInfo;
|
|
|
|
use crate::amazon_bedrock::AwsAuthRecovery;
|
|
use crate::amazon_bedrock::AwsCredentialExport;
|
|
|
|
/// Provider-owned runtime state shared across independently configured sessions.
|
|
#[derive(Debug, Default)]
|
|
pub(crate) struct ModelProviderSharedState {
|
|
aws_credential_exports: Mutex<Vec<(ModelProviderAwsAuthInfo, Weak<AwsCredentialExport>)>>,
|
|
aws_auth_recoveries: Mutex<Vec<(ModelProviderAwsAuthInfo, Weak<AwsAuthRecovery>)>>,
|
|
}
|
|
|
|
pub(crate) fn process_shared_state() -> &'static ModelProviderSharedState {
|
|
static STATE: OnceLock<ModelProviderSharedState> = OnceLock::new();
|
|
STATE.get_or_init(ModelProviderSharedState::default)
|
|
}
|
|
|
|
impl ModelProviderSharedState {
|
|
pub(crate) fn aws_credential_export(
|
|
&self,
|
|
aws: &ModelProviderAwsAuthInfo,
|
|
) -> Option<Arc<AwsCredentialExport>> {
|
|
let config = aws.credential_export.as_ref()?;
|
|
let mut exports = self
|
|
.aws_credential_exports
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
|
exports.retain(|(_, export)| export.strong_count() != 0);
|
|
|
|
if let Some(export) = exports
|
|
.iter()
|
|
.find(|(cached_aws, _)| cached_aws == aws)
|
|
.and_then(|(_, export)| export.upgrade())
|
|
{
|
|
return Some(export);
|
|
}
|
|
|
|
let export = Arc::new(AwsCredentialExport::new(config.clone()));
|
|
exports.push((aws.clone(), Arc::downgrade(&export)));
|
|
Some(export)
|
|
}
|
|
|
|
pub(crate) fn aws_auth_recovery(
|
|
&self,
|
|
aws: &ModelProviderAwsAuthInfo,
|
|
) -> Option<Arc<AwsAuthRecovery>> {
|
|
let config = aws.auth_refresh.as_ref()?;
|
|
let mut recoveries = self
|
|
.aws_auth_recoveries
|
|
.lock()
|
|
.unwrap_or_else(std::sync::PoisonError::into_inner);
|
|
recoveries.retain(|(_, recovery)| recovery.strong_count() != 0);
|
|
|
|
if let Some(recovery) = recoveries
|
|
.iter()
|
|
.find(|(cached_aws, _)| cached_aws == aws)
|
|
.and_then(|(_, recovery)| recovery.upgrade())
|
|
{
|
|
return Some(recovery);
|
|
}
|
|
|
|
let recovery = Arc::new(AwsAuthRecovery::new(config.clone()));
|
|
recoveries.push((aws.clone(), Arc::downgrade(&recovery)));
|
|
Some(recovery)
|
|
}
|
|
}
|