Skip to content

selinux: rename check_selinux_enabled() #7771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

selinux: rename check_selinux_enabled() #7771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/uu/mkdir/src/mkdir.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ fn create_dir(path: &Path, is_parent: bool, config: &Config) -> UResult<()> {

// Apply SELinux context if requested
#[cfg(feature = "selinux")]
if config.set_selinux_context && uucore::selinux::check_selinux_enabled().is_ok() {
if config.set_selinux_context && uucore::selinux::is_selinux_enabled() {
if let Err(e) = uucore::selinux::set_selinux_security_context(path, config.context)
{
let _ = std::fs::remove_dir(path);
Expand Down
2 changes: 1 addition & 1 deletion src/uu/stat/src/stat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ impl Stater {
'C' => {
#[cfg(feature = "selinux")]
{
if uucore::selinux::check_selinux_enabled().is_ok() {
if uucore::selinux::is_selinux_enabled() {
match uucore::selinux::get_selinux_security_context(Path::new(file))
{
Ok(ctx) => OutputType::Str(ctx),
Expand Down
39 changes: 10 additions & 29 deletions src/uucore/src/lib/features/selinux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,8 @@ impl From<Error> for i32 {
/// Checks if SELinux is enabled on the system.
///
/// This function verifies whether the kernel has SELinux support enabled.
///
/// # Returns
///
/// * `Ok(())` - If SELinux is enabled on the system.
/// * `Err(Error::SELinuxNotEnabled)` - If SELinux is not enabled.
///
/// # Examples
///
/// ```
/// use uucore::selinux::check_selinux_enabled;
///
/// match check_selinux_enabled() {
/// Ok(_) => println!("SELinux is enabled"),
/// Err(_) => println!("SELinux is not enabled"),
/// }
/// ```
pub fn check_selinux_enabled() -> Result<(), Error> {
if selinux::kernel_support() == selinux::KernelSupport::Unsupported {
Err(Error::SELinuxNotEnabled)
} else {
Ok(())
}
pub fn is_selinux_enabled() -> bool {
selinux::kernel_support() != selinux::KernelSupport::Unsupported
}

/// Sets the SELinux security context for the given filesystem path.
Expand Down Expand Up @@ -97,8 +77,9 @@ pub fn check_selinux_enabled() -> Result<(), Error> {
/// }
/// ```
pub fn set_selinux_security_context(path: &Path, context: Option<&String>) -> Result<(), String> {
// Check if SELinux is enabled on the system
check_selinux_enabled().map_err(|e| format!("{:?}", e))?;
if !is_selinux_enabled() {
return Err("SELinux is not enabled on this system".to_string());
}

if let Some(ctx_str) = context {
// Create a CString from the provided context string
Expand Down Expand Up @@ -165,7 +146,7 @@ pub fn set_selinux_security_context(path: &Path, context: Option<&String>) -> Re
/// ```

pub fn get_selinux_security_context(path: &Path) -> Result<String, Error> {
if selinux::kernel_support() == selinux::KernelSupport::Unsupported {
if !is_selinux_enabled() {
return Err(Error::SELinuxNotEnabled);
}

Expand Down Expand Up @@ -240,15 +221,15 @@ mod tests {
}

#[test]
fn test_check_selinux_enabled_runtime_behavior() {
let result = check_selinux_enabled();
fn test_is_selinux_enabled_runtime_behavior() {
let result = is_selinux_enabled();

match selinux::kernel_support() {
selinux::KernelSupport::Unsupported => {
assert!(matches!(result, Err(Error::SELinuxNotEnabled)));
assert!(!result, "Expected false when SELinux is not supported");
}
_ => {
assert!(result.is_ok(), "Expected Ok(()) when SELinux is supported");
assert!(result, "Expected true when SELinux is supported");
}
}
}
Expand Down
Loading