Remove expect

Author: Hinton

crates/bitwarden-exporters/src/cxf/import.rs

@@ -124,20 +124,25 @@ fn parse_item(value: Item) -> Vec<ImportingCipher> {
 
     // SSH Key credentials
     if let Some(ssh) = grouped.ssh.first() {
-        let (ssh_key, fields) = to_ssh(ssh);
-
-        output.push(ImportingCipher {
-            folder_id: None, // TODO: Handle folders
-            name: value.title.clone(),
-            notes: None,
-            r#type: CipherType::SshKey(Box::new(ssh_key)),
-            favorite: false,
-            reprompt: 0,
-            fields: [fields, scope.map(to_fields).unwrap_or_default()].concat(),
-            revision_date,
-            creation_date,
-            deleted_date: None,
-        })
+        match to_ssh(ssh) {
+            Ok((ssh_key, fields)) => {
+                output.push(ImportingCipher {
+                    folder_id: None, // TODO: Handle folders
+                    name: value.title.clone(),
+                    notes: None,
+                    r#type: CipherType::SshKey(Box::new(ssh_key)),
+                    favorite: false,
+                    reprompt: 0,
+                    fields: [fields, scope.map(to_fields).unwrap_or_default()].concat(),
+                    revision_date,
+                    creation_date,
+                    deleted_date: None,
+                })
+            }
+            Err(_) => {
+                // Include information about the failed items, or import as note?
+            }
+        }
     }
 
     output

crates/bitwarden-exporters/src/cxf/ssh.rs

@@ -1,13 +1,16 @@
-use bitwarden_ssh::import::import_der_key;
+use bitwarden_ssh::{error::SshKeyImportError, import::import_der_key};
 use bitwarden_vault::FieldType;
 use credential_exchange_format::SshKeyCredential;
 
 use crate::{cxf::editable_field::create_field, Field, SshKey};
 
-pub(super) fn to_ssh(credential: &SshKeyCredential) -> (SshKey, Vec<Field>) {
+/// Convert SSH key credentials to SshKey and custom fields
+pub(super) fn to_ssh(
+    credential: &SshKeyCredential,
+) -> Result<(SshKey, Vec<Field>), SshKeyImportError> {
     // Convert to OpenSSH format
     let encoded_key: Vec<u8> = credential.private_key.as_ref().into();
-    let encoded_key = import_der_key(&encoded_key).expect("valid SSH key format");
+    let encoded_key = import_der_key(&encoded_key)?;
 
     let ssh = SshKey {
         private_key: encoded_key.private_key,
@@ -39,7 +42,7 @@ pub(super) fn to_ssh(credential: &SshKeyCredential) -> (SshKey, Vec<Field>) {
     .flatten()
     .collect();
 
-    (ssh, fields)
+    Ok((ssh, fields))
 }
 
 #[cfg(test)]
@@ -67,7 +70,7 @@ mod tests {
             key_generation_source: Some("Generated using OpenSSH".to_owned().into()),
         };
 
-        let (ssh, fields) = to_ssh(&credential);
+        let (ssh, fields) = to_ssh(&credential).unwrap();
 
         assert_eq!(ssh.private_key, "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW\nQyNTUxOQAAACDQiCIk4t4YPC6bOSb7CLzac/vC+ZudqhYqY00cxqr8zAAAAIilFVdupRVX\nbgAAAAtzc2gtZWQyNTUxOQAAACDQiCIk4t4YPC6bOSb7CLzac/vC+ZudqhYqY00cxqr8zA\nAAAEA/lPVWpGrjuBbL+G/856Qx3HWIO+FOvLImY51iz5+0NdCIIiTi3hg8Lps5JvsIvNpz\n+8L5m52qFipjTRzGqvzMAAAAAAECAwQF\n-----END OPENSSH PRIVATE KEY-----\n");
         assert_eq!(