From 680c46e6866071ae987d9978316ce2952347fe35 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Wed, 14 Oct 2020 21:10:27 +0200 Subject: rename and move file to clarify file purpose --- mumd/src/network.rs | 21 +++++++++++++++++++++ mumd/src/network/mod.rs | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 mumd/src/network.rs delete mode 100644 mumd/src/network/mod.rs (limited to 'mumd/src') diff --git a/mumd/src/network.rs b/mumd/src/network.rs new file mode 100644 index 0000000..1a31ee2 --- /dev/null +++ b/mumd/src/network.rs @@ -0,0 +1,21 @@ +pub mod tcp; +pub mod udp; + +use std::net::SocketAddr; + +#[derive(Clone, Debug)] +pub struct ConnectionInfo { + socket_addr: SocketAddr, + hostname: String, + accept_invalid_cert: bool, +} + +impl ConnectionInfo { + pub fn new(socket_addr: SocketAddr, hostname: String, accept_invalid_cert: bool) -> Self { + Self { + socket_addr, + hostname, + accept_invalid_cert, + } + } +} diff --git a/mumd/src/network/mod.rs b/mumd/src/network/mod.rs deleted file mode 100644 index 1a31ee2..0000000 --- a/mumd/src/network/mod.rs +++ /dev/null @@ -1,21 +0,0 @@ -pub mod tcp; -pub mod udp; - -use std::net::SocketAddr; - -#[derive(Clone, Debug)] -pub struct ConnectionInfo { - socket_addr: SocketAddr, - hostname: String, - accept_invalid_cert: bool, -} - -impl ConnectionInfo { - pub fn new(socket_addr: SocketAddr, hostname: String, accept_invalid_cert: bool) -> Self { - Self { - socket_addr, - hostname, - accept_invalid_cert, - } - } -} -- cgit v1.2.1 From cfc0ab78a893d6a16d2eedfef290c9e1496a23e1 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Thu, 15 Oct 2020 22:09:57 +0200 Subject: add basic error messaging on mumd --- mumd/src/command.rs | 6 +++++- mumd/src/main.rs | 8 ++++---- mumd/src/state.rs | 31 ++++++++++++++++++++----------- 3 files changed, 29 insertions(+), 16 deletions(-) (limited to 'mumd/src') diff --git a/mumd/src/command.rs b/mumd/src/command.rs index 9adf7d8..6314870 100644 --- a/mumd/src/command.rs +++ b/mumd/src/command.rs @@ -8,7 +8,7 @@ use tokio::sync::mpsc; pub async fn handle( state: Arc>, - mut command_receiver: mpsc::UnboundedReceiver<(Command, IpcSender, ()>>)>, + mut command_receiver: mpsc::UnboundedReceiver<(Command, IpcSender>>)>, ) { debug!("Begin listening for commands"); loop { @@ -16,13 +16,17 @@ pub async fn handle( let command = command_receiver.recv().await.unwrap(); debug!("Received command {:?}", command.0); let mut state = state.lock().unwrap(); + debug!("Got mutex lock"); let (wait_for_connected, command_response) = state.handle_command(command.0).await; if wait_for_connected { let mut watcher = state.phase_receiver(); drop(state); + debug!("Waiting to be connected"); while !matches!(watcher.recv().await.unwrap(), StatePhase::Connected) {} } + debug!("Sending response"); command.1.send(command_response).unwrap(); + debug!("Sent response"); } //TODO err if not connected //while let Some(command) = command_receiver.recv().await { diff --git a/mumd/src/main.rs b/mumd/src/main.rs index 8639c35..7ab3c61 100644 --- a/mumd/src/main.rs +++ b/mumd/src/main.rs @@ -27,7 +27,7 @@ async fn main() { // For simplicity we don't deal with re-syncing, real applications would have to. let (crypt_state_sender, crypt_state_receiver) = mpsc::channel::(1); // crypt state should always be consumed before sending a new one let (packet_sender, packet_receiver) = mpsc::unbounded_channel::>(); - let (command_sender, command_receiver) = mpsc::unbounded_channel::<(Command, IpcSender, ()>>)>(); + let (command_sender, command_receiver) = mpsc::unbounded_channel::<(Command, IpcSender>>)>(); let (connection_info_sender, connection_info_receiver) = watch::channel::>(None); @@ -62,16 +62,16 @@ async fn main() { } fn receive_oneshot_commands( - command_sender: mpsc::UnboundedSender<(Command, IpcSender, ()>>)>, + command_sender: mpsc::UnboundedSender<(Command, IpcSender>>)>, ) { loop { // create listener - let (server, server_name): (IpcOneShotServer<(Command, IpcSender, ()>>)>, String) = IpcOneShotServer::new().unwrap(); + let (server, server_name): (IpcOneShotServer<(Command, IpcSender>>)>, String) = IpcOneShotServer::new().unwrap(); fs::write("/var/tmp/mumd-oneshot", &server_name).unwrap(); debug!("Listening for command at {}...", server_name); // receive command and response channel - let (_, conn): (_, (Command, IpcSender, ()>>)) = server.accept().unwrap(); + let (_, conn): (_, (Command, IpcSender>>)) = server.accept().unwrap(); debug!("Sending command {:?} to command handler", conn.0); command_sender.send(conn).unwrap(); } diff --git a/mumd/src/state.rs b/mumd/src/state.rs index 0fd814c..0b3663d 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -9,6 +9,7 @@ use mumlib::command::{Command, CommandResponse}; use mumlib::state::Server; use std::net::ToSocketAddrs; use tokio::sync::{mpsc, watch}; +use mumlib::error::Error; #[derive(Clone, Debug, Eq, PartialEq)] pub enum StatePhase { @@ -50,12 +51,17 @@ impl State { pub async fn handle_command( &mut self, command: Command, - ) -> (bool, Result, ()>) { + ) -> (bool, mumlib::error::Result>) { match command { Command::ChannelJoin { channel_id } => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) { warn!("Not connected"); - return (false, Err(())); + return (false, Err(Error::DisconnectedError)); + } + if let Some(server) = &self.server { + if !server.channels().contains_key(&channel_id) { + return (false, Err(Error::InvalidChannelIdError)); + } } let mut msg = msgs::UserState::new(); msg.set_session(self.session_id.unwrap()); @@ -66,7 +72,7 @@ impl State { Command::ChannelList => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) { warn!("Not connected"); - return (false, Err(())); + return (false, Err(Error::DisconnectedError)); } ( false, @@ -83,7 +89,7 @@ impl State { } => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Disconnected) { warn!("Tried to connect to a server while already connected"); - return (false, Err(())); + return (false, Err(Error::AlreadyConnectedError)); } self.server = Some(Server::new()); self.username = Some(username); @@ -91,11 +97,14 @@ impl State { .0 .broadcast(StatePhase::Connecting) .unwrap(); - let socket_addr = (host.as_ref(), port) - .to_socket_addrs() - .expect("Failed to parse server address") - .next() - .expect("Failed to resolve server address"); + + let socket_addr = match (host.as_ref(), port).to_socket_addrs().map(|mut e| e.next()) { + Ok(Some(v)) => v, + _ => { + warn!("Error parsing server addr"); + return (false, Err(Error::InvalidServerAddrError)); + } + }; self.connection_info_sender .broadcast(Some(ConnectionInfo::new( socket_addr, @@ -108,13 +117,13 @@ impl State { Command::Status => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) { warn!("Not connected"); - return (false, Err(())); + return (false, Err(Error::DisconnectedError)); } ( false, Ok(Some(CommandResponse::Status { username: self.username.clone(), - server_state: self.server.clone().unwrap(), + server_state: self.server.clone().unwrap(), //guaranteed not to panic because if we are connected, server is guaranteed to be Some })), ) } -- cgit v1.2.1 From b156b43b0994017636b153abceb78d86542047d7 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Thu, 15 Oct 2020 22:11:08 +0200 Subject: change loop to avoid panic --- mumd/src/command.rs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'mumd/src') diff --git a/mumd/src/command.rs b/mumd/src/command.rs index 6314870..57eaaa3 100644 --- a/mumd/src/command.rs +++ b/mumd/src/command.rs @@ -11,22 +11,16 @@ pub async fn handle( mut command_receiver: mpsc::UnboundedReceiver<(Command, IpcSender>>)>, ) { debug!("Begin listening for commands"); - loop { - debug!("Enter loop"); - let command = command_receiver.recv().await.unwrap(); + while let Some(command) = command_receiver.recv().await { debug!("Received command {:?}", command.0); let mut state = state.lock().unwrap(); - debug!("Got mutex lock"); let (wait_for_connected, command_response) = state.handle_command(command.0).await; if wait_for_connected { let mut watcher = state.phase_receiver(); drop(state); - debug!("Waiting to be connected"); while !matches!(watcher.recv().await.unwrap(), StatePhase::Connected) {} } - debug!("Sending response"); command.1.send(command_response).unwrap(); - debug!("Sent response"); } //TODO err if not connected //while let Some(command) = command_receiver.recv().await { -- cgit v1.2.1 From 6136a8d7e9d251348fa514f04d74aa19257c1e18 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Fri, 16 Oct 2020 02:01:22 +0200 Subject: add an error check --- mumd/src/state.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'mumd/src') diff --git a/mumd/src/state.rs b/mumd/src/state.rs index 58280cc..a9dbfc6 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -55,7 +55,6 @@ impl State { match command { Command::ChannelJoin { channel_id } => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) { - warn!("Not connected"); return (false, Err(Error::DisconnectedError)); } if let Some(server) = &self.server { @@ -71,12 +70,9 @@ impl State { } Command::ChannelList => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) { - warn!("Not connected"); return (false, Err(Error::DisconnectedError)); } - ( - false, - Ok(Some(CommandResponse::ChannelList { + (false, Ok(Some(CommandResponse::ChannelList { channels: self.server.as_ref().unwrap().channels().clone(), })), ) @@ -88,7 +84,6 @@ impl State { accept_invalid_cert, } => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Disconnected) { - warn!("Tried to connect to a server while already connected"); return (false, Err(Error::AlreadyConnectedError)); } self.server = Some(Server::new()); @@ -116,7 +111,6 @@ impl State { } Command::Status => { if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) { - warn!("Not connected"); return (false, Err(Error::DisconnectedError)); } ( @@ -128,6 +122,10 @@ impl State { ) } Command::ServerDisconnect => { + if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) { + return (false, Err(Error::DisconnectedError)); + } + self.session_id = None; self.username = None; self.server = None; -- cgit v1.2.1 From 6a6ee0c9db9de7f7632050ad4984a3f92d8a96e9 Mon Sep 17 00:00:00 2001 From: Eskil Queseth Date: Fri, 16 Oct 2020 02:18:59 +0200 Subject: add pretty printing for error type --- mumd/src/state.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mumd/src') diff --git a/mumd/src/state.rs b/mumd/src/state.rs index a9dbfc6..82d671e 100644 --- a/mumd/src/state.rs +++ b/mumd/src/state.rs @@ -59,7 +59,7 @@ impl State { } if let Some(server) = &self.server { if !server.channels().contains_key(&channel_id) { - return (false, Err(Error::InvalidChannelIdError)); + return (false, Err(Error::InvalidChannelIdError(channel_id))); } } let mut msg = msgs::UserState::new(); @@ -97,7 +97,7 @@ impl State { Ok(Some(v)) => v, _ => { warn!("Error parsing server addr"); - return (false, Err(Error::InvalidServerAddrError)); + return (false, Err(Error::InvalidServerAddrError(host, port))); } }; self.connection_info_sender -- cgit v1.2.1