Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions crates/openshell-driver-vm/src/runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1247,17 +1247,7 @@ fn hash_path_id(path: &Path) -> String {
}

fn secure_socket_base(subdir: &str) -> Result<PathBuf, String> {
let base = std::env::var_os("XDG_RUNTIME_DIR").map_or_else(
|| {
let fallback = PathBuf::from("/tmp");
if fallback.is_dir() {
fallback
} else {
std::env::temp_dir()
}
},
PathBuf::from,
);
let base = std::env::var_os("XDG_RUNTIME_DIR").map_or_else(socket_fallback_base, PathBuf::from);
let dir = base.join(subdir);

if dir.exists() {
Expand Down Expand Up @@ -1296,6 +1286,27 @@ fn secure_socket_base(subdir: &str) -> Result<PathBuf, String> {
Ok(dir)
}

fn socket_fallback_base() -> PathBuf {
let temp_dir = {
let fallback = PathBuf::from("/tmp");
if fallback.is_dir() {
fallback
} else {
std::env::temp_dir()
}
};

#[cfg(unix)]
{
temp_dir.join(format!("openshell-{}", unsafe { libc::getuid() }))
}

#[cfg(not(unix))]
{
temp_dir.join("openshell")
}
}

fn gvproxy_socket_base(overlay_disk: &Path) -> Result<PathBuf, String> {
Ok(secure_socket_base("osd-gv")?.join(hash_path_id(overlay_disk)))
}
Expand Down
1 change: 1 addition & 0 deletions nix/crate.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
openshell-core = {
dir = "openshell-core";
nativeBuildInputs = [ pkgs.protobuf ];
nativeCheckInputs = [ pkgs.lsof ];
assets = [ (root + "/proto") ];
};
openshell-driver-docker = {
Expand Down
Loading