Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions apps/labrinth/src/routes/v3/reports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 10 additions & 18 deletions apps/labrinth/src/util/routes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,29 @@ pub async fn read_limited_from_payload(
cap: usize,
err_msg: impl Into<String>,
) -> Result<BytesMut, ApiError> {
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::<String>::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<T>(
payload: &mut Payload,
cap: usize,
err_msg: impl Into<String>,
) -> Result<T, ApiError>
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")?;
Expand Down