selinux: use the uucore function

sylvestre · sylvestre · commit 728b90dd9b54 · 2025-04-22T09:32:04.000+02:00
diff --git a/src/uu/id/src/id.rs b/src/uu/id/src/id.rs
@@ -130,7 +130,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         selinux_supported: {
             #[cfg(feature = "selinux")]
             {
-                selinux::kernel_support() != selinux::KernelSupport::Unsupported
+                uucore::selinux::is_selinux_enabled()
             }
             #[cfg(not(feature = "selinux"))]
             {
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -1124,7 +1124,7 @@ impl Config {
             selinux_supported: {
                 #[cfg(feature = "selinux")]
                 {
-                    selinux::kernel_support() != selinux::KernelSupport::Unsupported
+                    uucore::selinux::is_selinux_enabled()
                 }
                 #[cfg(not(feature = "selinux"))]
                 {
diff --git a/src/uu/runcon/Cargo.toml b/src/uu/runcon/Cargo.toml
@@ -19,7 +19,7 @@ path = "src/runcon.rs"
 
 [dependencies]
 clap = { workspace = true }
-uucore = { workspace = true, features = ["entries", "fs", "perms"] }
+uucore = { workspace = true, features = ["entries", "fs", "perms", "selinux"] }
 selinux = { workspace = true }
 thiserror = { workspace = true }
 libc = { workspace = true }
diff --git a/src/uu/runcon/src/runcon.rs b/src/uu/runcon/src/runcon.rs
@@ -271,7 +271,7 @@ fn set_next_exec_context(context: &OpaqueSecurityContext) -> Result<()> {
 }
 
 fn get_plain_context(context: &OsStr) -> Result<OpaqueSecurityContext> {
-    if selinux::kernel_support() == selinux::KernelSupport::Unsupported {
+    if !uucore::selinux::is_selinux_enabled() {
         return Err(Error::SELinuxNotEnabled);
     }
 
@@ -342,7 +342,7 @@ fn get_custom_context(
     use OpaqueSecurityContext as OSC;
     type SetNewValueProc = fn(&OSC, &CStr) -> selinux::errors::Result<()>;
 
-    if selinux::kernel_support() == selinux::KernelSupport::Unsupported {
+    if !uucore::selinux::is_selinux_enabled() {
         return Err(Error::SELinuxNotEnabled);
     }
 
diff --git a/src/uucore/src/lib/features/selinux.rs b/src/uucore/src/lib/features/selinux.rs
@@ -235,6 +235,11 @@ mod tests {
 
     #[test]
     fn test_get_selinux_security_context() {
+        if !is_selinux_enabled() {
+            // Skip the test if SELinux is not enabled
+            return;
+        }
+
         let tmpfile = NamedTempFile::new().expect("Failed to create tempfile");
         let path = tmpfile.path();
 
@@ -261,6 +266,11 @@ mod tests {
 
     #[test]
     fn test_get_selinux_context_nonexistent_file() {
+        if !is_selinux_enabled() {
+            // Skip the test if SELinux is not enabled
+            return;
+        }
+
         let path = Path::new("/nonexistent/file/that/does/not/exist");
 
         let result = get_selinux_security_context(path);
diff --git a/tests/by-util/test_id.rs b/tests/by-util/test_id.rs
@@ -381,8 +381,7 @@ fn test_id_zero() {
 #[test]
 #[cfg(feature = "feat_selinux")]
 fn test_id_context() {
-    use selinux::{self, KernelSupport};
-    if selinux::kernel_support() == KernelSupport::Unsupported {
+    if !uucore::selinux::is_selinux_enabled() {
         println!("test skipped: Kernel has no support for SElinux context");
         return;
     }
@@ -456,12 +455,11 @@ fn test_id_no_specified_user_posixly() {
         feature = "feat_selinux"
     ))]
     {
-        use selinux::{self, KernelSupport};
-        if selinux::kernel_support() == KernelSupport::Unsupported {
-            println!("test skipped: Kernel has no support for SElinux context");
-        } else {
+        if uucore::selinux::is_selinux_enabled() {
             let result = ts.ucmd().succeeds();
             assert!(result.stdout_str().contains("context="));
+        } else {
+            println!("test skipped: Kernel has no support for SElinux context");
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {`
`130`	`130`	`selinux_supported: {`
`131`	`131`	`#[cfg(feature = "selinux")]`
`132`	`132`	`{`
`133`		`- selinux::kernel_support() != selinux::KernelSupport::Unsupported`
	`133`	`+ uucore::selinux::is_selinux_enabled()`
`134`	`134`	`}`
`135`	`135`	`#[cfg(not(feature = "selinux"))]`
`136`	`136`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1124,7 +1124,7 @@ impl Config {`
`1124`	`1124`	`selinux_supported: {`
`1125`	`1125`	`#[cfg(feature = "selinux")]`
`1126`	`1126`	`{`
`1127`		`- selinux::kernel_support() != selinux::KernelSupport::Unsupported`
	`1127`	`+ uucore::selinux::is_selinux_enabled()`
`1128`	`1128`	`}`
`1129`	`1129`	`#[cfg(not(feature = "selinux"))]`
`1130`	`1130`	`{`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ fn set_next_exec_context(context: &OpaqueSecurityContext) -> Result<()> {`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`fn get_plain_context(context: &OsStr) -> Result<OpaqueSecurityContext> {`
`274`		`- if selinux::kernel_support() == selinux::KernelSupport::Unsupported {`
	`274`	`+ if !uucore::selinux::is_selinux_enabled() {`
`275`	`275`	`return Err(Error::SELinuxNotEnabled);`
`276`	`276`	`}`
`277`	`277`
`@@ -342,7 +342,7 @@ fn get_custom_context(`
`342`	`342`	`use OpaqueSecurityContext as OSC;`
`343`	`343`	`type SetNewValueProc = fn(&OSC, &CStr) -> selinux::errors::Result<()>;`
`344`	`344`
`345`		`- if selinux::kernel_support() == selinux::KernelSupport::Unsupported {`
	`345`	`+ if !uucore::selinux::is_selinux_enabled() {`
`346`	`346`	`return Err(Error::SELinuxNotEnabled);`
`347`	`347`	`}`
`348`	`348`
Original file line number	Diff line number	Diff line change
`@@ -381,8 +381,7 @@ fn test_id_zero() {`
`381`	`381`	`#[test]`
`382`	`382`	`#[cfg(feature = "feat_selinux")]`
`383`	`383`	`fn test_id_context() {`
`384`		`- use selinux::{self, KernelSupport};`
`385`		`- if selinux::kernel_support() == KernelSupport::Unsupported {`
	`384`	`+ if !uucore::selinux::is_selinux_enabled() {`
`386`	`385`	`println!("test skipped: Kernel has no support for SElinux context");`
`387`	`386`	`return;`
`388`	`387`	`}`
`@@ -456,12 +455,11 @@ fn test_id_no_specified_user_posixly() {`
`456`	`455`	`feature = "feat_selinux"`
`457`	`456`	`))]`
`458`	`457`	`{`
`459`		`- use selinux::{self, KernelSupport};`
`460`		`- if selinux::kernel_support() == KernelSupport::Unsupported {`
`461`		`- println!("test skipped: Kernel has no support for SElinux context");`
`462`		`- } else {`
	`458`	`+ if uucore::selinux::is_selinux_enabled() {`
`463`	`459`	`let result = ts.ucmd().succeeds();`
`464`	`460`	`assert!(result.stdout_str().contains("context="));`
	`461`	`+ } else {`
	`462`	`+ println!("test skipped: Kernel has no support for SElinux context");`
`465`	`463`	`}`
`466`	`464`	`}`
`467`	`465`	`}`