git-echo/linux_patch_manager
Private
Public Access
1
0
Fork 0
Code Releases 8 Wiki Activity

fix: add missing CRL columns to Host SQL queries and fix comma syntax

Browse Source 
Co-authored-by: Draco Lunaris <331325+Draco-Lunaris@users.noreply.github.com>
This commit is contained in:
Draco-Lunaris-Echo
2026-06-05 22:52:59 -05:00
committed by GitHub
parent 0b12ded1cf
commit 050439ee14
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Cargo.lock generated
View File

@ -2043,7 +2043,7 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
[[package]] [[package]]
name = "migrate-secrets" name = "migrate-secrets"
version = "0.1.9" version = "0.2.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",
@ -2548,7 +2548,7 @@ dependencies = [
[[package]] [[package]]
name = "pm-agent-client" name = "pm-agent-client"
version = "0.1.9" version = "0.2.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -2565,7 +2565,7 @@ dependencies = [
[[package]] [[package]]
name = "pm-auth" name = "pm-auth"
version = "0.1.9" version = "0.2.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"argon2", "argon2",
@ -2593,7 +2593,7 @@ dependencies = [
[[package]] [[package]]
name = "pm-ca" name = "pm-ca"
version = "0.1.9" version = "0.2.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -2617,7 +2617,7 @@ dependencies = [
[[package]] [[package]]
name = "pm-core" name = "pm-core"
version = "0.1.9" version = "0.2.2"
dependencies = [ dependencies = [
"aes-gcm", "aes-gcm",
"anyhow", "anyhow",
@ -2641,7 +2641,7 @@ dependencies = [
[[package]] [[package]]
name = "pm-reports" name = "pm-reports"
version = "0.1.9" version = "0.2.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -2661,7 +2661,7 @@ dependencies = [
[[package]] [[package]]
name = "pm-web" name = "pm-web"
version = "0.1.9" version = "0.2.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
@ -2702,7 +2702,7 @@ dependencies = [
[[package]] [[package]]
name = "pm-worker" name = "pm-worker"
version = "0.1.9" version = "0.2.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",

2
crates/pm-web/src/routes/enrollment.rs
View File

@ -186,7 +186,7 @@ async fn approve_enrollment(
// Check for FQDN/IP collision in hosts table // Check for FQDN/IP collision in hosts table
if let Some(existing_host) = sqlx::query_as::<_, Host>( if let Some(existing_host) = sqlx::query_as::<_, Host>(
"SELECT id, fqdn, ip_address::text, display_name, os_family, os_name, arch, agent_version, health_status, last_health_at, last_patch_at, agent_port, notes, registered_at, updated_at FROM hosts WHERE fqdn = $1 OR ip_address = $2::inet" "SELECT id, fqdn, ip_address::text, display_name, os_family, os_name, arch, agent_version, health_status, last_health_at, last_patch_at, agent_port, notes, registered_at, updated_at, crl_status, crl_age_seconds, crl_next_update FROM hosts WHERE fqdn = $1 OR ip_address = $2::inet"
) )
.bind(&enrollment_request.fqdn) .bind(&enrollment_request.fqdn)
.bind(enrollment_request.ip_address.to_string()) .bind(enrollment_request.ip_address.to_string())

6
crates/pm-web/src/routes/hosts.rs
View File

@ -132,7 +132,7 @@ async fn list_hosts(
THEN 'some_unhealthy' THEN 'some_unhealthy'
ELSE 'all_healthy' ELSE 'all_healthy'
END AS health_check_status, END AS health_check_status,
h.registered_at h.registered_at,
h.crl_status h.crl_status
FROM hosts h FROM hosts h
LEFT JOIN host_patch_data hpd ON hpd.host_id = h.id LEFT JOIN host_patch_data hpd ON hpd.host_id = h.id
@ -166,7 +166,7 @@ async fn list_hosts(
THEN 'some_unhealthy' THEN 'some_unhealthy'
ELSE 'all_healthy' ELSE 'all_healthy'
END AS health_check_status, END AS health_check_status,
h.registered_at h.registered_at,
h.crl_status h.crl_status
FROM hosts h FROM hosts h
LEFT JOIN host_patch_data hpd ON hpd.host_id = h.id LEFT JOIN host_patch_data hpd ON hpd.host_id = h.id
@ -434,7 +434,7 @@ async fn update_host(
SELECT id, fqdn, host(ip_address)::text AS ip_address, display_name, SELECT id, fqdn, host(ip_address)::text AS ip_address, display_name,
os_family, os_name, arch, agent_version, health_status, os_family, os_name, arch, agent_version, health_status,
last_health_at, last_patch_at, agent_port, notes, last_health_at, last_patch_at, agent_port, notes,
registered_at, updated_at registered_at, updated_at, crl_status, crl_age_seconds, crl_next_update
FROM hosts WHERE id = (SELECT id FROM updated) FROM hosts WHERE id = (SELECT id FROM updated)
) h ) h
"#, "#,