diff --git a/crates/domain/src/jobs.rs b/crates/domain/src/jobs.rs index 8755260..29487b7 100644 --- a/crates/domain/src/jobs.rs +++ b/crates/domain/src/jobs.rs @@ -488,6 +488,11 @@ impl Action { if interpreter == "posix_sh" && script_utf8 == "uname -s\n" && arguments.is_empty() && expected == "FreeBSD\n") } + pub fn opnsense_root_script(&self) -> bool { + matches!(self, Self::RunScript {interpreter, windows_execution_profile:None, + privileged_script_profile:Some(PrivilegedScriptProfile::FullMaintenanceV1), ..} + if interpreter=="posix_sh") && self.validate() + } /// Shared plan/revalidation/start gate. Passive inventory never implies job support. pub fn available_for(&self, identity: &str, capabilities: &[String]) -> bool { @@ -500,9 +505,10 @@ impl Action { } let has = |cap: &str| capabilities.iter().any(|c| c == cap); if has("opnsense.base/1") { - return identity == "agent_service" && has("run_script") && has("rmm.sync.v1") - && has("opnsense.uname/1") && !has("windows.base/1") && !has("linux.base/1") - && self.opnsense_kernel_probe(); + return has("run_script") && has("rmm.sync.v1") && !has("windows.base/1") && !has("linux.base/1") + && ((identity=="agent_service" && has("opnsense.uname/1") && self.opnsense_kernel_probe()) + || (identity=="root" && has("opnsense.root.posix/1") && has(FULL_MAINTENANCE_CAPABILITY) + && has("helper.root.v1") && has("root:run_script") && self.opnsense_root_script())); } if !has(self.name()) || (self.full_maintenance() @@ -858,6 +864,19 @@ mod tests { assert!(!a.available_for("agent_service",&caps)); } #[test] + fn opnsense_root_requires_full_profile_and_separate_capabilities() { + let caps:Vec<_>=["opnsense.base/1","run_script","rmm.sync.v1","opnsense.root.posix/1", + FULL_MAINTENANCE_CAPABILITY,"helper.root.v1","root:run_script"].map(str::to_owned).into(); + let mut a=Action::RunScript{interpreter:"posix_sh".into(),script_utf8:"id -u\n".into(), + arguments:vec![],expected_stdout:None,windows_execution_profile:None, + privileged_script_profile:Some(PrivilegedScriptProfile::FullMaintenanceV1)}; + assert!(a.available_for("root",&caps)); + for omitted in &caps { assert!(!a.available_for("root",&caps.iter().filter(|x|*x!=omitted).cloned().collect::>())); } + assert!(!a.available_for("agent_service",&caps)); + if let Action::RunScript{interpreter,..}=&mut a { *interpreter="bash".into(); } + assert!(!a.available_for("root",&caps)); + } + #[test] fn windows_update_final_report_and_policy_are_exact() { assert_eq!( windows_update_reboot_report( diff --git a/crates/server/src/jobs.rs b/crates/server/src/jobs.rs index f896e8c..4853e6f 100644 --- a/crates/server/src/jobs.rs +++ b/crates/server/src/jobs.rs @@ -441,7 +441,7 @@ pub(crate) async fn plan_resolved( let row = &rows[0]; let caps = capabilities(row.get("capabilities"))?; let action = target_action(&input, &caps)?; - if caps.iter().any(|s| s=="opnsense.base/1") && + if input.execution_identity=="agent_service" && caps.iter().any(|s| s=="opnsense.base/1") && (input.max_runtime_seconds != 10 || input.max_output_bytes != 1024) { return Err(fail("UNSUPPORTED_CAPABILITY")); } diff --git a/crates/server/src/managed_scripts.rs b/crates/server/src/managed_scripts.rs index 6d0238d..a7af888 100644 --- a/crates/server/src/managed_scripts.rs +++ b/crates/server/src/managed_scripts.rs @@ -16,6 +16,8 @@ use uuid::Uuid; struct Policy { schema_version: u8, linux: Vec, + #[serde(default)] + opnsense: Vec, windows: Vec, #[serde(default)] release_anchors: Vec, @@ -123,6 +125,8 @@ impl Policy { return false; } let permits_subject = |subject: &str| match job.execution_identity.as_str() { + "root" if caps.iter().any(|c| c=="opnsense.base/1") => self.opnsense.iter() + .any(|scope| scope.permits(subject,job,caps,None)), "root" => self .linux .iter() @@ -206,7 +210,7 @@ pub(crate) async fn permits( .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.linux.len() + policy.windows.len() + policy.opnsense.len() > 64 || policy.release_anchors.len() > 64 || policy .release_anchors diff --git a/crates/server/src/root_policy.rs b/crates/server/src/root_policy.rs index 4b1bfb9..bc90059 100644 --- a/crates/server/src/root_policy.rs +++ b/crates/server/src/root_policy.rs @@ -380,6 +380,9 @@ pub async fn authorize( if crate::managed_scripts::permits(tx, principal, job, &caps).await? { return Ok(()); } + if caps.iter().any(|c| c=="opnsense.base/1") { + return Err(Error(StatusCode::FORBIDDEN,"SCRIPT_HELPER_SCOPE_DENIED")); + } 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())? diff --git a/web/src/api.ts b/web/src/api.ts index 8f1eeba..4b024cf 100644 --- a/web/src/api.ts +++ b/web/src/api.ts @@ -193,6 +193,7 @@ export function validateInput(input: PlanInput): void { validateScriptIdentityProfile(input.parameters, input.parameters.execution_identity, variant.interpreter); const bytes = new TextEncoder().encode(script).length; const platform = variant.os_family === 'linux' && ['posix_sh', 'bash'].includes(String(variant.interpreter)) + || variant.os_family === 'opnsense' && variant.interpreter === 'posix_sh' || variant.os_family === 'windows' && variant.interpreter === 'powershell'; return bytes > 0 && bytes <= 32768 && !script.includes('\0') && variant.encoding === 'utf-8' && platform && (variant.os_family !== 'windows' || /^[\x00-\x7f]*$/.test(script) || script.startsWith('\ufeff')); diff --git a/web/src/devices.tsx b/web/src/devices.tsx index 74cb3da..8dfcf52 100644 --- a/web/src/devices.tsx +++ b/web/src/devices.tsx @@ -206,7 +206,7 @@ function reportedScriptProfiles(device: RecordValue) { if (!caps.has('run_script')) return 'Nicht gemeldet'; const windows = os === 'windows'; const identity = windows ? 'system' : 'root'; - const service = windows ? 'PowerShell als Dienstkonto' : 'Shell als Dienstkonto'; + const service = os==='opnsense' ? 'Kernelabfrage als Dienstkonto' : windows ? 'PowerShell als Dienstkonto' : 'Shell als Dienstkonto'; if (!caps.has(os + '.base/1') || caps.has(windows ? 'linux.base/1' : 'windows.base/1')) return 'Nicht gemeldet'; if (windows && !['rmm.sync.v1', 'script.powershell/1', 'script.powershell.process_remote_signed/1'].every(cap => caps.has(cap))) return 'Nicht gemeldet'; diff --git a/web/src/order-composer.tsx b/web/src/order-composer.tsx index c9f0175..a723e7d 100644 --- a/web/src/order-composer.tsx +++ b/web/src/order-composer.tsx @@ -43,7 +43,7 @@ type Target = { id: string; name: string; os: string; - platform: 'linux' | 'windows' | null; + platform: 'linux' | 'windows' | 'opnsense' | null; state: string; current: boolean; }; @@ -143,6 +143,7 @@ export function OrderComposer({ tenantId, auth, initialAssetIds, onSubmitted, cu const [libraryIdentity, setLibraryIdentity] = useState(null); const [linux, setLinux] = useState