TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-19 10:51:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

improve register_switch_grant: skip public server, log at error level

Browse Source 
Also document why registration is fire-and-forget with no retry: the
peer connects within seconds, so a late retry would land after its
punch request was already rejected; a failed switch is recovered by
the user triggering it again, which registers a fresh grant.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
rustdesk
2026-07-28 17:36:58 +08:00
parent 937546d712
commit bc2c29ae9a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hbbs_http/sync.rs
View File

@@ -309,12 +309,16 @@ pub fn is_pro() -> bool {
PRO.lock().unwrap().clone() PRO.lock().unwrap().clone()
} }
// Fire-and-forget by design: the switch flow must not block on this POST,
// and there is no retry — the peer connects within seconds, so a late
// retry would land after its punch request was already rejected. If the
// switch fails, the user triggers it again, which registers a fresh grant.
#[cfg(feature = "flutter")] #[cfg(feature = "flutter")]
#[cfg(not(any(target_os = "android", target_os = "ios")))] #[cfg(not(any(target_os = "android", target_os = "ios")))]
pub fn register_switch_grant(switch_uuid: String) { pub fn register_switch_grant(switch_uuid: String) {
tokio::spawn(async move { tokio::spawn(async move {
let api_server = crate::ui_interface::get_api_server(); let api_server = crate::ui_interface::get_api_server();
if api_server.is_empty() { if api_server.is_empty() || crate::is_public(&api_server) {
return; return;
} }
use hbb_common::sodiumoxide::crypto::{hash::sha256, sign}; use hbb_common::sodiumoxide::crypto::{hash::sha256, sign};
@@ -322,7 +326,7 @@ pub fn register_switch_grant(switch_uuid: String) {
let id = Config::get_id(); let id = Config::get_id();
let kp = Config::get_key_pair(); let kp = Config::get_key_pair();
let Some(sk) = sign::SecretKey::from_slice(&kp.0) else { let Some(sk) = sign::SecretKey::from_slice(&kp.0) else {
log::warn!("Failed to register switch grant: no device key"); log::error!("Failed to register switch grant: no device key");
return; return;
}; };
let signed = sign::sign(&switch_grant_signed_msg(&id, &switch_code), &sk); let signed = sign::sign(&switch_grant_signed_msg(&id, &switch_code), &sk);
@@ -334,7 +338,7 @@ pub fn register_switch_grant(switch_uuid: String) {
.to_string(); .to_string();
let url = format!("{}/api/switch-grant", api_server); let url = format!("{}/api/switch-grant", api_server);
if let Err(e) = crate::post_request(url, body, "").await { if let Err(e) = crate::post_request(url, body, "").await {
log::warn!("Failed to register switch grant: {}", e); log::error!("Failed to register switch grant: {}", e);
} }
}); });
} }