github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-07 20:15:27 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

zip: ensure usage of relational paths during compression

Browse Source
This commit is contained in:
Vinícius Rodrigues Miguel 2021-03-26 22:56:57 -03:00
parent 3687e7255d
commit 8e37078043
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/compressors/tar.rs
View File

@ -6,6 +6,7 @@ use walkdir::WalkDir;
use super::compressor::Entry; use super::compressor::Entry;
use crate::{compressors::Compressor, file::File}; use crate::{compressors::Compressor, file::File};
use crate::utils;
pub struct TarCompressor {} pub struct TarCompressor {}
@ -20,19 +21,12 @@ impl TarCompressor {
} }
fn make_archive_from_files(input_filenames: Vec<PathBuf>) -> crate::Result<Vec<u8>> { fn make_archive_from_files(input_filenames: Vec<PathBuf>) -> crate::Result<Vec<u8>> {
let change_dir_and_return_parent = |filename: &PathBuf| -> crate::Result<PathBuf> {
let previous_location = env::current_dir()?;
let parent = filename.parent().unwrap();
env::set_current_dir(parent)?;
Ok(previous_location)
};
let buf = Vec::new(); let buf = Vec::new();
let mut b = Builder::new(buf); let mut b = Builder::new(buf);
for filename in input_filenames { for filename in input_filenames {
let previous_location = change_dir_and_return_parent(&filename)?; let previous_location = utils::change_dir_and_return_parent(&filename)?;
// Safe unwrap since this filename came from `fs::canonicalize`.
let filename = filename.file_name().unwrap(); let filename = filename.file_name().unwrap();
for entry in WalkDir::new(&filename) { for entry in WalkDir::new(&filename) {
let entry = entry?; let entry = entry?;

8
src/compressors/zip.rs
View File

@ -6,7 +6,7 @@ use std::{
use walkdir::WalkDir; use walkdir::WalkDir;
use super::compressor::Entry; use super::compressor::Entry;
use crate::{compressors::Compressor, file::File}; use crate::{compressors::Compressor, file::File, utils};
pub struct ZipCompressor {} pub struct ZipCompressor {}
@ -55,6 +55,10 @@ impl ZipCompressor {
zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Deflated); zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Deflated);
for filename in input_filenames { for filename in input_filenames {
let previous_location = utils::change_dir_and_return_parent(&filename)?;
let filename = filename.file_name().unwrap();
for entry in WalkDir::new(filename) { for entry in WalkDir::new(filename) {
let entry = entry?; let entry = entry?;
let entry_path = &entry.path(); let entry_path = &entry.path();
@ -65,6 +69,8 @@ impl ZipCompressor {
let file_bytes = std::fs::read(entry.path())?; let file_bytes = std::fs::read(entry.path())?;
writer.write_all(&*file_bytes)?; writer.write_all(&*file_bytes)?;
} }
std::env::set_current_dir(previous_location)?;
} }
let bytes = writer.finish().unwrap(); let bytes = writer.finish().unwrap();

12
src/utils.rs
View File

@ -1,7 +1,4 @@
use std::{ use std::{env, fs, path::{Path, PathBuf}};
fs,
path::{Path, PathBuf},
};
use colored::Colorize; use colored::Colorize;
@ -63,3 +60,10 @@ pub(crate) fn get_destination_path(dest: &Option<File>) -> &Path {
None => Path::new("."), None => Path::new("."),
} }
} }
pub (crate) fn change_dir_and_return_parent(filename: &PathBuf) -> crate::Result<PathBuf> {
let previous_location = env::current_dir()?;
let parent = filename.parent().unwrap();
env::set_current_dir(parent)?;
Ok(previous_location)
}