From d6339933d54974952721659c3de2b2871a086c1a Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sat, 8 Apr 2023 02:55:02 +0200 Subject: Implement basic websocket support --- src/bin/rbw-agent/agent.rs | 11 +++ src/bin/rbw-agent/main.rs | 1 + src/bin/rbw-agent/notifications.rs | 166 +++++++++++++++++++++++++++++++++++++ 3 files changed, 178 insertions(+) create mode 100644 src/bin/rbw-agent/notifications.rs (limited to 'src') diff --git a/src/bin/rbw-agent/agent.rs b/src/bin/rbw-agent/agent.rs index 7dcab16..9523c78 100644 --- a/src/bin/rbw-agent/agent.rs +++ b/src/bin/rbw-agent/agent.rs @@ -73,6 +73,17 @@ impl Agent { self, listener: tokio::net::UnixListener, ) -> anyhow::Result<()> { + tokio::spawn(async move { + let config = rbw::config::Config::load_async().await.expect("Error loading config"); + let mut websocket_url = config.base_url.clone().expect("Config is missing base url").replace("https://", "wss://") + "/notifications/hub?access_token="; + if let Some(email) = &config.email { + let db = rbw::db::Db::load_async(&config.server_name().as_str(), email).await.expect("Error loading db"); + let access_token = db.access_token.expect("Error getting access token"); + websocket_url = websocket_url + &access_token; + crate::notifications::subscribe_to_notifications(websocket_url).await; + } + }); + enum Event { Request(std::io::Result), Timeout(()), diff --git a/src/bin/rbw-agent/main.rs b/src/bin/rbw-agent/main.rs index 81eee3a..5e0fa61 100644 --- a/src/bin/rbw-agent/main.rs +++ b/src/bin/rbw-agent/main.rs @@ -21,6 +21,7 @@ mod daemon; mod debugger; mod sock; mod timeout; +mod notifications; async fn tokio_main( startup_ack: Option, diff --git a/src/bin/rbw-agent/notifications.rs b/src/bin/rbw-agent/notifications.rs new file mode 100644 index 0000000..ffdefe9 --- /dev/null +++ b/src/bin/rbw-agent/notifications.rs @@ -0,0 +1,166 @@ +use tokio_tungstenite::{connect_async, tungstenite::protocol::Message}; +use futures_util::{StreamExt, SinkExt}; + +struct SyncCipherUpdate { + id: String +} + +struct SyncCipherCreate { + id: String +} + +enum NotificationMessage { + SyncCipherUpdate(SyncCipherUpdate), + SyncCipherCreate(SyncCipherCreate), + SyncLoginDelete, + SyncFolderDelete, + SyncCiphers, + + SyncVault, + SyncOrgKeys, + SyncFolderCreate, + SyncFolderUpdate, + SyncCipherDelete, + SyncSettings, + + Logout, + + SyncSendCreate, + SyncSendUpdate, + SyncSendDelete, + + AuthRequest, + AuthRequestResponse, + + None, +} + +fn parse_messagepack(data: &[u8]) -> Option { + if data.len() < 2 { + return None; + } + + // the first few bytes with th 0x80 bit set, plus one byte terminating the length contain the length of the message + let len_buffer_length = data.iter().position(|&x| (x & 0x80) == 0 )? + 1; + + println!("len_buffer_length: {:?}", len_buffer_length); + println!("data: {:?}", data); + let unpacked_messagepack = rmpv::decode::read_value(&mut &data[len_buffer_length..]).ok().unwrap(); + println!("unpacked_messagepack: {:?}", unpacked_messagepack); + if !unpacked_messagepack.is_array() { + return None; + } + let unpacked_message = unpacked_messagepack.as_array().unwrap(); + println!("unpacked_message: {:?}", unpacked_message); + let message_type = unpacked_message.iter().next()?.as_u64()?; + let message = unpacked_message.iter().skip(4).next()?.as_array()?.first()?.as_map()?; + let payload = message.iter().filter(|x| x.0.as_str().unwrap() == "Payload").next()?.1.as_map()?; + println!("message_type: {:?}", message_type); + println!("payload: {:?}", payload); + + let message = match message_type { + 0 => { + let id = payload.iter().filter(|x| x.0.as_str().unwrap() == "Id").next()?.1.as_str()?; + + Some(NotificationMessage::SyncCipherUpdate( + SyncCipherUpdate { + id: id.to_string() + } + )) + }, + 1 => { + let id = payload.iter().filter(|x| x.0.as_str().unwrap() == "Id").next()?.1.as_str()?; + + Some(NotificationMessage::SyncCipherCreate( + SyncCipherCreate { + id: id.to_string() + } + )) + }, + 2 => Some(NotificationMessage::SyncLoginDelete), + 3 => Some(NotificationMessage::SyncFolderDelete), + 4 => Some(NotificationMessage::SyncCiphers), + 5 => Some(NotificationMessage::SyncVault), + 6 => Some(NotificationMessage::SyncOrgKeys), + 7 => Some(NotificationMessage::SyncFolderCreate), + 8 => Some(NotificationMessage::SyncFolderUpdate), + 9 => Some(NotificationMessage::SyncCipherDelete), + 10 => Some(NotificationMessage::SyncSettings), + 11 => Some(NotificationMessage::Logout), + 12 => Some(NotificationMessage::SyncSendCreate), + 13 => Some(NotificationMessage::SyncSendUpdate), + 14 => Some(NotificationMessage::SyncSendDelete), + 15 => Some(NotificationMessage::AuthRequest), + 16 => Some(NotificationMessage::AuthRequestResponse), + 100 => Some(NotificationMessage::None), + _ => None + }; + + return message; +} + +pub async fn subscribe_to_notifications(url: String) { + let url = url::Url::parse(url.as_str()).unwrap(); + + let (ws_stream, _response) = connect_async(url).await.expect("Failed to connect"); + + let (mut write, read) = ws_stream.split(); + + write.send(Message::Text("{\"protocol\":\"messagepack\",\"version\":1}\n".to_string())).await.unwrap(); + + let read_future = read.for_each(|message| async { + match message { + Ok(Message::Binary(binary)) => { + let msg = parse_messagepack(&binary); + match msg { + Some(NotificationMessage::SyncCipherUpdate(update)) => { + println!("Websocket sent SyncCipherUpdate for id: {:?}", update.id); + crate::actions::sync(None).await.unwrap(); + println!("Synced") + }, + Some(NotificationMessage::SyncCipherCreate(update)) => { + println!("Websocket sent SyncCipherUpdate for id: {:?}", update.id); + crate::actions::sync(None).await.unwrap(); + println!("Synced") + }, + Some(NotificationMessage::SyncLoginDelete) => { + crate::actions::sync(None).await.unwrap(); + }, + Some(NotificationMessage::SyncFolderDelete) => { + crate::actions::sync(None).await.unwrap(); + }, + Some(NotificationMessage::SyncCiphers) => { + crate::actions::sync(None).await.unwrap(); + }, + Some(NotificationMessage::SyncVault) => { + crate::actions::sync(None).await.unwrap(); + }, + Some(NotificationMessage::SyncOrgKeys) => { + crate::actions::sync(None).await.unwrap(); + }, + Some(NotificationMessage::SyncFolderCreate) => { + crate::actions::sync(None).await.unwrap(); + }, + Some(NotificationMessage::SyncFolderUpdate) => { + crate::actions::sync(None).await.unwrap(); + }, + Some(NotificationMessage::SyncCipherDelete) => { + crate::actions::sync(None).await.unwrap(); + }, + Some(NotificationMessage::Logout) => { + println!("Websocket sent Logout"); + // todo: proper logout? + std::process::exit(0); + }, + _ => {} + } + }, + Err(e) => { + println!("websocket error: {:?}", e); + }, + _ => {} + } + }); + + read_future.await; +} -- cgit v1.2.3-54-g00ecf From 355e17dc29244856454db3bdaeed082cf33231e6 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Sun, 16 Apr 2023 13:41:52 +0200 Subject: Restructure code --- src/bin/rbw-agent/actions.rs | 19 +++- src/bin/rbw-agent/agent.rs | 36 +++++-- src/bin/rbw-agent/notifications.rs | 210 ++++++++++++++++--------------------- 3 files changed, 136 insertions(+), 129 deletions(-) (limited to 'src') diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index 7b5dc58..006f7ca 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -130,7 +130,7 @@ pub async fn login( protected_key, )) => { login_success( - state, + state.clone(), access_token, refresh_token, kdf, @@ -169,7 +169,7 @@ pub async fn login( ) .await?; login_success( - state, + state.clone(), access_token, refresh_token, kdf, @@ -205,6 +205,8 @@ pub async fn login( } } + subscribe_to_notifications(state.clone()).await.expect("could not subscribe"); + respond_ack(sock).await?; Ok(()) @@ -655,3 +657,16 @@ async fn config_pinentry() -> anyhow::Result { let config = rbw::config::Config::load_async().await?; Ok(config.pinentry) } + +pub async fn subscribe_to_notifications(state: std::sync::Arc>) -> anyhow::Result<()> { + let config = rbw::config::Config::load_async().await.expect("Config is missing"); + let mut websocket_url = config.base_url.clone().expect("Config is missing base url").replace("https://", "wss://") + "/notifications/hub?access_token="; + let email = config.email.clone().expect("Config is missing email"); + let db = rbw::db::Db::load_async(&config.server_name().as_str(), &email).await.expect("Error loading db"); + let access_token = db.access_token.expect("Error getting access token"); + websocket_url = websocket_url + &access_token; + let mut state = state.write().await; + state.notifications_handler.connect(websocket_url).await.expect("Error connecting to websocket"); + + Ok(()) +} \ No newline at end of file diff --git a/src/bin/rbw-agent/agent.rs b/src/bin/rbw-agent/agent.rs index 9523c78..c025880 100644 --- a/src/bin/rbw-agent/agent.rs +++ b/src/bin/rbw-agent/agent.rs @@ -1,6 +1,8 @@ use anyhow::Context as _; use futures_util::StreamExt as _; +use crate::notifications; + pub struct State { pub priv_key: Option, pub org_keys: @@ -9,6 +11,7 @@ pub struct State { pub timeout_duration: std::time::Duration, pub sync_timeout: crate::timeout::Timeout, pub sync_timeout_duration: std::time::Duration, + pub notifications_handler: crate::notifications::NotificationsHandler, } impl State { @@ -55,6 +58,7 @@ impl Agent { if sync_timeout_duration > std::time::Duration::ZERO { sync_timeout.set(sync_timeout_duration); } + let notifications_handler = crate::notifications::NotificationsHandler::new(); Ok(Self { timer_r, sync_timer_r, @@ -65,6 +69,7 @@ impl Agent { timeout_duration, sync_timeout, sync_timeout_duration, + notifications_handler, })), }) } @@ -73,22 +78,32 @@ impl Agent { self, listener: tokio::net::UnixListener, ) -> anyhow::Result<()> { - tokio::spawn(async move { - let config = rbw::config::Config::load_async().await.expect("Error loading config"); - let mut websocket_url = config.base_url.clone().expect("Config is missing base url").replace("https://", "wss://") + "/notifications/hub?access_token="; - if let Some(email) = &config.email { - let db = rbw::db::Db::load_async(&config.server_name().as_str(), email).await.expect("Error loading db"); - let access_token = db.access_token.expect("Error getting access token"); - websocket_url = websocket_url + &access_token; - crate::notifications::subscribe_to_notifications(websocket_url).await; - } - }); + crate::actions::subscribe_to_notifications(self.state.clone()).await.expect("could not subscribe"); enum Event { Request(std::io::Result), Timeout(()), Sync(()), } + + let c: tokio::sync::mpsc::UnboundedReceiver = { + self.state.write().await.notifications_handler.get_channel().await + }; + let notifications = tokio_stream::wrappers::UnboundedReceiverStream::new( + c, + ) + .map(|message| { + match message { + notifications::NotificationMessage::Logout => { + Event::Timeout(()) + } + _ => { + Event::Sync(()) + } + } + }) + .boxed(); + let mut stream = futures_util::stream::select_all([ tokio_stream::wrappers::UnixListenerStream::new(listener) .map(Event::Request) @@ -103,6 +118,7 @@ impl Agent { ) .map(Event::Sync) .boxed(), + notifications, ]); while let Some(event) = stream.next().await { match event { diff --git a/src/bin/rbw-agent/notifications.rs b/src/bin/rbw-agent/notifications.rs index ffdefe9..c72fe38 100644 --- a/src/bin/rbw-agent/notifications.rs +++ b/src/bin/rbw-agent/notifications.rs @@ -1,17 +1,12 @@ -use tokio_tungstenite::{connect_async, tungstenite::protocol::Message}; +use futures::{stream::SplitSink}; +use tokio::{net::{TcpStream}, task::JoinHandle}; +use tokio_tungstenite::{connect_async, tungstenite::protocol::Message, WebSocketStream, MaybeTlsStream}; use futures_util::{StreamExt, SinkExt}; -struct SyncCipherUpdate { - id: String -} - -struct SyncCipherCreate { - id: String -} - -enum NotificationMessage { - SyncCipherUpdate(SyncCipherUpdate), - SyncCipherCreate(SyncCipherCreate), +#[derive(Copy, Clone)] +pub enum NotificationMessage { + SyncCipherUpdate, + SyncCipherCreate, SyncLoginDelete, SyncFolderDelete, SyncCiphers, @@ -24,59 +19,25 @@ enum NotificationMessage { SyncSettings, Logout, +} - SyncSendCreate, - SyncSendUpdate, - SyncSendDelete, - - AuthRequest, - AuthRequestResponse, - None, -} fn parse_messagepack(data: &[u8]) -> Option { - if data.len() < 2 { - return None; - } - - // the first few bytes with th 0x80 bit set, plus one byte terminating the length contain the length of the message + // the first few bytes with the 0x80 bit set, plus one byte terminating the length contain the length of the message let len_buffer_length = data.iter().position(|&x| (x & 0x80) == 0 )? + 1; - println!("len_buffer_length: {:?}", len_buffer_length); - println!("data: {:?}", data); - let unpacked_messagepack = rmpv::decode::read_value(&mut &data[len_buffer_length..]).ok().unwrap(); - println!("unpacked_messagepack: {:?}", unpacked_messagepack); + let unpacked_messagepack = rmpv::decode::read_value(&mut &data[len_buffer_length..]).ok()?; if !unpacked_messagepack.is_array() { return None; } + let unpacked_message = unpacked_messagepack.as_array().unwrap(); - println!("unpacked_message: {:?}", unpacked_message); - let message_type = unpacked_message.iter().next()?.as_u64()?; - let message = unpacked_message.iter().skip(4).next()?.as_array()?.first()?.as_map()?; - let payload = message.iter().filter(|x| x.0.as_str().unwrap() == "Payload").next()?.1.as_map()?; - println!("message_type: {:?}", message_type); - println!("payload: {:?}", payload); + let message_type = unpacked_message.iter().next().unwrap().as_u64().unwrap(); let message = match message_type { - 0 => { - let id = payload.iter().filter(|x| x.0.as_str().unwrap() == "Id").next()?.1.as_str()?; - - Some(NotificationMessage::SyncCipherUpdate( - SyncCipherUpdate { - id: id.to_string() - } - )) - }, - 1 => { - let id = payload.iter().filter(|x| x.0.as_str().unwrap() == "Id").next()?.1.as_str()?; - - Some(NotificationMessage::SyncCipherCreate( - SyncCipherCreate { - id: id.to_string() - } - )) - }, + 0 => Some(NotificationMessage::SyncCipherUpdate), + 1 => Some(NotificationMessage::SyncCipherCreate), 2 => Some(NotificationMessage::SyncLoginDelete), 3 => Some(NotificationMessage::SyncFolderDelete), 4 => Some(NotificationMessage::SyncCiphers), @@ -87,80 +48,95 @@ fn parse_messagepack(data: &[u8]) -> Option { 9 => Some(NotificationMessage::SyncCipherDelete), 10 => Some(NotificationMessage::SyncSettings), 11 => Some(NotificationMessage::Logout), - 12 => Some(NotificationMessage::SyncSendCreate), - 13 => Some(NotificationMessage::SyncSendUpdate), - 14 => Some(NotificationMessage::SyncSendDelete), - 15 => Some(NotificationMessage::AuthRequest), - 16 => Some(NotificationMessage::AuthRequestResponse), - 100 => Some(NotificationMessage::None), _ => None }; return message; } -pub async fn subscribe_to_notifications(url: String) { - let url = url::Url::parse(url.as_str()).unwrap(); +pub struct NotificationsHandler { + write: Option>, Message>>, + read_handle: Option>, + sending_channels : std::sync::Arc>>>, +} - let (ws_stream, _response) = connect_async(url).await.expect("Failed to connect"); +impl NotificationsHandler { + pub fn new() -> Self { + Self { + write: None, + read_handle: None, + sending_channels: std::sync::Arc::new(tokio::sync::RwLock::new(Vec::new())), + } + } - let (mut write, read) = ws_stream.split(); + pub async fn connect(&mut self, url: String) -> Result<(), Box> { + if self.is_connected() { + self.disconnect().await?; + } - write.send(Message::Text("{\"protocol\":\"messagepack\",\"version\":1}\n".to_string())).await.unwrap(); + //subscribe_to_notifications(url, self.sending_channels.clone()).await?; + let (write, read_handle) = subscribe_to_notifications(url, self.sending_channels.clone()).await?; + + self.write = Some(write); + self.read_handle = Some(read_handle); + return Ok(()); + } + + pub fn is_connected(&self) -> bool { + self.write.is_some() + } - let read_future = read.for_each(|message| async { - match message { - Ok(Message::Binary(binary)) => { - let msg = parse_messagepack(&binary); - match msg { - Some(NotificationMessage::SyncCipherUpdate(update)) => { - println!("Websocket sent SyncCipherUpdate for id: {:?}", update.id); - crate::actions::sync(None).await.unwrap(); - println!("Synced") - }, - Some(NotificationMessage::SyncCipherCreate(update)) => { - println!("Websocket sent SyncCipherUpdate for id: {:?}", update.id); - crate::actions::sync(None).await.unwrap(); - println!("Synced") - }, - Some(NotificationMessage::SyncLoginDelete) => { - crate::actions::sync(None).await.unwrap(); - }, - Some(NotificationMessage::SyncFolderDelete) => { - crate::actions::sync(None).await.unwrap(); - }, - Some(NotificationMessage::SyncCiphers) => { - crate::actions::sync(None).await.unwrap(); - }, - Some(NotificationMessage::SyncVault) => { - crate::actions::sync(None).await.unwrap(); - }, - Some(NotificationMessage::SyncOrgKeys) => { - crate::actions::sync(None).await.unwrap(); - }, - Some(NotificationMessage::SyncFolderCreate) => { - crate::actions::sync(None).await.unwrap(); - }, - Some(NotificationMessage::SyncFolderUpdate) => { - crate::actions::sync(None).await.unwrap(); - }, - Some(NotificationMessage::SyncCipherDelete) => { - crate::actions::sync(None).await.unwrap(); - }, - Some(NotificationMessage::Logout) => { - println!("Websocket sent Logout"); - // todo: proper logout? - std::process::exit(0); - }, - _ => {} - } - }, - Err(e) => { - println!("websocket error: {:?}", e); - }, - _ => {} + pub async fn disconnect(&mut self) -> Result<(), Box> { + self.sending_channels.write().await.clear(); + if let Some(mut write) = self.write.take() { + write.send(Message::Close(None)).await?; + write.close().await?; } - }); + Ok(()) + } + + pub async fn get_channel(&mut self) -> tokio::sync::mpsc::UnboundedReceiver { + let (tx, rx) = tokio::sync::mpsc::unbounded_channel::(); + self.sending_channels.write().await.push(tx); + return rx; + } - read_future.await; } + +async fn subscribe_to_notifications(url: String, sending_channels: std::sync::Arc>>>) -> Result<(SplitSink>, Message>, JoinHandle<()>), Box> { + let url = url::Url::parse(url.as_str())?; + println!("Connecting to {}", url); + let (ws_stream, _response) = connect_async(url).await.expect("Failed to connect"); + let (mut write, read) = ws_stream.split(); + + write.send(Message::Text("{\"protocol\":\"messagepack\",\"version\":1}\n".to_string())).await.unwrap(); + + let read_future = async move { + read.map(|message| { + (message, sending_channels.clone()) + }).for_each(|(message, a)| async move { + let a = a.read().await; + + match message { + Ok(Message::Binary(binary)) => { + if binary.len() < 4 { + return; + } + + let msg1 = parse_messagepack(&binary); + if let Some(msg) = msg1 { + for channel in a.iter() { + let res = channel.send(msg); + } + } + }, + Err(e) => { + println!("websocket error: {:?}", e); + }, + _ => {} + } + }).await; + }; + + return Ok((write, tokio::spawn(read_future))); +} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 8fbed0f3fbcac726fb73f2cd49cb7e4d36091c47 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Mon, 17 Apr 2023 02:46:38 +0200 Subject: Improve error handling --- src/bin/rbw-agent/actions.rs | 25 +++++++++++++++++-------- src/bin/rbw-agent/notifications.rs | 16 +++++++--------- 2 files changed, 24 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index 006f7ca..cc363dd 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -659,14 +659,23 @@ async fn config_pinentry() -> anyhow::Result { } pub async fn subscribe_to_notifications(state: std::sync::Arc>) -> anyhow::Result<()> { - let config = rbw::config::Config::load_async().await.expect("Config is missing"); - let mut websocket_url = config.base_url.clone().expect("Config is missing base url").replace("https://", "wss://") + "/notifications/hub?access_token="; - let email = config.email.clone().expect("Config is missing email"); - let db = rbw::db::Db::load_async(&config.server_name().as_str(), &email).await.expect("Error loading db"); - let access_token = db.access_token.expect("Error getting access token"); + // access token might be out of date, so we do a sync to refresh it + sync(None).await?; + + let config = rbw::config::Config::load_async().await.context("Config is missing")?; + let email = config.email.clone().context("Config is missing email")?; + let db = rbw::db::Db::load_async(&config.server_name().as_str(), &email).await?; + let access_token = db.access_token.context("Error getting access token")?; + + let mut websocket_url = config.base_url.clone().expect("config is missing base url").replace("https://", "wss://") + "/notifications/hub?access_token="; websocket_url = websocket_url + &access_token; + let mut state = state.write().await; - state.notifications_handler.connect(websocket_url).await.expect("Error connecting to websocket"); - - Ok(()) + let err = state.notifications_handler.connect(websocket_url).await.err(); + + if let Some(err) = err { + return Err(anyhow::anyhow!(err.to_string())); + } else { + Ok(()) + } } \ No newline at end of file diff --git a/src/bin/rbw-agent/notifications.rs b/src/bin/rbw-agent/notifications.rs index c72fe38..ab24c42 100644 --- a/src/bin/rbw-agent/notifications.rs +++ b/src/bin/rbw-agent/notifications.rs @@ -74,7 +74,6 @@ impl NotificationsHandler { self.disconnect().await?; } - //subscribe_to_notifications(url, self.sending_channels.clone()).await?; let (write, read_handle) = subscribe_to_notifications(url, self.sending_channels.clone()).await?; self.write = Some(write); @@ -91,6 +90,7 @@ impl NotificationsHandler { if let Some(mut write) = self.write.take() { write.send(Message::Close(None)).await?; write.close().await?; + self.read_handle.take().unwrap().await?; } Ok(()) } @@ -105,8 +105,7 @@ impl NotificationsHandler { async fn subscribe_to_notifications(url: String, sending_channels: std::sync::Arc>>>) -> Result<(SplitSink>, Message>, JoinHandle<()>), Box> { let url = url::Url::parse(url.as_str())?; - println!("Connecting to {}", url); - let (ws_stream, _response) = connect_async(url).await.expect("Failed to connect"); + let (ws_stream, _response) = connect_async(url).await?; let (mut write, read) = ws_stream.split(); write.send(Message::Text("{\"protocol\":\"messagepack\",\"version\":1}\n".to_string())).await.unwrap(); @@ -119,14 +118,13 @@ async fn subscribe_to_notifications(url: String, sending_channels: std::sync::Ar match message { Ok(Message::Binary(binary)) => { - if binary.len() < 4 { - return; - } - - let msg1 = parse_messagepack(&binary); - if let Some(msg) = msg1 { + let msgpack = parse_messagepack(&binary); + if let Some(msg) = msgpack { for channel in a.iter() { let res = channel.send(msg); + if res.is_err() { + println!("error sending websocket message to channel"); + } } } }, -- cgit v1.2.3-54-g00ecf From e49ca91ea1607a39257fc28b58598482eff4338a Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Mon, 17 Apr 2023 02:59:23 +0200 Subject: Fix panic when websocket endpoint is not available --- src/bin/rbw-agent/actions.rs | 4 ++-- src/bin/rbw-agent/agent.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index cc363dd..5ee23d9 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -205,7 +205,7 @@ pub async fn login( } } - subscribe_to_notifications(state.clone()).await.expect("could not subscribe"); + let _ = subscribe_to_notifications(state.clone()).await; respond_ack(sock).await?; @@ -669,7 +669,7 @@ pub async fn subscribe_to_notifications(state: std::sync::Arc), -- cgit v1.2.3-54-g00ecf From 7c77e2b47cee8bcda3bbe87af8979b6880356acd Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Mon, 17 Apr 2023 03:19:40 +0200 Subject: Improve websocket disconnect handling --- src/bin/rbw-agent/notifications.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/bin/rbw-agent/notifications.rs b/src/bin/rbw-agent/notifications.rs index ab24c42..334466f 100644 --- a/src/bin/rbw-agent/notifications.rs +++ b/src/bin/rbw-agent/notifications.rs @@ -82,7 +82,7 @@ impl NotificationsHandler { } pub fn is_connected(&self) -> bool { - self.write.is_some() + self.write.is_some() && self.read_handle.is_some() && !self.read_handle.as_ref().unwrap().is_finished() } pub async fn disconnect(&mut self) -> Result<(), Box> { @@ -92,6 +92,8 @@ impl NotificationsHandler { write.close().await?; self.read_handle.take().unwrap().await?; } + self.write = None; + self.read_handle = None; Ok(()) } -- cgit v1.2.3-54-g00ecf From d6bbc46089b519eb82ae009bd48fa6d449f07941 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 27 Apr 2023 02:14:54 +0200 Subject: Improve error logging for websockets --- src/bin/rbw-agent/actions.rs | 8 +++++++- src/bin/rbw-agent/agent.rs | 5 ++++- src/bin/rbw-agent/notifications.rs | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index 5ee23d9..f5b9dc0 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -1,3 +1,5 @@ +use std::f32::consts::E; + use anyhow::Context as _; pub async fn register( @@ -205,7 +207,11 @@ pub async fn login( } } - let _ = subscribe_to_notifications(state.clone()).await; + let err = subscribe_to_notifications(state.clone()).await.err(); + if let Some(e) = err { + eprintln!("failed to subscribe to notifications: {}", e) + } + respond_ack(sock).await?; diff --git a/src/bin/rbw-agent/agent.rs b/src/bin/rbw-agent/agent.rs index 0d672ee..fb21728 100644 --- a/src/bin/rbw-agent/agent.rs +++ b/src/bin/rbw-agent/agent.rs @@ -78,7 +78,10 @@ impl Agent { self, listener: tokio::net::UnixListener, ) -> anyhow::Result<()> { - let _ = crate::actions::subscribe_to_notifications(self.state.clone()).await; + let err = crate::actions::subscribe_to_notifications(self.state.clone()).await; + if let Err(e) = err { + eprintln!("failed to subscribe to notifications: {e:#}") + } enum Event { Request(std::io::Result), diff --git a/src/bin/rbw-agent/notifications.rs b/src/bin/rbw-agent/notifications.rs index 334466f..b575cf9 100644 --- a/src/bin/rbw-agent/notifications.rs +++ b/src/bin/rbw-agent/notifications.rs @@ -125,13 +125,13 @@ async fn subscribe_to_notifications(url: String, sending_channels: std::sync::Ar for channel in a.iter() { let res = channel.send(msg); if res.is_err() { - println!("error sending websocket message to channel"); + eprintln!("error sending websocket message to channel"); } } } }, Err(e) => { - println!("websocket error: {:?}", e); + eprintln!("websocket error: {:?}", e); }, _ => {} } -- cgit v1.2.3-54-g00ecf From 66cf6aea2d2fc355543470dab762211d9c8ad306 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 27 Apr 2023 02:38:29 +0200 Subject: Cargo format and reconnect websocket on sync --- src/bin/rbw-agent/actions.rs | 34 +++++++---- src/bin/rbw-agent/agent.rs | 66 ++++++++++++++-------- src/bin/rbw-agent/main.rs | 2 +- src/bin/rbw-agent/notifications.rs | 113 ++++++++++++++++++++++++++----------- 4 files changed, 148 insertions(+), 67 deletions(-) (limited to 'src') diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index f5b9dc0..2f34c6b 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -212,7 +212,6 @@ pub async fn login( eprintln!("failed to subscribe to notifications: {}", e) } - respond_ack(sock).await?; Ok(()) @@ -664,24 +663,39 @@ async fn config_pinentry() -> anyhow::Result { Ok(config.pinentry) } -pub async fn subscribe_to_notifications(state: std::sync::Arc>) -> anyhow::Result<()> { +pub async fn subscribe_to_notifications( + state: std::sync::Arc>, +) -> anyhow::Result<()> { // access token might be out of date, so we do a sync to refresh it sync(None).await?; - let config = rbw::config::Config::load_async().await.context("Config is missing")?; + let config = rbw::config::Config::load_async() + .await + .context("Config is missing")?; let email = config.email.clone().context("Config is missing email")?; - let db = rbw::db::Db::load_async(&config.server_name().as_str(), &email).await?; - let access_token = db.access_token.context("Error getting access token")?; - - let mut websocket_url = config.base_url.clone().expect("config is missing base url").replace("https://", "wss://") + "/notifications/hub?access_token="; + let db = rbw::db::Db::load_async(&config.server_name().as_str(), &email) + .await?; + let access_token = + db.access_token.context("Error getting access token")?; + + let mut websocket_url = config + .base_url + .clone() + .expect("config is missing base url") + .replace("https://", "wss://") + + "/notifications/hub?access_token="; websocket_url = websocket_url + &access_token; let mut state = state.write().await; - let err = state.notifications_handler.connect(websocket_url).await.err(); - + let err = state + .notifications_handler + .connect(websocket_url) + .await + .err(); + if let Some(err) = err { return Err(anyhow::anyhow!(err.to_string())); } else { Ok(()) } -} \ No newline at end of file +} diff --git a/src/bin/rbw-agent/agent.rs b/src/bin/rbw-agent/agent.rs index fb21728..b88121d 100644 --- a/src/bin/rbw-agent/agent.rs +++ b/src/bin/rbw-agent/agent.rs @@ -1,3 +1,4 @@ +use aes::cipher::typenum::private::IsNotEqualPrivate; use anyhow::Context as _; use futures_util::StreamExt as _; @@ -58,7 +59,8 @@ impl Agent { if sync_timeout_duration > std::time::Duration::ZERO { sync_timeout.set(sync_timeout_duration); } - let notifications_handler = crate::notifications::NotificationsHandler::new(); + let notifications_handler = + crate::notifications::NotificationsHandler::new(); Ok(Self { timer_r, sync_timer_r, @@ -78,7 +80,9 @@ impl Agent { self, listener: tokio::net::UnixListener, ) -> anyhow::Result<()> { - let err = crate::actions::subscribe_to_notifications(self.state.clone()).await; + let err = + crate::actions::subscribe_to_notifications(self.state.clone()) + .await; if let Err(e) = err { eprintln!("failed to subscribe to notifications: {e:#}") } @@ -88,25 +92,27 @@ impl Agent { Timeout(()), Sync(()), } - - let c: tokio::sync::mpsc::UnboundedReceiver = { - self.state.write().await.notifications_handler.get_channel().await + + let c: tokio::sync::mpsc::UnboundedReceiver< + notifications::NotificationMessage, + > = { + self.state + .write() + .await + .notifications_handler + .get_channel() + .await }; - let notifications = tokio_stream::wrappers::UnboundedReceiverStream::new( - c, - ) - .map(|message| { - match message { - notifications::NotificationMessage::Logout => { - Event::Timeout(()) - } - _ => { - Event::Sync(()) - } - } - }) - .boxed(); - + let notifications = + tokio_stream::wrappers::UnboundedReceiverStream::new(c) + .map(|message| match message { + notifications::NotificationMessage::Logout => { + Event::Timeout(()) + } + _ => Event::Sync(()), + }) + .boxed(); + let mut stream = futures_util::stream::select_all([ tokio_stream::wrappers::UnixListenerStream::new(listener) .map(Event::Request) @@ -121,7 +127,7 @@ impl Agent { ) .map(Event::Sync) .boxed(), - notifications, + notifications, ]); while let Some(event) = stream.next().await { match event { @@ -149,8 +155,24 @@ impl Agent { Event::Sync(()) => { // this could fail if we aren't logged in, but we don't // care about that + let state = self.state.clone(); tokio::spawn(async move { - let _ = crate::actions::sync(None).await; + let result = crate::actions::sync(None).await; + if let Err(e) = result { + eprintln!("failed to sync: {e:#}"); + } else { + if !state + .write() + .await + .notifications_handler + .is_connected() + { + let err = crate::actions::subscribe_to_notifications(state).await; + if let Err(e) = err { + eprintln!("failed to subscribe to notifications: {e:#}") + } + } + } }); self.state.write().await.set_sync_timeout(); } diff --git a/src/bin/rbw-agent/main.rs b/src/bin/rbw-agent/main.rs index 5e0fa61..a9477df 100644 --- a/src/bin/rbw-agent/main.rs +++ b/src/bin/rbw-agent/main.rs @@ -19,9 +19,9 @@ mod actions; mod agent; mod daemon; mod debugger; +mod notifications; mod sock; mod timeout; -mod notifications; async fn tokio_main( startup_ack: Option, diff --git a/src/bin/rbw-agent/notifications.rs b/src/bin/rbw-agent/notifications.rs index b575cf9..e8f84b0 100644 --- a/src/bin/rbw-agent/notifications.rs +++ b/src/bin/rbw-agent/notifications.rs @@ -1,7 +1,10 @@ -use futures::{stream::SplitSink}; -use tokio::{net::{TcpStream}, task::JoinHandle}; -use tokio_tungstenite::{connect_async, tungstenite::protocol::Message, WebSocketStream, MaybeTlsStream}; -use futures_util::{StreamExt, SinkExt}; +use futures::stream::SplitSink; +use futures_util::{SinkExt, StreamExt}; +use tokio::{net::TcpStream, task::JoinHandle}; +use tokio_tungstenite::{ + connect_async, tungstenite::protocol::Message, MaybeTlsStream, + WebSocketStream, +}; #[derive(Copy, Clone)] pub enum NotificationMessage { @@ -21,43 +24,54 @@ pub enum NotificationMessage { Logout, } - - fn parse_messagepack(data: &[u8]) -> Option { // the first few bytes with the 0x80 bit set, plus one byte terminating the length contain the length of the message - let len_buffer_length = data.iter().position(|&x| (x & 0x80) == 0 )? + 1; + let len_buffer_length = data.iter().position(|&x| (x & 0x80) == 0)? + 1; - let unpacked_messagepack = rmpv::decode::read_value(&mut &data[len_buffer_length..]).ok()?; + let unpacked_messagepack = + rmpv::decode::read_value(&mut &data[len_buffer_length..]).ok()?; if !unpacked_messagepack.is_array() { return None; } let unpacked_message = unpacked_messagepack.as_array().unwrap(); - let message_type = unpacked_message.iter().next().unwrap().as_u64().unwrap(); + let message_type = + unpacked_message.iter().next().unwrap().as_u64().unwrap(); let message = match message_type { - 0 => Some(NotificationMessage::SyncCipherUpdate), - 1 => Some(NotificationMessage::SyncCipherCreate), - 2 => Some(NotificationMessage::SyncLoginDelete), - 3 => Some(NotificationMessage::SyncFolderDelete), - 4 => Some(NotificationMessage::SyncCiphers), - 5 => Some(NotificationMessage::SyncVault), - 6 => Some(NotificationMessage::SyncOrgKeys), - 7 => Some(NotificationMessage::SyncFolderCreate), - 8 => Some(NotificationMessage::SyncFolderUpdate), - 9 => Some(NotificationMessage::SyncCipherDelete), + 0 => Some(NotificationMessage::SyncCipherUpdate), + 1 => Some(NotificationMessage::SyncCipherCreate), + 2 => Some(NotificationMessage::SyncLoginDelete), + 3 => Some(NotificationMessage::SyncFolderDelete), + 4 => Some(NotificationMessage::SyncCiphers), + 5 => Some(NotificationMessage::SyncVault), + 6 => Some(NotificationMessage::SyncOrgKeys), + 7 => Some(NotificationMessage::SyncFolderCreate), + 8 => Some(NotificationMessage::SyncFolderUpdate), + 9 => Some(NotificationMessage::SyncCipherDelete), 10 => Some(NotificationMessage::SyncSettings), 11 => Some(NotificationMessage::Logout), - _ => None + _ => None, }; return message; } pub struct NotificationsHandler { - write: Option>, Message>>, + write: Option< + futures::stream::SplitSink< + tokio_tungstenite::WebSocketStream< + tokio_tungstenite::MaybeTlsStream, + >, + Message, + >, + >, read_handle: Option>, - sending_channels : std::sync::Arc>>>, + sending_channels: std::sync::Arc< + tokio::sync::RwLock< + Vec>, + >, + >, } impl NotificationsHandler { @@ -65,27 +79,38 @@ impl NotificationsHandler { Self { write: None, read_handle: None, - sending_channels: std::sync::Arc::new(tokio::sync::RwLock::new(Vec::new())), + sending_channels: std::sync::Arc::new(tokio::sync::RwLock::new( + Vec::new(), + )), } } - pub async fn connect(&mut self, url: String) -> Result<(), Box> { + pub async fn connect( + &mut self, + url: String, + ) -> Result<(), Box> { if self.is_connected() { self.disconnect().await?; } - let (write, read_handle) = subscribe_to_notifications(url, self.sending_channels.clone()).await?; - + let (write, read_handle) = + subscribe_to_notifications(url, self.sending_channels.clone()) + .await?; + self.write = Some(write); self.read_handle = Some(read_handle); return Ok(()); } pub fn is_connected(&self) -> bool { - self.write.is_some() && self.read_handle.is_some() && !self.read_handle.as_ref().unwrap().is_finished() + self.write.is_some() + && self.read_handle.is_some() + && !self.read_handle.as_ref().unwrap().is_finished() } - pub async fn disconnect(&mut self) -> Result<(), Box> { + pub async fn disconnect( + &mut self, + ) -> Result<(), Box> { self.sending_channels.write().await.clear(); if let Some(mut write) = self.write.take() { write.send(Message::Close(None)).await?; @@ -97,20 +122,40 @@ impl NotificationsHandler { Ok(()) } - pub async fn get_channel(&mut self) -> tokio::sync::mpsc::UnboundedReceiver { - let (tx, rx) = tokio::sync::mpsc::unbounded_channel::(); + pub async fn get_channel( + &mut self, + ) -> tokio::sync::mpsc::UnboundedReceiver { + let (tx, rx) = + tokio::sync::mpsc::unbounded_channel::(); self.sending_channels.write().await.push(tx); return rx; } - } -async fn subscribe_to_notifications(url: String, sending_channels: std::sync::Arc>>>) -> Result<(SplitSink>, Message>, JoinHandle<()>), Box> { +async fn subscribe_to_notifications( + url: String, + sending_channels: std::sync::Arc< + tokio::sync::RwLock< + Vec>, + >, + >, +) -> Result< + ( + SplitSink>, Message>, + JoinHandle<()>, + ), + Box, +> { let url = url::Url::parse(url.as_str())?; let (ws_stream, _response) = connect_async(url).await?; let (mut write, read) = ws_stream.split(); - write.send(Message::Text("{\"protocol\":\"messagepack\",\"version\":1}\n".to_string())).await.unwrap(); + write + .send(Message::Text( + "{\"protocol\":\"messagepack\",\"version\":1}\n".to_string(), + )) + .await + .unwrap(); let read_future = async move { read.map(|message| { @@ -139,4 +184,4 @@ async fn subscribe_to_notifications(url: String, sending_channels: std::sync::Ar }; return Ok((write, tokio::spawn(read_future))); -} \ No newline at end of file +} -- cgit v1.2.3-54-g00ecf From 0e63285b6aaabe0f4bd71b890924f80e3a27e3cb Mon Sep 17 00:00:00 2001 From: troyready Date: Sat, 17 Jun 2023 15:45:10 -0700 Subject: add yubikey support This is all that's needed to support Yubikey hardware tokens in OTP mode (https://developers.yubico.com/OTP/) --- src/api.rs | 2 ++ src/bin/rbw-agent/actions.rs | 1 + 2 files changed, 3 insertions(+) (limited to 'src') diff --git a/src/api.rs b/src/api.rs index bf608b3..fb4fc42 100644 --- a/src/api.rs +++ b/src/api.rs @@ -62,6 +62,7 @@ impl TwoFactorProviderType { pub fn message(&self) -> &str { match *self { Self::Authenticator => "Enter the 6 digit verification code from your authenticator app.", + Self::Yubikey => "Insert your Yubikey and push the button.", Self::Email => "Enter the PIN you received via email.", _ => "Enter the code." } @@ -71,6 +72,7 @@ impl TwoFactorProviderType { pub fn header(&self) -> &str { match *self { Self::Authenticator => "Authenticator App", + Self::Yubikey => "Yubikey", Self::Email => "Email Code", _ => "Two Factor Authentication", } diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index 7b5dc58..066a27f 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -148,6 +148,7 @@ pub async fn login( Err(rbw::error::Error::TwoFactorRequired { providers }) => { let supported_types = vec![ rbw::api::TwoFactorProviderType::Authenticator, + rbw::api::TwoFactorProviderType::Yubikey, rbw::api::TwoFactorProviderType::Email, ]; -- cgit v1.2.3-54-g00ecf