mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-12-01 01:29:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix how 2FA codes are verified (#7429)

Browse Source 
Signed-off-by: p0358 <p0358@users.noreply.github.com>
This commit is contained in:
p0358 2024-03-20 12:50:55 +01:00 committed by GitHub
parent 41da6d552f
commit e0739709e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/auth_2fa.rs
View File

@ -89,16 +89,14 @@ pub fn generate2fa() -> String {
pub fn verify2fa(code: String) -> bool {
if let Some((info, totp)) = CURRENT_2FA.lock().unwrap().as_ref() {
if let Ok(cur) = totp.generate_current() {
let res = code == cur;
if res {
if let Ok(v) = info.into_string() {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
crate::ipc::set_option("2fa", &v);
#[cfg(any(target_os = "android", target_os = "ios"))]
Config::set_option("2fa".to_owned(), v);
return res;
}
let is_valid = totp.check_current(&code).unwrap_or(false);
if is_valid {
if let Ok(v) = info.into_string() {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
crate::ipc::set_option("2fa", &v);
#[cfg(any(target_os = "android", target_os = "ios"))]
Config::set_option("2fa".to_owned(), v);
return is_valid;
}
}
}