Merge pull request #3355 from mulkieran/dont-panic-if-no-unlock

Dont panic if no unlock method available

Author: mulkieran

src/engine/strat_engine/backstore/crypt/handle.rs

@@ -205,8 +205,15 @@ impl CryptHandle {
             .and_then(|path| clevis_info_from_metadata(&mut device).map(|ci| (path, ci)))
             .and_then(|(_, clevis_info)| {
                 let encryption_info =
-                    EncryptionInfo::from_options((encryption_info.key_description().cloned(), clevis_info))
-                        .expect("Encrypted device must be provided encryption parameters");
+                    if let Some(info) = EncryptionInfo::from_options((encryption_info.key_description().cloned(), clevis_info)) {
+                        info
+                    } else {
+                        return Err(StratisError::Msg(format!(
+                            "No valid encryption method that can be used to unlock device {} found after initialization",
+                            physical_path.display()
+                        )));
+                    };
+
                 let device_path = DevicePath::new(physical_path)?;
                 let devno = get_devno_from_path(physical_path)?;
                 Ok(CryptHandle::new(

src/engine/strat_engine/backstore/crypt/shared.rs

@@ -402,8 +402,15 @@ pub fn load_crypt_metadata(
     };
     let clevis_info = clevis_info_from_metadata(device)?;
 
-    let encryption_info = EncryptionInfo::from_options((key_description, clevis_info))
-        .expect("Must have at least one unlock method");
+    let encryption_info =
+        if let Some(info) = EncryptionInfo::from_options((key_description, clevis_info)) {
+            info
+        } else {
+            return Err(StratisError::Msg(format!(
+                "No valid encryption method that can be used to unlock device {} found",
+                physical_path.display()
+            )));
+        };
 
     let path = vec![DEVICEMAPPER_PATH, &activation_name.to_string()]
         .into_iter()