Add gated agent update planning, preserved handoff and Linux worker ports
Rust development slice / linux (push) Failing after 6s
Rust development slice / linux (push) Failing after 6s
This commit is contained in:
@@ -507,7 +507,10 @@ pub async fn permit(
|
||||
let payload: JobPayload = serde_json::from_slice(&row.get::<Vec<u8>, _>("payload"))?;
|
||||
let plan: PlanPayload = serde_json::from_slice(&row.get::<Vec<u8>, _>("plan_payload"))?;
|
||||
let capabilities: Vec<String> = serde_json::from_value(row.get("capabilities"))?;
|
||||
if crate::windows_msi_catalog::validate_job_binding(&plan, &payload).is_err() {
|
||||
if crate::windows_msi_catalog::validate_job_binding(&plan, &payload).is_err()
|
||||
|| (matches!(payload.action, Action::UpdateAgent { .. })
|
||||
&& crate::agent_updates::validate_job_binding(&plan, &payload).is_err())
|
||||
{
|
||||
return Ok(denied("WINDOWS_MSI_BINDING_MISMATCH"));
|
||||
}
|
||||
if row.get::<Uuid, _>("bound_asset") != payload.asset_id
|
||||
@@ -624,9 +627,20 @@ pub async fn permit(
|
||||
.filter(|r| r.job_id == payload.job_id && r.attempt_id == payload.attempt_id)
|
||||
.map(|r| r.artifact.artifact_id)
|
||||
.collect::<Vec<_>>();
|
||||
let artifacts = crate::catalog::resolve_artifacts(&mut tx, tenant, &artifact_ids)
|
||||
let artifacts = if let Action::UpdateAgent { update } = &payload.action {
|
||||
crate::agent_updates::resolve_artifacts(
|
||||
&mut tx,
|
||||
tenant,
|
||||
&update
|
||||
.manifest()
|
||||
.map_err(|_| anyhow::anyhow!("invalid agent release"))?
|
||||
.artifacts,
|
||||
)
|
||||
.await
|
||||
.map_err(|_| anyhow::anyhow!("artifact unavailable"))?;
|
||||
} else {
|
||||
crate::catalog::resolve_artifacts(&mut tx, tenant, &artifact_ids).await
|
||||
}
|
||||
.map_err(|_| anyhow::anyhow!("artifact unavailable"))?;
|
||||
if plan
|
||||
.artifact_references
|
||||
.iter()
|
||||
@@ -646,6 +660,9 @@ pub async fn permit(
|
||||
|| (matches!(payload.action, Action::RunScript { .. })
|
||||
&& (!crate::permissions::allowed(&mut tx, &plan.principal, "scripts:execute").await?
|
||||
|| !crate::permissions::allowed(&mut tx, &approver, "scripts:execute").await?))
|
||||
|| (matches!(payload.action, Action::UpdateAgent { .. })
|
||||
&& (!crate::permissions::allowed(&mut tx, &plan.principal, "updates:apply").await?
|
||||
|| !crate::permissions::allowed(&mut tx, &approver, "updates:apply").await?))
|
||||
{
|
||||
return Ok(denied("AUTHORIZATION_REVOKED"));
|
||||
}
|
||||
@@ -692,6 +709,8 @@ pub async fn permit(
|
||||
return Ok(denied("RESOURCE_LOCKED"));
|
||||
}
|
||||
let grant = ExecutionPermitPayload {
|
||||
agent_update_plan_id: matches!(payload.action, Action::UpdateAgent { .. })
|
||||
.then_some(plan.plan_id),
|
||||
domain: "rmm.execution-permit".into(),
|
||||
schema_version: 1,
|
||||
grant_id: Uuid::new_v4(),
|
||||
@@ -756,11 +775,15 @@ pub async fn next(
|
||||
};
|
||||
let payload: JobPayload = serde_json::from_slice(&row.get::<Vec<u8>, _>("payload"))?;
|
||||
let caps: Vec<String> = serde_json::from_value(row.get("capabilities"))?;
|
||||
if payload.action.windows_msi().is_some() {
|
||||
if payload.action.windows_msi().is_some()
|
||||
|| matches!(payload.action, Action::UpdateAgent { .. })
|
||||
{
|
||||
let raw: Vec<u8> = row.get("plan_payload");
|
||||
let plan: PlanPayload = serde_json::from_slice(&raw)?;
|
||||
if hash(&raw) != row.get::<String, _>("plan_hash")
|
||||
|| crate::windows_msi_catalog::validate_job_binding(&plan, &payload).is_err()
|
||||
|| (matches!(payload.action, Action::UpdateAgent { .. })
|
||||
&& crate::agent_updates::validate_job_binding(&plan, &payload).is_err())
|
||||
|| crate::catalog::check(&mut tx, &payload.action)
|
||||
.await
|
||||
.is_err()
|
||||
|
||||
Reference in New Issue
Block a user