Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.
fix(desktop): only download updates from our own GitHub releases
Bee108a9488e879
diff --git a/desktop/app/src/updater.rs b/desktop/app/src/updater.rsindex f7919a9..11c853b 100644--- a/desktop/app/src/updater.rs+++ b/desktop/app/src/updater.rs@@ -47,6 +47,9 @@ use crate::{};const LATEST: &str = "https://api.github.com/repos/thtbee/nectarlink/releases/latest";+/// Where our release files are. An update is only downloaded from here, so a+/// changed or spoofed release listing can't point the installer elsewhere.+const RELEASE_DOWNLOADS: &str = "https://github.com/thtbee/nectarlink/releases/download/";const FIRST_CHECK: Duration = Duration::from_secs(30);const EVERY: Duration = Duration::from_secs(24 * 3600);const MAX_INSTALLER: u64 = 400 * 1024 * 1024;@@ -348,8 +351,12 @@ fn newer_release_for(release: Release, current: &str, suffix: &str) -> Option<Up|| a.name.starts_with("nectarlink-"))&& a.name.chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '.' | '_'))&& !a.name.contains("..")+ && a.browser_download_url.starts_with(RELEASE_DOWNLOADS)})?;- let sums = release.assets.iter().find(|a| a.name == "SHA256SUMS.txt")?;+ let sums = release+ .assets+ .iter()+ .find(|a| a.name == "SHA256SUMS.txt" && a.browser_download_url.starts_with(RELEASE_DOWNLOADS))?;Some(Update {version,notes_url: release.html_url,@@ -1177,25 +1184,34 @@ mod tests {assets: vec![Asset {name: "Nectarlink-9.0.0-x64-setup.exe".into(),- browser_download_url: "https://x/setup".into(),+ browser_download_url: "https://github.com/thtbee/nectarlink/releases/download/v9/setup"+ .into(),},Asset {name: "Nectarlink-9.0.0-arm64-setup.exe".into(),- browser_download_url: "https://x/setup-arm64".into(),+ browser_download_url:+ "https://github.com/thtbee/nectarlink/releases/download/v9/setup-arm64".into(),},Asset {name: "Nectarlink-9.0.0-x86_64.AppImage".into(),- browser_download_url: "https://x/appimage-x64".into(),+ browser_download_url:+ "https://github.com/thtbee/nectarlink/releases/download/v9/appimage-x64".into(),},Asset {name: "nectarlink_9.0.0_amd64.deb".into(),- browser_download_url: "https://x/deb-amd64".into(),+ browser_download_url:+ "https://github.com/thtbee/nectarlink/releases/download/v9/deb-amd64".into(),},Asset {name: "nectarlink-9.0.0-1.x86_64.rpm".into(),- browser_download_url: "https://x/rpm-x86_64".into(),+ browser_download_url:+ "https://github.com/thtbee/nectarlink/releases/download/v9/rpm-x86_64".into(),+ },+ Asset {+ name: "SHA256SUMS.txt".into(),+ browser_download_url: "https://github.com/thtbee/nectarlink/releases/download/v9/sums"+ .into(),},- Asset { name: "SHA256SUMS.txt".into(), browser_download_url: "https://x/sums".into() },],}}@@ -1253,11 +1269,17 @@ mod tests {#[test]fn releases_become_updates_when_newer_and_complete() {let x64 = newer_release_for(release("v9.0.0"), "0.0.1", "-x64-setup.exe").unwrap();- assert_eq!((x64.version.as_str(), x64.installer_url.as_str()), ("9.0.0", "https://x/setup"));+ assert_eq!(+ (x64.version.as_str(), x64.installer_url.as_str()),+ ("9.0.0", "https://github.com/thtbee/nectarlink/releases/download/v9/setup")+ );let arm64 = newer_release_for(release("v9.0.0"), "0.0.1", "-arm64-setup.exe").unwrap();assert_eq!((arm64.installer_name.as_str(), arm64.installer_url.as_str()),- ("Nectarlink-9.0.0-arm64-setup.exe", "https://x/setup-arm64")+ (+ "Nectarlink-9.0.0-arm64-setup.exe",+ "https://github.com/thtbee/nectarlink/releases/download/v9/setup-arm64"+ ));assert!(newer_release(release("v0.0.1"), "0.0.1").is_none());let mut draft = release("v9.0.0");@@ -1266,6 +1288,17 @@ mod tests {let mut no_sums = release("v9.0.0");no_sums.assets.pop();assert!(newer_release(no_sums, "0.0.1").is_none());+ // Files anywhere but our own releases are never downloaded.+ for elsewhere in+ ["https://example.com/setup", "https://github.com/someone/nectarlink/releases/download/v9/setup"]+ {+ let mut moved = release("v9.0.0");+ moved.assets[0].browser_download_url = elsewhere.into();+ assert!(newer_release_for(moved, "0.0.1", "-x64-setup.exe").is_none(), "{elsewhere}");+ let mut moved_sums = release("v9.0.0");+ moved_sums.assets.last_mut().unwrap().browser_download_url = elsewhere.into();+ assert!(newer_release_for(moved_sums, "0.0.1", "-x64-setup.exe").is_none(), "{elsewhere}");+ }}#[test]@@ -1273,12 +1306,18 @@ mod tests {let appimage = newer_release_for(release("v9.0.0"), "0.0.1", "-x86_64.AppImage").unwrap();assert_eq!((appimage.installer_name.as_str(), appimage.installer_url.as_str()),- ("Nectarlink-9.0.0-x86_64.AppImage", "https://x/appimage-x64")+ (+ "Nectarlink-9.0.0-x86_64.AppImage",+ "https://github.com/thtbee/nectarlink/releases/download/v9/appimage-x64"+ ));let deb = newer_release_for(release("v9.0.0"), "0.0.1", "_amd64.deb").unwrap();assert_eq!((deb.installer_name.as_str(), deb.installer_url.as_str()),- ("nectarlink_9.0.0_amd64.deb", "https://x/deb-amd64")+ (+ "nectarlink_9.0.0_amd64.deb",+ "https://github.com/thtbee/nectarlink/releases/download/v9/deb-amd64"+ ));#[cfg(target_os = "linux")]{