From fe12daead9702df01a7ddab2bef634d27d8fbe4f Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 18 Nov 2025 19:18:56 +0000 Subject: [PATCH] Fix short-circuit condition; propagate 403 in unlikely branch anyway. (fixes #219) Signed-off-by: Jason Volk --- src/api/client/account.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/api/client/account.rs b/src/api/client/account.rs index 90b020f4..65f7e31a 100644 --- a/src/api/client/account.rs +++ b/src/api/client/account.rs @@ -5,7 +5,7 @@ use ruma::api::client::account::{ ThirdPartyIdRemovalStatus, change_password, deactivate, get_3pids, request_3pid_management_token_via_email, request_3pid_management_token_via_msisdn, whoami, }; -use tuwunel_core::{Err, Result, info, utils::ReadyExt}; +use tuwunel_core::{Err, Result, err, info, utils::ReadyExt}; use crate::{Ruma, router::auth_uiaa}; @@ -73,10 +73,12 @@ pub(crate) async fn whoami_route( Ok(whoami::v3::Response { user_id: body.sender_user().to_owned(), device_id: body.sender_device.clone(), - is_guest: services - .users - .is_deactivated(body.sender_user()) - .await? && body.appservice_info.is_none(), + is_guest: body.appservice_info.is_none() + && services + .users + .is_deactivated(body.sender_user()) + .await + .map_err(|_| err!(Request(Forbidden("User does not exist."))))?, }) }