|
|
|
@ -26,7 +26,13 @@ use reqwest::{
|
|
|
|
};
|
|
|
|
};
|
|
|
|
use semver::Version;
|
|
|
|
use semver::Version;
|
|
|
|
use serde::{de::Error as DeError, Deserialize, Deserializer, Serialize};
|
|
|
|
use serde::{de::Error as DeError, Deserialize, Deserializer, Serialize};
|
|
|
|
use tauri::{utils::platform::current_exe, AppHandle, Resource, Runtime};
|
|
|
|
use tauri::{
|
|
|
|
|
|
|
|
utils::{
|
|
|
|
|
|
|
|
config::BundleType,
|
|
|
|
|
|
|
|
platform::{bundle_type, current_exe},
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
AppHandle, Resource, Runtime,
|
|
|
|
|
|
|
|
};
|
|
|
|
use time::OffsetDateTime;
|
|
|
|
use time::OffsetDateTime;
|
|
|
|
use url::Url;
|
|
|
|
use url::Url;
|
|
|
|
|
|
|
|
|
|
|
|
@ -37,6 +43,31 @@ use crate::{
|
|
|
|
|
|
|
|
|
|
|
|
const UPDATER_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),);
|
|
|
|
const UPDATER_USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Copy, Clone)]
|
|
|
|
|
|
|
|
pub enum Installer {
|
|
|
|
|
|
|
|
AppImage,
|
|
|
|
|
|
|
|
Deb,
|
|
|
|
|
|
|
|
Rpm,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
App,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Msi,
|
|
|
|
|
|
|
|
Nsis,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
impl Installer {
|
|
|
|
|
|
|
|
fn suffix(self) -> &'static str {
|
|
|
|
|
|
|
|
match self {
|
|
|
|
|
|
|
|
Self::AppImage => "appimage",
|
|
|
|
|
|
|
|
Self::Deb => "deb",
|
|
|
|
|
|
|
|
Self::Rpm => "rpm",
|
|
|
|
|
|
|
|
Self::App => "app",
|
|
|
|
|
|
|
|
Self::Msi => "msi",
|
|
|
|
|
|
|
|
Self::Nsis => "nsis",
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[derive(Debug, Deserialize, Serialize, Clone)]
|
|
|
|
#[derive(Debug, Deserialize, Serialize, Clone)]
|
|
|
|
pub struct ReleaseManifestPlatform {
|
|
|
|
pub struct ReleaseManifestPlatform {
|
|
|
|
/// Download URL for the platform
|
|
|
|
/// Download URL for the platform
|
|
|
|
@ -270,7 +301,8 @@ impl UpdaterBuilder {
|
|
|
|
(target.clone(), target)
|
|
|
|
(target.clone(), target)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
let target = get_updater_target().ok_or(Error::UnsupportedOs)?;
|
|
|
|
let target = get_updater_target().ok_or(Error::UnsupportedOs)?;
|
|
|
|
(target.to_string(), format!("{target}-{arch}"))
|
|
|
|
let json_target = format!("{target}-{arch}");
|
|
|
|
|
|
|
|
(target.to_owned(), json_target)
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
let executable_path = self.executable_path.clone().unwrap_or(current_exe()?);
|
|
|
|
let executable_path = self.executable_path.clone().unwrap_or(current_exe()?);
|
|
|
|
@ -327,7 +359,7 @@ pub struct Updater {
|
|
|
|
proxy: Option<Url>,
|
|
|
|
proxy: Option<Url>,
|
|
|
|
endpoints: Vec<Url>,
|
|
|
|
endpoints: Vec<Url>,
|
|
|
|
arch: &'static str,
|
|
|
|
arch: &'static str,
|
|
|
|
// The `{{target}}` variable we replace in the endpoint
|
|
|
|
// The `{{target}}` variable we replace in the endpoint and serach for in the JSON
|
|
|
|
target: String,
|
|
|
|
target: String,
|
|
|
|
// The value we search if the updater server returns a JSON with the `platforms` object
|
|
|
|
// The value we search if the updater server returns a JSON with the `platforms` object
|
|
|
|
json_target: String,
|
|
|
|
json_target: String,
|
|
|
|
@ -342,6 +374,18 @@ pub struct Updater {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Updater {
|
|
|
|
impl Updater {
|
|
|
|
|
|
|
|
fn get_updater_installer(&self) -> Option<Installer> {
|
|
|
|
|
|
|
|
bundle_type().and_then(|t| match t {
|
|
|
|
|
|
|
|
BundleType::Deb => Some(Installer::Deb),
|
|
|
|
|
|
|
|
BundleType::Rpm => Some(Installer::Rpm),
|
|
|
|
|
|
|
|
BundleType::AppImage => Some(Installer::AppImage),
|
|
|
|
|
|
|
|
BundleType::Msi => Some(Installer::Msi),
|
|
|
|
|
|
|
|
BundleType::Nsis => Some(Installer::Nsis),
|
|
|
|
|
|
|
|
BundleType::App => Some(Installer::App),
|
|
|
|
|
|
|
|
BundleType::Dmg => None,
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub async fn check(&self) -> Result<Option<Update>> {
|
|
|
|
pub async fn check(&self) -> Result<Option<Update>> {
|
|
|
|
// we want JSON only
|
|
|
|
// we want JSON only
|
|
|
|
let mut headers = self.headers.clone();
|
|
|
|
let mut headers = self.headers.clone();
|
|
|
|
@ -466,6 +510,31 @@ impl Updater {
|
|
|
|
None => release.version > self.current_version,
|
|
|
|
None => release.version > self.current_version,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut download_url = release.download_url(&self.json_target);
|
|
|
|
|
|
|
|
let mut signature = release.signature(&self.json_target);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let installer = self.get_updater_installer();
|
|
|
|
|
|
|
|
if installer.is_none() && (download_url.is_err() || signature.is_err()) {
|
|
|
|
|
|
|
|
return Err(Error::TargetNotFound(self.json_target.clone()));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(installer) = installer {
|
|
|
|
|
|
|
|
let target = &format!("{}-{}", &self.json_target, installer.suffix());
|
|
|
|
|
|
|
|
download_url =
|
|
|
|
|
|
|
|
release
|
|
|
|
|
|
|
|
.download_url(target)
|
|
|
|
|
|
|
|
.or(download_url.or(Err(Error::TargetsNotFound(
|
|
|
|
|
|
|
|
self.json_target.clone(),
|
|
|
|
|
|
|
|
target.clone(),
|
|
|
|
|
|
|
|
))));
|
|
|
|
|
|
|
|
signature = release
|
|
|
|
|
|
|
|
.signature(target)
|
|
|
|
|
|
|
|
.or(signature.or(Err(Error::TargetsNotFound(
|
|
|
|
|
|
|
|
self.json_target.clone(),
|
|
|
|
|
|
|
|
target.clone(),
|
|
|
|
|
|
|
|
))));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let update = if should_update {
|
|
|
|
let update = if should_update {
|
|
|
|
Some(Update {
|
|
|
|
Some(Update {
|
|
|
|
run_on_main_thread: self.run_on_main_thread.clone(),
|
|
|
|
run_on_main_thread: self.run_on_main_thread.clone(),
|
|
|
|
@ -477,9 +546,10 @@ impl Updater {
|
|
|
|
extract_path: self.extract_path.clone(),
|
|
|
|
extract_path: self.extract_path.clone(),
|
|
|
|
version: release.version.to_string(),
|
|
|
|
version: release.version.to_string(),
|
|
|
|
date: release.pub_date,
|
|
|
|
date: release.pub_date,
|
|
|
|
download_url: release.download_url(&self.json_target)?.to_owned(),
|
|
|
|
download_url: download_url?.to_owned(),
|
|
|
|
signature: release.signature(&self.json_target)?.to_owned(),
|
|
|
|
body: release.notes.clone(),
|
|
|
|
body: release.notes,
|
|
|
|
signature: signature?.to_owned(),
|
|
|
|
|
|
|
|
installer,
|
|
|
|
raw_json: raw_json.unwrap(),
|
|
|
|
raw_json: raw_json.unwrap(),
|
|
|
|
timeout: None,
|
|
|
|
timeout: None,
|
|
|
|
proxy: self.proxy.clone(),
|
|
|
|
proxy: self.proxy.clone(),
|
|
|
|
@ -513,6 +583,8 @@ pub struct Update {
|
|
|
|
pub date: Option<OffsetDateTime>,
|
|
|
|
pub date: Option<OffsetDateTime>,
|
|
|
|
/// Target
|
|
|
|
/// Target
|
|
|
|
pub target: String,
|
|
|
|
pub target: String,
|
|
|
|
|
|
|
|
/// Current installer
|
|
|
|
|
|
|
|
pub installer: Option<Installer>,
|
|
|
|
/// Download URL announced
|
|
|
|
/// Download URL announced
|
|
|
|
pub download_url: Url,
|
|
|
|
pub download_url: Url,
|
|
|
|
/// Signature announced
|
|
|
|
/// Signature announced
|
|
|
|
@ -852,11 +924,10 @@ impl Update {
|
|
|
|
/// └── ...
|
|
|
|
/// └── ...
|
|
|
|
///
|
|
|
|
///
|
|
|
|
fn install_inner(&self, bytes: &[u8]) -> Result<()> {
|
|
|
|
fn install_inner(&self, bytes: &[u8]) -> Result<()> {
|
|
|
|
if self.is_deb_package() {
|
|
|
|
match self.installer {
|
|
|
|
self.install_deb(bytes)
|
|
|
|
Some(Installer::Deb) => self.install_deb(bytes),
|
|
|
|
} else {
|
|
|
|
Some(Installer::Rpm) => self.install_rpm(bytes),
|
|
|
|
// Handle AppImage or other formats
|
|
|
|
_ => self.install_appimage(bytes),
|
|
|
|
self.install_appimage(bytes)
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -933,39 +1004,6 @@ impl Update {
|
|
|
|
Err(Error::TempDirNotOnSameMountPoint)
|
|
|
|
Err(Error::TempDirNotOnSameMountPoint)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn is_deb_package(&self) -> bool {
|
|
|
|
|
|
|
|
// First check if we're in a typical Debian installation path
|
|
|
|
|
|
|
|
let in_system_path = self
|
|
|
|
|
|
|
|
.extract_path
|
|
|
|
|
|
|
|
.to_str()
|
|
|
|
|
|
|
|
.map(|p| p.starts_with("/usr"))
|
|
|
|
|
|
|
|
.unwrap_or(false);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if !in_system_path {
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Then verify it's actually a Debian-based system by checking for dpkg
|
|
|
|
|
|
|
|
let dpkg_exists = std::path::Path::new("/var/lib/dpkg").exists();
|
|
|
|
|
|
|
|
let apt_exists = std::path::Path::new("/etc/apt").exists();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Additional check for the package in dpkg database
|
|
|
|
|
|
|
|
let package_in_dpkg = if let Ok(output) = std::process::Command::new("dpkg")
|
|
|
|
|
|
|
|
.args(["-S", &self.extract_path.to_string_lossy()])
|
|
|
|
|
|
|
|
.output()
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
output.status.success()
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
false
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Consider it a deb package only if:
|
|
|
|
|
|
|
|
// 1. We're in a system path AND
|
|
|
|
|
|
|
|
// 2. We have Debian package management tools AND
|
|
|
|
|
|
|
|
// 3. The binary is tracked by dpkg
|
|
|
|
|
|
|
|
dpkg_exists && apt_exists && package_in_dpkg
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn install_deb(&self, bytes: &[u8]) -> Result<()> {
|
|
|
|
fn install_deb(&self, bytes: &[u8]) -> Result<()> {
|
|
|
|
// First verify the bytes are actually a .deb package
|
|
|
|
// First verify the bytes are actually a .deb package
|
|
|
|
if !infer::archive::is_deb(bytes) {
|
|
|
|
if !infer::archive::is_deb(bytes) {
|
|
|
|
@ -973,6 +1011,18 @@ impl Update {
|
|
|
|
return Err(Error::InvalidUpdaterFormat);
|
|
|
|
return Err(Error::InvalidUpdaterFormat);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
self.try_tmp_locations(bytes, "dpkg", "-i")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn install_rpm(&self, bytes: &[u8]) -> Result<()> {
|
|
|
|
|
|
|
|
// First verify the bytes are actually a .rpm package
|
|
|
|
|
|
|
|
if !infer::archive::is_rpm(bytes) {
|
|
|
|
|
|
|
|
return Err(Error::InvalidUpdaterFormat);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
self.try_tmp_locations(bytes, "rpm", "-U")
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn try_tmp_locations(&self, bytes: &[u8], install_cmd: &str, install_arg: &str) -> Result<()> {
|
|
|
|
// Try different temp directories
|
|
|
|
// Try different temp directories
|
|
|
|
let tmp_dir_locations = vec
kandrelczyk
1 day ago
committed by
GitHub