From fd5a55ccbdba97273d92d89a7ced876e029c5c69 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Tue, 19 Dec 2023 19:17:52 +1100 Subject: [PATCH] sigchat obtain uuid from Signal Provisioning server --- apps/sigchat/src/manager.rs | 27 ++++++++++++++++++++------- apps/sigchat/src/manager/signal_ws.rs | 9 +++++++-- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/apps/sigchat/src/manager.rs b/apps/sigchat/src/manager.rs index 3fea464b8..179932844 100644 --- a/apps/sigchat/src/manager.rs +++ b/apps/sigchat/src/manager.rs @@ -8,7 +8,9 @@ use group_permission::GroupPermission; use link_state::LinkState; use std::io::Error; use signal_ws::SignalWS; +use std::io::{Error, ErrorKind}; pub use trust_mode::TrustMode; +use tungstenite::Message; // Structure modeled on signal-cli by AsamK and contributors - https://github.com/AsamK/signal-cli. // signal-cli is a commandline interface for libsignal-service-java. It supports registering, verifying, sending and receiving messages. @@ -135,16 +137,27 @@ impl Manager { // insert default values as required let name = name.unwrap_or(DEFAULT_DEVICE_NAME); let host = host.unwrap_or(DEFAULT_HOST_NAME); + let link_err = Error::new(ErrorKind::Other, "failed to link device",); match SignalWS::new_provision(&host) { - Ok(ws) => { - if let Some(prior_ws) = &mut self.websocket { - prior_ws.close(); + Ok(mut ws) => { + log::info!("provisioning websocket established to {host}"); + match ws.read() { + Ok(Message::Binary(uuid)) => { + log::info!("raw uuid ProtoBuffer: {:?}", uuid); + ws.close(); + Ok(false) + } + Ok(_) => { + log::warn!("unexpected Provisioning msg."); + Err(link_err) + } + Err(e) => { + log::warn!("{e}"); + Err(link_err) + } } - self.websocket = Some(ws); + } - log::info!("websocket established to link {name} at {host}"); - log::warn!("Manager.link() not fully implemented."); - } Err(e) => { log::info!("failed to connect to server: {}", e); Err(e) diff --git a/apps/sigchat/src/manager/signal_ws.rs b/apps/sigchat/src/manager/signal_ws.rs index 625ce1b0c..3e1f06098 100644 --- a/apps/sigchat/src/manager/signal_ws.rs +++ b/apps/sigchat/src/manager/signal_ws.rs @@ -45,8 +45,13 @@ impl SignalWS { .unwrap_or_else(|e| log::warn!("failed to flush websocket: {e}")); } - - + pub fn read(&mut self) -> Result { + match self.ws.read() { + Ok(msg) => Ok(msg), + Err(e) => { + log::warn!("{e}"); + Err(Error::new(ErrorKind::Other, "error on reading ws")) + } } }