hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a quick fix for 2fa

Browse Source
This commit is contained in:
rustdesk 2024-01-21 15:18:25 +08:00
parent 804f035a87
commit 68afb89b99
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/client.rs
View File

@ -2564,7 +2564,6 @@ pub fn handle_login_error(
interface.msgbox("re-input-password", err, "Do you want to enter again?", ""); interface.msgbox("re-input-password", err, "Do you want to enter again?", "");
true true
} else if err == LOGIN_MSG_2FA_WRONG || err == REQUIRE_2FA { } else if err == LOGIN_MSG_2FA_WRONG || err == REQUIRE_2FA {
lc.write().unwrap().password = Default::default();
interface.msgbox("input-2fa", err, "", ""); interface.msgbox("input-2fa", err, "", "");
true true
} else if LOGIN_ERROR_MAP.contains_key(err) { } else if LOGIN_ERROR_MAP.contains_key(err) {

6
src/server/connection.rs
View File

@ -1625,8 +1625,8 @@ impl Connection {
#[cfg(all(target_os = "linux", feature = "linux_headless"))] #[cfg(all(target_os = "linux", feature = "linux_headless"))]
#[cfg(not(any(feature = "flatpak", feature = "appimage")))] #[cfg(not(any(feature = "flatpak", feature = "appimage")))]
self.linux_headless_handle.wait_desktop_cm_ready().await; self.linux_headless_handle.wait_desktop_cm_ready().await;
self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), true);
self.send_logon_response().await; self.send_logon_response().await;
self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), self.authorized);
if self.port_forward_socket.is_some() { if self.port_forward_socket.is_some() {
return false; return false;
} }
@ -1666,7 +1666,7 @@ impl Connection {
#[cfg(not(any(feature = "flatpak", feature = "appimage")))] #[cfg(not(any(feature = "flatpak", feature = "appimage")))]
self.linux_headless_handle.wait_desktop_cm_ready().await; self.linux_headless_handle.wait_desktop_cm_ready().await;
self.send_logon_response().await; self.send_logon_response().await;
self.try_start_cm(lr.my_id, lr.my_name, true); self.try_start_cm(lr.my_id, lr.my_name, self.authorized);
if self.port_forward_socket.is_some() { if self.port_forward_socket.is_some() {
return false; return false;
} }
@ -1746,8 +1746,8 @@ impl Connection {
if let Some((_instant, uuid_old)) = uuid_old { if let Some((_instant, uuid_old)) = uuid_old {
if uuid == uuid_old { if uuid == uuid_old {
self.from_switch = true; self.from_switch = true;
self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), true);
self.send_logon_response().await; self.send_logon_response().await;
self.try_start_cm(lr.my_id.clone(), lr.my_name.clone(), self.authorized);
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
self.try_start_cm_ipc(); self.try_start_cm_ipc();
} }