xfy/yggdrasil
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: make ConnectInfo optional in serve_image to prevent 500

Browse Source
This commit is contained in:
xfy 2026-06-17 13:21:20 +08:00
parent 260b26c693
commit 7bad3ce382
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/image.rs
View File

@ -7,7 +7,7 @@
#[cfg(feature = "server")] #[cfg(feature = "server")]
use axum::{ use axum::{
extract::{ConnectInfo, Path, Query}, extract::{ConnectInfo, Extension, Path, Query},
http::{header, HeaderValue, StatusCode}, http::{header, HeaderValue, StatusCode},
response::{IntoResponse, Response}, response::{IntoResponse, Response},
}; };
@ -333,12 +333,13 @@ async fn write_disk_cache(cache_key: &str, cached: &CachedImage) {
/// 依次执行：限流 → 路径安全校验 → 参数校验 → 无参数时直接返回原文件 → /// 依次执行：限流 → 路径安全校验 → 参数校验 → 无参数时直接返回原文件 →
/// 查询内存缓存 → 查询磁盘缓存 → 读取并解码 → 处理 → 写入两级缓存 → 返回。 /// 查询内存缓存 → 查询磁盘缓存 → 读取并解码 → 处理 → 写入两级缓存 → 返回。
pub async fn serve_image( pub async fn serve_image(
ConnectInfo(addr): ConnectInfo<SocketAddr>, connect_info: Option<Extension<ConnectInfo<SocketAddr>>>,
Path(path): Path<String>, Path(path): Path<String>,
Query(params): Query<ImageParams>, Query(params): Query<ImageParams>,
headers: HeaderMap, headers: HeaderMap,
) -> Response { ) -> Response {
let ip = crate::api::rate_limit::get_client_ip_with_peer(&headers, Some(addr)); let peer = connect_info.map(|Extension(ConnectInfo(addr))| addr);
let ip = crate::api::rate_limit::get_client_ip_with_peer(&headers, peer);
if let Err(status) = crate::api::rate_limit::check_image_limit(&ip) { if let Err(status) = crate::api::rate_limit::check_image_limit(&ip) {
return status.into_response(); return status.into_response();
} }