i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 01:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow empty provider secrets to attempt requests

Browse Source
This commit is contained in:
fawney19
2026-04-29 18:55:52 +08:00
parent d6de917878
commit a16550249b
5 changed files with 190 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
crates/aether-provider-transport/src/auth.rs
View File

@@ -236,7 +236,7 @@ pub fn resolve_local_openai_bearer_auth(
}
let secret = resolved_local_secret(transport)?;
Some(("authorization".to_string(), format!("Bearer {secret}")))
Some(("authorization".to_string(), bearer_auth_value(secret)))
}
pub fn resolve_local_standard_auth(
@@ -247,7 +247,7 @@ pub fn resolve_local_standard_auth(
match auth_type.as_str() {
"api_key" => Some(("x-api-key".to_string(), secret.to_string())),
"bearer" => Some(("authorization".to_string(), format!("Bearer {secret}"))),
"bearer" => Some(("authorization".to_string(), bearer_auth_value(secret))),
_ => None,
}
}
@@ -260,7 +260,7 @@ pub fn resolve_local_gemini_auth(
match auth_type.as_str() {
"api_key" => Some(("x-goog-api-key".to_string(), secret.to_string())),
"bearer" => Some(("authorization".to_string(), format!("Bearer {secret}"))),
"bearer" => Some(("authorization".to_string(), bearer_auth_value(secret))),
_ => None,
}
}
@@ -291,7 +291,21 @@ pub(crate) fn resolve_local_auth_type_for_transport_format(
fn resolved_local_secret(transport: &GatewayProviderTransportSnapshot) -> Option<&str> {
let secret = transport.key.decrypted_api_key.trim();
(!secret.is_empty() && secret != PLACEHOLDER_API_KEY).then_some(secret)
if !secret.is_empty() && secret != PLACEHOLDER_API_KEY {
Some(secret)
} else if transport.key.decrypted_auth_config.is_some() {
None
} else {
Some("")
}
}
fn bearer_auth_value(secret: &str) -> String {
if secret.is_empty() {
String::new()
} else {
format!("Bearer {secret}")
}
}
#[cfg(test)]
@@ -465,16 +479,31 @@ mod tests {
}
#[test]
fn local_standard_auth_rejects_placeholder_secret() {
assert!(resolve_local_standard_auth(&sample_transport()).is_none());
fn local_standard_auth_keeps_header_shape_for_placeholder_secret() {
assert_eq!(
resolve_local_standard_auth(&sample_transport()),
Some(("authorization".to_string(), String::new()))
);
}
#[test]
fn local_standard_auth_rejects_empty_secret() {
fn local_standard_auth_keeps_header_shape_for_empty_secret() {
let mut transport = sample_transport();
transport.key.auth_type = "api_key".to_string();
transport.key.decrypted_api_key = String::new();
assert_eq!(
resolve_local_standard_auth(&transport),
Some(("x-api-key".to_string(), String::new()))
);
}
#[test]
fn local_standard_auth_defers_to_auth_config_when_raw_secret_is_empty() {
let mut transport = sample_transport();
transport.key.decrypted_auth_config =
Some(r#"{"access_token":"cached-token"}"#.to_string());
assert!(resolve_local_standard_auth(&transport).is_none());
}

2
crates/aether-provider-transport/src/claude_code/auth.rs
View File

@@ -3,6 +3,6 @@ use super::super::snapshot::GatewayProviderTransportSnapshot;
use super::super::supports_local_oauth_request_auth_resolution;
pub fn supports_local_claude_code_auth(transport: &GatewayProviderTransportSnapshot) -> bool {
resolve_local_standard_auth(transport).is_some()
resolve_local_standard_auth(transport).is_some_and(|(_, value)| !value.trim().is_empty())
|| supports_local_oauth_request_auth_resolution(transport)
}