Skip to content

Commit

Permalink
Add moar logs
Browse files Browse the repository at this point in the history
  • Loading branch information
j-chmielewski committed Mar 27, 2024
1 parent 2063e2b commit 1948fe6
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 13 deletions.
14 changes: 10 additions & 4 deletions src/handlers/desktop_client_mfa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@ async fn start_client_mfa(
device_info: Option<DeviceInfo>,
Json(req): Json<ClientMfaStartRequest>,
) -> Result<Json<ClientMfaStartResponse>, 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)
Expand All @@ -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)
Expand Down
25 changes: 19 additions & 6 deletions src/handlers/enrollment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand All @@ -63,7 +66,8 @@ pub async fn activate_user(
mut private_cookies: PrivateCookieJar,
Json(mut req): Json<ActivateUserRequest>,
) -> Result<PrivateCookieJar, ApiError> {
info!("Activating user");
let phone = req.phone_number.clone();
info!("Activating user - phone number {phone:?}");

// set auth info
req.token = private_cookies
Expand All @@ -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);
}
Expand All @@ -97,7 +102,8 @@ pub async fn create_device(
private_cookies: PrivateCookieJar,
Json(mut req): Json<NewDevice>,
) -> Result<Json<DeviceConfigResponse>, 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
Expand All @@ -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)
Expand All @@ -123,7 +132,8 @@ pub async fn get_network_info(
private_cookies: PrivateCookieJar,
Json(mut req): Json<ExistingDevice>,
) -> Result<Json<DeviceConfigResponse>, ApiError> {
info!("Getting network info");
let pubkey = req.pubkey.clone();
info!("Getting network info for device {pubkey}");

// set auth info
req.token = private_cookies
Expand All @@ -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)
Expand Down
10 changes: 7 additions & 3 deletions src/handlers/password_reset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)))
}
_ => {
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 1948fe6

Please sign in to comment.