selinux: fix xattr and remove anyhow (#2936)

* fix_xattr

Signed-off-by: Hiroyuki Moriya <[email protected]>

* fix

Signed-off-by: Hiroyuki Moriya <[email protected]>

---------

Signed-off-by: Hiroyuki Moriya <[email protected]>

experiment/selinux/Cargo.toml

@@ -12,7 +12,6 @@ autoexamples = true
 keywords = ["youki", "container", "selinux"]
 
 [dependencies]
-anyhow = "1.0.86"
 nix = { version = "0.29.0", features = ["process", "fs", "socket"] }
 rustix = { version = "0.38.34", features = ["fs"] }
 tempfile = "3.10.1"

experiment/selinux/src/main.rs

@@ -1,10 +1,9 @@
-use anyhow::Result;
 use selinux::selinux::*;
 use selinux::selinux_label::*;
 use std::fs::File;
 use std::path::Path;
 
-fn main() -> Result<()> {
+fn main() -> Result<(), SELinuxError> {
     let mut selinux_instance: SELinux = SELinux::new();
 
     if selinux_instance.get_enabled() {
@@ -32,7 +31,7 @@ fn main() -> Result<()> {
     }
 
     let file_path = Path::new("./test_file.txt");
-    let _file = File::create(file_path)?;
+    let _file = File::create(file_path).unwrap();
     let selinux_label =
         SELinuxLabel::try_from("system_u:object_r:public_content_t:s0".to_string())?;
     SELinux::set_file_label(file_path, selinux_label)?;

experiment/selinux/src/selinux.rs

@@ -489,7 +489,7 @@ mod tests {
 
     fn create_temp_file(content: &[u8], file_name: &str) {
         let path = Path::new(file_name);
-        let mut file = File::create(&path).expect("Failed to create file");
+        let mut file = File::create(path).expect("Failed to create file");
         file.write_all(content).expect("Failed to write to file");
         file.sync_all().expect("Failed to sync file");
     }
@@ -570,7 +570,7 @@ mod tests {
             let expected = PathBuf::from(expected_array[i]);
             match SELinux::check_line_include_selinux_fs_mount_point(input) {
                 Some(output) => assert_eq!(expected, output),
-                None => assert_eq!(succeeded_array[i], false),
+                None => assert!(!succeeded_array[i]),
             }
         }
     }

experiment/selinux/src/tools/xattr.rs

@@ -34,7 +34,11 @@ where
     // set_xattr sets extended attributes on a file specified by its path.
     fn set_xattr(&self, attr: &str, data: &[u8]) -> Result<(), XattrError> {
         let path = self.as_ref();
-        match rfs::setxattr(path, attr, data, rfs::XattrFlags::REPLACE) {
+        let op = match path.get_xattr(attr) {
+            Ok(_) => rfs::XattrFlags::REPLACE,
+            Err(_) => rfs::XattrFlags::CREATE,
+        };
+        match rfs::setxattr(path, attr, data, op) {
             Ok(_) => Ok(()),
             Err(e) => {
                 let errno = e.raw_os_error();
@@ -50,7 +54,11 @@ where
     // lset_xattr sets extended attributes on a symbolic link.
     fn lset_xattr(&self, attr: &str, data: &[u8]) -> Result<(), XattrError> {
         let path = self.as_ref();
-        match rfs::lsetxattr(path, attr, data, rfs::XattrFlags::REPLACE) {
+        let op = match path.lget_xattr(attr) {
+            Ok(_) => rfs::XattrFlags::REPLACE,
+            Err(_) => rfs::XattrFlags::CREATE,
+        };
+        match rfs::lsetxattr(path, attr, data, op) {
             Ok(_) => Ok(()),
             Err(e) => {
                 let errno = e.raw_os_error();
@@ -128,6 +136,15 @@ mod tests {
         let temp_file = NamedTempFile::new().expect("Failed to create temp file");
         let file_path = temp_file.path();
 
+        // Verify that the first "set_xattr" operation succeeds, which means it doesn't have xattr yet.
+        file_path
+            .set_xattr(attr_name, attr_value.as_bytes())
+            .expect("Failed to set xattr");
+        let actual = file_path.get_xattr(attr_name).expect("Failed to get xattr");
+        assert_eq!(actual, attr_value);
+
+        // Verify that the second "set_xattr" operation succeeds, which means it already has xattr.
+        let attr_value = "system_u:object_r:another_label_t";
         file_path
             .set_xattr(attr_name, attr_value.as_bytes())
             .expect("Failed to set xattr");