diff --git a/crates/agent-windows/src/bin/rmm-helper-windows.rs b/crates/agent-windows/src/bin/rmm-helper-windows.rs index 0be7955..0b0c050 100644 --- a/crates/agent-windows/src/bin/rmm-helper-windows.rs +++ b/crates/agent-windows/src/bin/rmm-helper-windows.rs @@ -8,6 +8,10 @@ fn main() -> anyhow::Result<()> { println!("enrolled-windows-update/1"); return Ok(()); } + if std::env::args().skip(1).eq(["--managed-script-helper-version"]) { + println!("managed-script-helper/1"); + return Ok(()); + } rmm_agent_windows::helper_system::dispatch() } #[cfg(not(windows))] diff --git a/crates/agent-windows/src/bin/rmm-updater-windows.rs b/crates/agent-windows/src/bin/rmm-updater-windows.rs index 8741a32..0b2d681 100644 --- a/crates/agent-windows/src/bin/rmm-updater-windows.rs +++ b/crates/agent-windows/src/bin/rmm-updater-windows.rs @@ -11,6 +11,10 @@ fn main() -> anyhow::Result<()> { println!("release-job-lock/1"); Ok(()) } + Some(flag) if flag == "--managed-script-helper-version" && args.next().is_none() => { + println!("managed-script-helper/1"); + Ok(()) + } Some(flag) if flag == "--verify-bootstrap" => { let release = rmm_updater::verify_bootstrap_files( rmm_agent_windows::release_platform::VERIFY, diff --git a/crates/agent-windows/src/helper_system.rs b/crates/agent-windows/src/helper_system.rs index cc1eb9c..440b536 100644 --- a/crates/agent-windows/src/helper_system.rs +++ b/crates/agent-windows/src/helper_system.rs @@ -107,10 +107,13 @@ impl Settings { }) } pub(crate) fn windows_update_only(&self) -> bool { - self.schema_version >= 3 && self.enable_effects && self.windows_update_max_runtime_seconds.is_some() + (3..=4).contains(&self.schema_version) && self.enable_effects && self.windows_update_max_runtime_seconds.is_some() && self.allowed_script_profiles.is_none() && self.allowed_services.is_empty() && self.allowed_msi_recipe_sha256.is_none() && !self.allow_reboot && self.max_runtime_seconds <= 30 } + pub(crate) fn managed_scripts(&self) -> bool { + self.schema_version == 5 + } fn permits_script(&self, job: &JobPayload) -> bool { self.schema_version >= 3 && job.execution_identity == "system" @@ -133,7 +136,12 @@ impl Settings { } pub fn validate(&self) -> Result<()> { ensure!( - matches!(self.schema_version, 1..=4) + matches!(self.schema_version, 1..=5) + && (!self.managed_scripts() + || (self.enable_effects && self.allowed_services.is_empty() + && self.allowed_msi_recipe_sha256.is_none() && !self.allow_reboot + && self.allowed_script_profiles.as_deref() + == Some(&[rmm_domain::jobs::PrivilegedScriptProfile::FullMaintenanceV1]))) && (self.schema_version >= 2 || self.allowed_msi_recipe_sha256.is_none()) && (self.schema_version >= 3 || self.allowed_script_profiles.is_none()) && self @@ -891,7 +899,7 @@ impl SystemHelper { let pin = settings.pin()?; ipc::publish_self_query_rights(&settings.agent.service_sid, &settings.helper.service_sid)?; let (guard, db) = LedgerGuard::acquire(&settings.helper.service_sid, &settings.binding)?; - let clock = if settings.windows_update_only() { + let clock = if settings.windows_update_only() || settings.managed_scripts() { RuntimeClock::enrolled_windows_update_helper(settings.binding.clone(), settings.helper.clone()) } else { RuntimeClock::new(rmm_time_attestation::Role::SystemHelper) }.for_generation(0); let boot = WindowsBoot::capture()?; diff --git a/crates/agent-windows/src/release_service.rs b/crates/agent-windows/src/release_service.rs index fd11d1e..dea0513 100644 --- a/crates/agent-windows/src/release_service.rs +++ b/crates/agent-windows/src/release_service.rs @@ -319,10 +319,16 @@ fn local_manifest(installed: &Installed) -> Result { // Only typed release UUIDs enter the fixed SCM command. The actual service path, // LocalService account and absence of an independently provisioned helper are checked again on the target. -fn select(from: Uuid, to: Uuid) -> Result<()> { +fn select(from: &Installed, to: &Installed) -> Result<()> { + let manifest = local_manifest(to)?; + let [agent, helper] = manifest.artifacts.as_slice() else { + anyhow::bail!("incomplete installed release pair"); + }; let script = include_str!("release_service_switch.ps1") - .replace("FROM_UUID", &from.to_string()) - .replace("TO_UUID", &to.to_string()); + .replace("FROM_UUID", &from.release_id.to_string()) + .replace("TO_UUID", &to.release_id.to_string()) + .replace("SELECTED_AGENT_SHA256", &agent.sha256) + .replace("SELECTED_HELPER_SHA256", &helper.sha256); let windows = std::env::var_os("SystemRoot").context("Windows directory")?; let ps = Path::new(&windows).join(r"System32\WindowsPowerShell\v1.0\powershell.exe"); let result = Command::new(ps) @@ -338,8 +344,7 @@ fn select(from: Uuid, to: Uuid) -> Result<()> { Ok(()) } async fn rollback(t: &Transition) -> Result<()> { - local_manifest(&t.old)?; - select(t.new.release_id, t.old.release_id)?; + select(&t.new, &t.old)?; write_record("rejected-release.json", &t.new)?; fs::remove_file(record_path(INTENT))?; Ok(()) @@ -494,7 +499,7 @@ async fn cycle() -> Result<()> { let t = Transition { old: active, new }; write_record(INTENT, &t)?; let start = chrono::Utc::now(); - let selected = select(t.old.release_id, t.new.release_id); + let selected = select(&t.old, &t.new); if selected.is_ok() { for _ in 0..18 { if let Ok(h) = device.health().await diff --git a/crates/agent-windows/src/release_service_switch.ps1 b/crates/agent-windows/src/release_service_switch.ps1 index 9771599..3d60d56 100644 --- a/crates/agent-windows/src/release_service_switch.ps1 +++ b/crates/agent-windows/src/release_service_switch.ps1 @@ -4,6 +4,31 @@ function Get-Image([string]$Id) { $image = Join-Path ([Environment]::GetFolderPath('ProgramFiles')) ('RustDiscovery\releases\' + $Id + '\rmm-agent-windows.exe') return '"' + $image + '" --service --config "' + $configPath + '"' } +function Get-HelperImage([string]$Id) { + Join-Path ([Environment]::GetFolderPath('ProgramFiles')) ('RustDiscovery\releases\' + $Id + '\rmm-helper-windows.exe') +} +function Wait-Stopped([string]$Name) { + $control = Get-Service $Name + if ($control.Status -ne 'Stopped') { + $control.Stop() + $control.WaitForStatus('Stopped', [TimeSpan]::FromSeconds(45)) + } +} +function Select-Image($Service, [string]$Image) { + if ($Service.PathName -cne $Image) { + $result = Invoke-CimMethod -InputObject $Service -MethodName Change -Arguments @{PathName=$Image} + if ($result.ReturnValue -ne 0) { throw 'SCM path change failed.' } + } +} +function Replace-Pin([string]$Path, [string]$Value) { + $temp = "$Path.next-$([Guid]::NewGuid())" + try { + [IO.File]::WriteAllText($temp, $Value, [Text.UTF8Encoding]::new($false)) + [IO.File]::Replace($temp, $Path, $null) + } finally { + if (Test-Path -LiteralPath $temp) { Remove-Item -LiteralPath $temp } + } +} $configPath = Join-Path ([Environment]::GetFolderPath('CommonApplicationData')) 'RustDiscovery\config.json' $from = Get-Image 'FROM_UUID' $to = Get-Image 'TO_UUID' @@ -13,16 +38,36 @@ if ($config.PSObject.Properties['enable_jobs'] -and $config.enable_jobs) { if (-not $config.PSObject.Properties['localservice_time_policy'] -or $config.localservice_time_policy -cne (Join-Path (Split-Path $configPath) 'job-time.json')) { throw 'Job-enabled pair requires a coordinated helper handoff.' } } +$managed = $config.PSObject.Properties['managed_script_helper'] -and $config.managed_script_helper +$helper = Get-CimInstance -ClassName Win32_Service -Filter "Name='RmmDiscoverySystemHelper'" if (-not $service -or $service.StartName -ine 'NT AUTHORITY\LocalService' -or - $service.PathName -cnotin @($from,$to) -or (Get-Service 'RmmDiscoverySystemHelper' -ErrorAction SilentlyContinue)) { throw 'Unexpected service configuration.' } -if ($service.PathName -cne $to) { - $control = Get-Service 'RmmDiscoveryWindows' - if ($control.Status -ne 'Stopped') { - $control.Stop() - $control.WaitForStatus('Stopped', [TimeSpan]::FromSeconds(45)) - } - $res = Invoke-CimMethod -InputObject $service -MethodName Change -Arguments @{PathName=$to} - if ($res.ReturnValue -ne 0) { throw 'SCM path change failed.' } + $service.PathName -cnotin @($from,$to) -or ([bool]$helper -ne [bool]$managed)) { throw 'Unexpected service configuration.' } +if ($managed) { + $helperExe = Get-HelperImage 'TO_UUID' + $helperTo = '"' + $helperExe + '" --service' + $helperFrom = '"' + (Get-HelperImage 'FROM_UUID') + '" --service' + if ($helper.StartName -ine 'LocalSystem' -or $helper.PathName -cnotin @($helperFrom,$helperTo)) { throw 'Unexpected managed helper service.' } + $policyRoot = Join-Path ([Environment]::GetFolderPath('CommonApplicationData')) 'RustDiscoverySystem' + $settingsPath = Join-Path $policyRoot 'helper.json' + $settings = Get-Content -LiteralPath $settingsPath -Raw | ConvertFrom-Json + if ($settings.schema_version -ne 5) { throw 'Managed helper settings required.' } + $rendered = ([ordered]@{binding=$settings.binding; release_id='TO_UUID' + agent_sha256='SELECTED_AGENT_SHA256'; helper_sha256='SELECTED_HELPER_SHA256' + max_runtime_seconds=$settings.windows_update_max_runtime_seconds; managed_scripts=$true} | ConvertTo-Json -Depth 6 -Compress) | + & $helperExe --prepare-enrolled-windows-update + if ($LASTEXITCODE -ne 0) { throw 'Signed successor helper could not render its pins.' } + $pins = $rendered | ConvertFrom-Json + Wait-Stopped 'RmmDiscoveryWindows' + Wait-Stopped 'RmmDiscoverySystemHelper' + Replace-Pin $settingsPath $pins.helper_settings + Replace-Pin (Join-Path $policyRoot 'agent-pin.json') $pins.agent_pin + Select-Image $helper $helperTo + Select-Image $service $to + Start-Service 'RmmDiscoverySystemHelper' + (Get-Service 'RmmDiscoverySystemHelper').WaitForStatus('Running', [TimeSpan]::FromSeconds(45)) +} elseif ($service.PathName -cne $to) { + Wait-Stopped 'RmmDiscoveryWindows' + Select-Image $service $to } $control = Get-Service 'RmmDiscoveryWindows' if ($control.Status -ne 'Running') { diff --git a/crates/agent-windows/src/runtime.rs b/crates/agent-windows/src/runtime.rs index 2ee5ead..d7619d7 100644 --- a/crates/agent-windows/src/runtime.rs +++ b/crates/agent-windows/src/runtime.rs @@ -40,6 +40,8 @@ struct Config { localservice_time_policy: Option, #[serde(default)] windows_update_helper: bool, + #[serde(default)] + managed_script_helper: bool, // Explicit protected opt-in only; this flag never qualifies a clock or pins. #[serde(default)] enable_jobs: bool, @@ -99,7 +101,8 @@ impl Config { fn read(path: &Path) -> Result { let raw = protected_read(path, 32768)?; let config: Self = serde_json::from_slice(&raw)?; - if config.windows_update_helper { + ensure!(!(config.windows_update_helper && config.managed_script_helper), "AMBIGUOUS_ENROLLED_HELPER"); + if config.windows_update_helper || config.managed_script_helper { ensure!(config.localservice_time_policy.is_some() && cfg!(feature = "system-helper"), "ENROLLED_WINDOWS_UPDATE_HELPER_REQUIRED"); } if let Some(policy) = &config.localservice_time_policy { @@ -817,7 +820,8 @@ impl Agent { &identity.certificate_pem, &identity.private_key_pem, )?; - let helper = if self.config.localservice_time_policy.is_some() && !self.config.windows_update_helper { + let helper = if self.config.localservice_time_policy.is_some() + && !self.config.windows_update_helper && !self.config.managed_script_helper { None } else { rmm_agent_windows::helper_runtime::Client::discover( &self.identity.agent_id, @@ -1406,7 +1410,9 @@ impl Agent { } fn supported_job(&self, job: &rmm_domain::jobs::JobPayload) -> bool { if self.config.localservice_time_policy.is_some() && job.execution_identity != "agent_service" - && !(self.config.windows_update_helper && job.execution_identity == "system" && job.action.windows_update_or_identity_probe()) { + && !(job.execution_identity == "system" + && (self.config.windows_update_helper && job.action.windows_update_or_identity_probe() + || self.config.managed_script_helper && job.action.full_maintenance())) { return false; } if self.config.windows_echo_probe_only diff --git a/crates/agent-windows/src/system_capabilities.rs b/crates/agent-windows/src/system_capabilities.rs index 4baea1b..83bc15f 100644 --- a/crates/agent-windows/src/system_capabilities.rs +++ b/crates/agent-windows/src/system_capabilities.rs @@ -42,12 +42,21 @@ pub fn qualified( pin.validate()?; let (settings, _handles) = helper_system::read_settings()?; ensure!(serde_json::to_vec(&settings.pin()?)? == serde_json::to_vec(pin)?, "system qualification pin"); - if settings.windows_update_only() { - // The caller has verified an independent helper-role clock and the live - // peer. Only the two built-in scripts pass both local and server gates. - return Ok(vec!["helper.system.v1".into(), format!("helper.binary.sha256:{}",pin.helper.binary_sha256), - format!("helper.policy.sha256:{}",pin.policy_sha256), "system:run_script".into(), - rmm_domain::jobs::WINDOWS_UPDATE_LONG_CAPABILITY.into()]); + if settings.windows_update_only() || settings.managed_scripts() { + // The caller has verified the live enrolled peer and its independent clock. + let mut caps = vec![ + "helper.system.v1".into(), + format!("helper.binary.sha256:{}", pin.helper.binary_sha256), + format!("helper.policy.sha256:{}", pin.policy_sha256), + "system:run_script".into(), + ]; + if settings.windows_update_max_runtime_seconds.is_some() { + caps.push(rmm_domain::jobs::WINDOWS_UPDATE_LONG_CAPABILITY.into()); + } + if settings.managed_scripts() { + caps.push(rmm_domain::jobs::FULL_MAINTENANCE_CAPABILITY.into()); + } + return Ok(caps); } let ordinary = load_ordinary(pin); let (q, result_bytes) = match ordinary { diff --git a/crates/agent-windows/src/windows_update_setup.rs b/crates/agent-windows/src/windows_update_setup.rs index 7ebd792..8e1b7d9 100644 --- a/crates/agent-windows/src/windows_update_setup.rs +++ b/crates/agent-windows/src/windows_update_setup.rs @@ -20,6 +20,8 @@ struct Input { agent_sha256: String, helper_sha256: String, max_runtime_seconds: u32, + #[serde(default)] + managed_scripts: bool, } pub fn render() -> Result<()> { @@ -48,7 +50,7 @@ pub fn render() -> Result<()> { }) }; let settings = Settings { - schema_version: 3, + schema_version: if data.managed_scripts { 5 } else { 3 }, binding: data.binding, agent: role( crate::SERVICE_NAME, @@ -63,11 +65,13 @@ pub fn render() -> Result<()> { data.helper_sha256, )?, allowed_services: vec![], - max_runtime_seconds: 30, + max_runtime_seconds: if data.managed_scripts { 120 } else { 30 }, enable_effects: true, allow_reboot: false, allowed_msi_recipe_sha256: None, - allowed_script_profiles: None, + allowed_script_profiles: data.managed_scripts.then(|| { + vec![rmm_domain::jobs::PrivilegedScriptProfile::FullMaintenanceV1] + }), windows_update_max_runtime_seconds: Some(data.max_runtime_seconds), }; settings.validate()?; diff --git a/crates/privileged-helper/src/main.rs b/crates/privileged-helper/src/main.rs index a108a97..781cb80 100644 --- a/crates/privileged-helper/src/main.rs +++ b/crates/privileged-helper/src/main.rs @@ -78,9 +78,11 @@ impl Config { }) } fn validate_profile(&self) -> Result<()> { + let state = self.state.as_path(); ensure!( - self.state.as_path() - == std::path::Path::new(rmm_privileged_helper::readiness::SHARED_STATE), + state == std::path::Path::new(rmm_privileged_helper::readiness::SHARED_STATE) + || (self.profile == HelperProfile::FullMaintenanceV1 + && state == std::path::Path::new("/var/lib/rmm-discovery-helper")), "SHARED_HELPER_LEDGER_REQUIRED" ); if self.profile == HelperProfile::FullMaintenanceV1 { diff --git a/crates/server/src/main.rs b/crates/server/src/main.rs index 98953ce..3aa291d 100644 --- a/crates/server/src/main.rs +++ b/crates/server/src/main.rs @@ -27,6 +27,7 @@ mod oidc; mod pagination; mod permissions; mod root_policy; +mod managed_scripts; mod scheduler; mod script_library; mod synchronization; diff --git a/crates/server/src/managed_scripts.rs b/crates/server/src/managed_scripts.rs new file mode 100644 index 0000000..b81c2f7 --- /dev/null +++ b/crates/server/src/managed_scripts.rs @@ -0,0 +1,61 @@ +//! Permanent authorization ceilings for installed, pinned script helpers. +//! Plan submission, interactive approval and signed start grants are unchanged. +use crate::{jobs::Error, root_policy::RootScope, windows_policy::SystemScope}; +use axum::http::StatusCode; +use rmm_domain::jobs::{Action, JobPayload}; +use serde::Deserialize; +use std::{fs, os::unix::fs::MetadataExt, path::Path}; + +#[derive(Deserialize)] +#[serde(deny_unknown_fields)] +struct Policy { + schema_version: u8, + linux: Vec, + windows: Vec, +} + +fn invalid() -> Error { + Error(StatusCode::CONFLICT, "MANAGED_SCRIPT_POLICY_INVALID") +} + +impl Policy { + fn permits(&self, principal: &str, job: &JobPayload, caps: &[String]) -> bool { + if !matches!(job.action, Action::RunScript { .. }) + || !job.action.full_maintenance() + || !job.action.validate() + || !job.action.available_for(&job.execution_identity, caps) + || !job.action.valid_job_limits(job.max_runtime_seconds, job.max_output_bytes) + { + return false; + } + match job.execution_identity.as_str() { + "root" => self.linux.iter().any(|scope| scope.permits(principal, job, caps, None)), + "system" => self.windows.iter().any(|scope| scope.permits(principal, job, caps, false, true, false)), + _ => false, + } + } +} + +pub(crate) fn permits(principal: &str, job: &JobPayload, caps: &[String]) -> Result { + if !job.action.full_maintenance() { + return Ok(false); + } + let Some(path) = std::env::var_os("RMM_MANAGED_SCRIPT_POLICY_FILE") else { + return Ok(false); + }; + let key = std::env::var_os("RMM_JOB_KEY_FILE").ok_or_else(invalid)?; + let signer = fs::symlink_metadata(key).map_err(|_| invalid())?; + if !signer.is_file() { + return Err(invalid()); + } + let bytes = crate::windows_policy::protected_bytes(Path::new(&path), signer.uid()) + .map_err(|_| invalid())?; + let policy: Policy = serde_json::from_slice(&bytes).map_err(|_| invalid())?; + if policy.schema_version != 1 + || policy.linux.len() + policy.windows.len() > 64 + || !policy.windows.iter().all(SystemScope::valid) + { + return Err(invalid()); + } + Ok(policy.permits(principal, job, caps)) +} diff --git a/crates/server/src/mcp.rs b/crates/server/src/mcp.rs index 0ebd6d3..06c86fa 100644 --- a/crates/server/src/mcp.rs +++ b/crates/server/src/mcp.rs @@ -126,7 +126,7 @@ fn tools() -> Vec { ), tool::( "scripts.plan", - "Plan the selected immutable script revision against fixed assets. Submit the returned plan for WebUI approval via operations.submit.", + "Plan the selected immutable script revision against fixed assets. Set input.execution_identity to select agent_service, root on Linux or system on Windows. Omitting it uses the revision default. Submit the plan for WebUI approval via operations.submit.", ), tool::( "updates.list_releases", diff --git a/crates/server/src/root_policy.rs b/crates/server/src/root_policy.rs index 2b4e983..65cf02d 100644 --- a/crates/server/src/root_policy.rs +++ b/crates/server/src/root_policy.rs @@ -20,7 +20,7 @@ pub struct RootPolicy { } #[derive(Deserialize)] #[serde(deny_unknown_fields)] -struct RootScope { +pub(crate) struct RootScope { tenant_id: Uuid, asset_id: Uuid, agent_id: Uuid, @@ -158,7 +158,7 @@ impl RootScope { && self.enrollment_generation == job.enrollment_generation && self.assignment_version == job.assignment_version } - fn permits( + pub(crate) fn permits( &self, principal: &str, job: &JobPayload, @@ -338,6 +338,11 @@ pub async fn authorize( for permission in required_permissions(job, false) { crate::permissions::require(tx, principal, permission).await?; } + let caps:serde_json::Value=sqlx::query_scalar("SELECT capabilities FROM agent_installations WHERE agent_id=$1 AND asset_id=$2 AND revoked_at IS NULL AND enrollment_generation=$3 AND assignment_version=$4").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 caps: Vec = serde_json::from_value(caps)?; + if crate::managed_scripts::permits(principal, job, &caps)? { + return Ok(()); + } let policy = load()?; let global_log_units = if matches!(job.action, Action::QueryLogs { .. }) { parse_log_units(std::env::var("RMM_ROOT_LOG_UNITS").ok().as_deref())? @@ -356,8 +361,6 @@ pub async fn authorize( crate::permissions::require(tx, principal, "logs:read_sensitive").await?; } } - let caps:serde_json::Value=sqlx::query_scalar("SELECT capabilities FROM agent_installations WHERE agent_id=$1 AND asset_id=$2 AND revoked_at IS NULL AND enrollment_generation=$3 AND assignment_version=$4").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 caps: Vec = serde_json::from_value(caps)?; if !policy .scopes .iter() diff --git a/crates/server/src/script_library.rs b/crates/server/src/script_library.rs index 500b6a4..ace39e7 100644 --- a/crates/server/src/script_library.rs +++ b/crates/server/src/script_library.rs @@ -38,6 +38,7 @@ pub struct Selection { pub reason: String, pub max_runtime_seconds: u32, pub max_output_bytes: u32, + pub execution_identity: Option, } fn script(interpreter: &str, identity: &str, body: String) -> Result { @@ -169,7 +170,9 @@ pub async fn plan( version: row.get("version"), script_sha256: hash(body.as_bytes()), }; - let identity: String = row.get("execution_identity"); + let identity = input + .execution_identity + .unwrap_or_else(|| row.get("execution_identity")); let action = script(row.get("interpreter"), &identity, body)?; let plan = PlanInput { targets: input.targets, @@ -299,6 +302,7 @@ pub(crate) mod tests { reason: "standard diagnostic library contract".into(), max_runtime_seconds: 120, max_output_bytes: 65536, + execution_identity: None, }; let planned = plan(s, p, tenant, id, selection).await; if identity == "system" { @@ -394,6 +398,7 @@ pub(crate) mod tests { reason: "isolated library contract".into(), max_runtime_seconds: 60, max_output_bytes: 4096, + execution_identity: None, }; assert_eq!( plan(s, p, tenant, id, selection(windows)) diff --git a/crates/server/src/windows_policy.rs b/crates/server/src/windows_policy.rs index f0429e2..6f4879c 100644 --- a/crates/server/src/windows_policy.rs +++ b/crates/server/src/windows_policy.rs @@ -25,7 +25,7 @@ struct SystemPolicy { } #[derive(Deserialize)] #[serde(deny_unknown_fields)] -struct SystemScope { +pub(crate) struct SystemScope { tenant_id: Uuid, asset_id: Uuid, agent_id: Uuid, @@ -76,7 +76,7 @@ fn fixture_service(name: &str) -> bool { .all(|c| c.is_ascii_alphanumeric() || b"_-".contains(&c)) } impl SystemScope { - fn valid(&self) -> bool { + pub(crate) fn valid(&self) -> bool { !self.tenant_id.is_nil() && !self.asset_id.is_nil() && !self.agent_id.is_nil() @@ -127,7 +127,7 @@ impl SystemScope { && rmm_domain::jobs::valid_windows_update_limit(self.windows_update_max_runtime_seconds) && (1..=120).contains(&self.max_runtime_seconds) } - fn permits( + pub(crate) fn permits( &self, principal: &str, job: &JobPayload, @@ -293,7 +293,7 @@ fn protected_parent_chain(path: &Path, owner: u32) -> Result<(), Error> { } Ok(()) } -fn protected_bytes(path: &Path, owner: u32) -> Result, Error> { +pub(crate) fn protected_bytes(path: &Path, owner: u32) -> Result, Error> { no_symlink_components(path)?; protected_parent_chain(path, owner)?; let before = fs::symlink_metadata(path).map_err(|_| disabled())?; @@ -374,9 +374,12 @@ pub async fn authorize( if matches!(job.action, Action::RunScript { .. }) { crate::permissions::require(tx, principal, "scripts:execute").await?; } - let policy = load()?; 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 = serde_json::from_value(caps)?; + if crate::managed_scripts::permits(principal, job, &capabilities)? { + return Ok(()); + } + let policy = load()?; if !policy.permits(principal, job, &capabilities, Utc::now()) { return Err(Error( StatusCode::FORBIDDEN, diff --git a/deploy/server.managed-scripts.compose.yaml b/deploy/server.managed-scripts.compose.yaml new file mode 100644 index 0000000..5f081ff --- /dev/null +++ b/deploy/server.managed-scripts.compose.yaml @@ -0,0 +1,16 @@ +services: + api: + environment: + RMM_MANAGED_SCRIPT_POLICY_FILE: /managed-scripts/policy.json + volumes: + - ../devstate/managed-scripts:/managed-scripts:ro + public-api: + environment: + RMM_MANAGED_SCRIPT_POLICY_FILE: /managed-scripts/policy.json + volumes: + - ../devstate/managed-scripts:/managed-scripts:ro + gateway: + environment: + RMM_MANAGED_SCRIPT_POLICY_FILE: /managed-scripts/policy.json + volumes: + - ../devstate/managed-scripts:/managed-scripts:ro diff --git a/web/src/order-composer.tsx b/web/src/order-composer.tsx index 0b8fed7..054484a 100644 --- a/web/src/order-composer.tsx +++ b/web/src/order-composer.tsx @@ -27,6 +27,7 @@ import { scriptPlatform, type Identity, type Interpreter, + type Revision, type Script } from './script-catalog'; import { ScriptFields } from './script-library'; @@ -137,9 +138,9 @@ export function OrderComposer({ tenantId, auth, initialAssetIds, onSubmitted, on const ticket = canPlanScript ? savedTicket : null; const [mode, setMode] = useState<'library' | 'once' | 'reboot'>(() => canPlanScript ? 'library' : 'reboot'); const [revisionId, choose] = useState(''); + const [libraryIdentity, setLibraryIdentity] = useState(null); const [linux, setLinux] = useState