fix: user.name instead user.gecos

Author: andycandy-dev

swhkd/src/daemon.rs

@@ -12,6 +12,7 @@ use std::{
     collections::{HashMap, HashSet},
     env,
     error::Error,
+    ffi::CString,
     fs::{self, File, OpenOptions, Permissions},
     io::{Read, Write},
     os::unix::{fs::PermissionsExt, net::UnixStream},
@@ -200,7 +201,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
                 .expect("Failed to get user info")
                 .expect(&format!("User with UID {} not found", invoking_uid));
 
-            nix::unistd::initgroups(&user.gecos, user.gid)
+            let username = CString::new(user.name.as_str())
+                .expect("Failed to convert username to CString");
+            nix::unistd::initgroups(&username, user.gid)
                 .expect(&format!("Failed to set supplementary groups for UID {}", invoking_uid));
             setgid(user.gid)
                 .expect(&format!("Failed to set group-id to {}", user.gid));

swhkd/src/perms.rs

@@ -1,5 +1,5 @@
 use nix::unistd::{Gid, Uid, User};
-use std::process::exit;
+use std::{ffi::CString, process::exit};
 
 pub fn _drop_privileges(user_uid: u32) {
     let user_uid = Uid::from_raw(user_uid);
@@ -20,7 +20,8 @@ pub fn raise_privileges() {
 
 fn set_initgroups(user: &nix::unistd::User, gid: u32) {
     let gid = Gid::from_raw(gid);
-    match nix::unistd::initgroups(&user.gecos, gid) {
+    let username = CString::new(user.name.as_str()).expect("Failed to convert username to CString");
+    match nix::unistd::initgroups(&username, gid) {
         Ok(_) => log::debug!("Setting initgroups..."),
         Err(e) => {
             log::error!("Failed to set init groups: {:#?}", e);