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

chroot: fix parsing of --userspec argument

Browse source 
Fix the parsing of the `--userspec=USER:GROUP` argument so that the
both the user and the group are optional, and update the error message
to match that of GNU `chroot`. This commit also removes the incorrect
`clap` arguments for `--user` and `--group`. In `chroot --user=USER`,
the `--user` is an abbreviation of `--userspec`, and in `chroot
--group=GROUP`, the `--group` is an abbreviation of `--groups`.

Closes #7040.
This commit is contained in:
Jeffrey Finkelstein 2024-12-31 12:05:25 -05:00 • committed by Sylvestre Ledru
parent 797876f8cd
commit 5bd5cdb7c1
3 changed files with 129 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tests/by-util/test_chroot.rs
View file

@ -55,13 +55,34 @@ fn test_no_such_directory() {
#[test]
fn test_invalid_user_spec() {
let (at, mut ucmd) = at_and_ucmd!();
let ts = TestScenario::new(util_name!());
at.mkdir("a");
if let Ok(result) = run_ucmd_as_root(&ts, &["--userspec=ARABA:", "/"]) {
result
.failure()
.code_is(125)
.stderr_is("chroot: invalid user");
} else {
print!("Test skipped; requires root user");
}
let result = ucmd.arg("a").arg("--userspec=ARABA:").fails();
result.code_is(125);
assert!(result.stderr_str().starts_with("chroot: invalid userspec"));
if let Ok(result) = run_ucmd_as_root(&ts, &["--userspec=ARABA:ARABA", "/"]) {
result
.failure()
.code_is(125)
.stderr_is("chroot: invalid user");
} else {
print!("Test skipped; requires root user");
}
if let Ok(result) = run_ucmd_as_root(&ts, &["--userspec=:ARABA", "/"]) {
result
.failure()
.code_is(125)
.stderr_is("chroot: invalid group");
} else {
print!("Test skipped; requires root user");
}
}
#[test]
@ -77,10 +98,9 @@ fn test_invalid_user() {
print!("Test skipped; requires root user");
}
// `--user` is an abbreviation of `--userspec`.
if let Ok(result) = run_ucmd_as_root(&ts, &["--user=nobody:+65535", dir, "pwd"]) {
result
.failure()
.stderr_contains("no such user: nobody:+65535");
result.failure().stderr_is("chroot: invalid user");
} else {
print!("Test skipped; requires root user");
}
@ -116,6 +136,7 @@ fn test_preference_of_userspec() {
at.mkdir("a");
// `--user` is an abbreviation of `--userspec`.
let result = ucmd
.arg("a")
.arg("--user")