complete fixes

Author: curious-rabbit

src/archive/rar.rs

@@ -8,7 +8,8 @@ use crate::{
     error::{Error, Result},
     info,
     list::{FileInArchive, ListFileType},
-    utils::{BytesFmt, PathFmt},
+    utils::{BytesFmt, PathFmt, validate_entry_path},
+    warning,
 };
 
 /// Unpacks the archive given by `archive_path` into the folder given by `output_folder`.
@@ -25,13 +26,18 @@ pub fn unpack_archive(archive_path: &Path, output_folder: &Path, password: Optio
     while let Some(header) = archive.read_header()? {
         let entry = header.entry();
         archive = if entry.is_file() {
-            info!(
-                "extracted ({}) {}",
-                BytesFmt(entry.unpacked_size),
-                PathFmt(&entry.filename),
-            );
-            files_unpacked += 1;
-            header.extract_with_base(output_folder)?
+            if let Err(e) = validate_entry_path(&entry.filename) {
+                warning!("skipping unsafe rar entry {}: {}", PathFmt(&entry.filename), e);
+                header.skip()?
+            } else {
+                info!(
+                    "extracted ({}) {}",
+                    BytesFmt(entry.unpacked_size),
+                    PathFmt(&entry.filename),
+                );
+                files_unpacked += 1;
+                header.extract_with_base(output_folder)?
+            }
         } else {
             header.skip()?
         };

src/archive/sevenz.rs

@@ -17,8 +17,9 @@ use crate::{
     info,
     list::{FileInArchive, ListFileType},
     utils::{
-        BytesFmt, FileVisibilityPolicy, PathFmt, SanitizedStr, cd_into_same_dir_as, ensure_parent_dir_exists,
-        is_same_file_as_output, validate_dest_inside_root, validate_entry_path,
+        BytesFmt, FileVisibilityPolicy, LimitedReader, PathFmt, SanitizedStr, cd_into_same_dir_as,
+        ensure_parent_dir_exists, is_same_file_as_output, max_decompressed_bytes, validate_dest_inside_root,
+        validate_entry_path,
     },
     warning,
 };
@@ -64,7 +65,8 @@ where
 
                 let file = fs::File::create(path)?;
                 let mut writer = BufWriter::new(file);
-                io::copy(reader, &mut writer)?;
+                let mut limited = LimitedReader::new(reader, max_decompressed_bytes());
+                io::copy(&mut limited, &mut writer)?;
 
                 use filetime_creation as ft;
                 // Surface mtime-set failures as warnings so users know timestamps weren't preserved

src/archive/zip.rs

@@ -22,9 +22,10 @@ use crate::{
     info, info_accessible,
     list::{FileInArchive, ListFileType},
     utils::{
-        BytesFmt, FileType, FileVisibilityPolicy, PathFmt, SanitizedStr, canonicalize, cd_into_same_dir_as,
-        create_symlink, ensure_parent_dir_exists, get_invalid_utf8_paths, is_same_file_as_output,
-        pretty_format_list_of_paths, read_file_type, strip_cur_dir, validate_dest_inside_root, validate_symlink_target,
+        BytesFmt, FileType, FileVisibilityPolicy, LimitedReader, PathFmt, SanitizedStr, canonicalize,
+        cd_into_same_dir_as, create_symlink, ensure_parent_dir_exists, get_invalid_utf8_paths, is_same_file_as_output,
+        max_decompressed_bytes, pretty_format_list_of_paths, read_file_type, strip_cur_dir, validate_dest_inside_root,
+        validate_symlink_target,
     },
     warning,
 };
@@ -106,7 +107,10 @@ where
                     };
                     #[cfg(not(unix))]
                     let mut output_file = fs::File::create(file_path)?;
-                    io::copy(&mut file, &mut output_file)?;
+                    {
+                        let mut limited = LimitedReader::new(&mut file, max_decompressed_bytes());
+                        io::copy(&mut limited, &mut output_file)?;
+                    }
                     set_last_modified_time(&file, file_path)?;
                     #[cfg(unix)]
                     unix_set_permissions(file_path, &file)?;

src/list.rs

@@ -90,14 +90,14 @@ fn print_entry(out: &mut impl Write, name: impl fmt::Display, file_type: &ListFi
             };
 
             if is_running_in_accessible_mode() {
-                let _ = writeln!(out, "{name} -> {}{suffix}", target.display());
+                let _ = writeln!(out, "{name} -> {}{suffix}", NoQuotePathFmt(target));
             } else {
                 let _ = writeln!(
                     out,
                     "{c}{name}{r} {c}-> {c}{target}{suffix}{r}",
                     c = *CYAN,
                     r = *ALL_RESET,
-                    target = target.display()
+                    target = NoQuotePathFmt(target)
                 );
             }
         }
@@ -129,7 +129,6 @@ mod tree {
         path,
     };
 
-    use bstr::{ByteSlice, ByteVec};
     use linked_hash_map::LinkedHashMap;
 
     use super::{FileInArchive, ListFileType};
@@ -199,7 +198,7 @@ mod tree {
             };
             super::print_entry(
                 out,
-                <Vec<u8> as ByteVec>::from_os_str_lossy(name).as_bstr(),
+                super::NoQuotePathFmt(path::Path::new(name)),
                 &file_type,
                 false, // Always show targets in tree view, regardless of --quiet flag
             );

src/utils/fs.rs

@@ -140,7 +140,7 @@ pub fn normalize_safe_path(path: &Path) -> Option<PathBuf> {
 pub fn validate_entry_path(path: &Path) -> Result<PathBuf> {
     normalize_safe_path(path).ok_or_else(|| {
         FinalError::with_title("refusing to extract archive entry with unsafe path")
-            .detail(format!("entry: {}", path.display()))
+            .detail(format!("entry: {}", PathFmt(path)))
             .into()
     })
 }
@@ -154,11 +154,7 @@ pub fn validate_symlink_target(link_relpath: &Path, target: &Path) -> Result<()>
     if normalize_safe_path(&parent.join(target)).is_none() {
         return Err(
             FinalError::with_title("refusing to create symlink escaping extraction root")
-                .detail(format!(
-                    "link: {}  target: {}",
-                    link_relpath.display(),
-                    target.display()
-                ))
+                .detail(format!("link: {}  target: {}", PathFmt(link_relpath), PathFmt(target)))
                 .into(),
         );
     }
@@ -169,7 +165,7 @@ pub fn validate_symlink_target(link_relpath: &Path, target: &Path) -> Result<()>
 /// Walks every existing prefix between root and dest and errors if any component is a symlink.
 pub fn validate_dest_inside_root(root: &Path, dest: &Path) -> Result<()> {
     let rel = dest.strip_prefix(root).map_err(|_| {
-        FinalError::with_title("refusing to write outside extraction root").detail(format!("dest: {}", dest.display()))
+        FinalError::with_title("refusing to write outside extraction root").detail(format!("dest: {}", PathFmt(dest)))
     })?;
     let mut probe = root.to_path_buf();
     for comp in rel.components() {
@@ -178,7 +174,7 @@ pub fn validate_dest_inside_root(root: &Path, dest: &Path) -> Result<()> {
             Ok(md) if md.file_type().is_symlink() => {
                 return Err(
                     FinalError::with_title("refusing to traverse on-disk symlink during extraction")
-                        .detail(format!("path: {}", probe.display()))
+                        .detail(format!("path: {}", PathFmt(&probe)))
                         .into(),
                 );
             }