Skip to content

Don't follow symlinks in append_dir_all() if follow_symlinks(false) #417

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

Open
nabijaczleweli wants to merge 2 commits into
base: main
Choose a base branch
from
+21 −14
Open

Don't follow symlinks in append_dir_all() if follow_symlinks(false) #417

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f9cfc2
Deduplicate append_path_with_name()'s [l]stat() error handler
nabijaczleweli Oct 8, 2025
d07bc3e
Don't follow symlinks in append_dir_all() if follow_symlinks(false)
nabijaczleweli Oct 8, 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/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,20 +606,16 @@ fn append_path_with_name(
options: BuilderOptions,
) -> io::Result<()> {
let stat = if options.follow {
fs::metadata(path).map_err(|err| {
io::Error::new(
err.kind(),
format!("{} when getting metadata for {}", err, path.display()),
)
})?
fs::metadata(path)
} else {
fs::symlink_metadata(path).map_err(|err| {
io::Error::new(
err.kind(),
format!("{} when getting metadata for {}", err, path.display()),
)
})?
};
fs::symlink_metadata(path)
}
.map_err(|err| {
io::Error::new(
err.kind(),
format!("{} when getting metadata for {}", err, path.display()),
)
})?;
let ar_name = name.unwrap_or(path);
if stat.is_file() {
append_file(dst, ar_name, &mut fs::File::open(path)?, options)
Expand Down Expand Up @@ -874,7 +870,18 @@ fn append_dir_all(
src_path: &Path,
options: BuilderOptions,
) -> io::Result<()> {
let mut stack = vec![(src_path.to_path_buf(), true, false)];
let src_metadata = if options.follow {
fs::metadata(src_path)
} else {
fs::symlink_metadata(src_path)
}?;
if !src_metadata.is_dir() {
return Err(io::Error::new(
io::ErrorKind::NotADirectory,
"append_dir_all() argument not a directory",
));
}
let mut stack = vec![(src_path.to_path_buf(), true, src_metadata.is_symlink())];
while let Some((src, is_dir, is_symlink)) = stack.pop() {
let dest = path.join(src.strip_prefix(src_path).unwrap());
// In case of a symlink pointing to a directory, is_dir is false, but src.is_dir() will return true
Expand Down