laantungir/fips
1
0
Fork 0
mirror of https://github.com/jmcorgan/fips.git synced 2026-07-22 07:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix control socket path mismatch between daemon and clients

Browse Source 
fipsctl and fipstop checked XDG_RUNTIME_DIR before /run/fips/, causing
them to look in /run/user/<uid>/fips/ while the systemd-managed daemon
listens on /run/fips/control.sock. Reorder the fallback to check the
system-wide path first. Also improve the permission-denied error in
fipsctl to suggest adding the user to the fips group.
This commit is contained in:
Johnathan Corgan
2026-03-09 14:37:26 +00:00
parent aa53da061f
commit f907adad7b
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/bin/fipsctl.rs
View File

@@ -95,11 +95,14 @@ impl ShowCommands {
}
/// Determine the default socket path.
///
/// Checks the system-wide path first (used when the daemon runs as a
/// systemd service), then falls back to the user's XDG runtime directory.
fn default_socket_path() -> PathBuf {
if let Ok(runtime_dir) = std::env::var("XDG_RUNTIME_DIR") {
PathBuf::from(format!("{runtime_dir}/fips/control.sock"))
} else if Path::new("/run/fips/control.sock").exists() {
if Path::new("/run/fips/control.sock").exists() {
PathBuf::from("/run/fips/control.sock")
} else if let Ok(runtime_dir) = std::env::var("XDG_RUNTIME_DIR") {
PathBuf::from(format!("{runtime_dir}/fips/control.sock"))
} else {
PathBuf::from("/tmp/fips-control.sock")
}
@@ -174,7 +177,14 @@ fn main() {
socket_path.display(),
e
);
eprintln!("Is the FIPS daemon running?");
if e.kind() == std::io::ErrorKind::PermissionDenied {
eprintln!(
"Hint: add your user to the 'fips' group: sudo usermod -aG fips $USER"
);
eprintln!("Then log out and back in for the change to take effect.");
} else {
eprintln!("Is the FIPS daemon running?");
}
std::process::exit(1);
}
};

10
src/bin/fipstop/main.rs
View File

@@ -30,11 +30,15 @@ struct Cli {
refresh: u64,
}
/// Determine the default socket path.
///
/// Checks the system-wide path first (used when the daemon runs as a
/// systemd service), then falls back to the user's XDG runtime directory.
fn default_socket_path() -> PathBuf {
if let Ok(runtime_dir) = std::env::var("XDG_RUNTIME_DIR") {
PathBuf::from(format!("{runtime_dir}/fips/control.sock"))
} else if Path::new("/run/fips/control.sock").exists() {
if Path::new("/run/fips/control.sock").exists() {
PathBuf::from("/run/fips/control.sock")
} else if let Ok(runtime_dir) = std::env::var("XDG_RUNTIME_DIR") {
PathBuf::from(format!("{runtime_dir}/fips/control.sock"))
} else {
PathBuf::from("/tmp/fips-control.sock")
}