mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-29 12:07:46 +00:00
cp: restrict copy through dangling symlink with -f
Change `cp` to terminate with an error when attempting to copy through a dangling symbolic link with the `--force` option. Before this commit, touch src ln -s no-such-file dest cp -f src dest would incorrectly replace `dest` with the contents of `src`. After this commit, it correctly fails with the error message cp: not writing through dangling symlink 'dest'
This commit is contained in:
parent
418518a443
commit
d48a650966
2 changed files with 24 additions and 5 deletions
|
@ -1264,10 +1264,6 @@ fn copy_file(
|
||||||
symlinked_files: &mut HashSet<FileInformation>,
|
symlinked_files: &mut HashSet<FileInformation>,
|
||||||
source_in_command_line: bool,
|
source_in_command_line: bool,
|
||||||
) -> CopyResult<()> {
|
) -> CopyResult<()> {
|
||||||
if file_or_link_exists(dest) {
|
|
||||||
handle_existing_dest(source, dest, options, source_in_command_line)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fail if dest is a dangling symlink or a symlink this program created previously
|
// Fail if dest is a dangling symlink or a symlink this program created previously
|
||||||
if dest.is_symlink() {
|
if dest.is_symlink() {
|
||||||
if FileInformation::from_path(dest, false)
|
if FileInformation::from_path(dest, false)
|
||||||
|
@ -1281,7 +1277,13 @@ fn copy_file(
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
let copy_contents = options.dereference(source_in_command_line) || !source.is_symlink();
|
let copy_contents = options.dereference(source_in_command_line) || !source.is_symlink();
|
||||||
if copy_contents && !dest.exists() {
|
if copy_contents
|
||||||
|
&& !dest.exists()
|
||||||
|
&& !matches!(
|
||||||
|
options.overwrite,
|
||||||
|
OverwriteMode::Clobber(ClobberMode::RemoveDestination)
|
||||||
|
)
|
||||||
|
{
|
||||||
return Err(Error::Error(format!(
|
return Err(Error::Error(format!(
|
||||||
"not writing through dangling symlink '{}'",
|
"not writing through dangling symlink '{}'",
|
||||||
dest.display()
|
dest.display()
|
||||||
|
@ -1289,6 +1291,10 @@ fn copy_file(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if file_or_link_exists(dest) {
|
||||||
|
handle_existing_dest(source, dest, options, source_in_command_line)?;
|
||||||
|
}
|
||||||
|
|
||||||
if options.verbose {
|
if options.verbose {
|
||||||
println!("{}", context_for(source, dest));
|
println!("{}", context_for(source, dest));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1827,6 +1827,19 @@ fn test_copy_through_dangling_symlink_no_dereference_2() {
|
||||||
.stderr_only("cp: not writing through dangling symlink 'target'");
|
.stderr_only("cp: not writing through dangling symlink 'target'");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Test that copy through a dangling symbolic link fails, even with --force.
|
||||||
|
#[test]
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
fn test_copy_through_dangling_symlink_force() {
|
||||||
|
let (at, mut ucmd) = at_and_ucmd!();
|
||||||
|
at.touch("src");
|
||||||
|
at.symlink_file("no-such-file", "dest");
|
||||||
|
ucmd.args(&["--force", "src", "dest"])
|
||||||
|
.fails()
|
||||||
|
.stderr_only("cp: not writing through dangling symlink 'dest'");
|
||||||
|
assert!(!at.file_exists("dest"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
#[cfg(unix)]
|
#[cfg(unix)]
|
||||||
fn test_cp_archive_on_nonexistent_file() {
|
fn test_cp_archive_on_nonexistent_file() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue