mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent bug in pam (#2960)

Browse source 
* Prevent bug in pam
* Pointer tidy
This commit is contained in:
Firstyear 2024-08-09 20:12:34 +10:00 committed by GitHub
parent eee2df8894
commit d19bd99c0d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
unix_integration/pam_kanidm/src/pam/module.rs
View file

@ -51,7 +51,7 @@ extern "C" {
fn pam_get_user( fn pam_get_user(
pamh: *const PamHandle, pamh: *const PamHandle,
user: &*mut c_char, user: &mut *const c_char,
prompt: *const c_char, prompt: *const c_char,
) -> PamResultCode; ) -> PamResultCode;
} }
@ -176,19 +176,22 @@ impl PamHandle {
/// See `pam_get_user` in /// See `pam_get_user` in
/// <http://www.linux-pam.org/Linux-PAM-html/mwg-expected-by-module-item.html> /// <http://www.linux-pam.org/Linux-PAM-html/mwg-expected-by-module-item.html>
pub fn get_user(&self, prompt: Option<&str>) -> PamResult<String> { pub fn get_user(&self, prompt: Option<&str>) -> PamResult<String> {
let ptr: *mut c_char = ptr::null_mut(); let mut ptr: *const c_char = ptr::null_mut();
let res = match prompt { let res = match prompt {
Some(p) => { Some(p) => {
let c_prompt = CString::new(p).unwrap(); let c_prompt = CString::new(p).unwrap();
unsafe { pam_get_user(self, &ptr, c_prompt.as_ptr()) } unsafe { pam_get_user(self, &mut ptr, c_prompt.as_ptr()) }
} }
None => unsafe { pam_get_user(self, &ptr, ptr::null()) }, None => unsafe { pam_get_user(self, &mut ptr, ptr::null()) },
}; };
if PamResultCode::PAM_SUCCESS == res && !ptr.is_null() { if PamResultCode::PAM_SUCCESS == res {
let const_ptr = ptr as *const c_char; if ptr.is_null() {
let bytes = unsafe { CStr::from_ptr(const_ptr).to_bytes() }; Err(PamResultCode::PAM_AUTHINFO_UNAVAIL)
String::from_utf8(bytes.to_vec()).map_err(|_| PamResultCode::PAM_CONV_ERR) } else {
let bytes = unsafe { CStr::from_ptr(ptr).to_bytes() };
String::from_utf8(bytes.to_vec()).map_err(|_| PamResultCode::PAM_CONV_ERR)
}
} else { } else {
Err(res) Err(res)
} }