Skip to content

fix(daemon): don't touch the env-derived socket dir when binding to explicit paths #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msmps merged 1 commit into from
Jul 11, 2026
Merged

fix(daemon): don't touch the env-derived socket dir when binding to explicit paths #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions crates/pilotty-cli/src/daemon/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ pub struct DaemonServer {
impl DaemonServer {
/// Create a new daemon server bound to the default socket path.
pub async fn bind() -> Result<Self> {
// The default socket directory is derived from the environment and
// needs 0700 permissions; explicit-path binds (bind_to) must not
// touch it, so it is prepared here rather than in bind_to.
paths::ensure_socket_dir().context("Failed to create socket directory")?;
let socket_path = paths::get_socket_path(None);
let pid_path = paths::get_pid_path(None);
Self::bind_to(socket_path, pid_path).await
Expand All @@ -58,9 +62,6 @@ impl DaemonServer {
/// 3. If daemon dead, remove stale socket and retry
/// 4. If daemon alive, return error
pub async fn bind_to(socket_path: PathBuf, pid_path: PathBuf) -> Result<Self> {
// Ensure socket directory exists with secure permissions (0700)
paths::ensure_socket_dir().context("Failed to create socket directory")?;

if let Some(parent) = socket_path.parent() {
std::fs::create_dir_all(parent).with_context(|| {
format!("Failed to create socket directory for {:?}", socket_path)
Expand Down
Loading