fix_xattr

Signed-off-by: Hiroyuki Moriya <[email protected]>
youki-dev · Sep 28, 2024 · 3d2d34a · 3d2d34a
1 parent e0d53a8
commit 3d2d34a
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 18 deletions.
diff --git a/experiment/selinux/src/selinux.rs b/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]),
             }
         }
     }

diff --git a/experiment/selinux/src/tools/xattr.rs b/experiment/selinux/src/tools/xattr.rs
@@ -34,31 +34,55 @@ 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) {
-            Ok(_) => Ok(()),
-            Err(e) => {
-                let errno = e.raw_os_error();
-                if errno == libc::EINTR {
-                    return Err(XattrError::EINTR(errno));
+        match path.get_xattr(attr) {
+            Ok(_) => match rfs::setxattr(path, attr, data, rfs::XattrFlags::REPLACE) {
+                Ok(_) => Ok(()),
+                Err(e) => {
+                    let errno = e.raw_os_error();
+                    if errno == libc::EINTR {
+                        return Err(XattrError::EINTR(errno));
+                    }
+                    Err(XattrError::SetXattr(e.to_string()))
                 }
-                Err(XattrError::SetXattr(e.to_string()))
-            }
+            },
+            Err(_) => match rfs::setxattr(path, attr, data, rfs::XattrFlags::CREATE) {
+                Ok(_) => Ok(()),
+                Err(e) => {
+                    let errno = e.raw_os_error();
+                    if errno == libc::EINTR {
+                        return Err(XattrError::EINTR(errno));
+                    }
+                    Err(XattrError::SetXattr(e.to_string()))
+                }
+            },
         }
     }
 
     // function similar with lsetxattr in golang.org/x/sys/unix repo.
     // 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) {
-            Ok(_) => Ok(()),
-            Err(e) => {
-                let errno = e.raw_os_error();
-                if errno == libc::EINTR {
-                    return Err(XattrError::EINTR(errno));
+        match path.lget_xattr(attr) {
+            Ok(_) => match rfs::lsetxattr(path, attr, data, rfs::XattrFlags::REPLACE) {
+                Ok(_) => Ok(()),
+                Err(e) => {
+                    let errno = e.raw_os_error();
+                    if errno == libc::EINTR {
+                        return Err(XattrError::EINTR(errno));
+                    }
+                    Err(XattrError::LSetXattr(e.to_string()))
                 }
-                Err(XattrError::LSetXattr(e.to_string()))
-            }
+            },
+            Err(_) => match rfs::lsetxattr(path, attr, data, rfs::XattrFlags::CREATE) {
+                Ok(_) => Ok(()),
+                Err(e) => {
+                    let errno = e.raw_os_error();
+                    if errno == libc::EINTR {
+                        return Err(XattrError::EINTR(errno));
+                    }
+                    Err(XattrError::LSetXattr(e.to_string()))
+                }
+            },
         }
     }
 
@@ -128,6 +152,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 succeds, 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");