From 983ee31c7de0185791c9653a04e40a2a4896af8f Mon Sep 17 00:00:00 2001 From: Haam Date: Sat, 14 Nov 2026 14:10:22 +0900 Subject: [PATCH] fix(api): enforce payload size limits in the shared readers --- apps/labrinth/src/routes/v3/reports.rs | 10 ++++++--- apps/labrinth/src/util/routes.rs | 28 +++++++++----------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/apps/labrinth/src/routes/v3/reports.rs b/apps/labrinth/src/routes/v3/reports.rs index c4a0deea3cf..14e9df0f87b 100644 --- a/apps/labrinth/src/routes/v3/reports.rs +++ b/apps/labrinth/src/routes/v3/reports.rs @@ -90,9 +90,13 @@ pub async fn report_create( .wrap_auth_err("authenticating API request")? .user; - let new_report: CreateReport = read_typed_from_payload(&mut body) - .await - .wrap_api_err("reading request payload")?; + let new_report: CreateReport = read_typed_from_payload( + &mut body, + 256 * 1024, + "report payload exceeds the maximum size of 256KiB", + ) + .await + .wrap_api_err("reading request payload")?; let id = crate::database::models::generate_report_id(&mut transaction) .await diff --git a/apps/labrinth/src/util/routes.rs b/apps/labrinth/src/util/routes.rs index 708a076e53e..3a01ed09c1a 100644 --- a/apps/labrinth/src/util/routes.rs +++ b/apps/labrinth/src/util/routes.rs @@ -13,37 +13,29 @@ pub async fn read_limited_from_payload( cap: usize, err_msg: impl Into, ) -> Result { + let err_msg = err_msg.into(); let mut bytes = BytesMut::new(); while let Some(item) = payload.next().await { - if bytes.len() >= cap { - return Err(ApiError::Request(eyre::eyre!(Into::::into( - err_msg - )))); - } else { - bytes.extend_from_slice( - &item.map_err(|err| eyre::eyre!(err)).wrap_request_err( - "unable to parse bytes in payload sent!".to_string(), - )?, - ); + let item = item.map_err(|err| eyre::eyre!(err)).wrap_request_err( + "unable to parse bytes in payload sent!".to_string(), + )?; + if bytes.len().saturating_add(item.len()) > cap { + return Err(ApiError::Request(eyre::eyre!(err_msg))); } + bytes.extend_from_slice(&item); } Ok(bytes) } pub async fn read_typed_from_payload( payload: &mut Payload, + cap: usize, + err_msg: impl Into, ) -> Result where T: DeserializeOwned + Validate, { - let mut bytes = BytesMut::new(); - while let Some(item) = payload.next().await { - bytes.extend_from_slice( - &item.map_err(|err| eyre::eyre!(err)).wrap_request_err( - "unable to parse bytes in payload sent!".to_string(), - )?, - ); - } + let bytes = read_limited_from_payload(payload, cap, err_msg).await?; let parsed: T = serde_json::from_slice(&bytes) .wrap_request_err("deserializing JSON data")?;