vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs-mistrust: Use pwd-grp's getgroups function 

This gets rid of some unsafe code here, with doubtful error handling,
in favour of the unit-tested version in pwd-grp.
This commit is contained in:
Ian Jackson 2023-07-14 14:42:44 +01:00
parent 5f46bacbb2
commit fe79f423f7
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/fs-mistrust/src/user.rs
View File

@ -94,31 +94,8 @@ fn get_own_username<U: PwdGrpProvider>(userdb: &U) -> io::Result<Option<OsString
}
/// Return a vector of the group ID values for every group to which we belong.
///
/// (We don't use `users::group_access_list()` here, since that function calls
/// `getgrnam_r` on every group we belong to, when in fact we don't care what
/// the groups are named.)
#[allow(clippy::unnecessary_wraps)] // XXXX
fn cur_groups() -> io::Result<Vec<u32>> {
let n_groups = unsafe { libc::getgroups(0, std::ptr::null_mut()) };
if n_groups <= 0 {
return Ok(Vec::new());
}
let mut buf: Vec<Id> = vec![0; n_groups as usize];
let n_groups2 = unsafe { libc::getgroups(buf.len() as i32, buf.as_mut_ptr()) };
if n_groups2 <= 0 {
return Ok(Vec::new());
}
if n_groups2 < n_groups {
buf.resize(n_groups2 as usize, 0);
}
// It's not guaranteed that our current GID is necessarily one of our
// current groups. So, we add it.
let cur_gid = PwdGrp.getgid();
if !buf.contains(&cur_gid) {
buf.push(cur_gid);
}
Ok(buf)
PwdGrp.getgroups()
}
/// A user that we can be configured to trust.