fix(media): return an error when content is failed to be parsed as an image
This commit is contained in:
Matthias Ahouansou
parent
c45e52f45a
commit
ad6fc93249
1 changed files with 107 additions and 103 deletions
|
|
@ -2,6 +2,7 @@ mod data;
|
||||||
use std::io::Cursor;
|
use std::io::Cursor;
|
||||||
|
|
||||||
pub use data::Data;
|
pub use data::Data;
|
||||||
|
use ruma::api::client::error::ErrorKind;
|
||||||
|
|
||||||
use crate::{services, Result};
|
use crate::{services, Result};
|
||||||
use image::imageops::FilterType;
|
use image::imageops::FilterType;
|
||||||
|
|
@ -117,112 +118,115 @@ impl Service {
|
||||||
.thumbnail_properties(width, height)
|
.thumbnail_properties(width, height)
|
||||||
.unwrap_or((0, 0, false)); // 0, 0 because that's the original file
|
.unwrap_or((0, 0, false)); // 0, 0 because that's the original file
|
||||||
|
|
||||||
if let Ok((content_disposition, content_type, key)) =
|
Ok(
|
||||||
self.db.search_file_metadata(mxc.clone(), width, height)
|
if let Ok((content_disposition, content_type, key)) =
|
||||||
{
|
self.db.search_file_metadata(mxc.clone(), width, height)
|
||||||
// Using saved thumbnail
|
{
|
||||||
let path = services().globals.get_media_file(&key);
|
// Using saved thumbnail
|
||||||
let mut file = Vec::new();
|
let path = services().globals.get_media_file(&key);
|
||||||
File::open(path).await?.read_to_end(&mut file).await?;
|
let mut file = Vec::new();
|
||||||
|
File::open(path).await?.read_to_end(&mut file).await?;
|
||||||
|
|
||||||
Ok(Some(FileMeta {
|
Some(FileMeta {
|
||||||
content_disposition,
|
|
||||||
content_type,
|
|
||||||
file: file.to_vec(),
|
|
||||||
}))
|
|
||||||
} else if let Ok((content_disposition, content_type, key)) =
|
|
||||||
self.db.search_file_metadata(mxc.clone(), 0, 0)
|
|
||||||
{
|
|
||||||
// Generate a thumbnail
|
|
||||||
let path = services().globals.get_media_file(&key);
|
|
||||||
let mut file = Vec::new();
|
|
||||||
File::open(path).await?.read_to_end(&mut file).await?;
|
|
||||||
|
|
||||||
if let Ok(image) = image::load_from_memory(&file) {
|
|
||||||
let original_width = image.width();
|
|
||||||
let original_height = image.height();
|
|
||||||
if width > original_width || height > original_height {
|
|
||||||
return Ok(Some(FileMeta {
|
|
||||||
content_disposition,
|
|
||||||
content_type,
|
|
||||||
file: file.to_vec(),
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
let thumbnail = if crop {
|
|
||||||
image.resize_to_fill(width, height, FilterType::CatmullRom)
|
|
||||||
} else {
|
|
||||||
let (exact_width, exact_height) = {
|
|
||||||
// Copied from image::dynimage::resize_dimensions
|
|
||||||
let ratio = u64::from(original_width) * u64::from(height);
|
|
||||||
let nratio = u64::from(width) * u64::from(original_height);
|
|
||||||
|
|
||||||
let use_width = nratio <= ratio;
|
|
||||||
let intermediate = if use_width {
|
|
||||||
u64::from(original_height) * u64::from(width)
|
|
||||||
/ u64::from(original_width)
|
|
||||||
} else {
|
|
||||||
u64::from(original_width) * u64::from(height)
|
|
||||||
/ u64::from(original_height)
|
|
||||||
};
|
|
||||||
if use_width {
|
|
||||||
if intermediate <= u64::from(::std::u32::MAX) {
|
|
||||||
(width, intermediate as u32)
|
|
||||||
} else {
|
|
||||||
(
|
|
||||||
(u64::from(width) * u64::from(::std::u32::MAX) / intermediate)
|
|
||||||
as u32,
|
|
||||||
::std::u32::MAX,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} else if intermediate <= u64::from(::std::u32::MAX) {
|
|
||||||
(intermediate as u32, height)
|
|
||||||
} else {
|
|
||||||
(
|
|
||||||
::std::u32::MAX,
|
|
||||||
(u64::from(height) * u64::from(::std::u32::MAX) / intermediate)
|
|
||||||
as u32,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
image.thumbnail_exact(exact_width, exact_height)
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut thumbnail_bytes = Vec::new();
|
|
||||||
thumbnail.write_to(
|
|
||||||
&mut Cursor::new(&mut thumbnail_bytes),
|
|
||||||
image::ImageFormat::Png,
|
|
||||||
)?;
|
|
||||||
|
|
||||||
// Save thumbnail in database so we don't have to generate it again next time
|
|
||||||
let thumbnail_key = self.db.create_file_metadata(
|
|
||||||
mxc,
|
|
||||||
width,
|
|
||||||
height,
|
|
||||||
content_disposition.as_deref(),
|
|
||||||
content_type.as_deref(),
|
|
||||||
)?;
|
|
||||||
|
|
||||||
let path = services().globals.get_media_file(&thumbnail_key);
|
|
||||||
let mut f = File::create(path).await?;
|
|
||||||
f.write_all(&thumbnail_bytes).await?;
|
|
||||||
|
|
||||||
Ok(Some(FileMeta {
|
|
||||||
content_disposition,
|
|
||||||
content_type,
|
|
||||||
file: thumbnail_bytes.to_vec(),
|
|
||||||
}))
|
|
||||||
} else {
|
|
||||||
// Couldn't parse file to generate thumbnail, send original
|
|
||||||
Ok(Some(FileMeta {
|
|
||||||
content_disposition,
|
content_disposition,
|
||||||
content_type,
|
content_type,
|
||||||
file: file.to_vec(),
|
file: file.to_vec(),
|
||||||
}))
|
})
|
||||||
}
|
} else if let Ok((content_disposition, content_type, key)) =
|
||||||
} else {
|
self.db.search_file_metadata(mxc.clone(), 0, 0)
|
||||||
Ok(None)
|
{
|
||||||
}
|
// Generate a thumbnail
|
||||||
|
let path = services().globals.get_media_file(&key);
|
||||||
|
let mut file = Vec::new();
|
||||||
|
File::open(path).await?.read_to_end(&mut file).await?;
|
||||||
|
|
||||||
|
if let Ok(image) = image::load_from_memory(&file) {
|
||||||
|
let original_width = image.width();
|
||||||
|
let original_height = image.height();
|
||||||
|
if width > original_width || height > original_height {
|
||||||
|
Some(FileMeta {
|
||||||
|
content_disposition,
|
||||||
|
content_type,
|
||||||
|
file: file.to_vec(),
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
let thumbnail = if crop {
|
||||||
|
image.resize_to_fill(width, height, FilterType::CatmullRom)
|
||||||
|
} else {
|
||||||
|
let (exact_width, exact_height) = {
|
||||||
|
// Copied from image::dynimage::resize_dimensions
|
||||||
|
let ratio = u64::from(original_width) * u64::from(height);
|
||||||
|
let nratio = u64::from(width) * u64::from(original_height);
|
||||||
|
|
||||||
|
let use_width = nratio <= ratio;
|
||||||
|
let intermediate = if use_width {
|
||||||
|
u64::from(original_height) * u64::from(width)
|
||||||
|
/ u64::from(original_width)
|
||||||
|
} else {
|
||||||
|
u64::from(original_width) * u64::from(height)
|
||||||
|
/ u64::from(original_height)
|
||||||
|
};
|
||||||
|
if use_width {
|
||||||
|
if intermediate <= u64::from(::std::u32::MAX) {
|
||||||
|
(width, intermediate as u32)
|
||||||
|
} else {
|
||||||
|
(
|
||||||
|
(u64::from(width) * u64::from(::std::u32::MAX)
|
||||||
|
/ intermediate)
|
||||||
|
as u32,
|
||||||
|
::std::u32::MAX,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
} else if intermediate <= u64::from(::std::u32::MAX) {
|
||||||
|
(intermediate as u32, height)
|
||||||
|
} else {
|
||||||
|
(
|
||||||
|
::std::u32::MAX,
|
||||||
|
(u64::from(height) * u64::from(::std::u32::MAX)
|
||||||
|
/ intermediate)
|
||||||
|
as u32,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
image.thumbnail_exact(exact_width, exact_height)
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut thumbnail_bytes = Vec::new();
|
||||||
|
thumbnail.write_to(
|
||||||
|
&mut Cursor::new(&mut thumbnail_bytes),
|
||||||
|
image::ImageFormat::Png,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
// Save thumbnail in database so we don't have to generate it again next time
|
||||||
|
let thumbnail_key = self.db.create_file_metadata(
|
||||||
|
mxc,
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
content_disposition.as_deref(),
|
||||||
|
content_type.as_deref(),
|
||||||
|
)?;
|
||||||
|
|
||||||
|
let path = services().globals.get_media_file(&thumbnail_key);
|
||||||
|
let mut f = File::create(path).await?;
|
||||||
|
f.write_all(&thumbnail_bytes).await?;
|
||||||
|
|
||||||
|
Some(FileMeta {
|
||||||
|
content_disposition,
|
||||||
|
content_type,
|
||||||
|
file: thumbnail_bytes.to_vec(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Couldn't parse file to generate thumbnail, likely not an image
|
||||||
|
return Err(crate::Error::BadRequest(
|
||||||
|
ErrorKind::Unknown,
|
||||||
|
"Unable to generate thumbnail for the requested content",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
},
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue