Updates & replace deprecated rustls-pemfile

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mailcrab-backend"
-version = "1.6.2"
+version = "1.6.3"
 edition = "2024"
 publish = true
 license = "Apache-2.0 OR MIT"
@@ -18,7 +18,7 @@ tokio-util = "0.7"
 tower-http = { version = "0.6", features = ["fs", "trace"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-uuid = { version = "1.2", features = ["v4", "serde"] }
+uuid = { version = "1.19", features = ["v4", "serde"] }
 
 [dev-dependencies]
 lettre = { version = "0.11", default-features = false, features=[
@@ -29,5 +29,5 @@ lettre = { version = "0.11", default-features = false, features=[
     "tokio1-rustls-tls",
     "tokio1"
 ] }
-fake = { version = "4.0", features=["derive"]}
+fake = { version = "4.4", features=["derive"]}
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }

backend/src/storage.rs

@@ -29,31 +29,27 @@ pub(crate) async fn storage(
     while running {
         tokio::select! {
             incoming = storage_rx.recv() => {
-                if let Ok(message) = incoming {
-                    if let Ok(mut storage) = state.storage.write() {
-                        storage.insert(message.id, message);
-                    }
+                if let Ok(message) = incoming && let Ok(mut storage) = state.storage.write() {
+                    storage.insert(message.id, message);
                 }
             },
             _ = retention_interval.tick() => {
-                if state.retention_period > Duration::from_secs(0) {
-                    if let Ok(mut storage) = state.storage.write() {
-                        let remove_before = std::time::SystemTime::now()
-                            .sub(state.retention_period)
-                            .duration_since(SystemTime::UNIX_EPOCH)?
-                            .as_secs() as i64;
-
-                        storage.retain(|_, mail_message| {
-                            if mail_message.time > remove_before {
-                                true
-                            } else {
-                                info!("Removing old message {} from {}", mail_message.id, mail_message.envelope_from);
-
-                                false
-                            }
-
-                        });
-                    }
+                if state.retention_period > Duration::from_secs(0) && let Ok(mut storage) = state.storage.write() {
+                    let remove_before = std::time::SystemTime::now()
+                        .sub(state.retention_period)
+                        .duration_since(SystemTime::UNIX_EPOCH)?
+                        .as_secs() as i64;
+
+                    storage.retain(|_, mail_message| {
+                        if mail_message.time > remove_before {
+                            true
+                        } else {
+                            info!("Removing old message {} from {}", mail_message.id, mail_message.envelope_from);
+
+                            false
+                        }
+
+                    });
                 }
             },
             _ = token.cancelled() => {

backend/src/web_server.rs

@@ -77,16 +77,12 @@ async fn ws_handler(
                                     storage.clear();
                                     info!("storage cleared");
                                 },
-                                Ok(Action::Open(id)) => if let Ok(mut storage) = state.storage.write() {
-                                    if let Some(message) = storage.get_mut(&id) {
-                                        message.open();
-                                        info!("message {} opened", &id);
-                                    }
+                                Ok(Action::Open(id)) => if let Ok(mut storage) = state.storage.write() && let Some(message) = storage.get_mut(&id) {
+                                    message.open();
+                                    info!("message {} opened", &id);
                                 },
-                                Ok(Action::Remove(id)) => if let Ok(mut storage) = state.storage.write() {
-                                    if storage.remove(&id).is_some() {
-                                        info!("message {} removed", &id);
-                                    }
+                                Ok(Action::Remove(id)) => if let Ok(mut storage) = state.storage.write() && storage.remove(&id).is_some() {
+                                    info!("message {} removed", &id);
                                 },
                                 msg => {
                                     warn!("unknown action {:?}", msg);
@@ -109,7 +105,7 @@ async fn ws_handler(
                         },
                     }
                 }
-            };
+            }
         }
     })
 }
@@ -119,7 +115,8 @@ async fn messages_handler(
     Extension(state): Extension<Arc<AppState>>,
 ) -> Result<Json<Vec<MailMessageMetadata>>, StatusCode> {
     if let Ok(storage) = state.storage.read() {
-        let mut messages = storage.values()
+        let mut messages = storage
+            .values()
             .map(|message| message.clone().into())
             .collect::<Vec<MailMessageMetadata>>();