i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-11 03:39:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(transport): preserve safe accept encoding

Browse Source
This commit is contained in:
elky
2026-06-10 19:58:57 +08:00
parent ff7ec8575c
commit 0246ba93dd
4 changed files with 296 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-provider-transport/src/auth.rs
+51 -18
View File
@@ -1,7 +1,8 @@
use std::collections::BTreeMap;
use super::headers::{
should_skip_upstream_complete_passthrough_header, should_skip_upstream_passthrough_header,
normalize_upstream_accept_encoding, should_skip_upstream_complete_passthrough_header,
should_skip_upstream_passthrough_header,
};
use super::snapshot::GatewayProviderTransportSnapshot;
@@ -21,20 +22,18 @@ fn collect_passthrough_headers(
if should_skip_upstream_passthrough_header(&key) {
continue;
}
let value = value.trim();
if value.is_empty() {
let Some(value) = normalize_passthrough_header_value(&key, value) else {
continue;
}
out.insert(key, value.to_string());
};
out.insert(key, value);
}
for (key, value) in extra_headers {
let normalized_key = key.to_ascii_lowercase();
let value = value.trim();
if value.is_empty() {
let Some(value) = normalize_passthrough_header_value(&normalized_key, value) else {
continue;
}
out.insert(normalized_key, value.to_string());
};
out.insert(normalized_key, value);
}
out
@@ -53,25 +52,36 @@ fn collect_complete_passthrough_headers(
if should_skip_upstream_complete_passthrough_header(&key) {
continue;
}
let value = value.trim();
if value.is_empty() {
let Some(value) = normalize_passthrough_header_value(&key, value) else {
continue;
}
out.insert(key, value.to_string());
};
out.insert(key, value);
}
for (key, value) in extra_headers {
let normalized_key = key.to_ascii_lowercase();
let value = value.trim();
if value.is_empty() {
let Some(value) = normalize_passthrough_header_value(&normalized_key, value) else {
continue;
}
out.insert(normalized_key, value.to_string());
};
out.insert(normalized_key, value);
}
out
}
fn normalize_passthrough_header_value(key: &str, value: &str) -> Option<String> {
let value = value.trim();
if value.is_empty() {
return None;
}
if key.eq_ignore_ascii_case("accept-encoding") {
return normalize_upstream_accept_encoding(value);
}
Some(value.to_string())
}
pub fn build_passthrough_headers(
headers: &http::HeaderMap,
extra_headers: &BTreeMap<String, String>,
@@ -312,7 +322,8 @@ fn bearer_auth_value(secret: &str) -> String {
mod tests {
use super::{
build_claude_passthrough_headers, build_complete_passthrough_headers_with_auth,
resolve_local_openai_bearer_auth, resolve_local_standard_auth,
build_openai_passthrough_headers, resolve_local_openai_bearer_auth,
resolve_local_standard_auth,
};
use crate::snapshot::{
GatewayProviderTransportEndpoint, GatewayProviderTransportKey,
@@ -417,6 +428,28 @@ mod tests {
);
}
#[test]
fn passthrough_headers_preserve_supported_response_compression() {
let mut headers = http::HeaderMap::new();
headers.insert(
http::header::ACCEPT_ENCODING,
http::HeaderValue::from_static("gzip, br"),
);
let built = build_openai_passthrough_headers(
&headers,
"authorization",
"Bearer upstream",
&BTreeMap::new(),
Some("application/json"),
);
assert_eq!(
built.get("accept-encoding").map(String::as_str),
Some("gzip")
);
}
#[test]
fn claude_passthrough_headers_preserve_explicit_anthropic_version_override() {
let mut headers = http::HeaderMap::new();