diff --git a/src/actors/users_actor.rs b/src/actors/users_actor.rs index 1257726..7f6e532 100644 --- a/src/actors/users_actor.rs +++ b/src/actors/users_actor.rs @@ -151,7 +151,7 @@ impl Handler 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 } } diff --git a/src/controllers/login_api.rs b/src/controllers/login_api.rs index e178813..9aeb647 100644 --- a/src/controllers/login_api.rs +++ b/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, diff --git a/src/controllers/login_controller.rs b/src/controllers/login_controller.rs index 3a35eb2..e797d25 100644 --- a/src/controllers/login_controller.rs +++ b/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!"); } }; diff --git a/src/controllers/openid_controller.rs b/src/controllers/openid_controller.rs index fd4a954..565ef68 100644 --- a/src/controllers/openid_controller.rs +++ b/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(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", diff --git a/src/controllers/providers_controller.rs b/src/controllers/providers_controller.rs index c27f07f..bcaae75 100644 --- a/src/controllers/providers_controller.rs +++ b/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, diff --git a/src/controllers/two_factor_api.rs b/src/controllers/two_factor_api.rs index 56b4994..2d3eec8 100644 --- a/src/controllers/two_factor_api.rs +++ b/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!"); } }; diff --git a/src/controllers/two_factors_controller.rs b/src/controllers/two_factors_controller.rs index 5a1231e..1883a8b 100644 --- a/src/controllers/two_factors_controller.rs +++ b/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(®istration_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!"); } }; diff --git a/src/data/action_logger.rs b/src/data/action_logger.rs index 31430c6..fae8226 100644 --- a/src/data/action_logger.rs +++ b/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 {}!", diff --git a/src/data/code_challenge.rs b/src/data/code_challenge.rs index f9df32f..934531c 100644 --- a/src/data/code_challenge.rs +++ b/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")); } } diff --git a/src/data/session_identity.rs b/src/data/session_identity.rs index 91fcc11..7b7b738 100644 --- a/src/data/session_identity.rs +++ b/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."); } diff --git a/src/data/users_file_entity.rs b/src/data/users_file_entity.rs index 21a1a43..d7795df 100644 --- a/src/data/users_file_entity.rs +++ b/src/data/users_file_entity.rs @@ -18,7 +18,7 @@ impl EntityManager { }; 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>(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 } } diff --git a/src/data/webauthn_manager.rs b/src/data/webauthn_manager.rs index 35f1db2..e89e5be 100644 --- a/src/data/webauthn_manager.rs +++ b/src/data/webauthn_manager.rs @@ -108,15 +108,11 @@ impl WebAuthManager { ) -> Res { let state: RegisterKeyOpaqueData = self.crypto_wrapper.decrypt(opaque_state)?; if state.user_id != user.uid { - return Err(Box::new(std::io::Error::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::other( - "Challenge has expired!", - ))); + return Err(Box::new(std::io::Error::other("Challenge has expired!"))); } let res = self.core.finish_passkey_registration( @@ -154,15 +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::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::other( - "Challenge has expired!", - ))); + return Err(Box::new(std::io::Error::other("Challenge has expired!"))); } self.core.finish_passkey_authentication( diff --git a/src/main.rs b/src/main.rs index ba53c2e..63f4d7d 100644 --- a/src/main.rs +++ b/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, diff --git a/src/middlewares/auth_middleware.rs b/src/middlewares/auth_middleware.rs index 54646e7..102f27a 100644 --- a/src/middlewares/auth_middleware.rs +++ b/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() diff --git a/src/utils/string_utils.rs b/src/utils/string_utils.rs index ba8beb4..5bd778c 100644 --- a/src/utils/string_utils.rs +++ b/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)); }