Merge pull request 'Update Rust crate webauthn-rs to 0.5.2' (#409) from renovate/webauthn-rs-0.x into master

Reviewed-on: #407

Cargo.lock

@@ -574,12 +574,12 @@ checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
 
 [[package]]
 name = "base64urlsafedata"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f0ad38ce7fbed55985ad5b2197f05cff8324ee6eb6638304e78f0108fae56c"
+checksum = "e5913e643e4dfb43d5908e9e6f1386f8e0dfde086ecef124a6450c6195d89160"
 dependencies = [
  "base64 0.21.7",
- "paste",
+ "pastey",
  "serde",
 ]
 
@@ -816,9 +816,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.38"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -826,9 +826,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.38"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -838,9 +838,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -871,23 +871,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
-[[package]]
-name = "compact_jwt"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bbab6445446e8d0b07468a01d0bfdae15879de5c440c5e47ae4ae0e18a1fba"
-dependencies = [
- "base64 0.21.7",
- "base64urlsafedata",
- "hex",
- "openssl",
- "serde",
- "serde_json",
- "tracing",
- "url",
- "uuid",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -2286,9 +2269,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.106"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -2344,10 +2327,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "paste"
-version = "1.0.15"
+name = "pastey"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+checksum = "b3a8cb46bdc156b1c90460339ae6bfd45ba0394e5effbaa640badb4987fdc261"
 
 [[package]]
 name = "pem-rfc7468"
@@ -3397,12 +3380,14 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
 dependencies = [
  "getrandom 0.3.2",
+ "js-sys",
  "serde",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3539,12 +3524,13 @@ dependencies = [
 
 [[package]]
 name = "webauthn-attestation-ca"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e77e8859ecb93b00e4a8e56ae45f8a8dd69b1539e3d32cf4cce1db9a3a0b99"
+checksum = "384e43534efe4e8f56c4eb1615a27e24d2ff29281385c843cf9f16ac1077dbdc"
 dependencies = [
  "base64urlsafedata",
  "openssl",
+ "openssl-sys",
  "serde",
  "tracing",
  "uuid",
@@ -3552,9 +3538,9 @@ dependencies = [
 
 [[package]]
 name = "webauthn-rs"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b44347ee0d66f222043663a6aaf5ec78022b9b11c3a9ed488c21f2bd5680856"
+checksum = "ed1f861a94557baeb0cf711e3e55d623c46b68f4aab7aa932562f785b8b5f1ab"
 dependencies = [
  "base64urlsafedata",
  "serde",
@@ -3566,17 +3552,17 @@ dependencies = [
 
 [[package]]
 name = "webauthn-rs-core"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef48f07ed8f3dfe304d6c48e85317feba0439675f31a13063b2936c9b4eaf0d"
+checksum = "269c210cd5f183aaca860bb5733187d1dd110ebed54640f8fc1aca31a04aa4dc"
 dependencies = [
  "base64 0.21.7",
  "base64urlsafedata",
- "compact_jwt",
  "der-parser",
  "hex",
  "nom",
  "openssl",
+ "openssl-sys",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "serde",
@@ -3593,9 +3579,9 @@ dependencies = [
 
 [[package]]
 name = "webauthn-rs-proto"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14e1367f70e7dc7b83afc971ce8a54d578f4fdf488ea093021180e073744a69f"
+checksum = "144dbee9abb4bfad78fd283a2613f0312a0ed5955051b7864cfc98679112ae60"
 dependencies = [
  "base64 0.21.7",
  "base64urlsafedata",

Cargo.toml

@@ -11,7 +11,7 @@ actix-identity = "0.8.0"
 actix-web = "4.11.0"
 actix-session = { version = "0.10.1", features = ["cookie-session"] }
 actix-remote-ip = "0.1.0"
-clap = { version = "4.5.38", features = ["derive", "env"] }
+clap = { version = "4.5.41", features = ["derive", "env"] }
 include_dir = "0.7.4"
 log = "0.4.27"
 serde_json = "1.0.140"
@@ -19,10 +19,10 @@ serde_yaml = "0.9.34"
 env_logger = "0.11.8"
 serde = { version = "1.0.219", features = ["derive"] }
 bcrypt = "0.17.0"
-uuid = { version = "1.16.0", features = ["v4"] }
+uuid = { version = "1.17.0", features = ["v4"] }
 mime_guess = "2.0.5"
 askama = "0.14.0"
-futures-util = "0.3.30"
+futures-util = "0.3.31"
 urlencoding = "2.1.3"
 rand = "0.9.1"
 base64 = "0.22.1"
@@ -33,7 +33,7 @@ lazy-regex = "3.4.1"
 totp_rfc6238 = "0.6.1"
 base32 = "0.5.1"
 qrcode-generator = "5.0.0"
-webauthn-rs = { version = "0.5.1", features = ["danger-allow-state-serialisation"] }
+webauthn-rs = { version = "0.5.2", features = ["danger-allow-state-serialisation"] }
 url = "2.5.4"
 light-openid = { version = "1.0.4", features = ["crypto-wrapper"] }
 bincode = "2.0.1"

src/actors/users_actor.rs

@@ -151,7 +151,7 @@ impl Handler<LocalLoginRequest> for UsersActor {
     fn handle(&mut self, msg: LocalLoginRequest, _ctx: &mut Self::Context) -> Self::Result {
         match self.manager.find_by_username_or_email(&msg.login) {
             Err(e) => {
-                log::error!("Failed to find user! {}", e);
+                log::error!("Failed to find user! {e}");
                 MessageResult(LoginResult::Error)
             }
             Ok(None) => MessageResult(LoginResult::AccountNotFound),
@@ -184,7 +184,7 @@ impl Handler<ProviderLoginRequest> for UsersActor {
     fn handle(&mut self, msg: ProviderLoginRequest, _ctx: &mut Self::Context) -> Self::Result {
         match self.manager.find_by_email(&msg.email) {
             Err(e) => {
-                log::error!("Failed to find user! {}", e);
+                log::error!("Failed to find user! {e}");
                 MessageResult(LoginResult::Error)
             }
             Ok(None) => MessageResult(LoginResult::AccountNotFound),
@@ -210,7 +210,7 @@ impl Handler<CreateAccount> for UsersActor {
         match self.manager.create_user_account(msg.0) {
             Ok(id) => Some(id),
             Err(e) => {
-                log::error!("Failed to create user account! {}", e);
+                log::error!("Failed to create user account! {e}");
                 None
             }
         }
@@ -227,7 +227,7 @@ impl Handler<ChangePasswordRequest> for UsersActor {
         {
             Ok(_) => true,
             Err(e) => {
-                log::error!("Failed to change user password! {:?}", e);
+                log::error!("Failed to change user password! {e:?}");
                 false
             }
         }
@@ -241,7 +241,7 @@ impl Handler<Add2FAFactor> for UsersActor {
         match self.manager.add_2fa_factor(&msg.0, msg.1) {
             Ok(_) => true,
             Err(e) => {
-                log::error!("Failed to add 2FA factor! {}", e);
+                log::error!("Failed to add 2FA factor! {e}");
                 false
             }
         }
@@ -255,7 +255,7 @@ impl Handler<Remove2FAFactor> for UsersActor {
         match self.manager.remove_2fa_factor(&msg.0, msg.1) {
             Ok(_) => true,
             Err(e) => {
-                log::error!("Failed to remove 2FA factor! {}", e);
+                log::error!("Failed to remove 2FA factor! {e}");
                 false
             }
         }
@@ -272,7 +272,7 @@ impl Handler<AddSuccessful2FALogin> for UsersActor {
         {
             Ok(_) => true,
             Err(e) => {
-                log::error!("Failed to save successful 2FA authentication! {}", e);
+                log::error!("Failed to save successful 2FA authentication! {e}");
                 false
             }
         }
@@ -309,10 +309,7 @@ impl Handler<SetAuthorizedAuthenticationSources> for UsersActor {
         {
             Ok(_) => true,
             Err(e) => {
-                log::error!(
-                    "Failed to set authorized authentication sources for user! {}",
-                    e
-                );
+                log::error!("Failed to set authorized authentication sources for user! {e}");
                 false
             }
         }
@@ -325,7 +322,7 @@ impl Handler<SetGrantedClients> for UsersActor {
         match self.manager.set_granted_2fa_clients(&msg.0, msg.1) {
             Ok(_) => true,
             Err(e) => {
-                log::error!("Failed to set granted 2FA clients! {}", e);
+                log::error!("Failed to set granted 2FA clients! {e}");
                 false
             }
         }
@@ -339,7 +336,7 @@ impl Handler<GetUserRequest> for UsersActor {
         MessageResult(GetUserResult(match self.manager.find_by_user_id(&msg.0) {
             Ok(r) => r,
             Err(e) => {
-                log::error!("Failed to find user by id! {}", e);
+                log::error!("Failed to find user by id! {e}");
                 None
             }
         }))
@@ -353,7 +350,7 @@ impl Handler<VerifyUserPasswordRequest> for UsersActor {
         self.manager
             .verify_user_password(&msg.0, &msg.1)
             .unwrap_or_else(|e| {
-                log::error!("Failed to verify user password! {}", e);
+                log::error!("Failed to verify user password! {e}");
                 false
             })
     }
@@ -367,7 +364,7 @@ impl Handler<FindUserByUsername> for UsersActor {
             self.manager
                 .find_by_username_or_email(&msg.0)
                 .unwrap_or_else(|e| {
-                    log::error!("Failed to find user by username or email! {}", e);
+                    log::error!("Failed to find user by username or email! {e}");
                     None
                 }),
         ))
@@ -381,7 +378,7 @@ impl Handler<GetAllUsers> for UsersActor {
         match self.manager.get_entire_users_list() {
             Ok(r) => r,
             Err(e) => {
-                log::error!("Failed to get entire users list! {}", e);
+                log::error!("Failed to get entire users list! {e}");
                 vec![]
             }
         }
@@ -395,7 +392,7 @@ impl Handler<UpdateUserSettings> for UsersActor {
         match self.manager.set_general_user_settings(msg.0) {
             Ok(_) => true,
             Err(e) => {
-                log::error!("Failed to update general user information! {:?}", e);
+                log::error!("Failed to update general user information! {e:?}");
                 false
             }
         }
@@ -409,7 +406,7 @@ impl Handler<DeleteUserRequest> for UsersActor {
         match self.manager.delete_account(&msg.0) {
             Ok(_) => true,
             Err(e) => {
-                log::error!("Failed to delete user account! {}", e);
+                log::error!("Failed to delete user account! {e}");
                 false
             }
         }

src/controllers/login_api.rs

@@ -47,7 +47,7 @@ pub async fn auth_webauthn(
             HttpResponse::Ok().body("You are authenticated!")
         }
         Err(e) => {
-            log::error!("Failed to authenticate user using webauthn! {:?}", e);
+            log::error!("Failed to authenticate user using webauthn! {e:?}");
             logger.log(Action::LoginWebauthnAttempt {
                 success: false,
                 user_id,

src/controllers/login_controller.rs

@@ -190,12 +190,7 @@ pub async fn login_route(
             }
 
             c => {
-                log::warn!(
-                    "Failed login for ip {:?} /  username {}: {:?}",
-                    remote_ip,
-                    login,
-                    c
-                );
+                log::warn!("Failed login for ip {remote_ip:?} /  username {login}: {c:?}");
                 logger.log(Action::FailedLoginWithBadCredentials(&login));
                 danger = Some("Login failed.".to_string());
 
@@ -474,7 +469,7 @@ pub async fn login_with_webauthn(
     let challenge = match manager.start_authentication(&user.uid, &pub_keys) {
         Ok(c) => c,
         Err(e) => {
-            log::error!("Failed to generate webauthn challenge! {:?}", e);
+            log::error!("Failed to generate webauthn challenge! {e:?}");
             return HttpResponse::InternalServerError().body(build_fatal_error_page(
                 "Failed to generate webauthn challenge",
             ));
@@ -484,7 +479,7 @@ pub async fn login_with_webauthn(
     let challenge_json = match serde_json::to_string(&challenge.login_challenge) {
         Ok(r) => r,
         Err(e) => {
-            log::error!("Failed to serialize challenge! {:?}", e);
+            log::error!("Failed to serialize challenge! {e:?}");
             return HttpResponse::InternalServerError().body("Failed to serialize challenge!");
         }
     };

src/controllers/openid_controller.rs

@@ -111,12 +111,7 @@ pub struct AuthorizeQuery {
 }
 
 fn error_redirect(query: &AuthorizeQuery, error: &str, description: &str) -> HttpResponse {
-    log::warn!(
-        "Failed to process sign in request ({} => {}): {:?}",
-        error,
-        description,
-        query
-    );
+    log::warn!("Failed to process sign in request ({error} => {description}): {query:?}");
     HttpResponse::Found()
         .append_header((
             "Location",
@@ -243,7 +238,7 @@ pub async fn authorize(
                 .await
                 .unwrap();
 
-            log::trace!("New OpenID session: {:#?}", session);
+            log::trace!("New OpenID session: {session:#?}");
             logger.log(Action::NewOpenIDSession { client: &client });
 
             Ok(HttpResponse::Found()
@@ -319,12 +314,7 @@ struct ErrorResponse {
 }
 
 pub fn error_response<D: Debug>(query: &D, error: &str, description: &str) -> HttpResponse {
-    log::warn!(
-        "request failed: {} - {} => '{:#?}'",
-        error,
-        description,
-        query
-    );
+    log::warn!("request failed: {error} - {description} => '{query:#?}'");
     HttpResponse::BadRequest().json(ErrorResponse {
         error: error.to_string(),
         error_description: description.to_string(),
@@ -389,7 +379,7 @@ pub async fn token(
                 let decode = String::from_utf8_lossy(&match BASE64_STANDARD.decode(token) {
                     Ok(d) => d,
                     Err(e) => {
-                        log::error!("Failed to decode authorization header: {:?}", e);
+                        log::error!("Failed to decode authorization header: {e:?}");
                         return Ok(error_response(
                             &query,
                             "invalid_request",

src/controllers/providers_controller.rs

@@ -96,14 +96,14 @@ pub async fn start_login(
     let config = match ProviderConfigurationHelper::get_configuration(&provider).await {
         Ok(c) => c,
         Err(e) => {
-            log::error!("Failed to load provider configuration! {}", e);
+            log::error!("Failed to load provider configuration! {e}");
             return HttpResponse::InternalServerError().body(build_fatal_error_page(
                 "Failed to load provider configuration!",
             ));
         }
     };
 
-    log::debug!("Provider configuration: {:?}", config);
+    log::debug!("Provider configuration: {config:?}");
 
     let url = config.auth_url(&provider, &state);
     log::debug!("Redirect user on {url} for authentication",);
@@ -210,7 +210,7 @@ pub async fn finish_login(
     let provider_config = match ProviderConfigurationHelper::get_configuration(&provider).await {
         Ok(c) => c,
         Err(e) => {
-            log::error!("Failed to load provider configuration! {}", e);
+            log::error!("Failed to load provider configuration! {e}");
             return HttpResponse::InternalServerError().body(build_fatal_error_page(
                 "Failed to load provider configuration!",
             ));
@@ -222,7 +222,7 @@ pub async fn finish_login(
     let token = match token {
         Ok(t) => t,
         Err(e) => {
-            log::error!("Failed to retrieve login token! {:?}", e);
+            log::error!("Failed to retrieve login token! {e:?}");
 
             bruteforce
                 .send(bruteforce_actor::RecordFailedAttempt {
@@ -247,7 +247,7 @@ pub async fn finish_login(
     let user_info = match provider_config.get_userinfo(&token).await {
         Ok(info) => info,
         Err(e) => {
-            log::error!("Failed to retrieve user information! {:?}", e);
+            log::error!("Failed to retrieve user information! {e:?}");
 
             logger.log(Action::ProviderFailedGetUserInfo {
                 provider: &provider,

src/controllers/two_factor_api.rs

@@ -94,7 +94,7 @@ pub async fn save_webauthn_factor(
     let key = match manager.finish_registration(&user, &form.0.opaque_state, form.0.credential) {
         Ok(k) => k,
         Err(e) => {
-            log::error!("Failed to register security key! {:?}", e);
+            log::error!("Failed to register security key! {e:?}");
             return HttpResponse::InternalServerError().body("Failed to register key!");
         }
     };

src/controllers/two_factors_controller.rs

@@ -68,7 +68,7 @@ pub async fn add_totp_factor_route(_critical: CriticalRoute, user: CurrentUser)
     let qr_code = match qr_code {
         Ok(q) => q,
         Err(e) => {
-            log::error!("Failed to generate QrCode! {:?}", e);
+            log::error!("Failed to generate QrCode! {e:?}");
             return HttpResponse::InternalServerError().body("Failed to generate QrCode!");
         }
     };
@@ -95,7 +95,7 @@ pub async fn add_webauthn_factor_route(
     let registration_request = match manager.start_register(&user) {
         Ok(r) => r,
         Err(e) => {
-            log::error!("Failed to request new key! {:?}", e);
+            log::error!("Failed to request new key! {e:?}");
             return HttpResponse::InternalServerError()
                 .body("Failed to generate request for registration!");
         }
@@ -104,7 +104,7 @@ pub async fn add_webauthn_factor_route(
     let challenge_json = match serde_json::to_string(&registration_request.creation_challenge) {
         Ok(r) => r,
         Err(e) => {
-            log::error!("Failed to serialize challenge! {:?}", e);
+            log::error!("Failed to serialize challenge! {e:?}");
             return HttpResponse::InternalServerError().body("Failed to serialize challenge!");
         }
     };

src/data/action_logger.rs

@@ -156,8 +156,7 @@ impl Action<'_> {
                     .to_string()
             }
             Action::ProviderFailedGetToken { state, code } => format!(
-                "could not complete login from provider because the id_token could not be retrieved! (state={:?} code = {code})",
-                state
+                "could not complete login from provider because the id_token could not be retrieved! (state={state:?} code = {code})"
             ),
             Action::ProviderFailedGetUserInfo { provider } => format!(
                 "could not get user information from userinfo endpoint of provider {}!",

src/data/code_challenge.rs

@@ -22,7 +22,7 @@ impl CodeChallenge {
                 encoded.eq(&self.code_challenge)
             }
             s => {
-                log::error!("Unknown code challenge method: {}", s);
+                log::error!("Unknown code challenge method: {s}");
                 false
             }
         }
@@ -40,8 +40,8 @@ mod test {
             code_challenge: "text1".to_string(),
         };
 
-        assert_eq!(true, chal.verify_code("text1"));
-        assert_eq!(false, chal.verify_code("text2"));
+        assert!(chal.verify_code("text1"));
+        assert!(!chal.verify_code("text2"));
     }
 
     #[test]
@@ -51,8 +51,8 @@ mod test {
             code_challenge: "uSOvC48D8TMh6RgW-36XppMlMgys-6KAE_wEIev9W2g".to_string(),
         };
 
-        assert_eq!(true, chal.verify_code("HIwht3lCHfnsruA+7Sq8NP2mPj5cBZe0Ewf23eK9UQhK4TdCIt3SK7Fr/giCdnfjxYQILOPG2D562emggAa2lA=="));
-        assert_eq!(false, chal.verify_code("text1"));
+        assert!(chal.verify_code("HIwht3lCHfnsruA+7Sq8NP2mPj5cBZe0Ewf23eK9UQhK4TdCIt3SK7Fr/giCdnfjxYQILOPG2D562emggAa2lA=="));
+        assert!(!chal.verify_code("text1"));
     }
 
     #[test]
@@ -62,10 +62,7 @@ mod test {
             code_challenge: "E9Melhoa2OwvFrEMTJguCHaoeK1t8URWbuGJSstw-cM".to_string(),
         };
 
-        assert_eq!(
-            true,
-            chal.verify_code("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk")
-        );
-        assert_eq!(false, chal.verify_code("text1"));
+        assert!(chal.verify_code("dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"));
+        assert!(!chal.verify_code("text1"));
     }
 }

src/data/session_identity.rs

@@ -46,7 +46,7 @@ impl SessionIdentity<'_> {
             .map(|f| match f {
                 Ok(d) => Some(d),
                 Err(e) => {
-                    log::warn!("Failed to deserialize session data! {:?}", e);
+                    log::warn!("Failed to deserialize session data! {e:?}");
                     None
                 }
             })
@@ -65,7 +65,7 @@ impl SessionIdentity<'_> {
 
         log::debug!("Will set user session data.");
         if let Err(e) = Identity::login(&req.extensions(), s) {
-            log::error!("Failed to set session data! {}", e);
+            log::error!("Failed to set session data! {e}");
         }
         log::debug!("Did set user session data.");
     }

src/data/totp_key.rs

@@ -1,5 +1,3 @@
-use std::io::ErrorKind;
-
 use base32::Alphabet;
 use rand::Rng;
 use totp_rfc6238::{HashAlgorithm, TotpGenerator};
@@ -90,8 +88,7 @@ impl TotpKey {
 
         let key = match base32::decode(BASE32_ALPHABET, &self.encoded) {
             None => {
-                return Err(Box::new(std::io::Error::new(
-                    ErrorKind::Other,
+                return Err(Box::new(std::io::Error::other(
                     "Failed to decode base32 secret!",
                 )));
             }

src/data/users_file_entity.rs

@@ -18,7 +18,7 @@ impl EntityManager<User> {
         };
 
         if let Err(e) = self.replace_entries(|u| u.uid.eq(id), &update(user)) {
-            log::error!("Failed to update user information! {:?}", e);
+            log::error!("Failed to update user information! {e:?}");
             return Err(e);
         }
 
@@ -34,7 +34,7 @@ fn verify_password<P: AsRef<[u8]>>(pwd: P, hash: &str) -> bool {
     match bcrypt::verify(pwd, hash) {
         Ok(r) => r,
         Err(e) => {
-            log::warn!("Failed to verify password! {:?}", e);
+            log::warn!("Failed to verify password! {e:?}");
             false
         }
     }

src/data/webauthn_manager.rs

@@ -1,4 +1,3 @@
-use std::io::ErrorKind;
 use std::sync::Arc;
 
 use actix_web::web;
@@ -109,17 +108,11 @@ impl WebAuthManager {
     ) -> Res<WebauthnPubKey> {
         let state: RegisterKeyOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?;
         if state.user_id != user.uid {
-            return Err(Box::new(std::io::Error::new(
-                ErrorKind::Other,
-                "Invalid user for pubkey!",
-            )));
+            return Err(Box::new(std::io::Error::other("Invalid user for pubkey!")));
         }
 
         if state.expire < time() {
-            return Err(Box::new(std::io::Error::new(
-                ErrorKind::Other,
-                "Challenge has expired!",
-            )));
+            return Err(Box::new(std::io::Error::other("Challenge has expired!")));
         }
 
         let res = self.core.finish_passkey_registration(
@@ -157,17 +150,11 @@ impl WebAuthManager {
     ) -> Res {
         let state: AuthStateOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?;
         if &state.user_id != user_id {
-            return Err(Box::new(std::io::Error::new(
-                ErrorKind::Other,
-                "Invalid user for pubkey!",
-            )));
+            return Err(Box::new(std::io::Error::other("Invalid user for pubkey!")));
         }
 
         if state.expire < time() {
-            return Err(Box::new(std::io::Error::new(
-                ErrorKind::Other,
-                "Challenge has expired!",
-            )));
+            return Err(Box::new(std::io::Error::other("Challenge has expired!")));
         }
 
         self.core.finish_passkey_authentication(

src/main.rs

@@ -51,7 +51,7 @@ async fn main() -> std::io::Result<()> {
 
     // Create initial user if required
     if users.is_empty() {
-        log::info!("Create default {} user", DEFAULT_ADMIN_USERNAME);
+        log::info!("Create default {DEFAULT_ADMIN_USERNAME} user");
         let default_admin = User {
             username: DEFAULT_ADMIN_USERNAME.to_string(),
             authorized_clients: None,

src/middlewares/auth_middleware.rs

@@ -97,10 +97,7 @@ where
                         .unwrap_or("bad")
                         .eq(&AppConfig::get().website_origin)
                     {
-                        log::warn!(
-                            "Blocked POST request from invalid origin! Origin given {:?}",
-                            o
-                        );
+                        log::warn!("Blocked POST request from invalid origin! Origin given {o:?}");
                         return Ok(req.into_response(
                             HttpResponse::Unauthorized()
                                 .body("POST request from invalid origin!")
@@ -133,8 +130,8 @@ where
                 _ => ConnStatus::SignedOut,
             };
 
-            log::trace!("Connection data: {:#?}", session_data);
-            log::debug!("Connection status: {:?}", session);
+            log::trace!("Connection data: {session_data:#?}");
+            log::debug!("Connection status: {session:?}");
 
             // Redirect user to login page
             if !session.is_auth()

src/utils/string_utils.rs

@@ -47,7 +47,7 @@ mod test {
         unsafe {
             env::set_var(VAR_ONE, "good");
         }
-        let src = format!("This is ${{{}}}", VAR_ONE);
+        let src = format!("This is ${{{VAR_ONE}}}");
         assert_eq!("This is good", apply_env_vars(&src));
     }
 
@@ -55,7 +55,7 @@ mod test {
 
     #[test]
     fn test_invalid_var_syntax() {
-        let src = format!("This is ${{{}}}", VAR_INVALID);
+        let src = format!("This is ${{{VAR_INVALID}}}");
         assert_eq!(src, apply_env_vars(&src));
     }