Move encryption methods to the private API

Author: imobachgs

rust/agama-manager/src/message.rs

@@ -167,3 +167,10 @@ impl SolveStorageModel {
 impl Message for SolveStorageModel {
     type Reply = Option<Value>;
 }
+
+/// Gets the available encryption methods.
+pub struct GetEncryptionMethods;
+
+impl Message for GetEncryptionMethods {
+    type Reply = Vec<String>;
+}

rust/agama-manager/src/service.rs

@@ -866,6 +866,20 @@ impl MessageHandler<message::SolveStorageModel> for Service {
     }
 }
 
+#[async_trait]
+impl MessageHandler<message::GetEncryptionMethods> for Service {
+    /// Gets the available encryption methods.
+    async fn handle(
+        &mut self,
+        _message: message::GetEncryptionMethods,
+    ) -> Result<Vec<String>, Error> {
+        Ok(self
+            .storage
+            .call(storage::message::GetEncryptionMethods)
+            .await?)
+    }
+}
+
 // FIXME: write a macro to forward a message.
 #[async_trait]
 impl MessageHandler<software::message::SetResolvables> for Service {

rust/agama-server/src/server/web.rs

@@ -141,6 +141,7 @@ pub fn server_with_state(state: ServerState) -> Result<Router, ServiceError> {
         .route("/private/resolvables/:id", put(set_resolvables))
         .route("/private/download_logs", get(download_logs))
         .route("/private/password_check", post(check_password))
+        .route("/private/encryption_methods", get(get_encryption_methods))
         .with_state(state))
 }
 
@@ -586,3 +587,20 @@ async fn check_password(
         .await?;
     Ok(Json(result))
 }
+
+/// Returns the available encryption methods for the current system and product.
+#[utoipa::path(
+    get,
+    path = "/private/encryption_methods",
+    context_path = "/api/v2",
+    responses(
+        (status = 200, description = "Available encryption methods", body = Vec<String>),
+        (status = 400, description = "Could not retrieve encryption methods")
+    )
+)]
+async fn get_encryption_methods(
+    State(state): State<ServerState>,
+) -> Result<Json<Vec<String>>, Error> {
+    let methods = state.manager.call(message::GetEncryptionMethods).await?;
+    Ok(Json(methods))
+}

rust/agama-storage-client/src/message.rs

@@ -90,6 +90,12 @@ impl Message for GetIssues {
     type Reply = Vec<Issue>;
 }
 
+pub struct GetEncryptionMethods;
+
+impl Message for GetEncryptionMethods {
+    type Reply = Vec<String>;
+}
+
 pub struct GetConfigFromModel {
     pub model: serde_json::Value,
 }

rust/agama-storage-client/src/proxies/storage1.rs

@@ -32,6 +32,9 @@ pub trait Storage1 {
     /// Finish method
     fn finish(&self) -> zbus::Result<()>;
 
+    /// GetEncryptionMethods method
+    fn get_encryption_methods(&self) -> zbus::Result<String>;
+
     /// GetConfigFromModel method
     fn get_config_from_model(&self, model: &str) -> zbus::Result<String>;
 

rust/agama-storage-client/src/service.rs

@@ -168,6 +168,17 @@ impl MessageHandler<message::GetIssues> for Service {
     }
 }
 
+#[async_trait]
+impl MessageHandler<message::GetEncryptionMethods> for Service {
+    async fn handle(
+        &mut self,
+        _message: message::GetEncryptionMethods,
+    ) -> Result<Vec<String>, Error> {
+        let raw_json = self.storage_proxy.get_encryption_methods().await?;
+        Ok(try_from_string(&raw_json)?)
+    }
+}
+
 #[async_trait]
 impl MessageHandler<message::GetConfigFromModel> for Service {
     async fn handle(

rust/agama-storage/src/client.rs

@@ -68,6 +68,7 @@ pub trait StorageClient {
     ) -> Result<BoxFuture<Result<(), Error>>, Error>;
     async fn solve_config_model(&self, model: Value) -> Result<Option<Value>, Error>;
     async fn set_locale(&self, locale: String) -> Result<(), Error>;
+    async fn get_encryption_methods(&self) -> Result<Vec<String>, Error>;
 }
 
 /// D-Bus client for the storage service
@@ -164,4 +165,12 @@ impl StorageClient for Client {
             .await?;
         Ok(())
     }
+
+    async fn get_encryption_methods(&self) -> Result<Vec<String>, Error> {
+        let value = self
+            .storage_client
+            .call(message::GetEncryptionMethods)
+            .await?;
+        Ok(value)
+    }
 }

rust/agama-storage/src/message.rs

@@ -169,3 +169,10 @@ impl SetLocale {
 impl Message for SetLocale {
     type Reply = ();
 }
+
+#[derive(Clone)]
+pub struct GetEncryptionMethods;
+
+impl Message for GetEncryptionMethods {
+    type Reply = Vec<String>;
+}

rust/agama-storage/src/service.rs

@@ -238,3 +238,13 @@ impl MessageHandler<message::SetLocale> for Service {
         Ok(())
     }
 }
+
+#[async_trait]
+impl MessageHandler<message::GetEncryptionMethods> for Service {
+    async fn handle(
+        &mut self,
+        _message: message::GetEncryptionMethods,
+    ) -> Result<Vec<String>, Error> {
+        Ok(self.client.get_encryption_methods().await?)
+    }
+}

rust/agama-storage/src/test_utils.rs

@@ -165,6 +165,10 @@ impl StorageClient for TestClient {
     async fn set_locale(&self, _locale: String) -> Result<(), Error> {
         Ok(())
     }
+
+    async fn get_encryption_methods(&self) -> Result<Vec<String>, Error> {
+        Ok(vec!["luks2".to_string()])
+    }
 }
 
 /// Starts a testing storage service.