Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dd6961265d | |||
| 40ba483d35 | |||
| 192ebbd47f | |||
| 050439ee14 |
16
Cargo.lock
generated
16
Cargo.lock
generated
@ -2043,7 +2043,7 @@ checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "migrate-secrets"
|
name = "migrate-secrets"
|
||||||
version = "0.1.9"
|
version = "0.2.3"
|
||||||
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.3"
|
||||||
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.3"
|
||||||
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.3"
|
||||||
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.3"
|
||||||
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.3"
|
||||||
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.3"
|
||||||
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.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
|
|||||||
@ -12,7 +12,7 @@ members = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.2.2"
|
version = "0.2.4"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["Echo <echo@moon-dragon.us>"]
|
authors = ["Echo <echo@moon-dragon.us>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|||||||
@ -178,8 +178,10 @@ pub enum EnrollmentStatusResponse {
|
|||||||
Pending,
|
Pending,
|
||||||
Approved {
|
Approved {
|
||||||
ca_crt: String,
|
ca_crt: String,
|
||||||
|
ca_chain: String,
|
||||||
server_crt: String,
|
server_crt: String,
|
||||||
server_key: String,
|
server_key: String,
|
||||||
|
crl_pem: String,
|
||||||
},
|
},
|
||||||
Denied,
|
Denied,
|
||||||
NotFound,
|
NotFound,
|
||||||
|
|||||||
@ -111,8 +111,10 @@ async fn enroll_status(
|
|||||||
}
|
}
|
||||||
return Ok(Json(EnrollmentStatusResponse::Approved {
|
return Ok(Json(EnrollmentStatusResponse::Approved {
|
||||||
ca_crt: entry.pki.ca_crt.clone(),
|
ca_crt: entry.pki.ca_crt.clone(),
|
||||||
|
ca_chain: entry.pki.ca_chain.clone(),
|
||||||
server_crt: entry.pki.server_crt.clone(),
|
server_crt: entry.pki.server_crt.clone(),
|
||||||
server_key: entry.pki.server_key.clone(),
|
server_key: entry.pki.server_key.clone(),
|
||||||
|
crl_pem: entry.pki.crl_pem.clone(),
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -186,7 +188,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())
|
||||||
|
|||||||
@ -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
|
||||||
"#,
|
"#,
|
||||||
|
|||||||
Reference in New Issue
Block a user