Qualify tenant-scoped bootstrap rotation and fresh Windows scripting
This commit is contained in:
@@ -121,7 +121,12 @@ pub(crate) fn execute(
|
||||
.as_ref()
|
||||
.is_none_or(|s| output.stdout == s.as_bytes());
|
||||
let interrupted = output.interrupted || began.elapsed() >= timeout || observe(false).is_err();
|
||||
let success = !interrupted && output.exit_code == Some(0) && expected && !output.truncated;
|
||||
let windows_update = job.action.is_windows_update_template();
|
||||
let reboot = if windows_update && !interrupted && !output.truncated {
|
||||
rmm_domain::jobs::windows_update_reboot_report(&output.stdout)
|
||||
} else { None };
|
||||
let success = !interrupted && output.exit_code == Some(0) && expected && !output.truncated
|
||||
&& (!windows_update || reboot.is_some());
|
||||
let mut evidence = serde_json::json!({"postconditions_passed":success,"interpreter":"powershell",
|
||||
"script_sha256":hash(script_utf8.as_bytes()),"privileged_script_profile":"full_maintenance_v1",
|
||||
"execution_sid":"S-1-5-18","output_encoding":"raw_native_bytes","comparison":"exact_utf8_bytes",
|
||||
@@ -133,6 +138,9 @@ pub(crate) fn execute(
|
||||
evidence["execution_policy_requested"] = "RemoteSigned".into();
|
||||
evidence["execution_policy_scope"] = "process".into();
|
||||
}
|
||||
if windows_update {
|
||||
evidence["windows_update_reboot_required"] = serde_json::json!(reboot);
|
||||
}
|
||||
Ok(Outcome {
|
||||
state: if interrupted {
|
||||
"unknown"
|
||||
@@ -146,13 +154,15 @@ pub(crate) fn execute(
|
||||
stderr: output.stderr,
|
||||
exit_code: output.exit_code,
|
||||
output_truncated: output.truncated,
|
||||
reboot_required: false,
|
||||
reboot_required: reboot.unwrap_or(false),
|
||||
error_code: if success {
|
||||
""
|
||||
} else if interrupted {
|
||||
"SYSTEM_SCRIPT_INTERRUPTED_EFFECT_UNKNOWN"
|
||||
} else if output.truncated {
|
||||
"OUTPUT_LIMIT_REACHED"
|
||||
} else if windows_update && output.exit_code == Some(0) && reboot.is_none() {
|
||||
"WINDOWS_UPDATE_SUMMARY_MISSING"
|
||||
} else if !expected {
|
||||
"STDOUT_POSTCONDITION_FAILED"
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user