fix(sandbox): preserve standard sbin paths for CDI workloads

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

crates/openshell-sandbox/src/boundary_exec.rs

@@ -35,6 +35,7 @@ pub struct LocalBoundaryExec {
     ca_file_paths: Option<Arc<(std::path::PathBuf, std::path::PathBuf)>>,
     provider_credentials: ProviderCredentialState,
     user_environment: HashMap<String, String>,
+    repair_standard_sbin: bool,
     runtime: Arc<crate::boundary_io::BoundaryRuntimeState>,
     #[cfg(target_os = "linux")]
     launcher: openshell_isolation_interface::linux::workload_launcher::WorkloadLauncher,
@@ -59,6 +60,7 @@ impl LocalBoundaryExec {
             ca_file_paths,
             provider_credentials,
             user_environment,
+            repair_standard_sbin: false,
             runtime,
             #[cfg(target_os = "linux")]
             launcher,
@@ -120,6 +122,13 @@ impl LocalBoundaryExec {
         })
     }
 
+    /// Configure whether workload paths should include the standard sbin directories.
+    #[must_use]
+    pub fn with_standard_sbin_path_repair(mut self, enabled: bool) -> Self {
+        self.repair_standard_sbin = enabled;
+        self
+    }
+
     fn command(&self, spec: &ExecSpec) -> Result<Command, BackendError> {
         let (program, args) = if let Some(shell_spec) = &spec.shell {
             let shell = openshell_core::shell::find_login_shell().ok_or_else(|| {
@@ -150,12 +159,18 @@ impl LocalBoundaryExec {
         if program.is_empty() {
             return Err(BackendError::Process("exec program is empty".to_string()));
         }
+        let repair_standard_sbin = self.repair_standard_sbin;
+        let args = crate::process::process_args_with_standard_sbin_paths(
+            &program,
+            &args,
+            repair_standard_sbin,
+        );
         let mut command = Command::new(&program);
-        command.args(&args);
+        command.args(args);
         let effective_workdir = spec.workdir.as_deref().or(self.base_workdir.as_deref());
         let (session_user, session_home) =
             crate::process::session_user_and_home(&self.policy, effective_workdir);
-        let path = std::env::var("PATH").unwrap_or_else(|_| "/usr/local/bin:/usr/bin:/bin".into());
+        let path = crate::child_env::child_path_from_env(repair_standard_sbin);
         command
             .env_clear()
             .env(openshell_core::sandbox_env::SANDBOX, "1")
@@ -168,7 +183,17 @@ impl LocalBoundaryExec {
         }
         for (key, value) in &self.user_environment {
             if !key.starts_with("OPENSHELL_") {
-                command.env(key, value);
+                if key == "PATH" {
+                    command.env(
+                        key,
+                        crate::child_env::maybe_path_with_standard_sbin_paths(
+                            value,
+                            repair_standard_sbin,
+                        ),
+                    );
+                } else {
+                    command.env(key, value);
+                }
             }
         }
         if let Some((ca_cert_path, combined_bundle_path)) = self.ca_file_paths.as_deref() {
@@ -178,13 +203,33 @@ impl LocalBoundaryExec {
         }
         for (key, value) in self.provider_credentials.child_env_with_gcp_resolved() {
             if !crate::process::is_supervisor_only_env_var(&key) {
-                command.env(key, value);
+                if key == "PATH" {
+                    command.env(
+                        key,
+                        crate::child_env::maybe_path_with_standard_sbin_paths(
+                            &value,
+                            repair_standard_sbin,
+                        ),
+                    );
+                } else {
+                    command.env(key, value);
+                }
             }
         }
         crate::process::strip_proxy_env_std(&mut command);
         for (key, value) in &spec.env {
             if !key.starts_with("OPENSHELL_") {
-                command.env(key, value);
+                if key == "PATH" {
+                    command.env(
+                        key,
+                        crate::child_env::maybe_path_with_standard_sbin_paths(
+                            value,
+                            repair_standard_sbin,
+                        ),
+                    );
+                } else {
+                    command.env(key, value);
+                }
             }
         }
         if let Some(workdir) = spec.workdir.as_deref().or(self.base_workdir.as_deref()) {

crates/openshell-sandbox/src/boundary_server.rs

@@ -2587,6 +2587,7 @@ mod linux {
                 process_id: format!("{}:main:0", self.config.generation),
                 spec,
                 policy,
+                cdi_active: self.config.cdi_context.is_some(),
                 provider_env_revision,
                 provider_env,
                 ca_file_paths,
@@ -2933,6 +2934,7 @@ mod linux {
         process_id: String,
         spec: AgentSpecWire,
         policy: openshell_core::policy::SandboxPolicy,
+        cdi_active: bool,
         provider_env_revision: u64,
         provider_env: std::collections::HashMap<String, String>,
         ca_file_paths: Option<(std::path::PathBuf, std::path::PathBuf)>,
@@ -2967,6 +2969,7 @@ mod linux {
                 process_id,
                 spec,
                 policy,
+                cdi_active,
                 provider_env_revision,
                 provider_env,
                 ca_file_paths,
@@ -2987,6 +2990,7 @@ mod linux {
                     spec.timeout_secs,
                     spec.interactive,
                     &policy,
+                    cdi_active,
                     entrypoint_pid,
                     provider_credentials.clone(),
                     provider_env,
@@ -5240,6 +5244,7 @@ containerEdits:
                         process_id: "generation-retained:main:0".to_string(),
                         spec: agent_spec.clone(),
                         policy,
+                        cdi_active: false,
                         provider_env_revision: 0,
                         provider_env: std::collections::HashMap::new(),
                         ca_file_paths: None,