Add fresh device trust, installer recovery and scoped patch runtime
This commit is contained in:
@@ -186,6 +186,27 @@ pub async fn plan(
|
||||
jobs::plan_resolved(s, p, tenant, plan, None, Some(reference)).await
|
||||
}
|
||||
|
||||
pub(crate) fn validate_plan_bindings(plan: &rmm_domain::jobs::PlanPayload) -> Result<(), Error> {
|
||||
let Some(reference) = &plan.script_revision else {
|
||||
if plan.jobs.iter().any(|job| {
|
||||
job.payload.max_runtime_seconds > 120 && job.payload.action.is_windows_update_template()
|
||||
}) {
|
||||
return Err(Error(
|
||||
StatusCode::CONFLICT,
|
||||
"WINDOWS_UPDATE_REVISION_REQUIRED",
|
||||
));
|
||||
}
|
||||
return Ok(());
|
||||
};
|
||||
if reference.revision_id.is_nil() || reference.version < 1 || reference.name.is_empty() || plan.jobs.is_empty()
|
||||
|| plan.jobs.iter().any(|job| !matches!(&job.payload.action,
|
||||
Action::RunScript { script_utf8, .. } if hash(script_utf8.as_bytes()) == reference.script_sha256
|
||||
&& job.script_sha256.as_ref() == Some(&reference.script_sha256))) {
|
||||
return Err(Error(StatusCode::CONFLICT, "SCRIPT_REVISION_BINDING_MISMATCH"));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn routes(r: Router<crate::State>) -> Router<crate::State> {
|
||||
r.route(
|
||||
"/api/v1/tenants/{tenant}/script-revisions",
|
||||
@@ -247,7 +268,13 @@ pub(crate) mod tests {
|
||||
template["script_utf8"].as_str().unwrap().into(),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(native.full_maintenance());
|
||||
assert!(native.is_windows_update_template());
|
||||
assert_eq!(
|
||||
template["script_sha256"],
|
||||
rmm_domain::jobs::WINDOWS_UPDATE_SCRIPT_SHA256
|
||||
);
|
||||
assert!(native.valid_job_limits(3600, 65536));
|
||||
assert!(!native.valid_job_limits(3601, 65536));
|
||||
|
||||
let v1 = Publish {
|
||||
name: "Agentversion".into(),
|
||||
@@ -335,6 +362,20 @@ pub(crate) mod tests {
|
||||
.unwrap();
|
||||
tx.commit().await.unwrap();
|
||||
let bound: rmm_domain::jobs::PlanPayload = serde_json::from_slice(&bytes).unwrap();
|
||||
let mut extended = bound.clone();
|
||||
extended.jobs[0].payload.action = native;
|
||||
extended.jobs[0].payload.max_runtime_seconds = 3600;
|
||||
extended.jobs[0].script_sha256 =
|
||||
Some(rmm_domain::jobs::WINDOWS_UPDATE_SCRIPT_SHA256.into());
|
||||
assert_eq!(
|
||||
validate_plan_bindings(&extended).unwrap_err().1,
|
||||
"SCRIPT_REVISION_BINDING_MISMATCH"
|
||||
);
|
||||
extended.script_revision = None;
|
||||
assert_eq!(
|
||||
validate_plan_bindings(&extended).unwrap_err().1,
|
||||
"WINDOWS_UPDATE_REVISION_REQUIRED"
|
||||
);
|
||||
let reference = bound.script_revision.unwrap();
|
||||
assert_eq!(reference.revision_id, id);
|
||||
assert_eq!(reference.version, 1);
|
||||
|
||||
Reference in New Issue
Block a user