RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #985 from knight42/fix-preserve-root

Browse source 
chgrp: fix bug in option --preserve-root
This commit is contained in:
Alex Lyon 2016-11-30 02:59:19 -08:00 • committed by GitHub
commit 7ec754ec1b
4 changed files with 62 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/chgrp/chgrp.rs
View file

@ -235,7 +235,12 @@ impl Chgrper {
let may_exist = if follow_arg {
path.canonicalize().ok()
} else {
Some(resolve_relative_path(path).into_owned())
let real = resolve_relative_path(path);
if real.is_dir() {
Some(real.canonicalize().expect("failed to get real path"))
} else {
Some(real.into_owned())
}
};
if let Some(p) = may_exist {

7
src/chown/chown.rs
View file

@ -298,7 +298,12 @@ impl Chowner {
let may_exist = if follow_arg {
path.canonicalize().ok()
} else {
Some(resolve_relative_path(path).into_owned())
let real = resolve_relative_path(path);
if real.is_dir() {
Some(real.canonicalize().expect("failed to get real path"))
} else {
Some(real.into_owned())
}
};
if let Some(p) = may_exist {

11
src/uucore/fs.rs
View file

@ -17,20 +17,21 @@ use std::path::{Component, Path, PathBuf};
#[cfg(unix)]
use std::borrow::Cow;
#[cfg(unix)]
pub fn resolve_relative_path<'a>(path: &'a Path) -> Cow<'a, Path> {
if path.is_absolute() {
if path.components().all(|e| e != Component::ParentDir) {
return path.into();
}
let mut result = env::current_dir().unwrap_or(PathBuf::from("/"));
let root = Component::RootDir.as_os_str();
let mut result = env::current_dir().unwrap_or(PathBuf::from(root));
for comp in path.components() {
match comp {
Component::ParentDir => {
result.pop();
}
Component::CurDir => (),
Component::Normal(s) => result.push(s),
_ => unreachable!(),
Component::RootDir |
Component::Normal(_) |
Component::Prefix(_) => result.push(comp.as_os_str()),
}
}
result.into()

42
tests/test_chgrp.rs
View file

@ -43,12 +43,52 @@ fn test_fail_silently() {
#[test]
fn test_preserve_root() {
// It's weird that on OS X, `realpath /etc/..` returns '/private'
for d in &["/", "/////tmp///../../../../",
"../../../../../../../../../../../../../../",
"./../../../../../../../../../../../../../../"] {
new_ucmd!()
.arg("--preserve-root")
.arg("-R")
.arg("bin").arg("/")
.arg("bin").arg(d)
.fails()
.stderr_is("chgrp: it is dangerous to operate recursively on '/'\nchgrp: use --no-preserve-root to override this failsafe");
}
}
#[test]
fn test_preserve_root_symlink() {
let file = "test_chgrp_symlink2root";
for d in &["/", "////tmp//../../../../",
"..//../../..//../..//../../../../../../../../",
".//../../../../../../..//../../../../../../../"] {
let (at, mut ucmd) = at_and_ucmd!();
at.symlink(d, file);
ucmd.arg("--preserve-root")
.arg("-HR")
.arg("bin").arg(file)
.fails()
.stderr_is("chgrp: it is dangerous to operate recursively on '/'\nchgrp: use --no-preserve-root to override this failsafe");
}
let (at, mut ucmd) = at_and_ucmd!();
at.symlink("///usr", file);
ucmd.arg("--preserve-root")
.arg("-HR")
.arg("bin").arg(format!(".//{}/..//..//../../", file))
.fails()
.stderr_is("chgrp: it is dangerous to operate recursively on '/'\nchgrp: use --no-preserve-root to override this failsafe");
let (at, mut ucmd) = at_and_ucmd!();
at.symlink("/", "/tmp/__root__");
ucmd.arg("--preserve-root")
.arg("-R")
.arg("bin").arg("/tmp/__root__/.")
.fails()
.stderr_is("chgrp: it is dangerous to operate recursively on '/'\nchgrp: use --no-preserve-root to override this failsafe");
use ::std::fs;
fs::remove_file("/tmp/__root__").unwrap();
}
#[test]