DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: Check if archive contains a symlink's target, without borrowing both at the same time

Browse source
This commit is contained in:
Chris Hennick 2024-05-15 17:06:57 -07:00
parent 17fee7938a
commit 633a6733e6
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 45 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/read.rs
View file

@ -682,48 +682,55 @@ impl<R: Read + Seek> ZipArchive<R> {
if file.is_dir() { if file.is_dir() {
Self::make_writable_dir_all(&outpath)?; Self::make_writable_dir_all(&outpath)?;
continue;
}
let symlink_target = if file.is_symlink() && (cfg!(unix) || cfg!(windows)) {
let mut target = Vec::with_capacity(file.size() as usize);
file.read_exact(&mut target)?;
Some(target)
} else { } else {
if let Some(p) = outpath.parent() { None
Self::make_writable_dir_all(p)?; };
drop(file);
if let Some(p) = outpath.parent() {
Self::make_writable_dir_all(p)?;
}
if let Some(target) = symlink_target {
#[cfg(unix)]
{
use std::os::unix::ffi::OsStringExt;
let target = OsString::from_vec(target);
let target_path = directory.as_ref().join(target);
std::os::unix::fs::symlink(target_path, outpath.as_path())?;
} }
if file.is_symlink() && (cfg!(unix) || cfg!(windows)) { #[cfg(windows)]
let mut target = Vec::with_capacity(file.size() as usize); {
file.read_exact(&mut target)?; let Ok(target) = String::from_utf8(target) else {
#[cfg(unix)] return Err(ZipError::InvalidArchive(
{ "Invalid UTF-8 as symlink target",
use std::os::unix::ffi::OsStringExt; ));
let target = OsString::from_vec(target); };
let target_path = directory.as_ref().join(target); let target = target.into_boxed_str();
std::os::unix::fs::symlink(target_path, outpath.as_path())?; let target_is_dir_from_archive =
self.shared.files.contains_key(&target) && is_dir(&target);
let target_path = directory.as_ref().join(OsString::from(target.to_string()));
let target_is_dir = if target_is_dir_from_archive {
true
} else if let Ok(meta) = std::fs::metadata(&target_path) {
meta.is_dir()
} else {
false
};
if target_is_dir {
std::os::windows::fs::symlink_dir(target_path, outpath.as_path())?;
} else {
std::os::windows::fs::symlink_file(target_path, outpath.as_path())?;
} }
#[cfg(windows)]
{
let Ok(target) = String::from_utf8(target) else {
return Err(ZipError::InvalidArchive(
"Invalid UTF-8 as symlink target",
));
};
let target = target.into_boxed_str();
let target_is_dir_from_archive =
self.shared.files.contains_key(&target) && is_dir(&target);
let target_path = directory.as_ref().join(target.to_string().into());
let target_is_dir = if target_is_dir_from_archive {
true
} else if let Ok(meta) = std::fs::metadata(&target_path) {
meta.is_dir()
} else {
false
};
if target_is_dir {
std::os::windows::fs::symlink_dir(target_path, outpath.as_path())?;
} else {
std::os::windows::fs::symlink_file(target_path, outpath.as_path())?;
}
}
} else {
let mut outfile = fs::File::create(&outpath)?;
io::copy(&mut file, &mut outfile)?;
} }
} else {
let mut file = self.by_index(i)?;
let mut outfile = fs::File::create(&outpath)?;
io::copy(&mut file, &mut outfile)?;
} }
#[cfg(unix)] #[cfg(unix)]
{ {
@ -932,11 +939,6 @@ impl<R: Read + Seek> ZipArchive<R> {
} }
} }
#[cfg(windows)]
fn try_utf8_to_os_string(utf8_bytes: Vec<u8>) -> Result<OsString, std::string::FromUtf8Error> {
Ok(OsString::from(String::from_utf8(utf8_bytes)?))
}
const fn unsupported_zip_error<T>(detail: &'static str) -> ZipResult<T> { const fn unsupported_zip_error<T>(detail: &'static str) -> ZipResult<T> {
Err(ZipError::UnsupportedArchive(detail)) Err(ZipError::UnsupportedArchive(detail))
} }