Skip to content

Commit

Permalink
fix: fix HSTRING being dropped, causing NERR_UserNotFound errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ehuff700 committed Dec 6, 2024
1 parent 4807520 commit e568f4e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
23 changes: 17 additions & 6 deletions src/windows/users.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::sys::utils::to_utf8_str;
use crate::{windows::sid::Sid, Gid, Group, GroupInner, Uid, User};

use std::ptr::null_mut;
use windows::core::{w, PCWSTR};
use windows::core::PCWSTR;
use windows::Win32::Foundation::{ERROR_MORE_DATA, LUID};
use windows::Win32::NetworkManagement::NetManagement::{
NERR_Success, NetApiBufferFree, NetUserEnum, NetUserGetInfo, NetUserGetLocalGroups,
Expand All @@ -16,8 +16,6 @@ use windows::Win32::Security::Authentication::Identity::{
SECURITY_LOGON_SESSION_DATA, SECURITY_LOGON_TYPE,
};

use super::utils::to_pcwstr;

pub(crate) struct UserInner {
pub(crate) uid: Uid,
pub(crate) gid: Gid,
Expand Down Expand Up @@ -56,7 +54,16 @@ impl UserInner {

pub(crate) fn groups(&self) -> Vec<Group> {
if let (Some(c_user_name), true) = (&self.c_user_name, self.is_local) {
unsafe { get_groups_for_user(to_pcwstr(c_user_name.to_vec())) }
// Convert the wide string to a PCWSTR, and ensure it has a null terminator.
// Since the Vec is created here, we can ensure it will not be dropped prematurely.
let username = {
let mut null_terminated = c_user_name.to_vec();
if null_terminated.last().is_some_and(|v| *v != 0) {
null_terminated.push(0);
}
null_terminated
};
unsafe { get_groups_for_user(PCWSTR::from_raw(username.as_ptr())) }
} else {
Vec::new()
}
Expand Down Expand Up @@ -115,14 +122,18 @@ impl<T> LsaBuffer<T> {
}
}

/// Get the groups for a user.
///
/// # Safety
/// The caller must ensure that the `username` is a valid wide Unicode string with a null terminator.
unsafe fn get_groups_for_user(username: PCWSTR) -> Vec<Group> {
let mut buf: NetApiBuffer<LOCALGROUP_USERS_INFO_0> = Default::default();
let mut nb_entries = 0;
let mut total_entries = 0;
let mut groups;
let mut groups: Vec<Group>;

let status = NetUserGetLocalGroups(
w!(""),
PCWSTR::null(),
username,
0,
LG_INCLUDE_INDIRECT,
Expand Down
9 changes: 0 additions & 9 deletions src/windows/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,6 @@ pub(crate) unsafe fn to_utf8_str(p: windows::core::PWSTR) -> String {
})
}

#[cfg(any(feature = "user", feature = "system"))]
pub(crate) unsafe fn to_pcwstr(v: Vec<u16>) -> windows::core::PCWSTR {
if v.is_empty() {
return windows::core::PCWSTR::null();
}
let string = String::from_utf16(&v).unwrap_or_default();
windows::core::PCWSTR(windows::core::HSTRING::from(&format!("{}\0", string)).as_ptr())
}

cfg_if! {
if #[cfg(any(feature = "disk", feature = "system"))] {
use windows::Win32::Foundation::{CloseHandle, HANDLE};
Expand Down

0 comments on commit e568f4e

Please sign in to comment.