Update Rust crate jwt-simple to 0.12.14

Cargo.toml

@@ -11,33 +11,35 @@ actix-identity = "0.9.0"
 actix-web = "4.12.1"
 actix-session = { version = "0.11.0", features = ["cookie-session", "redis-session"] }
 actix-remote-ip = "0.1.0"
-clap = { version = "4.5.53", features = ["derive", "env"] }
+clap = { version = "4.5.54", features = ["derive", "env"] }
 include_dir = "0.7.4"
 log = "0.4.29"
-serde_json = "1.0.145"
+serde_json = "1.0.149"
 serde_yaml = "0.9.34"
 env_logger = "0.11.8"
 serde = { version = "1.0.228", features = ["derive"] }
-bcrypt = "0.17.1"
+bcrypt = "0.18.0"
 uuid = { version = "1.19.0", features = ["v4"] }
 mime_guess = "2.0.5"
-askama = "0.14.0"
+askama = "0.15.1"
 urlencoding = "2.1.3"
-rand = "0.10.0-rc.5"
+rand = "0.9.0"
 base64 = "0.22.1"
-jwt-simple = { version = "0.12.13", default-features = false, features = ["pure-rust"] }
+jwt-simple = { version = "0.12.14", default-features = false, features = ["pure-rust"] }
-digest = "0.11.0-rc.4"
+digest = "0.11.0-rc.5"
 sha2 = "0.11.0-rc.3"
-lazy-regex = "3.4.2"
+lazy-regex = "3.5.1"
 totp_rfc6238 = "0.6.1"
 base32 = "0.5.1"
 qrcode-generator = "5.0.0"
-webauthn-rs = { version = "0.5.3", features = ["danger-allow-state-serialisation"] }
+webauthn-rs = { version = "0.5.4", features = ["danger-allow-state-serialisation"] }
-url = "2.5.7"
+url = "2.5.8"
-light-openid = { version = "1.0.4", features = ["crypto-wrapper"] }
+light-openid = { version = "1.1.0", features = ["crypto-wrapper"] }
-bincode = "2.0.1"
+rkyv = "0.8.14"
-chrono = "0.4.42"
+chrono = "0.4.43"
 lazy_static = "1.5.0"
 mailchecker = "6.0.19"
 httpdate = "1.0.3"
 build-time = "0.1.3"
+hex = "0.4.3"
+anyhow = "1.0.100"

src/controllers/assets_controller.rs

@@ -3,6 +3,7 @@ use crate::utils::time_utils;
 use actix_web::http::header;
 use actix_web::{HttpRequest, HttpResponse, web};
 use include_dir::{Dir, include_dir};
+use std::cmp::max;
 use std::ops::Add;
 use std::path::Path;
 use std::time::Duration;
@@ -22,14 +23,15 @@ pub async fn assets_route(req: HttpRequest, path: web::Path<String>) -> HttpResp
         None => HttpResponse::NotFound().body("404 Not found"),
         Some(file) => {
             let res = mime_guess::from_path(path).first_or_octet_stream();
-            let digest = format!("{:x?}", sha256(file.contents()));
+            let digest = hex::encode(sha256(file.contents()));
+            let file_time = max(time_utils::time_start_of_day(), time_utils::build_time());
 
             // Check if the browser already knows the file by date
             if let Some(c) = req.headers().get(header::IF_MODIFIED_SINCE) {
                 let date_str = c.to_str().unwrap_or("");
                 if let Ok(date) = httpdate::parse_http_date(date_str)
                     && date.add(Duration::from_secs(1))
-                        >= time_utils::unix_to_system_time(time_utils::build_time())
+                        >= time_utils::unix_to_system_time(file_time)
                 {
                     return HttpResponse::NotModified().finish();
                 }
@@ -45,10 +47,7 @@ pub async fn assets_route(req: HttpRequest, path: web::Path<String>) -> HttpResp
             HttpResponse::Ok()
                 .content_type(res.to_string())
                 .insert_header(("etag", digest))
-                .insert_header((
+                .insert_header(("last-modified", time_utils::unix_to_http_date(file_time)))
-                    "last-modified",
-                    time_utils::unix_to_http_date(time_utils::build_time()),
-                ))
                 .body(file.contents())
         }
     }

src/data/user.rs

@@ -1,4 +1,3 @@
-use bincode::{Decode, Encode};
 use std::collections::HashMap;
 use std::net::IpAddr;
 
@@ -11,7 +10,17 @@ use crate::data::totp_key::TotpKey;
 use crate::data::webauthn_manager::WebauthnPubKey;
 use crate::utils::time_utils::{fmt_time, time};
 
-#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize, Encode, Decode)]
+#[derive(
+    Clone,
+    Debug,
+    Eq,
+    PartialEq,
+    serde::Serialize,
+    serde::Deserialize,
+    rkyv::Archive,
+    rkyv::Serialize,
+    rkyv::Deserialize,
+)]
 pub struct UserID(pub String);
 
 impl UserID {

src/data/webauthn_manager.rs

@@ -1,7 +1,6 @@
 use std::sync::Arc;
 
 use actix_web::web;
-use bincode::{Decode, Encode};
 use light_openid::crypto_wrapper::CryptoWrapper;
 use uuid::Uuid;
 use webauthn_rs::prelude::{
@@ -28,7 +27,9 @@ pub struct RegisterKeyRequest {
     pub creation_challenge: CreationChallengeResponse,
 }
 
-#[derive(Debug, serde::Serialize, serde::Deserialize, Encode, Decode)]
+#[derive(
+    Debug, serde::Serialize, serde::Deserialize, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize,
+)]
 struct RegisterKeyOpaqueData {
     registration_state: String,
     user_id: UserID,
@@ -40,7 +41,7 @@ pub struct AuthRequest {
     pub login_challenge: RequestChallengeResponse,
 }
 
-#[derive(Debug, Encode, Decode)]
+#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)]
 struct AuthStateOpaqueData {
     authentication_state: String,
     user_id: UserID,

src/utils/time_utils.rs

@@ -1,4 +1,4 @@
-use chrono::DateTime;
+use chrono::{DateTime, Local, NaiveTime};
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 /// Get the current time since epoch
@@ -37,6 +37,14 @@ pub fn build_time() -> u64 {
     date.timestamp() as u64
 }
 
+/// Get the first second of the day (local time)
+pub fn time_start_of_day() -> u64 {
+    let local: DateTime<Local> = Local::now()
+        .with_time(NaiveTime::from_hms_opt(0, 0, 0).unwrap())
+        .unwrap();
+    local.timestamp() as u64
+}
+
 #[cfg(test)]
 mod test {
     use crate::utils::time_utils::{fmt_time, time};