Skip to content

Commit

Permalink
ls: when a file has capabilities (setcap), change the color
Browse files Browse the repository at this point in the history
Should fix tests/ls/capability.sh
  • Loading branch information
sylvestre committed Dec 21, 2024
1 parent 31ffc3a commit 40e5492
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/uu/ls/src/colors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,22 @@ pub(crate) fn color_name(
target_symlink: Option<&PathData>,
wrap: bool,
) -> String {
#[cfg(any(not(unix), target_os = "android", target_os = "macos"))]
let has_capabilities = false;
#[cfg(all(unix, not(any(target_os = "android", target_os = "macos"))))]
// Check if the file has capabilities
let has_capabilities = uucore::fsxattr::has_acl(path.p_buf.as_path());

// If the file has capabilities, use a specific style for `ca` (capabilities)
if has_capabilities {
if let Some(style) = style_manager
.colors
.style_for_indicator(Indicator::Capabilities)
{
return style_manager.apply_style(Some(style), name, wrap);
}
}

if !path.must_dereference {
// If we need to dereference (follow) a symlink, we will need to get the metadata
if let Some(de) = &path.de {
Expand Down
47 changes: 47 additions & 0 deletions tests/by-util/test_ls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
// spell-checker:ignore (words) READMECAREFULLY birthtime doesntexist oneline somebackup lrwx somefile somegroup somehiddenbackup somehiddenfile tabsize aaaaaaaa bbbb cccc dddddddd ncccc neee naaaaa nbcdef nfffff dired subdired tmpfs mdir COLORTERM mexe bcdef mfoo
// spell-checker:ignore (words) fakeroot setcap
#![allow(
clippy::similar_names,
clippy::too_many_lines,
Expand Down Expand Up @@ -5516,3 +5517,49 @@ fn test_suffix_case_sensitivity() {
/* cSpell:enable */
);
}

#[cfg(all(unix, target_os = "linux"))]
#[test]
fn test_ls_capabilities() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;

// Test must be run as root (or with `sudo -E`)
// fakeroot setcap cap_net_bind_service=ep /tmp/file_name
// doesn't trigger an error but fails silently
if scene.cmd("whoami").run().stdout_str() != "root\n" {
return;
}
at.mkdir("test");
at.mkdir("test/dir");
at.touch("test/cap_pos");
at.touch("test/dir/cap_neg");
at.touch("test/dir/cap_pos");

let files = ["test/cap_pos", "test/dir/cap_pos"];
for file in &files {
scene
.cmd("sudo")
.args(&[
"-E",
"--non-interactive",
"setcap",
"cap_net_bind_service=ep",
at.plus(file).to_str().unwrap(),
])
.succeeds();
}

let ls_colors = "di=:ca=30;41";

scene
.ucmd()
.env("LS_COLORS", ls_colors)
.arg("--color=always")
.arg("test/cap_pos")
.arg("test/dir")
.succeeds()
.stdout_contains("\x1b[30;41mtest/cap_pos") // spell-checker:disable-line
.stdout_contains("\x1b[30;41mcap_pos") // spell-checker:disable-line
.stdout_does_not_contain("0;41mtest/dir/cap_neg"); // spell-checker:disable-line
}

0 comments on commit 40e5492

Please sign in to comment.