Fix return values that crash D-Bus socket

It appears that returning PoolUuid::default() will crash the D-Bus
socket and stratisd will fail to receive any future D-Bus messages.
Returning a String fixes the problem.

Author: jbaublitz

src/dbus/manager/manager_3_2/methods.rs

@@ -131,8 +131,8 @@ pub async fn stop_pool_method(
     connection: &Arc<Connection>,
     manager: &Lockable<Arc<RwLock<Manager>>>,
     pool: ObjectPath<'_>,
-) -> ((bool, PoolUuid), u16, String) {
-    let default_return = (false, PoolUuid::default());
+) -> ((bool, String), u16, String) {
+    let default_return = (false, String::new());
 
     let pool_uuid = match manager.read().await.pool_get_uuid(&pool) {
         Some(u) => u,
@@ -173,7 +173,7 @@ pub async fn stop_pool_method(
             OK_STRING.to_string(),
         ),
         Ok(StopAction::Stopped(_)) => (
-            (true, pool_uuid),
+            (true, pool_uuid.simple().to_string()),
             DbusErrorEnum::OK as u16,
             OK_STRING.to_string(),
         ),

src/dbus/manager/manager_3_2/mod.rs

@@ -153,7 +153,7 @@ impl ManagerR2 {
         .await
     }
 
-    async fn stop_pool(&self, pool: ObjectPath<'_>) -> ((bool, PoolUuid), u16, String) {
+    async fn stop_pool(&self, pool: ObjectPath<'_>) -> ((bool, String), u16, String) {
         stop_pool_method(&self.engine, &self.connection, &self.manager, pool).await
     }
 

src/dbus/manager/manager_3_3/mod.rs

@@ -152,7 +152,7 @@ impl ManagerR3 {
         .await
     }
 
-    async fn stop_pool(&self, pool: ObjectPath<'_>) -> ((bool, PoolUuid), u16, String) {
+    async fn stop_pool(&self, pool: ObjectPath<'_>) -> ((bool, String), u16, String) {
         stop_pool_method(&self.engine, &self.connection, &self.manager, pool).await
     }
 

src/dbus/manager/manager_3_4/mod.rs

@@ -27,7 +27,7 @@ use crate::{
         },
         types,
     },
-    engine::{Engine, KeyDescription, Lockable, PoolUuid, StoppedPoolsInfo, UnlockMethod},
+    engine::{Engine, KeyDescription, Lockable, StoppedPoolsInfo, UnlockMethod},
 };
 
 mod methods;
@@ -156,7 +156,7 @@ impl ManagerR4 {
         .await
     }
 
-    async fn stop_pool(&self, pool: ObjectPath<'_>) -> ((bool, PoolUuid), u16, String) {
+    async fn stop_pool(&self, pool: ObjectPath<'_>) -> ((bool, String), u16, String) {
         stop_pool_method(&self.engine, &self.connection, &self.manager, pool).await
     }
 

src/dbus/manager/manager_3_5/mod.rs

@@ -28,7 +28,7 @@ use crate::{
         },
         types,
     },
-    engine::{Engine, KeyDescription, Lockable, PoolUuid, StoppedPoolsInfo, UnlockMethod},
+    engine::{Engine, KeyDescription, Lockable, StoppedPoolsInfo, UnlockMethod},
 };
 
 pub struct ManagerR5 {
@@ -152,7 +152,7 @@ impl ManagerR5 {
         .await
     }
 
-    async fn stop_pool(&self, pool: ObjectPath<'_>) -> ((bool, PoolUuid), u16, String) {
+    async fn stop_pool(&self, pool: ObjectPath<'_>) -> ((bool, String), u16, String) {
         stop_pool_method(&self.engine, &self.connection, &self.manager, pool).await
     }
 

src/dbus/manager/manager_3_6/methods.rs

@@ -24,8 +24,8 @@ pub async fn stop_pool_method(
     manager: &Lockable<Arc<RwLock<Manager>>>,
     id: &str,
     id_type: &str,
-) -> ((bool, PoolUuid), u16, String) {
-    let default_return = (false, PoolUuid::default());
+) -> ((bool, String), u16, String) {
+    let default_return = (false, String::new());
 
     let id = match id_type {
         "uuid" => match PoolUuid::parse_str(id) {
@@ -81,7 +81,7 @@ pub async fn stop_pool_method(
             OK_STRING.to_string(),
         ),
         Ok(StopAction::Stopped(pool_uuid)) => (
-            (true, pool_uuid),
+            (true, pool_uuid.simple().to_string()),
             DbusErrorEnum::OK as u16,
             OK_STRING.to_string(),
         ),

src/dbus/manager/manager_3_6/mod.rs

@@ -28,7 +28,7 @@ use crate::{
         },
         types,
     },
-    engine::{Engine, KeyDescription, Lockable, PoolUuid, StoppedPoolsInfo, UnlockMethod},
+    engine::{Engine, KeyDescription, Lockable, StoppedPoolsInfo, UnlockMethod},
 };
 
 mod methods;
@@ -156,7 +156,7 @@ impl ManagerR6 {
         .await
     }
 
-    async fn stop_pool(&self, id: &str, id_type: &str) -> ((bool, PoolUuid), u16, String) {
+    async fn stop_pool(&self, id: &str, id_type: &str) -> ((bool, String), u16, String) {
         stop_pool_method(&self.engine, &self.connection, &self.manager, id, id_type).await
     }
 

src/dbus/manager/manager_3_7/mod.rs

@@ -29,7 +29,7 @@ use crate::{
         },
         types,
     },
-    engine::{Engine, KeyDescription, Lockable, PoolUuid, StoppedPoolsInfo, UnlockMethod},
+    engine::{Engine, KeyDescription, Lockable, StoppedPoolsInfo, UnlockMethod},
 };
 
 pub struct ManagerR7 {
@@ -153,7 +153,7 @@ impl ManagerR7 {
         .await
     }
 
-    async fn stop_pool(&self, id: &str, id_type: &str) -> ((bool, PoolUuid), u16, String) {
+    async fn stop_pool(&self, id: &str, id_type: &str) -> ((bool, String), u16, String) {
         stop_pool_method(&self.engine, &self.connection, &self.manager, id, id_type).await
     }
 

src/dbus/manager/manager_3_8/mod.rs

@@ -28,7 +28,7 @@ use crate::{
         },
         types,
     },
-    engine::{Engine, KeyDescription, Lockable, PoolUuid, StoppedPoolsInfo},
+    engine::{Engine, KeyDescription, Lockable, StoppedPoolsInfo},
 };
 
 mod methods;
@@ -166,7 +166,7 @@ impl ManagerR8 {
         .await
     }
 
-    async fn stop_pool(&self, id: &str, id_type: &str) -> ((bool, PoolUuid), u16, String) {
+    async fn stop_pool(&self, id: &str, id_type: &str) -> ((bool, String), u16, String) {
         stop_pool_method(&self.engine, &self.connection, &self.manager, id, id_type).await
     }
 

src/dbus/manager/manager_3_9/mod.rs

@@ -29,7 +29,7 @@ use crate::{
         },
         types,
     },
-    engine::{Engine, KeyDescription, Lockable, PoolUuid, StoppedPoolsInfo},
+    engine::{Engine, KeyDescription, Lockable, StoppedPoolsInfo},
 };
 
 mod methods;
@@ -167,7 +167,7 @@ impl ManagerR9 {
         .await
     }
 
-    async fn stop_pool(&self, id: &str, id_type: &str) -> ((bool, PoolUuid), u16, String) {
+    async fn stop_pool(&self, id: &str, id_type: &str) -> ((bool, String), u16, String) {
         stop_pool_method(&self.engine, &self.connection, &self.manager, id, id_type).await
     }