Skip to content

fix: allow strip_archive_path_components to strip a dir containing the same filename #6405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdx merged 5 commits into from
Sep 25, 2025
Merged

fix: allow strip_archive_path_components to strip a dir containing the same filename #6405

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69051ad
fix: allow strip_archive_path_components to strip a dir containing th…
risu729 Sep 25, 2025
f90f84c
refactor: use with_file_name
risu729 Sep 25, 2025
b035a69
Update src/file.rs
risu729 Sep 25, 2025
e478a80
remove comment
risu729 Sep 25, 2025
d1c4a16
fix: fix indentation
risu729 Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions src/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,22 +813,29 @@ fn strip_archive_path_components(dir: &Path, strip_depth: usize) -> Result<()> {
}

let top_level_paths = ls(dir)?;
let entries: Vec<PathBuf> = top_level_paths
.iter()
.map(|p| ls(p))
.collect::<Result<Vec<_>>>()?
.into_iter()
.flatten()
.collect::<Vec<_>>();
for entry in entries {
let mut new_dir = dir.to_path_buf();
new_dir.push(entry.file_name().unwrap());
fs::rename(entry, new_dir)?;
}

for path in top_level_paths {
if path.symlink_metadata()?.is_dir() {
remove_dir(path)?;
if !path.symlink_metadata()?.is_dir() {
continue;
}

// rename the directory to a temp name to avoid conflicts when moving files
let temp_path = path.with_file_name(format!(
"{}_tmp_strip",
path.file_name().unwrap().to_string_lossy()
));
fs::rename(&path, &temp_path)?;
Copy link

@cursor cursor bot Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Temporary Directory Collision Blocks Extraction

The temporary directory name generated by appending _tmp_strip could collide with an existing file or directory. This collision causes fs::rename to fail, stopping the archive extraction.

Fix in Cursor Fix in Web

Copy link
Owner

@jdx jdx Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can get around this with https://docs.rs/tempfile/latest/tempfile/struct.NamedTempFile.html#method.new_in

Copy link
Contributor Author

@risu729 risu729 Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to rename the parent directory with a unique name, so I think we cannot directly use the tempfile crate.
We can use it to get a unique directory name, but it creates a tempdir and removes it immediately, so I think it's not good for performance.

Also, the directory name with _tmp_strip could collide, but I believe it's not a common case.


for entry in ls(&temp_path)? {
if let Some(file_name) = entry.file_name() {
let dest_path = dir.join(file_name);
fs::rename(entry, dest_path)?;
} else {
continue;
}
}

remove_dir(temp_path)?;
}
Ok(())
}
Expand Down
Loading