client: Avoid cloning by using is_valid instead

Author: bilelmoussaoui

client/src/file/api/mod.rs

@@ -233,19 +233,25 @@ impl Keyring {
     pub fn remove_items(&mut self, attributes: &impl AsAttributes, key: &Key) -> Result<(), Error> {
         let hashed_search = attributes.hash(key);
 
-        let (remove, keep): (Vec<EncryptedItem>, _) =
-            self.items.clone().into_iter().partition(|e| {
-                hashed_search
-                    .iter()
-                    .all(|(k, v)| v.as_ref().is_ok_and(|v| e.has_attribute(k, v)))
-            });
-
-        // check hashes for the ones to be removed
-        for item in remove {
-            item.decrypt(key)?;
+        // Validate items to be removed before actually removing them
+        for item in &self.items {
+            if hashed_search
+                .iter()
+                .all(|(k, v)| v.as_ref().is_ok_and(|v| item.has_attribute(k, v)))
+            {
+                // Validate by checking if it can be decrypted
+                if !item.is_valid(key) {
+                    return Err(Error::MacError);
+                }
+            }
         }
 
-        self.items = keep;
+        // Remove matching items
+        self.items.retain(|e| {
+            !hashed_search
+                .iter()
+                .all(|(k, v)| v.as_ref().is_ok_and(|v| e.has_attribute(k, v)))
+        });
 
         Ok(())
     }

client/src/file/locked_keyring.rs

@@ -98,10 +98,10 @@ impl LockedKeyring {
             let mut n_broken_items = 0;
             let mut n_valid_items = 0;
             for encrypted_item in &inner_keyring.items {
-                if encrypted_item.clone().decrypt(&key).is_err() {
-                    n_broken_items += 1;
-                } else {
+                if encrypted_item.is_valid(&key) {
                     n_valid_items += 1;
+                } else {
+                    n_broken_items += 1;
                 }
             }
 
@@ -127,6 +127,7 @@ impl LockedKeyring {
                     broken_items: n_broken_items,
                 });
             }
+
             Some(Arc::new(key))
         } else {
             None