[PM-16221] uniffi bindings for ssh agent and keygen

crates/bitwarden-ssh/Cargo.toml

@@ -20,6 +20,7 @@ wasm = [
     "dep:tsify-next",
     "dep:wasm-bindgen"
 ] # WASM support
+uniffi = ["dep:uniffi"] # Uniffi bindings
 
 [dependencies]
 bitwarden-error = { workspace = true }
@@ -36,6 +37,7 @@ ssh-key = { version = ">=0.6.7, <0.7", features = [
 ], default-features = false }
 thiserror = { workspace = true }
 tsify-next = { workspace = true, optional = true }
+uniffi = { workspace = true, optional = true }
 wasm-bindgen = { workspace = true, optional = true }
 
 [dev-dependencies]

crates/bitwarden-ssh/src/generator.rs

@@ -7,6 +7,7 @@ use crate::{error, error::KeyGenerationError, SshKey};
 
 #[derive(Serialize, Deserialize)]
 #[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
+#[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 pub enum KeyAlgorithm {
     Ed25519,
     Rsa3072,

crates/bitwarden-ssh/src/lib.rs

@@ -9,8 +9,12 @@
 #[cfg(feature = "wasm")]
 use tsify_next::Tsify;
 
+#[cfg(feature = "uniffi")]
+uniffi::setup_scaffolding!();
+
 #[derive(Serialize, Deserialize, Debug)]
 #[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]
+#[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
 pub struct SshKey {
     /// The private key in OpenSSH format
     pub private_key: String,

crates/bitwarden-ssh/uniffi.toml

@@ -0,0 +1,9 @@
+[bindings.kotlin]
+package_name = "com.bitwarden.ssh"
+generate_immutable_records = true
+android = true
+
+[bindings.swift]
+ffi_module_name = "BitwardenSshFFI"
+module_name = "BitwardenSsh"
+generate_immutable_records = true

crates/bitwarden-uniffi/Cargo.toml

@@ -24,6 +24,7 @@ bitwarden-exporters = { workspace = true, features = ["uniffi"] }
 bitwarden-fido = { workspace = true, features = ["uniffi"] }
 bitwarden-generators = { workspace = true, features = ["uniffi"] }
 bitwarden-send = { workspace = true, features = ["uniffi"] }
+bitwarden-ssh = { workspace = true, features = ["uniffi"] }
 bitwarden-vault = { workspace = true, features = ["uniffi"] }
 chrono = { workspace = true, features = ["std"] }
 env_logger = "0.11.1"

crates/bitwarden-uniffi/src/error.rs

@@ -76,4 +76,9 @@ pub enum Error {
     DecryptFido2AutofillCredentials(#[from] bitwarden_fido::DecryptFido2AutofillCredentialsError),
     #[error(transparent)]
     Fido2Client(#[from] bitwarden_fido::Fido2ClientError),
+
+    #[error(transparent)]
+    SshGeneration(#[from] bitwarden_ssh::error::KeyGenerationError),
+    #[error(transparent)]
+    SshImport(#[from] bitwarden_ssh::error::SshKeyImportError),
 }

crates/bitwarden-uniffi/src/lib.rs

@@ -19,7 +19,7 @@
 use crypto::CryptoClient;
 use error::Result;
 use platform::PlatformClient;
-use tool::{ExporterClient, GeneratorClients, SendClient};
+use tool::{ExporterClient, GeneratorClients, SendClient, SshClient};
 use vault::VaultClient;
 
 #[derive(uniffi::Object)]
@@ -67,6 +67,11 @@
         Arc::new(SendClient(self))
     }
 
+    /// SSH operations
+    pub fn ssh(self: Arc<Self>) -> Arc<SshClient> {
+        Arc::new(SshClient(self))
+    }
+
     /// Auth operations
     pub fn auth(self: Arc<Self>) -> Arc<AuthClient> {
         Arc::new(AuthClient(self))

crates/bitwarden-uniffi/src/tool/mod.rs

@@ -15,6 +15,9 @@ use crate::{
 mod sends;
 pub use sends::SendClient;
 
+mod ssh;
+pub use ssh::SshClient;
+
 #[derive(uniffi::Object)]
 pub struct GeneratorClients(pub(crate) Arc<Client>);
 

crates/bitwarden-uniffi/src/tool/ssh.rs

@@ -0,0 +1,29 @@
+use std::sync::Arc;
+
+use crate::{
+    error::{BitwardenError, Error},
+    Client, Result,
+};
+
+#[derive(uniffi::Object)]
+pub struct SshClient(pub Arc<Client>);
+
+#[uniffi::export]
+impl SshClient {
+    pub fn generate_ssh_key(
+        &self,
+        key_algorithm: bitwarden_ssh::generator::KeyAlgorithm,
+    ) -> Result<bitwarden_ssh::SshKey> {
+        bitwarden_ssh::generator::generate_sshkey(key_algorithm)
+            .map_err(|e| BitwardenError::E(Error::SshGeneration(e)))
+    }
+
+    pub fn import_ssh_key(
+        &self,
+        imported_key: String,
+        password: Option<String>,
+    ) -> Result<bitwarden_ssh::SshKey> {
+        bitwarden_ssh::import::import_key(imported_key, password)
+            .map_err(|e| BitwardenError::E(Error::SshImport(e)))
+    }
+}