Plan device actions exclusively as approved scripts and provide reboot library revisions
This commit is contained in:
@@ -38,6 +38,8 @@ pub(crate) struct SystemScope {
|
||||
acceptance_evidence_id: Uuid,
|
||||
allowed_services: Vec<String>,
|
||||
#[serde(default, deserialize_with = "strict_optional_hashes")]
|
||||
allowed_script_sha256: Option<Vec<String>>,
|
||||
#[serde(default, deserialize_with = "strict_optional_hashes")]
|
||||
allowed_msi_recipe_sha256: Option<Vec<String>>,
|
||||
max_runtime_seconds: u32,
|
||||
#[serde(
|
||||
@@ -97,6 +99,15 @@ impl SystemScope {
|
||||
.collect::<std::collections::BTreeSet<_>>()
|
||||
.len()
|
||||
== self.principals.len()
|
||||
&& self.allowed_script_sha256.as_ref().is_none_or(|hashes| {
|
||||
hashes.len() <= 64
|
||||
&& hashes.iter().all(|h| digest(h))
|
||||
&& hashes
|
||||
.iter()
|
||||
.collect::<std::collections::BTreeSet<_>>()
|
||||
.len()
|
||||
== hashes.len()
|
||||
})
|
||||
&& self.allowed_services.len() <= 16
|
||||
&& self
|
||||
.allowed_services
|
||||
@@ -178,8 +189,16 @@ impl SystemScope {
|
||||
&& has("system:set_service_state")
|
||||
&& has("set_service_state")
|
||||
}
|
||||
Action::RunScript { .. } => {
|
||||
Action::RunScript {
|
||||
script_utf8,
|
||||
arguments,
|
||||
..
|
||||
} => {
|
||||
allow_scripts
|
||||
&& self.allowed_script_sha256.as_ref().is_none_or(|hashes| {
|
||||
arguments.is_empty()
|
||||
&& hashes.contains(&rmm_domain::jobs::hash(script_utf8.as_bytes()))
|
||||
})
|
||||
&& job.action.full_maintenance()
|
||||
&& (self.allowed_script_profiles.as_ref().is_some_and(|v| {
|
||||
v.contains(
|
||||
@@ -376,7 +395,7 @@ pub async fn authorize(
|
||||
}
|
||||
let caps:serde_json::Value=sqlx::query_scalar("SELECT capabilities FROM agent_installations WHERE tenant_id=$1 AND agent_id=$2 AND asset_id=$3 AND revoked_at IS NULL AND enrollment_generation=$4 AND assignment_version=$5").bind(job.tenant_id).bind(job.agent_id).bind(job.asset_id).bind(i64::try_from(job.enrollment_generation).map_err(|_|Error(StatusCode::CONFLICT,"BINDING_MISMATCH"))?).bind(i64::try_from(job.assignment_version).map_err(|_|Error(StatusCode::CONFLICT,"BINDING_MISMATCH"))?).fetch_optional(&mut **tx).await?.ok_or(Error(StatusCode::CONFLICT,"AUTHORIZATION_REVOKED"))?;
|
||||
let capabilities: Vec<String> = serde_json::from_value(caps)?;
|
||||
if crate::managed_scripts::permits(principal, job, &capabilities)? {
|
||||
if crate::managed_scripts::permits(tx, principal, job, &capabilities).await? {
|
||||
return Ok(());
|
||||
}
|
||||
let policy = load()?;
|
||||
@@ -569,6 +588,27 @@ mod tests {
|
||||
policy.schema_version = 3;
|
||||
assert!(policy.permits("selected", &job, &caps, Utc::now()));
|
||||
assert!(!policy.permits("foreign", &job, &caps, Utc::now()));
|
||||
policy.scopes[0].allowed_script_sha256 = Some(vec![]);
|
||||
assert!(!policy.permits("selected", &job, &caps, Utc::now()));
|
||||
policy.scopes[0].allowed_script_sha256 =
|
||||
Some(vec![rmm_domain::jobs::hash(b"Write-Output 'hi'\r\n")]);
|
||||
assert!(policy.permits("selected", &job, &caps, Utc::now()));
|
||||
let mut changed = job.clone();
|
||||
if let Action::RunScript { arguments, .. } = &mut changed.action {
|
||||
arguments.push("unexpected".into());
|
||||
}
|
||||
assert!(!policy.permits("selected", &changed, &caps, Utc::now()));
|
||||
if let Action::RunScript {
|
||||
arguments,
|
||||
script_utf8,
|
||||
..
|
||||
} = &mut changed.action
|
||||
{
|
||||
arguments.clear();
|
||||
script_utf8.push(' ');
|
||||
}
|
||||
assert!(!policy.permits("selected", &changed, &caps, Utc::now()));
|
||||
policy.scopes[0].allowed_script_sha256 = None;
|
||||
let general = job.action.clone();
|
||||
job.action = Action::RunScript {
|
||||
interpreter: "powershell".into(),
|
||||
@@ -600,13 +640,25 @@ mod tests {
|
||||
}
|
||||
#[test]
|
||||
fn windows_update_window_accepts_only_the_two_fixed_scripts() {
|
||||
use rmm_domain::jobs::{PrivilegedScriptProfile, WindowsExecutionProfile, WINDOWS_UPDATE_IDENTITY_PROBE, WINDOWS_UPDATE_LONG_CAPABILITY, WINDOWS_UPDATE_SCRIPT_UTF8};
|
||||
use rmm_domain::jobs::{
|
||||
PrivilegedScriptProfile, WINDOWS_UPDATE_IDENTITY_PROBE, WINDOWS_UPDATE_LONG_CAPABILITY,
|
||||
WINDOWS_UPDATE_SCRIPT_UTF8, WindowsExecutionProfile,
|
||||
};
|
||||
let (mut policy, mut job, mut caps) = fixture();
|
||||
policy.schema_version = 3;
|
||||
let scope = &mut policy.scopes[0];
|
||||
scope.allowed_services.clear();
|
||||
scope.windows_update_max_runtime_seconds = Some(3600);
|
||||
caps.extend(["run_script", "system:run_script", "script.powershell/1", "script.powershell.process_remote_signed/1", WINDOWS_UPDATE_LONG_CAPABILITY].map(str::to_owned));
|
||||
caps.extend(
|
||||
[
|
||||
"run_script",
|
||||
"system:run_script",
|
||||
"script.powershell/1",
|
||||
"script.powershell.process_remote_signed/1",
|
||||
WINDOWS_UPDATE_LONG_CAPABILITY,
|
||||
]
|
||||
.map(str::to_owned),
|
||||
);
|
||||
for (script, seconds, expected) in [
|
||||
(WINDOWS_UPDATE_SCRIPT_UTF8, 3600, true),
|
||||
(WINDOWS_UPDATE_IDENTITY_PROBE, 30, true),
|
||||
@@ -614,13 +666,18 @@ mod tests {
|
||||
("Write-Output 12", 30, false),
|
||||
] {
|
||||
job.action = Action::RunScript {
|
||||
interpreter:"powershell".into(), script_utf8:script.into(),
|
||||
arguments:vec![], expected_stdout:None,
|
||||
windows_execution_profile:Some(WindowsExecutionProfile::PowerShell51RemoteSigned),
|
||||
privileged_script_profile:Some(PrivilegedScriptProfile::FullMaintenanceV1),
|
||||
interpreter: "powershell".into(),
|
||||
script_utf8: script.into(),
|
||||
arguments: vec![],
|
||||
expected_stdout: None,
|
||||
windows_execution_profile: Some(WindowsExecutionProfile::PowerShell51RemoteSigned),
|
||||
privileged_script_profile: Some(PrivilegedScriptProfile::FullMaintenanceV1),
|
||||
};
|
||||
job.max_runtime_seconds = seconds;
|
||||
assert_eq!(policy.permits("selected", &job, &caps, Utc::now()), expected);
|
||||
assert_eq!(
|
||||
policy.permits("selected", &job, &caps, Utc::now()),
|
||||
expected
|
||||
);
|
||||
}
|
||||
}
|
||||
#[test]
|
||||
|
||||
Reference in New Issue
Block a user