mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 03:27:44 +00:00
mkdir: add support of -Z
Should fix: gnu/tests/mkdir/selinux.sh tests/mkdir/restorecon.sh
This commit is contained in:
parent
5bfbc30fba
commit
81c02b7408
3 changed files with 191 additions and 7 deletions
|
@ -19,6 +19,7 @@ path = "src/mkdir.rs"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = { workspace = true }
|
clap = { workspace = true }
|
||||||
|
selinux = { workspace = true }
|
||||||
uucore = { workspace = true, features = ["fs", "mode", "fsxattr"] }
|
uucore = { workspace = true, features = ["fs", "mode", "fsxattr"] }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
use clap::builder::ValueParser;
|
use clap::builder::ValueParser;
|
||||||
use clap::parser::ValuesRef;
|
use clap::parser::ValuesRef;
|
||||||
use clap::{Arg, ArgAction, ArgMatches, Command};
|
use clap::{Arg, ArgAction, ArgMatches, Command};
|
||||||
|
use selinux::SecurityContext;
|
||||||
use std::ffi::OsString;
|
use std::ffi::OsString;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
#[cfg(not(windows))]
|
#[cfg(not(windows))]
|
||||||
|
@ -29,6 +30,8 @@ mod options {
|
||||||
pub const PARENTS: &str = "parents";
|
pub const PARENTS: &str = "parents";
|
||||||
pub const VERBOSE: &str = "verbose";
|
pub const VERBOSE: &str = "verbose";
|
||||||
pub const DIRS: &str = "dirs";
|
pub const DIRS: &str = "dirs";
|
||||||
|
pub const SELINUX: &str = "z";
|
||||||
|
pub const CONTEXT: &str = "context";
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
|
@ -72,6 +75,58 @@ fn strip_minus_from_mode(args: &mut Vec<String>) -> bool {
|
||||||
mode::strip_minus_from_mode(args)
|
mode::strip_minus_from_mode(args)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add a new function to handle setting the SELinux security context
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
fn set_selinux_security_context(path: &Path, context: Option<&String>) -> Result<(), String> {
|
||||||
|
// Get SELinux kernel support
|
||||||
|
let support = selinux::kernel_support();
|
||||||
|
|
||||||
|
// If SELinux is not enabled, return early
|
||||||
|
if support == selinux::KernelSupport::Unsupported {
|
||||||
|
return Err("SELinux is not enabled on this system".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
// If a specific context was provided, use it
|
||||||
|
if let Some(ctx_str) = context {
|
||||||
|
// Use the provided context
|
||||||
|
match SecurityContext::of_path(path, false, false) {
|
||||||
|
Ok(_) => {
|
||||||
|
// Create a CString from the context string
|
||||||
|
let c_context = std::ffi::CString::new(ctx_str.as_str())
|
||||||
|
.map_err(|_| "Invalid context string (contains null bytes)".to_string())?;
|
||||||
|
|
||||||
|
// Create a security context from the string
|
||||||
|
let security_context = match selinux::OpaqueSecurityContext::from_c_str(&c_context)
|
||||||
|
{
|
||||||
|
Ok(ctx) => ctx,
|
||||||
|
Err(e) => return Err(format!("Failed to create security context: {}", e)),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Convert back to string for the API
|
||||||
|
let context_str = match security_context.to_c_string() {
|
||||||
|
Ok(ctx) => ctx,
|
||||||
|
Err(e) => return Err(format!("Failed to convert context to string: {}", e)),
|
||||||
|
};
|
||||||
|
|
||||||
|
// Set the context on the file
|
||||||
|
let sc = SecurityContext::from_c_str(&context_str, false);
|
||||||
|
|
||||||
|
match sc.set_for_path(path, false, false) {
|
||||||
|
Ok(_) => Ok(()),
|
||||||
|
Err(e) => Err(format!("Failed to set context: {}", e)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => Err(format!("Failed to get current context: {}", e)),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// If no context was specified, use the default context for the path
|
||||||
|
match SecurityContext::set_default_for_path(path) {
|
||||||
|
Ok(_) => Ok(()),
|
||||||
|
Err(e) => Err(format!("Failed to set default context: {}", e)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[uucore::main]
|
#[uucore::main]
|
||||||
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
||||||
let mut args = args.collect_lossy();
|
let mut args = args.collect_lossy();
|
||||||
|
@ -91,8 +146,19 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
|
||||||
let verbose = matches.get_flag(options::VERBOSE);
|
let verbose = matches.get_flag(options::VERBOSE);
|
||||||
let recursive = matches.get_flag(options::PARENTS);
|
let recursive = matches.get_flag(options::PARENTS);
|
||||||
|
|
||||||
|
// Extract the SELinux related flags and options
|
||||||
|
let set_selinux_context = matches.get_flag(options::SELINUX);
|
||||||
|
let context = matches.get_one::<String>(options::CONTEXT);
|
||||||
|
|
||||||
match get_mode(&matches, mode_had_minus_prefix) {
|
match get_mode(&matches, mode_had_minus_prefix) {
|
||||||
Ok(mode) => exec(dirs, recursive, mode, verbose),
|
Ok(mode) => exec(
|
||||||
|
dirs,
|
||||||
|
recursive,
|
||||||
|
mode,
|
||||||
|
verbose,
|
||||||
|
set_selinux_context || context.is_some(),
|
||||||
|
context,
|
||||||
|
),
|
||||||
Err(f) => Err(USimpleError::new(1, f)),
|
Err(f) => Err(USimpleError::new(1, f)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -124,6 +190,15 @@ pub fn uu_app() -> Command {
|
||||||
.help("print a message for each printed directory")
|
.help("print a message for each printed directory")
|
||||||
.action(ArgAction::SetTrue),
|
.action(ArgAction::SetTrue),
|
||||||
)
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::new(options::SELINUX)
|
||||||
|
.short('Z')
|
||||||
|
.help("set SELinux security context of each created directory to the default type")
|
||||||
|
.action(ArgAction::SetTrue),
|
||||||
|
)
|
||||||
|
.arg(Arg::new(options::CONTEXT).long(options::CONTEXT).value_name("CTX").help(
|
||||||
|
"like -Z, or if CTX is specified then set the SELinux or SMACK security context to CTX",
|
||||||
|
))
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new(options::DIRS)
|
Arg::new(options::DIRS)
|
||||||
.action(ArgAction::Append)
|
.action(ArgAction::Append)
|
||||||
|
@ -137,12 +212,26 @@ pub fn uu_app() -> Command {
|
||||||
/**
|
/**
|
||||||
* Create the list of new directories
|
* Create the list of new directories
|
||||||
*/
|
*/
|
||||||
fn exec(dirs: ValuesRef<OsString>, recursive: bool, mode: u32, verbose: bool) -> UResult<()> {
|
fn exec(
|
||||||
|
dirs: ValuesRef<OsString>,
|
||||||
|
recursive: bool,
|
||||||
|
mode: u32,
|
||||||
|
verbose: bool,
|
||||||
|
set_selinux_context: bool,
|
||||||
|
context: Option<&String>,
|
||||||
|
) -> UResult<()> {
|
||||||
for dir in dirs {
|
for dir in dirs {
|
||||||
let path_buf = PathBuf::from(dir);
|
let path_buf = PathBuf::from(dir);
|
||||||
let path = path_buf.as_path();
|
let path = path_buf.as_path();
|
||||||
|
|
||||||
show_if_err!(mkdir(path, recursive, mode, verbose));
|
show_if_err!(mkdir(
|
||||||
|
path,
|
||||||
|
recursive,
|
||||||
|
mode,
|
||||||
|
verbose,
|
||||||
|
set_selinux_context,
|
||||||
|
context
|
||||||
|
));
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -160,7 +249,14 @@ fn exec(dirs: ValuesRef<OsString>, recursive: bool, mode: u32, verbose: bool) ->
|
||||||
///
|
///
|
||||||
/// To match the GNU behavior, a path with the last directory being a single dot
|
/// To match the GNU behavior, a path with the last directory being a single dot
|
||||||
/// (like `some/path/to/.`) is created (with the dot stripped).
|
/// (like `some/path/to/.`) is created (with the dot stripped).
|
||||||
pub fn mkdir(path: &Path, recursive: bool, mode: u32, verbose: bool) -> UResult<()> {
|
pub fn mkdir(
|
||||||
|
path: &Path,
|
||||||
|
recursive: bool,
|
||||||
|
mode: u32,
|
||||||
|
verbose: bool,
|
||||||
|
set_selinux_context: bool,
|
||||||
|
context: Option<&String>,
|
||||||
|
) -> UResult<()> {
|
||||||
if path.as_os_str().is_empty() {
|
if path.as_os_str().is_empty() {
|
||||||
return Err(USimpleError::new(
|
return Err(USimpleError::new(
|
||||||
1,
|
1,
|
||||||
|
@ -173,7 +269,15 @@ pub fn mkdir(path: &Path, recursive: bool, mode: u32, verbose: bool) -> UResult<
|
||||||
// std::fs::create_dir("foo/."); fails in pure Rust
|
// std::fs::create_dir("foo/."); fails in pure Rust
|
||||||
let path_buf = dir_strip_dot_for_creation(path);
|
let path_buf = dir_strip_dot_for_creation(path);
|
||||||
let path = path_buf.as_path();
|
let path = path_buf.as_path();
|
||||||
create_dir(path, recursive, verbose, false, mode)
|
create_dir(
|
||||||
|
path,
|
||||||
|
recursive,
|
||||||
|
verbose,
|
||||||
|
false,
|
||||||
|
mode,
|
||||||
|
set_selinux_context,
|
||||||
|
context,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(any(unix, target_os = "redox"))]
|
#[cfg(any(unix, target_os = "redox"))]
|
||||||
|
@ -200,6 +304,8 @@ fn create_dir(
|
||||||
verbose: bool,
|
verbose: bool,
|
||||||
is_parent: bool,
|
is_parent: bool,
|
||||||
mode: u32,
|
mode: u32,
|
||||||
|
set_selinux_context: bool,
|
||||||
|
context: Option<&String>,
|
||||||
) -> UResult<()> {
|
) -> UResult<()> {
|
||||||
let path_exists = path.exists();
|
let path_exists = path.exists();
|
||||||
if path_exists && !recursive {
|
if path_exists && !recursive {
|
||||||
|
@ -214,7 +320,15 @@ fn create_dir(
|
||||||
|
|
||||||
if recursive {
|
if recursive {
|
||||||
match path.parent() {
|
match path.parent() {
|
||||||
Some(p) => create_dir(p, recursive, verbose, true, mode)?,
|
Some(p) => create_dir(
|
||||||
|
p,
|
||||||
|
recursive,
|
||||||
|
verbose,
|
||||||
|
true,
|
||||||
|
mode,
|
||||||
|
set_selinux_context,
|
||||||
|
context,
|
||||||
|
)?,
|
||||||
None => {
|
None => {
|
||||||
USimpleError::new(1, "failed to create whole tree");
|
USimpleError::new(1, "failed to create whole tree");
|
||||||
}
|
}
|
||||||
|
@ -255,6 +369,18 @@ fn create_dir(
|
||||||
let new_mode = mode;
|
let new_mode = mode;
|
||||||
|
|
||||||
chmod(path, new_mode)?;
|
chmod(path, new_mode)?;
|
||||||
|
|
||||||
|
// Apply SELinux context if requested
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
if set_selinux_context {
|
||||||
|
if let Err(e) = set_selinux_security_context(path, context) {
|
||||||
|
return Err(USimpleError::new(
|
||||||
|
1,
|
||||||
|
format!("failed to set SELinux security context: {}", e),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
// spell-checker:ignore bindgen getfattr testtest
|
||||||
|
|
||||||
#![allow(clippy::cast_sign_loss, clippy::cast_possible_truncation)]
|
#![allow(clippy::cast_sign_loss, clippy::cast_possible_truncation)]
|
||||||
|
|
||||||
|
@ -358,3 +358,60 @@ fn test_empty_argument() {
|
||||||
.fails()
|
.fails()
|
||||||
.stderr_only("mkdir: cannot create directory '': No such file or directory\n");
|
.stderr_only("mkdir: cannot create directory '': No such file or directory\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[cfg(feature = "feat_selinux")]
|
||||||
|
fn test_selinux() {
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
let scene = TestScenario::new(util_name!());
|
||||||
|
let at = &scene.fixtures;
|
||||||
|
let dest = "test_dir_a";
|
||||||
|
let args = ["-Z", "--context=unconfined_u:object_r:user_tmp_t:s0"];
|
||||||
|
for arg in args {
|
||||||
|
new_ucmd!()
|
||||||
|
.arg(arg)
|
||||||
|
.arg("-v")
|
||||||
|
.arg(at.plus_as_string(dest))
|
||||||
|
.succeeds()
|
||||||
|
.stdout_contains("created directory");
|
||||||
|
|
||||||
|
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");
|
||||||
|
|
||||||
|
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 '{}' not found in getfattr output:\n{}",
|
||||||
|
"unconfined_u",
|
||||||
|
stdout
|
||||||
|
);
|
||||||
|
at.rmdir(dest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[cfg(feature = "feat_selinux")]
|
||||||
|
fn test_selinux_invalid() {
|
||||||
|
let scene = TestScenario::new(util_name!());
|
||||||
|
let at = &scene.fixtures;
|
||||||
|
let dest = "test_dir_a";
|
||||||
|
new_ucmd!()
|
||||||
|
.arg("--context=testtest")
|
||||||
|
.arg(at.plus_as_string(dest))
|
||||||
|
.fails()
|
||||||
|
.no_stdout()
|
||||||
|
.stderr_contains("failed to set SELinux security context:");
|
||||||
|
// invalid context, so, no directory
|
||||||
|
assert!(!at.dir_exists(dest));
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue