Implement bounded Windows MSI delegation with deny-only cancellation and retained installer ownership
Rust development slice / linux (push) Failing after 7s
Rust development slice / linux (push) Failing after 7s
This commit is contained in:
@@ -470,6 +470,13 @@ fn verified_mirror_row(
|
||||
Ok(outcome)
|
||||
}
|
||||
fn system_shape(job: &JobPayload) -> bool {
|
||||
if job.action.windows_msi().is_some() {
|
||||
return job.execution_identity == "system"
|
||||
&& job.action.validate()
|
||||
&& job
|
||||
.action
|
||||
.valid_job_limits(job.max_runtime_seconds, job.max_output_bytes);
|
||||
}
|
||||
job.execution_identity == "system"
|
||||
&& (1..=120).contains(&job.max_runtime_seconds)
|
||||
&& (1..=65536).contains(&job.max_output_bytes)
|
||||
@@ -487,7 +494,7 @@ pub(super) fn checked_outcome(job: &JobPayload, outcome: &Outcome) -> Result<()>
|
||||
matches!(
|
||||
outcome.state.as_str(),
|
||||
"succeeded" | "failed" | "cancelled" | "expired" | "unknown"
|
||||
) && !outcome.reboot_required
|
||||
) && (job.action.windows_msi().is_some() || !outcome.reboot_required)
|
||||
&& outcome
|
||||
.stdout
|
||||
.len()
|
||||
@@ -496,6 +503,47 @@ pub(super) fn checked_outcome(job: &JobPayload, outcome: &Outcome) -> Result<()>
|
||||
"SYSTEM_EXECUTE_OUTCOME_SCOPE"
|
||||
);
|
||||
if outcome.state == "succeeded" {
|
||||
if let Some(m) = job.action.windows_msi() {
|
||||
let e = &outcome.evidence;
|
||||
let after: crate::package::Snapshot = serde_json::from_value(e["after"].clone())?;
|
||||
let noop = e["already_desired"] == true;
|
||||
ensure!(
|
||||
job.action.validate()
|
||||
&& e["provider"] == "windows.msi.fixture/1"
|
||||
&& e["recipe_sha256"] == m.recipe_sha256
|
||||
&& e["artifact_sha256"] == m.recipe.artifact.sha256
|
||||
&& e["postconditions_passed"] == true
|
||||
&& e["state"] == "succeeded"
|
||||
&& e["exit_code"] == serde_json::to_value(outcome.exit_code)?
|
||||
&& e["already_desired"].is_boolean()
|
||||
&& !outcome.output_truncated
|
||||
&& e["reboot_initiated"] == false
|
||||
&& e["automatic_retry"] == false
|
||||
&& after.desired(m),
|
||||
"SYSTEM_MSI_POSTCONDITION_BINDING"
|
||||
);
|
||||
if noop {
|
||||
let before: crate::package::Snapshot = serde_json::from_value(e["before"].clone())?;
|
||||
ensure!(
|
||||
outcome.exit_code.is_none()
|
||||
&& !outcome.reboot_required
|
||||
&& e["installer_process_started"] == false
|
||||
&& e["transaction_started"] == false
|
||||
&& e["installer_reboot_required"].is_null()
|
||||
&& before.desired(m),
|
||||
"SYSTEM_MSI_NOOP_BINDING"
|
||||
);
|
||||
} else {
|
||||
ensure!(
|
||||
matches!(outcome.exit_code, Some(0 | 3010))
|
||||
&& e["installer_process_started"] == true
|
||||
&& outcome.reboot_required == (outcome.exit_code == Some(3010))
|
||||
&& e["installer_reboot_required"] == outcome.reboot_required,
|
||||
"SYSTEM_MSI_EXIT_BINDING"
|
||||
);
|
||||
}
|
||||
return Ok(());
|
||||
}
|
||||
let Action::SetServiceState { unit, state } = &job.action else {
|
||||
anyhow::bail!("SYSTEM_TYPED_SERVICE_REQUIRED");
|
||||
};
|
||||
@@ -537,6 +585,43 @@ pub fn map_snapshot(s: &Snapshot) -> HelperSnapshot {
|
||||
.collect(),
|
||||
}
|
||||
}
|
||||
#[cfg(test)]
|
||||
pub(crate) fn msi_test_job() -> JobPayload {
|
||||
use rmm_domain::windows_execution::*;
|
||||
let recipe:WindowsMsiRecipe=serde_json::from_value(json!({"schema_version":1,"recipe_id":MSI_RECIPE_ID,"recipe_version":"1","platform":"windows","upgrade_code":MSI_UPGRADE_CODE,"architecture":"x64","context":"machine","command_profile":"fixture_quiet_no_reboot_v1","artifact":{"artifact_id":uuid::Uuid::from_u128(10),"sha256":"ab".repeat(32),"bytes":32768},"postcondition":{"product_code":MSI_PRODUCT_CODE,"product_version":MSI_VERSION,"payload_path":MSI_PAYLOAD,"payload_sha256":MSI_PAYLOAD_10_SHA256,"payload_bytes":33},"no_reboot":true})).unwrap();
|
||||
let manifest = ResolvedWindowsMsi {
|
||||
recipe_sha256: recipe.sha256().unwrap(),
|
||||
recipe,
|
||||
};
|
||||
let now = chrono::Utc::now();
|
||||
let id = uuid::Uuid::from_u128(1);
|
||||
JobPayload {
|
||||
schema_version: 1,
|
||||
tenant_id: id,
|
||||
asset_id: id,
|
||||
agent_id: id,
|
||||
enrollment_generation: 1,
|
||||
assignment_version: 1,
|
||||
job_id: id,
|
||||
attempt_id: id,
|
||||
action: Action::EnsurePackage {
|
||||
provider: "msi".into(),
|
||||
package: MSI_PACKAGE_ID.into(),
|
||||
version: MSI_VERSION.into(),
|
||||
architecture: "x64".into(),
|
||||
recipe_version: "1".into(),
|
||||
installation_context: "machine".into(),
|
||||
recipe_id: Some(MSI_RECIPE_ID.into()),
|
||||
apt_manifest: None,
|
||||
windows_msi_manifest: Some(Box::new(manifest)),
|
||||
},
|
||||
execution_identity: "system".into(),
|
||||
not_before: now,
|
||||
start_before: now + chrono::Duration::minutes(2),
|
||||
max_runtime_seconds: 30,
|
||||
max_output_bytes: 4096,
|
||||
}
|
||||
}
|
||||
fn write_current_probe(state: &Path, value: &serde_json::Value) -> Result<()> {
|
||||
native::private_path(state, true)?;
|
||||
let path = state.join(PROBE_FILE);
|
||||
@@ -574,6 +659,50 @@ fn write_current_probe(state: &Path, value: &serde_json::Value) -> Result<()> {
|
||||
mod tests {
|
||||
use super::*;
|
||||
#[test]
|
||||
fn msi_scope_requires_bound_independent_postconditions_and_exact_noop_or_installer_exit() {
|
||||
let job = msi_test_job();
|
||||
assert!(system_shape(&job));
|
||||
let m = job.action.windows_msi().unwrap();
|
||||
let p = &m.recipe.postcondition;
|
||||
let snapshot = crate::package::Snapshot {
|
||||
product_code: p.product_code.clone(),
|
||||
related_products: vec![p.product_code.clone()],
|
||||
product_state: Some("5".into()),
|
||||
product_version: Some(p.product_version.clone()),
|
||||
payload_sha256: Some(p.payload_sha256.clone()),
|
||||
payload_bytes: Some(p.payload_bytes),
|
||||
..Default::default()
|
||||
};
|
||||
let mut out = Outcome {
|
||||
state: "succeeded".into(),
|
||||
exit_code: Some(3010),
|
||||
reboot_required: true,
|
||||
evidence: json!({"provider":"windows.msi.fixture/1","recipe_sha256":m.recipe_sha256,"artifact_sha256":m.recipe.artifact.sha256,"postconditions_passed":true,"reboot_initiated":false,"automatic_retry":false,"already_desired":false,"state":"succeeded","exit_code":3010,"installer_process_started":true,"installer_reboot_required":true,"after":snapshot,"before":snapshot}),
|
||||
..Outcome::unknown("")
|
||||
};
|
||||
assert!(checked_outcome(&job, &out).is_ok());
|
||||
out.reboot_required = false;
|
||||
assert!(checked_outcome(&job, &out).is_err());
|
||||
out.reboot_required = true;
|
||||
out.evidence["after"]["payload_sha256"] = "cd".repeat(32).into();
|
||||
assert!(checked_outcome(&job, &out).is_err());
|
||||
out.evidence["after"] = serde_json::to_value(&snapshot).unwrap();
|
||||
out.evidence["already_desired"] = true.into();
|
||||
out.evidence["exit_code"] = serde_json::Value::Null;
|
||||
out.exit_code = None;
|
||||
out.reboot_required = false;
|
||||
out.evidence["installer_reboot_required"] = serde_json::Value::Null;
|
||||
out.evidence["installer_process_started"] = false.into();
|
||||
out.evidence["transaction_started"] = false.into();
|
||||
assert!(checked_outcome(&job, &out).is_ok());
|
||||
out.exit_code = Some(0);
|
||||
assert!(checked_outcome(&job, &out).is_err());
|
||||
out.state = "unknown".into();
|
||||
out.reboot_required = true;
|
||||
out.exit_code = Some(1641);
|
||||
assert!(checked_outcome(&job, &out).is_ok());
|
||||
}
|
||||
#[test]
|
||||
fn system_route_binds_original_request_shape_budget_and_reply_scope() {
|
||||
let id = uuid::Uuid::new_v4();
|
||||
let now = chrono::Utc::now();
|
||||
|
||||
Reference in New Issue
Block a user