From 97314b58635f74e8f6dbfcdb9854c388020303a8 Mon Sep 17 00:00:00 2001 From: BlackDex Date: Mon, 26 May 2025 23:04:38 +0200 Subject: [PATCH] Fix admin diagnostics crash Better handle semver issues. Fixes #5882 Fixes #5883 Fixes #5885 Signed-off-by: BlackDex --- src/api/admin.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/api/admin.rs b/src/api/admin.rs index 5034884f..0909ddd8 100644 --- a/src/api/admin.rs +++ b/src/api/admin.rs @@ -698,10 +698,14 @@ async fn diagnostics(_token: AdminToken, ip_header: IpHeader, mut conn: DbConn) let web_vault_version = get_web_vault_version(); // Check if the running version is newer than the latest stable released version - let web_ver_match = semver::VersionReq::parse(&format!(">{latest_web_build}")).unwrap(); - let web_vault_pre_release = web_ver_match.matches( - &semver::Version::parse(&web_vault_version).unwrap_or_else(|_| semver::Version::parse("2025.1.1").unwrap()), - ); + let web_vault_pre_release = if let Ok(web_ver_match) = semver::VersionReq::parse(&format!(">{latest_web_build}")) { + web_ver_match.matches( + &semver::Version::parse(&web_vault_version).unwrap_or_else(|_| semver::Version::parse("2025.1.1").unwrap()), + ) + } else { + error!("Unable to parse latest_web_build: '{latest_web_build}'"); + false + }; let diagnostics_json = json!({ "dns_resolved": dns_resolved,