mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Avoid TOCTOU errors in data directory installations (#1227)

Browse source 
## Summary

See: https://github.com/astral-sh/puffin/issues/1224

## Test Plan

Ran `python -m scripts.bench --puffin
scripts/requirements/compiled/jupyter.txt --min-runs 100 --benchmark
install-warm --verbose` several times, which failed eventually on `main`
but not on this branch.
This commit is contained in:
Charlie Marsh 2024-02-01 06:55:29 -08:00 • committed by GitHub
parent fcf848877c
commit 9487378ef9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/install-wheel-rs/src/wheel.rs
View file

@ -652,9 +652,7 @@ pub(crate) fn move_folder_recorded(
site_packages: &Path,
record: &mut [RecordEntry],
) -> Result<(), Error> {
if !dest_dir.is_dir() {
fs::create_dir_all(dest_dir)?;
}
fs::create_dir_all(dest_dir)?;
for entry in WalkDir::new(src_dir) {
let entry = entry?;
let src = entry.path();
@ -667,10 +665,8 @@ pub(crate) fn move_folder_recorded(
.strip_prefix(site_packages)
.expect("Prefix must no change");
let target = dest_dir.join(relative_to_data);
if src.is_dir() {
if !target.is_dir() {
fs::create_dir(target)?;
}
if entry.file_type().is_dir() {
fs::create_dir_all(&target)?;
} else {
fs::rename(src, &target)?;
let entry = record
@ -679,8 +675,8 @@ pub(crate) fn move_folder_recorded(
.ok_or_else(|| {
Error::RecordFile(format!(
"Could not find entry for {} ({})",
relative_to_site_packages.display(),
src.display()
relative_to_site_packages.normalized_display(),
src.normalized_display()
))
})?;
entry.path = relative_to(&target, site_packages)?.display().to_string();