Browse Source
Fix admin diagnostics crash (#5886)
Better handle semver issues.
Fixes #5882
Fixes #5883
Fixes #5885
Signed-off-by: BlackDex <black.dex@gmail.com>
pull/5891/head
1.34.1
Mathijs van Veluw
2 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
8 additions and
4 deletions
-
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, |
|
|
|
|
