edward/omegaupload
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move decryption handlers to functions

Browse source
This commit is contained in:
Edward Shen 2022-01-15 21:38:33 -08:00
parent 8a09da764e
commit 67aa009746
Signed by: edward
GPG key ID: 19182661E818369F
1 changed files with 55 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
web/src/decrypt.rs
View file

@ -86,7 +86,15 @@ pub fn decrypt(
ContentType::Image => DecryptedData::Image(blob, container.len()), ContentType::Image => DecryptedData::Image(blob, container.len()),
ContentType::Audio => DecryptedData::Audio(blob), ContentType::Audio => DecryptedData::Audio(blob),
ContentType::Video => DecryptedData::Video(blob), ContentType::Video => DecryptedData::Video(blob),
ContentType::ZipArchive => { ContentType::ZipArchive => handle_zip_archive(blob, container),
ContentType::Gzip => handle_gzip(blob, container),
ContentType::Unknown => DecryptedData::Blob(blob),
};
Ok((data, MimeType(mime_type.to_owned())))
}
fn handle_zip_archive(blob: Arc<Blob>, container: Vec<u8>) -> DecryptedData {
let mut entries = vec![]; let mut entries = vec![];
let cursor = Cursor::new(container); let cursor = Cursor::new(container);
if let Ok(mut zip) = zip::ZipArchive::new(cursor) { if let Ok(mut zip) = zip::ZipArchive::new(cursor) {
@ -111,7 +119,8 @@ pub fn decrypt(
entries.sort_by(|a, b| a.name.cmp(&b.name)); entries.sort_by(|a, b| a.name.cmp(&b.name));
DecryptedData::Archive(blob, entries) DecryptedData::Archive(blob, entries)
} }
ContentType::Gzip => {
fn handle_gzip(blob: Arc<Blob>, container: Vec<u8>) -> DecryptedData {
let mut entries = vec![]; let mut entries = vec![];
let cursor = Cursor::new(container); let cursor = Cursor::new(container);
let gzip_dec = flate2::read::GzDecoder::new(cursor); let gzip_dec = flate2::read::GzDecoder::new(cursor);
@ -137,11 +146,6 @@ pub fn decrypt(
DecryptedData::Blob(blob) DecryptedData::Blob(blob)
} }
} }
ContentType::Unknown => DecryptedData::Blob(blob),
};
Ok((data, MimeType(mime_type.to_owned())))
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
enum ContentType { enum ContentType {