zobally/RustDesk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(update): improve update SHA256 caching and verification flow

Browse source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2026-05-10 14:53:39 +08:00
parent e354a8af3e
commit 48097d5ebe
1 changed files with 54 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

95
src/updater.rs
View file

@ -148,51 +148,15 @@ fn check_update(manually: bool) -> ResultType<()> {
format!("{}/rustdesk-{}-x86-sciter.exe", download_url, version)
};
log::debug!("New version available: {}", &version);
let client = create_http_client_with_url(&download_url, Some(false));
let Some(file_path) = get_download_file_from_url(&download_url) else {
bail!("Failed to get the file path from the URL: {}", download_url);
};
let expected_sha256 = fetch_github_asset_sha256(&update_url, &download_url)?;
let mut is_file_exists = false;
if file_path.exists() {
// Check if the file size is the same as the server file size
// If the file size is the same, we don't need to download it again.
let file_size = std::fs::metadata(&file_path)?.len();
let response = client.head(&download_url).send()?;
if !response.status().is_success() {
bail!("Failed to get the file size: {}", response.status());
}
let total_size = response
.headers()
.get(reqwest::header::CONTENT_LENGTH)
.and_then(|ct_len| ct_len.to_str().ok())
.and_then(|ct_len| ct_len.parse::<u64>().ok());
let Some(total_size) = total_size else {
bail!("Failed to get content length");
};
if file_size == total_size {
match verify_file_sha256(&file_path, &expected_sha256) {
Ok(()) => is_file_exists = true,
Err(e) => {
log::warn!("Removing cached update file with invalid SHA256: {}", e);
std::fs::remove_file(&file_path)?;
}
}
} else {
std::fs::remove_file(&file_path)?;
}
}
if !is_file_exists {
let response = client.get(&download_url).send()?;
if !response.status().is_success() {
bail!(
"Failed to download the new version file: {}",
response.status()
);
}
let file_data = response.bytes()?;
write_verified_download(&file_path, &file_data, &expected_sha256)?;
let expected_sha256 = download_file_expected_sha256(&download_url)?;
let verify_res = ensure_verified_update_file(&download_url, &file_path, &expected_sha256);
if verify_res.is_err() {
clear_download_file_expected_sha256(&download_url);
}
verify_res?;
// We have checked if the `conns` is empty before, but we need to check again.
// No need to care about the downloaded file here, because it's rare case that the `conns` are empty
// before the download, but not empty after the download.
@ -204,6 +168,55 @@ fn check_update(manually: bool) -> ResultType<()> {
Ok(())
}
fn ensure_verified_update_file(
download_url: &str,
file_path: &Path,
expected_sha256: &str,
) -> ResultType<()> {
let client = create_http_client_with_url(download_url, Some(false));
let mut is_file_exists = false;
if file_path.exists() {
// Check if the file size is the same as the server file size
// If the file size is the same, we don't need to download it again.
let file_size = std::fs::metadata(file_path)?.len();
let response = client.head(download_url).send()?;
if !response.status().is_success() {
bail!("Failed to get the file size: {}", response.status());
}
let total_size = response
.headers()
.get(reqwest::header::CONTENT_LENGTH)
.and_then(|ct_len| ct_len.to_str().ok())
.and_then(|ct_len| ct_len.parse::<u64>().ok());
let Some(total_size) = total_size else {
bail!("Failed to get content length");
};
if file_size == total_size {
match verify_file_sha256(file_path, expected_sha256) {
Ok(()) => is_file_exists = true,
Err(e) => {
log::warn!("Removing cached update file with invalid SHA256: {}", e);
std::fs::remove_file(file_path)?;
}
}
} else {
std::fs::remove_file(file_path)?;
}
}
if !is_file_exists {
let response = client.get(download_url).send()?;
if !response.status().is_success() {
bail!(
"Failed to download the new version file: {}",
response.status()
);
}
let file_data = response.bytes()?;
write_verified_download(file_path, &file_data, expected_sha256)?;
}
Ok(())
}
#[cfg(target_os = "windows")]
fn update_new_version(update_msi: bool, version: &str, file_path: &PathBuf, expected_sha256: &str) {
log::debug!(