diff --git a/gpgui/src-tauri/src/auth.rs b/gpgui/src-tauri/src/auth.rs index 2bcaea3..2cd4846 100644 --- a/gpgui/src-tauri/src/auth.rs +++ b/gpgui/src-tauri/src/auth.rs @@ -64,9 +64,9 @@ impl TryFrom> for AuthRequest { pub(crate) struct AuthData { #[redact] username: Option, - #[redact(fixed = 10)] + #[redact] prelogin_cookie: Option, - #[redact(fixed = 10)] + #[redact] portal_userauthcookie: Option, } @@ -84,8 +84,11 @@ impl AuthData { } fn check(&self) -> bool { - self.username.is_some() - && (self.prelogin_cookie.is_some() || self.portal_userauthcookie.is_some()) + let username_valid = self.username.clone().is_some_and(|username| !username.is_empty()); + let prelogin_cookie_valid = self.prelogin_cookie.clone().is_some_and(|val| val.len() > 5); + let portal_userauthcookie_valid = self.portal_userauthcookie.clone().is_some_and(|val| val.len() > 5); + + username_valid && (prelogin_cookie_valid || portal_userauthcookie_valid) } }