From c5caa024d679e3be5b396723015cdf73cd070a38 Mon Sep 17 00:00:00 2001 From: Mex <44814932+MMexicann@users.noreply.github.com> Date: Sat, 17 Oct 2026 22:16:51 +0200 Subject: [PATCH] fix(update): reject invalid self-update marker timestamps (#492) --- crates/native/src/self_update.rs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/crates/native/src/self_update.rs b/crates/native/src/self_update.rs index 6c248b97..0ce6ff3e 100644 --- a/crates/native/src/self_update.rs +++ b/crates/native/src/self_update.rs @@ -78,7 +78,7 @@ pub fn just_updated_to(paths: &Paths, release: &Release) -> bool { let Ok(text) = std::fs::read_to_string(marker(paths)) else { return false }; let mut lines = text.lines(); let (Some(tag), Some(at)) = (lines.next(), lines.next().and_then(|a| a.parse::().ok())) else { return false }; - tag == release.tag && crate::now() - at < JUST_UPDATED_FOR + tag == release.tag && crate::now().checked_sub(at).is_some_and(|age| (0..JUST_UPDATED_FOR).contains(&age)) } fn marker(paths: &Paths) -> PathBuf { @@ -293,6 +293,26 @@ fn ps_quote_arg(path: &Path) -> String { mod tests { use super::*; + #[test] + fn a_corrupt_self_update_timestamp_does_not_overflow() { + let dir = tempfile::tempdir().unwrap(); + let paths = Paths::under(dir.path()); + let release = Release { tag: "v0.2.0".into(), ..Release::default() }; + crate::paths::write_atomic(&marker(&paths), format!("v0.2.0\n{}\n", i64::MIN).as_bytes()).unwrap(); + assert!(!just_updated_to(&paths, &release)); + } + + #[test] + fn a_future_self_update_timestamp_does_not_suppress_updates() { + let dir = tempfile::tempdir().unwrap(); + let paths = Paths::under(dir.path()); + let release = Release { tag: "v0.2.0".into(), ..Release::default() }; + for at in [crate::now() + JUST_UPDATED_FOR, i64::MAX] { + crate::paths::write_atomic(&marker(&paths), format!("v0.2.0\n{at}\n").as_bytes()).unwrap(); + assert!(!just_updated_to(&paths, &release), "future timestamp {at}"); + } + } + #[test] fn a_version_just_installed_is_not_offered_again() { let dir = tempfile::tempdir().unwrap();