Reject empty HOME envvar
This commit is contained in:
@@ -2,7 +2,7 @@ use std::env;
|
||||
use std::path::PathBuf;
|
||||
|
||||
pub fn agent_rw_paths() -> Vec<PathBuf> {
|
||||
let home = match env::var("HOME") {
|
||||
let home = match crate::require_home() {
|
||||
Ok(h) => PathBuf::from(h),
|
||||
Err(_) => return vec![],
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ pub fn resolve_overlays(ctx: &PathContext) -> Result<BlacklistOverlays, SandboxE
|
||||
}
|
||||
|
||||
pub fn resolve_path_context() -> Result<PathContext, SandboxError> {
|
||||
let home = std::env::var("HOME").map_err(|_| SandboxError::HomeNotSet)?;
|
||||
let home = crate::require_home()?;
|
||||
let run_user = std::env::var("XDG_RUNTIME_DIR")
|
||||
.ok()
|
||||
.or_else(resolve_run_user_from_proc)
|
||||
|
||||
@@ -6,6 +6,7 @@ mod sandbox;
|
||||
|
||||
pub use errors::SandboxError;
|
||||
|
||||
use std::env;
|
||||
use std::ffi::OsString;
|
||||
use std::os::unix::process::CommandExt;
|
||||
use std::path::PathBuf;
|
||||
@@ -27,6 +28,13 @@ pub struct SandboxConfig {
|
||||
pub dry_run: bool,
|
||||
}
|
||||
|
||||
pub fn require_home() -> Result<String, SandboxError> {
|
||||
env::var("HOME")
|
||||
.ok()
|
||||
.filter(|h| !h.is_empty())
|
||||
.ok_or(SandboxError::HomeNotSet)
|
||||
}
|
||||
|
||||
pub fn run(config: SandboxConfig) -> Result<(), SandboxError> {
|
||||
preflight::check(&config)?;
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ fn add_blacklist_mode(cmd: &mut Command) -> Result<(), SandboxError> {
|
||||
}
|
||||
|
||||
fn add_whitelist_mode(cmd: &mut Command) -> Result<(), SandboxError> {
|
||||
let home = std::env::var("HOME").map_err(|_| SandboxError::HomeNotSet)?;
|
||||
let home = crate::require_home()?;
|
||||
|
||||
cmd.args(["--ro-bind", "/usr", "/usr"]);
|
||||
for path in ["/lib", "/lib64", "/lib32", "/bin", "/sbin"] {
|
||||
|
||||
Reference in New Issue
Block a user