mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 11:37:44 +00:00
Merge pull request #7831 from sylvestre/selinux-mkfifo
mkfifo: implement selinux support
This commit is contained in:
commit
c5fba4bfd8
8 changed files with 100 additions and 13 deletions
|
@ -47,6 +47,7 @@ flamegraph
|
||||||
fsxattr
|
fsxattr
|
||||||
fullblock
|
fullblock
|
||||||
getfacl
|
getfacl
|
||||||
|
getfattr
|
||||||
getopt
|
getopt
|
||||||
gibi
|
gibi
|
||||||
gibibytes
|
gibibytes
|
||||||
|
|
|
@ -51,6 +51,7 @@ feat_selinux = [
|
||||||
"id/selinux",
|
"id/selinux",
|
||||||
"ls/selinux",
|
"ls/selinux",
|
||||||
"mkdir/selinux",
|
"mkdir/selinux",
|
||||||
|
"mkfifo/selinux",
|
||||||
"mknod/selinux",
|
"mknod/selinux",
|
||||||
"stat/selinux",
|
"stat/selinux",
|
||||||
"selinux",
|
"selinux",
|
||||||
|
|
|
@ -22,6 +22,9 @@ clap = { workspace = true }
|
||||||
libc = { workspace = true }
|
libc = { workspace = true }
|
||||||
uucore = { workspace = true, features = ["fs", "mode"] }
|
uucore = { workspace = true, features = ["fs", "mode"] }
|
||||||
|
|
||||||
|
[features]
|
||||||
|
selinux = ["uucore/selinux"]
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "mkfifo"
|
name = "mkfifo"
|
||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// For the full copyright and license information, please view the LICENSE
|
// For the full copyright and license information, please view the LICENSE
|
||||||
// file that was distributed with this source code.
|
// file that was distributed with this source code.
|
||||||
|
|
||||||
use clap::{Arg, ArgAction, Command};
|
use clap::{Arg, ArgAction, Command, value_parser};
|
||||||
use libc::mkfifo;
|
use libc::mkfifo;
|
||||||
use std::ffi::CString;
|
use std::ffi::CString;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
|
@ -17,7 +17,7 @@ static ABOUT: &str = help_about!("mkfifo.md");
|
||||||
|
|
||||||
mod options {
|
mod options {
|
||||||
pub static MODE: &str = "mode";
|
pub static MODE: &str = "mode";
|
||||||
pub static SE_LINUX_SECURITY_CONTEXT: &str = "Z";
|
pub static SELINUX: &str = "Z";
|
||||||
pub static CONTEXT: &str = "context";
|
pub static CONTEXT: &str = "context";
|
||||||
pub static FIFO: &str = "fifo";
|
pub static FIFO: &str = "fifo";
|
||||||
}
|
}
|
||||||
|
@ -26,13 +26,6 @@ mod options {
|
||||||
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
||||||
let matches = uu_app().try_get_matches_from(args)?;
|
let matches = uu_app().try_get_matches_from(args)?;
|
||||||
|
|
||||||
if matches.contains_id(options::CONTEXT) {
|
|
||||||
return Err(USimpleError::new(1, "--context is not implemented"));
|
|
||||||
}
|
|
||||||
if matches.get_flag(options::SE_LINUX_SECURITY_CONTEXT) {
|
|
||||||
return Err(USimpleError::new(1, "-Z is not implemented"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let mode = match matches.get_one::<String>(options::MODE) {
|
let mode = match matches.get_one::<String>(options::MODE) {
|
||||||
// if mode is passed, ignore umask
|
// if mode is passed, ignore umask
|
||||||
Some(m) => match usize::from_str_radix(m, 8) {
|
Some(m) => match usize::from_str_radix(m, 8) {
|
||||||
|
@ -67,6 +60,27 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
||||||
format!("cannot set permissions on {}: {e}", f.quote()),
|
format!("cannot set permissions on {}: {e}", f.quote()),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Apply SELinux context if requested
|
||||||
|
#[cfg(feature = "selinux")]
|
||||||
|
{
|
||||||
|
// Extract the SELinux related flags and options
|
||||||
|
let set_selinux_context = matches.get_flag(options::SELINUX);
|
||||||
|
let context = matches.get_one::<String>(options::CONTEXT);
|
||||||
|
|
||||||
|
if set_selinux_context || context.is_some() {
|
||||||
|
use std::path::Path;
|
||||||
|
if let Err(e) =
|
||||||
|
uucore::selinux::set_selinux_security_context(Path::new(&f), context)
|
||||||
|
{
|
||||||
|
let _ = fs::remove_file(f);
|
||||||
|
return Err(USimpleError::new(
|
||||||
|
1,
|
||||||
|
format!("failed to set SELinux security context: {e}"),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
@ -86,7 +100,7 @@ pub fn uu_app() -> Command {
|
||||||
.value_name("MODE"),
|
.value_name("MODE"),
|
||||||
)
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new(options::SE_LINUX_SECURITY_CONTEXT)
|
Arg::new(options::SELINUX)
|
||||||
.short('Z')
|
.short('Z')
|
||||||
.help("set the SELinux security context to default type")
|
.help("set the SELinux security context to default type")
|
||||||
.action(ArgAction::SetTrue),
|
.action(ArgAction::SetTrue),
|
||||||
|
@ -95,6 +109,9 @@ pub fn uu_app() -> Command {
|
||||||
Arg::new(options::CONTEXT)
|
Arg::new(options::CONTEXT)
|
||||||
.long(options::CONTEXT)
|
.long(options::CONTEXT)
|
||||||
.value_name("CTX")
|
.value_name("CTX")
|
||||||
|
.value_parser(value_parser!(String))
|
||||||
|
.num_args(0..=1)
|
||||||
|
.require_equals(true)
|
||||||
.help(
|
.help(
|
||||||
"like -Z, or if CTX is specified then set the SELinux \
|
"like -Z, or if CTX is specified then set the SELinux \
|
||||||
or SMACK security context to CTX",
|
or SMACK security context to CTX",
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// For the full copyright and license information, please view the LICENSE
|
// For the full copyright and license information, please view the LICENSE
|
||||||
// file that was distributed with this source code.
|
// file that was distributed with this source code.
|
||||||
// spell-checker:ignore (flags) reflink (fs) tmpfs (linux) rlimit Rlim NOFILE clob btrfs neve ROOTDIR USERDIR procfs outfile uufs xattrs
|
// spell-checker:ignore (flags) reflink (fs) tmpfs (linux) rlimit Rlim NOFILE clob btrfs neve ROOTDIR USERDIR procfs outfile uufs xattrs
|
||||||
// spell-checker:ignore bdfl hlsl IRWXO IRWXG getfattr
|
// spell-checker:ignore bdfl hlsl IRWXO IRWXG
|
||||||
use uutests::at_and_ucmd;
|
use uutests::at_and_ucmd;
|
||||||
use uutests::new_ucmd;
|
use uutests::new_ucmd;
|
||||||
use uutests::path_concat;
|
use uutests::path_concat;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// For the full copyright and license information, please view the LICENSE
|
// For the full copyright and license information, please view the LICENSE
|
||||||
// file that was distributed with this source code.
|
// file that was distributed with this source code.
|
||||||
|
|
||||||
// spell-checker:ignore bindgen getfattr testtest
|
// spell-checker:ignore bindgen testtest
|
||||||
|
|
||||||
#![allow(clippy::cast_sign_loss, clippy::cast_possible_truncation)]
|
#![allow(clippy::cast_sign_loss, clippy::cast_possible_truncation)]
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
//
|
//
|
||||||
// For the full copyright and license information, please view the LICENSE
|
// For the full copyright and license information, please view the LICENSE
|
||||||
// file that was distributed with this source code.
|
// file that was distributed with this source code.
|
||||||
|
|
||||||
|
// spell-checker:ignore nconfined
|
||||||
|
|
||||||
use uutests::new_ucmd;
|
use uutests::new_ucmd;
|
||||||
use uutests::util::TestScenario;
|
use uutests::util::TestScenario;
|
||||||
use uutests::util_name;
|
use uutests::util_name;
|
||||||
|
@ -101,3 +104,65 @@ fn test_create_fifo_with_umask() {
|
||||||
test_fifo_creation(0o022, "prw-r--r--"); // spell-checker:disable-line
|
test_fifo_creation(0o022, "prw-r--r--"); // spell-checker:disable-line
|
||||||
test_fifo_creation(0o777, "p---------"); // spell-checker:disable-line
|
test_fifo_creation(0o777, "p---------"); // spell-checker:disable-line
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[cfg(feature = "feat_selinux")]
|
||||||
|
fn test_mkfifo_selinux() {
|
||||||
|
use std::process::Command;
|
||||||
|
let ts = TestScenario::new(util_name!());
|
||||||
|
let at = &ts.fixtures;
|
||||||
|
let dest = "test_file";
|
||||||
|
let args = [
|
||||||
|
"-Z",
|
||||||
|
"--context",
|
||||||
|
"--context=unconfined_u:object_r:user_tmp_t:s0",
|
||||||
|
];
|
||||||
|
for arg in args {
|
||||||
|
ts.ucmd().arg(arg).arg(dest).succeeds();
|
||||||
|
assert!(at.is_fifo("test_file"));
|
||||||
|
|
||||||
|
let getfattr_output = Command::new("getfattr")
|
||||||
|
.arg(at.plus_as_string(dest))
|
||||||
|
.arg("-n")
|
||||||
|
.arg("security.selinux")
|
||||||
|
.output()
|
||||||
|
.expect("Failed to run `getfattr` on the destination file");
|
||||||
|
println!("{:?}", getfattr_output);
|
||||||
|
assert!(
|
||||||
|
getfattr_output.status.success(),
|
||||||
|
"getfattr did not run successfully: {}",
|
||||||
|
String::from_utf8_lossy(&getfattr_output.stderr)
|
||||||
|
);
|
||||||
|
|
||||||
|
let stdout = String::from_utf8_lossy(&getfattr_output.stdout);
|
||||||
|
assert!(
|
||||||
|
stdout.contains("unconfined_u"),
|
||||||
|
"Expected 'foo' not found in getfattr output:\n{stdout}"
|
||||||
|
);
|
||||||
|
at.remove(&at.plus_as_string(dest));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[cfg(feature = "feat_selinux")]
|
||||||
|
fn test_mkfifo_selinux_invalid() {
|
||||||
|
let scene = TestScenario::new(util_name!());
|
||||||
|
let at = &scene.fixtures;
|
||||||
|
let dest = "orig";
|
||||||
|
|
||||||
|
let args = [
|
||||||
|
"--context=a",
|
||||||
|
"--context=unconfined_u:object_r:user_tmp_t:s0:a",
|
||||||
|
"--context=nconfined_u:object_r:user_tmp_t:s0",
|
||||||
|
];
|
||||||
|
for arg in args {
|
||||||
|
new_ucmd!()
|
||||||
|
.arg(arg)
|
||||||
|
.arg(dest)
|
||||||
|
.fails()
|
||||||
|
.stderr_contains("Failed to");
|
||||||
|
if at.file_exists(dest) {
|
||||||
|
at.remove(dest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// For the full copyright and license information, please view the LICENSE
|
// For the full copyright and license information, please view the LICENSE
|
||||||
// file that was distributed with this source code.
|
// file that was distributed with this source code.
|
||||||
|
|
||||||
// spell-checker:ignore getfattr nconfined
|
// spell-checker:ignore nconfined
|
||||||
|
|
||||||
use uutests::new_ucmd;
|
use uutests::new_ucmd;
|
||||||
use uutests::util::TestScenario;
|
use uutests::util::TestScenario;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue