some more websocket-related improvements

Author: 0x7d8

application/src/main.rs

@@ -458,7 +458,7 @@ async fn main() {
 
                 tracing::info!(
                     "ssh server listening on {} (app@{}, {}ms)",
-                    address.to_string().cyan(),
+                    address.to_string(),
                     wings_rs::VERSION,
                     state.start_time.elapsed().as_millis()
                 );
@@ -503,7 +503,7 @@ async fn main() {
             .context("failed to load SSL certificate and key")
             .unwrap();
 
-            tracing::info!("https listening on {}", address.to_string().cyan(),);
+            tracing::info!("https listening on {}", address.to_string());
 
             match axum_server::bind_rustls(address, config)
                 .serve(router.into_make_service_with_connect_info::<SocketAddr>())
@@ -521,7 +521,7 @@ async fn main() {
                 }
             }
         } else {
-            tracing::info!("http listening on {}", address.to_string().cyan(),);
+            tracing::info!("http listening on {}", address.to_string());
 
             match axum::serve(
                 match tokio::net::TcpListener::bind(address).await {
@@ -557,7 +557,7 @@ async fn main() {
         {
             let socket_path = &state.config.api.host;
 
-            tracing::info!("http server listening on {}", socket_path.cyan(),);
+            tracing::info!("http server listening on {}", socket_path);
 
             let router = router.layer(axum::middleware::from_fn(
                 |mut req: Request, next: Next| async move {

application/src/server/permissions.rs

@@ -87,7 +87,6 @@ pub struct UserPermissionsMap {
 impl Default for UserPermissionsMap {
     fn default() -> Self {
         let map = Arc::new(Mutex::new(HashMap::new()));
-
         let (tx, rx) = tokio::sync::broadcast::channel(32);
 
         Self {
@@ -175,6 +174,13 @@ impl UserPermissionsMap {
             ),
         );
     }
+
+    pub async fn clear_permissions(&self) {
+        for user_uuid in self.map.lock().await.keys().copied().collect::<Vec<_>>() {
+            self.map.lock().await.remove(&user_uuid);
+            self.removal_sender.send(user_uuid).ok();
+        }
+    }
 }
 
 impl Drop for UserPermissionsMap {

application/src/server/transfer.rs

@@ -725,6 +725,7 @@ impl OutgoingServerTransfer {
                         ["completed".into()].into(),
                     ))
                     .ok();
+                server.user_permissions.clear_permissions().await;
             });
         }));
 

application/src/server/websocket/handler.rs

@@ -33,7 +33,7 @@ pub async fn handle_ws(
     let user_ip = state.config.find_ip(&headers, connect_info);
 
     ws.on_upgrade(move |socket| async move {
-        let (sender, mut reciever) = socket.split();
+        let (sender, mut receiver) = socket.split();
         let sender = Arc::new(Mutex::new(sender));
         let socket_jwt = Arc::new(RwLock::new(None));
 
@@ -69,7 +69,7 @@ pub async fn handle_ws(
                             websocket_handler.close("permission revoked").await;
                             break;
                         }
-                        data = reciever.next() => match data {
+                        data = receiver.next() => match data {
                             Some(Ok(data)) => data,
                             Some(Err(err)) => {
                                 tracing::debug!(

application/src/server/websocket/message_handler.rs

@@ -62,6 +62,14 @@ pub async fn handle_message(
                 ))
                 .await;
         }
+        WebsocketEvent::SendStatus => {
+            websocket_handler
+                .send_message(WebsocketMessage::new(
+                    WebsocketEvent::ServerStatus,
+                    [server.state.get_state().to_str().into()].into(),
+                ))
+                .await;
+        }
         WebsocketEvent::SendServerLogs => {
             if server.state.get_state() != crate::server::state::ServerState::Offline
                 || state.config.api.send_offline_server_logs

application/src/server/websocket/mod.rs

@@ -58,6 +58,8 @@ pub enum WebsocketEvent {
     SendCommand,
     #[serde(rename = "send stats")]
     SendStats,
+    #[serde(rename = "send status")]
+    SendStatus,
     #[serde(rename = "daemon error")]
     Error,
     #[serde(rename = "jwt error")]