From 1948fe6369c75ff9b0e4c8bb017432a88c2411b0 Mon Sep 17 00:00:00 2001 From: Jacek Chmielewski Date: Wed, 27 Mar 2024 10:23:46 +0100 Subject: [PATCH] Add moar logs --- src/handlers/desktop_client_mfa.rs | 14 ++++++++++---- src/handlers/enrollment.rs | 25 +++++++++++++++++++------ src/handlers/password_reset.rs | 10 +++++++--- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/handlers/desktop_client_mfa.rs b/src/handlers/desktop_client_mfa.rs index a64ab69..36fc72e 100644 --- a/src/handlers/desktop_client_mfa.rs +++ b/src/handlers/desktop_client_mfa.rs @@ -21,14 +21,17 @@ async fn start_client_mfa( device_info: Option, Json(req): Json, ) -> Result, ApiError> { - info!("Starting desktop client authorization"); + info!("Starting desktop client authorization {req:?}"); let rx = state.grpc_server.send( - Some(core_request::Payload::ClientMfaStart(req)), + Some(core_request::Payload::ClientMfaStart(req.clone())), device_info, )?; let payload = get_core_response(rx).await?; match payload { - core_response::Payload::ClientMfaStart(response) => Ok(Json(response)), + core_response::Payload::ClientMfaStart(response) => { + info!("Started desktop client authorization {req:?}"); + Ok(Json(response)) + } _ => { error!("Received invalid gRPC response type: {payload:?}"); Err(ApiError::InvalidResponseType) @@ -49,7 +52,10 @@ async fn finish_client_mfa( )?; let payload = get_core_response(rx).await?; match payload { - core_response::Payload::ClientMfaFinish(response) => Ok(Json(response)), + core_response::Payload::ClientMfaFinish(response) => { + info!("Finished desktop client authorization"); + Ok(Json(response)) + } _ => { error!("Received invalid gRPC response type: {payload:?}"); Err(ApiError::InvalidResponseType) diff --git a/src/handlers/enrollment.rs b/src/handlers/enrollment.rs index 3e6f4ce..7e5856f 100644 --- a/src/handlers/enrollment.rs +++ b/src/handlers/enrollment.rs @@ -42,8 +42,11 @@ pub async fn start_enrollment_process( let payload = get_core_response(rx).await?; match payload { core_response::Payload::EnrollmentStart(response) => { + info!( + "Started enrollment process for user {:?} by admin {:?}", + response.user, response.admin + ); // set session cookie - info!("Started enrollment process: {response:?}"); let cookie = Cookie::build((ENROLLMENT_COOKIE_NAME, token)) .expires(OffsetDateTime::from_unix_timestamp(response.deadline_timestamp).unwrap()); @@ -63,7 +66,8 @@ pub async fn activate_user( mut private_cookies: PrivateCookieJar, Json(mut req): Json, ) -> Result { - info!("Activating user"); + let phone = req.phone_number.clone(); + info!("Activating user - phone number {phone:?}"); // set auth info req.token = private_cookies @@ -77,6 +81,7 @@ pub async fn activate_user( match payload { core_response::Payload::Empty(_) => { if let Some(cookie) = private_cookies.get(ENROLLMENT_COOKIE_NAME) { + info!("Activated user - phone number {phone:?}"); debug!("Enrollment finished. Removing session cookie"); private_cookies = private_cookies.remove(cookie); } @@ -97,7 +102,8 @@ pub async fn create_device( private_cookies: PrivateCookieJar, Json(mut req): Json, ) -> Result, ApiError> { - info!("Adding new device"); + let (name, pubkey) = (req.name.clone(), req.pubkey.clone()); + info!("Adding new device {name} {pubkey}"); // set auth info req.token = private_cookies @@ -109,7 +115,10 @@ pub async fn create_device( .send(Some(core_request::Payload::NewDevice(req)), device_info)?; let payload = get_core_response(rx).await?; match payload { - core_response::Payload::DeviceConfig(response) => Ok(Json(response)), + core_response::Payload::DeviceConfig(response) => { + info!("Added new device {name} {pubkey}"); + Ok(Json(response)) + } _ => { error!("Received invalid gRPC response type: {payload:?}"); Err(ApiError::InvalidResponseType) @@ -123,7 +132,8 @@ pub async fn get_network_info( private_cookies: PrivateCookieJar, Json(mut req): Json, ) -> Result, ApiError> { - info!("Getting network info"); + let pubkey = req.pubkey.clone(); + info!("Getting network info for device {pubkey}"); // set auth info req.token = private_cookies @@ -135,7 +145,10 @@ pub async fn get_network_info( .send(Some(core_request::Payload::ExistingDevice(req)), None)?; let payload = get_core_response(rx).await?; match payload { - core_response::Payload::DeviceConfig(response) => Ok(Json(response)), + core_response::Payload::DeviceConfig(response) => { + info!("Got network info for device {pubkey}"); + Ok(Json(response)) + } _ => { error!("Received invalid gRPC response type: {payload:?}"); Err(ApiError::InvalidResponseType) diff --git a/src/handlers/password_reset.rs b/src/handlers/password_reset.rs index 88e9e44..f09a9ce 100644 --- a/src/handlers/password_reset.rs +++ b/src/handlers/password_reset.rs @@ -28,12 +28,15 @@ pub async fn request_password_reset( info!("Starting password reset request for {}", req.email); let rx = state.grpc_server.send( - Some(core_request::Payload::PasswordResetInit(req)), + Some(core_request::Payload::PasswordResetInit(req.clone())), device_info, )?; let payload = get_core_response(rx).await?; match payload { - core_response::Payload::Empty(_) => Ok(()), + core_response::Payload::Empty(_) => { + info!("Started password reset request for {}", req.email); + Ok(()) + } _ => { error!("Received invalid gRPC response type: {payload:?}"); Err(ApiError::InvalidResponseType) @@ -69,6 +72,7 @@ pub async fn start_password_reset( let cookie = Cookie::build((PASSWORD_RESET_COOKIE_NAME, token)) .expires(OffsetDateTime::from_unix_timestamp(response.deadline_timestamp).unwrap()); + info!("Started password reset process"); Ok((private_cookies.add(cookie), Json(response))) } _ => { @@ -99,7 +103,7 @@ pub async fn reset_password( match payload { core_response::Payload::Empty(_) => { if let Some(cookie) = private_cookies.get(PASSWORD_RESET_COOKIE_NAME) { - debug!("Password reset finished. Removing session cookie"); + info!("Password reset finished. Removing session cookie"); private_cookies = private_cookies.remove(cookie); } Ok(private_cookies)