fixup! feat: add rust client for the android interop application.

Author: typfel

interop/src/clients/corecrypto/android.rs

@@ -1,15 +1,16 @@
+#[cfg(feature = "proteus")]
+use std::cell::Cell;
 use std::{
-    cell::{Cell, RefCell},
-    io::{BufRead, BufReader, Read},
-    process::{Child, ChildStdout, Command, Output, Stdio},
+    cell::RefCell,
+    io::{BufRead as _, BufReader, Read as _},
+    process::{Child, ChildStdout, Command, Stdio},
     time::Duration,
 };
 
 use anyhow::Result;
 use base64::{Engine as _, engine::general_purpose};
 use core_crypto::{KeyPackageIn, Keypackage};
-use thiserror::Error;
-use tls_codec::Deserialize;
+use tls_codec::Deserialize as _;
 
 use crate::{
     CIPHERSUITE_IN_USE,
@@ -32,15 +33,15 @@ enum InteropResult {
     Failure { message: String },
 }
 
-#[derive(Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 #[error("simulator driver error: {msg}")]
 struct SimulatorDriverError {
     msg: String,
 }
 
 impl SimulatorDriver {
     fn new(device: String, application: String) -> Self {
-        let application = Self::launch_application(&device, &application, true).expect("Failed to launch application");
+        let application = Self::launch_application(&device, &application).expect("Failed to launch application");
 
         Self {
             device,
@@ -49,15 +50,7 @@ impl SimulatorDriver {
         }
     }
 
-    fn boot_device(device: &str) -> std::io::Result<Output> {
-        Command::new("xcrun").args(["simctl", "boot", device]).output()
-    }
-
-    fn launch_application(
-        device: &str,
-        application: &str,
-        boot_device: bool,
-    ) -> Result<(Child, BufReader<ChildStdout>)> {
+    fn launch_application(device: &str, application: &str) -> Result<(Child, BufReader<ChildStdout>)> {
         log::info!("launching application: {} on {}", application, device);
 
         let activity = format!("{}/.MainActivity", application);
@@ -89,6 +82,9 @@ impl SimulatorDriver {
         log::info!("retrieved {} pid", pid);
 
         // Start monitoring the system output of our application
+        //
+        // without formatting (raw)
+        // only include system out and silence all other logs (System.out:I *:S)
         let mut process = Command::new("adb")
             .args([
                 "-s",
@@ -117,12 +113,6 @@ impl SimulatorDriver {
         match process.try_wait() {
             Ok(None) => {}
             Ok(Some(exit_status)) => {
-                if boot_device && exit_status.code() == Some(149) {
-                    log::info!("device is shutdown, booting...");
-                    Self::boot_device(device)?;
-                    return Self::launch_application(device, application, false);
-                }
-
                 let mut error_message = String::new();
                 process
                     .stderr
@@ -216,11 +206,10 @@ impl CoreCryptoAndroidClient {
             .trim()
             .to_string();
         let driver = SimulatorDriver::new(device, "com.wire.androidinterop".into());
-        log::info!("initialising core crypto with ciphersuite {}", ciphersuite);
+        log::info!("initialising core crypto with ciphersuite {ciphersuite}");
         driver
             .execute(format!(
-                "--es action init-mls --es client_id {} --ei ciphersuite {}",
-                client_id_base64, ciphersuite
+                "--es action init-mls --es client_id {client_id_base64} --ei ciphersuite {ciphersuite}"
             ))
             .await?;
 
@@ -263,7 +252,7 @@ impl EmulatedMlsClient for CoreCryptoAndroidClient {
         let start = std::time::Instant::now();
         let kp_base64 = self
             .driver
-            .execute(format!("--es action get-key-package --ei ciphersuite {}", ciphersuite))
+            .execute(format!("--es action get-key-package --ei ciphersuite {ciphersuite}"))
             .await?;
         let kp_raw = general_purpose::STANDARD.decode(kp_base64)?;
         let kp: Keypackage = KeyPackageIn::tls_deserialize(&mut kp_raw.as_slice())?.into();
@@ -279,27 +268,12 @@ impl EmulatedMlsClient for CoreCryptoAndroidClient {
         Ok(kp_raw)
     }
 
-    async fn add_client(&self, conversation_id: &[u8], kp: &[u8]) -> Result<()> {
-        let cid_base64 = general_purpose::STANDARD.encode(conversation_id);
-        let kp_base64 = general_purpose::STANDARD.encode(kp);
-        let ciphersuite = CIPHERSUITE_IN_USE as u16;
-        self.driver
-            .execute(format!(
-                "--es action add-client --es cid {} --ei ciphersuite={} --es kp {}",
-                cid_base64, ciphersuite, kp_base64
-            ))
-            .await?;
-
-        Ok(())
-    }
-
     async fn kick_client(&self, conversation_id: &[u8], client_id: &[u8]) -> Result<()> {
         let cid_base64 = general_purpose::STANDARD.encode(conversation_id);
         let client_id_base64 = general_purpose::STANDARD.encode(client_id);
         self.driver
             .execute(format!(
-                "--es action remove-client --es cid {} --es client {}",
-                cid_base64, client_id_base64
+                "--es action remove-client --es cid {cid_base64} --es client {client_id_base64}"
             ))
             .await?;
 
@@ -310,7 +284,7 @@ impl EmulatedMlsClient for CoreCryptoAndroidClient {
         let welcome_base64 = general_purpose::STANDARD.encode(welcome);
         let conversation_id_base64 = self
             .driver
-            .execute(format!("--es action process-welcome --es welcome {}", welcome_base64))
+            .execute(format!("--es action process-welcome --es welcome {welcome_base64}"))
             .await?;
         let conversation_id = general_purpose::STANDARD.decode(conversation_id_base64)?;
 
@@ -323,8 +297,7 @@ impl EmulatedMlsClient for CoreCryptoAndroidClient {
         let encrypted_message_base64 = self
             .driver
             .execute(format!(
-                "--es action encrypt-message --es cid {} --es message {}",
-                cid_base64, message_base64
+                "--es action encrypt-message --es cid {cid_base64} --es message {message_base64}"
             ))
             .await?;
         let encrypted_message = general_purpose::STANDARD.decode(encrypted_message_base64)?;
@@ -338,8 +311,7 @@ impl EmulatedMlsClient for CoreCryptoAndroidClient {
         let result = self
             .driver
             .execute(format!(
-                "--es action decrypt-message --es cid {} --es message {}",
-                cid_base64, message_base64
+                "--es action decrypt-message --es cid {cid_base64} --es message {message_base64}"
             ))
             .await?;
 
@@ -366,7 +338,7 @@ impl crate::clients::EmulatedProteusClient for CoreCryptoAndroidClient {
 
         let prekey_base64 = self
             .driver
-            .execute(format!("--es action get-prekey --es id {}", prekey_last_id))
+            .execute(format!("--es action get-prekey --es id {prekey_last_id}"))
             .await?;
         let prekey = general_purpose::STANDARD.decode(prekey_base64)?;
 
@@ -377,8 +349,7 @@ impl crate::clients::EmulatedProteusClient for CoreCryptoAndroidClient {
         let prekey_base64 = general_purpose::STANDARD.encode(prekey);
         self.driver
             .execute(format!(
-                "--es action session-from-prekey --es session_id {} --es prekey {}",
-                session_id, prekey_base64
+                "--es action session-from-prekey --es session_id {session_id} --es prekey {prekey_base64}"
             ))
             .await?;
 
@@ -390,8 +361,7 @@ impl crate::clients::EmulatedProteusClient for CoreCryptoAndroidClient {
         let decrypted_message_base64 = self
             .driver
             .execute(format!(
-                "--es action session-from-message --es session_id {} --es message {}",
-                session_id, message_base64
+                "--es action session-from-message --es session_id {session_id} --es message {message_base64}"
             ))
             .await?;
         let decrypted_message = general_purpose::STANDARD.decode(decrypted_message_base64)?;
@@ -403,8 +373,7 @@ impl crate::clients::EmulatedProteusClient for CoreCryptoAndroidClient {
         let encrypted_message_base64 = self
             .driver
             .execute(format!(
-                "--es action encrypt-proteus --es session_id {} --es message {}",
-                session_id, plaintext_base64
+                "--es action encrypt-proteus --es session_id {session_id} --es message {plaintext_base64}"
             ))
             .await?;
         let encrypted_message = general_purpose::STANDARD.decode(encrypted_message_base64)?;
@@ -417,8 +386,7 @@ impl crate::clients::EmulatedProteusClient for CoreCryptoAndroidClient {
         let decrypted_message_base64 = self
             .driver
             .execute(format!(
-                "--es action decrypt-proteus --es session_id {} --es message {}",
-                session_id, ciphertext_base64
+                "--es action decrypt-proteus --es session_id {session_id} --es message {ciphertext_base64}"
             ))
             .await?;
         let decrypted_message = general_purpose::STANDARD.decode(decrypted_message_base64)?;

interop/src/clients/corecrypto/ios.rs

@@ -230,21 +230,7 @@ impl EmulatedMlsClient for CoreCryptoIosClient {
 
         Ok(kp_raw)
     }
-
-    async fn add_client(&self, conversation_id: &[u8], kp: &[u8]) -> Result<()> {
-        let cid_base64 = general_purpose::STANDARD.encode(conversation_id);
-        let kp_base64 = general_purpose::STANDARD.encode(kp);
-        let ciphersuite = CIPHERSUITE_IN_USE as u16;
-        self.driver
-            .execute(format!(
-                "add-client?cid={}&ciphersuite={}&kp={}",
-                cid_base64, ciphersuite, kp_base64
-            ))
-            .await?;
-
-        Ok(())
-    }
-
+    
     async fn kick_client(&self, conversation_id: &[u8], client_id: &[u8]) -> Result<()> {
         let cid_base64 = general_purpose::STANDARD.encode(conversation_id);
         let client_id_base64 = general_purpose::STANDARD.encode(client_id);