added more granular error handling for other file fetch function
This commit is contained in:
parent
50fa8c3abf
commit
27ff2d9363
1 changed files with 23 additions and 4 deletions
|
|
@ -145,13 +145,32 @@ pub(crate) async fn get_content_route(
|
||||||
media_id: &body.media_id,
|
media_id: &body.media_id,
|
||||||
};
|
};
|
||||||
|
|
||||||
let Ok(FileMeta {
|
let FileMeta {
|
||||||
content,
|
content,
|
||||||
content_type,
|
content_type,
|
||||||
content_disposition,
|
content_disposition,
|
||||||
}) = fetch_file(&services, &mxc, user, body.timeout_ms, None).await
|
} = match fetch_file(&services, &mxc, user, body.timeout_ms, None).await {
|
||||||
else {
|
| Ok(meta) => meta,
|
||||||
|
| Err(e) => {
|
||||||
|
match e {
|
||||||
|
| conduwuit::Error::Io(e) => {
|
||||||
|
match e.kind() {
|
||||||
|
| std::io::ErrorKind::PermissionDenied =>
|
||||||
|
// to not leak that a file exists
|
||||||
|
{
|
||||||
return Err!(Request(NotFound("Media not found.")));
|
return Err!(Request(NotFound("Media not found.")));
|
||||||
|
},
|
||||||
|
| std::io::ErrorKind::NotFound => {
|
||||||
|
return Err!(Request(NotFound("Media not found.")));
|
||||||
|
},
|
||||||
|
| _ => {
|
||||||
|
return Err!(Request(Unknown("Unknown error when fetching file.")));
|
||||||
|
},
|
||||||
|
}
|
||||||
|
},
|
||||||
|
| _ => return Err!(Request(Unknown("Unknown error when fetching file."))),
|
||||||
|
}
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(get_content::v1::Response {
|
Ok(get_content::v1::Response {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue