Tighten local auth allow-list matching

This commit is contained in:
fawney19
2026-04-30 00:26:33 +08:00
parent 37392d8774
commit 9e2faa7e5b
10 changed files with 758 additions and 53 deletions

View File

@@ -247,17 +247,15 @@ pub(crate) fn normalize_admin_user_api_formats(
};
let mut normalized = Vec::new();
let mut seen = std::collections::BTreeSet::new();
let pattern =
Regex::new(r"^[A-Za-z0-9_.-]+:[A-Za-z0-9_.-]+$").expect("api format regex should compile");
for item in values {
let item = item.trim();
if item.is_empty() {
return Err("allowed_api_formats 不能为空".to_string());
}
if !pattern.is_match(item) {
let Some(normalized_item) = crate::api::ai::normalize_admin_endpoint_signature(item) else {
return Err(format!("allowed_api_formats 格式无效: {item}"));
}
let normalized_item = item.to_ascii_lowercase();
};
let normalized_item = normalized_item.to_string();
if seen.insert(normalized_item.clone()) {
normalized.push(normalized_item);
}
@@ -278,3 +276,44 @@ pub(super) fn format_optional_datetime_iso8601(
) -> Option<String> {
value.map(|value| value.to_rfc3339())
}
#[cfg(test)]
mod tests {
use super::normalize_admin_user_api_formats;
#[test]
fn admin_user_api_formats_accept_current_canonical_signatures() {
assert_eq!(
normalize_admin_user_api_formats(Some(vec![
" OPENAI:RESPONSES ".to_string(),
"claude:messages".to_string(),
"gemini:generate_content".to_string(),
"openai:responses".to_string(),
]))
.expect("formats should normalize"),
Some(vec![
"openai:responses".to_string(),
"claude:messages".to_string(),
"gemini:generate_content".to_string(),
])
);
}
#[test]
fn admin_user_api_formats_reject_retired_signatures() {
for retired in [
"anthropic:messages",
"claude:chat",
"claude:cli",
"openai:cli",
"openai:compact",
"gemini:chat",
"gemini:cli",
] {
assert!(
normalize_admin_user_api_formats(Some(vec![retired.to_string()])).is_err(),
"{retired} should be rejected"
);
}
}
}

View File

@@ -1002,11 +1002,14 @@ pub(crate) async fn proxy_request(
if let Some(buffered_body) = buffered_body.as_ref() {
if let Some(rejection) = request_model_local_rejection(
&state,
control_decision,
&parts.uri,
&parts.headers,
buffered_body,
) {
)
.await?
{
let response =
build_local_auth_rejection_response(&trace_id, control_decision, &rejection)?;
return Ok(finalize_gateway_response_with_context(