web/src/decrypt.rs

@@ -86,15 +86,7 @@ pub fn decrypt(
         ContentType::Image => DecryptedData::Image(blob, container.len()),
         ContentType::Audio => DecryptedData::Audio(blob),
         ContentType::Video => DecryptedData::Video(blob),
-        ContentType::ZipArchive => handle_zip_archive(blob, container),
+        ContentType::ZipArchive => {
-        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 cursor = Cursor::new(container);
             if let Ok(mut zip) = zip::ZipArchive::new(cursor) {
@@ -118,15 +110,15 @@ fn handle_zip_archive(blob: Arc<Blob>, container: Vec<u8>) -> DecryptedData {
 
             entries.sort_by(|a, b| a.name.cmp(&b.name));
             DecryptedData::Archive(blob, entries)
-}
+        }
-
+        ContentType::GzipArchive => {
-fn handle_gzip(blob: Arc<Blob>, container: Vec<u8>) -> DecryptedData {
             let mut entries = vec![];
             let cursor = Cursor::new(container);
             let gzip_dec = flate2::read::GzDecoder::new(cursor);
             let mut archive = tar::Archive::new(gzip_dec);
             if let Ok(files) = archive.entries() {
-        for file in files.flatten() {
+                for file in files {
+                    if let Ok(file) = file {
                         let file_path = if let Ok(file_path) = file.path() {
                             file_path.display().to_string()
                         } else {
@@ -138,11 +130,17 @@ fn handle_gzip(blob: Arc<Blob>, container: Vec<u8>) -> DecryptedData {
                         });
                     }
                 }
-    if entries.is_empty() {
-        DecryptedData::Blob(blob)
-    } else {
-        DecryptedData::Archive(blob, entries)
             }
+            if entries.len() > 0 {
+                DecryptedData::Archive(blob, entries)
+            } else {
+                DecryptedData::Blob(blob)
+            }
+        },
+        ContentType::Unknown => DecryptedData::Blob(blob),
+    };
+
+    Ok((data, MimeType(mime_type.to_owned())))
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
@@ -152,7 +150,7 @@ enum ContentType {
     Audio,
     Video,
     ZipArchive,
-    Gzip,
+    GzipArchive,
     Unknown,
 }
 
@@ -190,7 +188,7 @@ impl<T: AsRef<[u8]>> ContentTypeExt for T {
         } else if mime_type == "application/zip" {
             ContentType::ZipArchive
         } else if mime_type == "application/gzip" {
-            ContentType::Gzip
+            ContentType::GzipArchive
         } else {
             ContentType::Unknown
         }
@@ -223,7 +221,7 @@ mod content_type {
     test_content_type!(mp4_is_video, "movie.mp4", ContentType::Video);
     test_content_type!(mkv_is_video, "movie.mkv", ContentType::Video);
     test_content_type!(zip_is_zip, "archive.zip", ContentType::ZipArchive);
-    test_content_type!(gzip_is_gzip, "image.png.gz", ContentType::Gzip);
+    test_content_type!(gzip_is_gzip, "image.png.gz", ContentType::GzipArchive);
     test_content_type!(binary_is_unknown, "omegaupload", ContentType::Unknown);
     test_content_type!(pgp_is_text, "text.pgp", ContentType::Text);
 }