Simplify PAM get_item_string calls

Signed-off-by: David Mulder <dmulder@samba.org>
himmelblau-idm · Oct 8, 2024 · 2b17e3d · 2b17e3d
1 parent 3541b39
commit 2b17e3d
Showing 1 changed file with 28 additions and 49 deletions.
diff --git a/src/pam/src/pam/module.rs b/src/pam/src/pam/module.rs
@@ -5,7 +5,8 @@ use std::{mem, ptr};
 
 use libc::c_char;
 
-use crate::pam::constants::{PamFlag, PamItemType, PamResultCode, PAM_AUTHTOK, PAM_RHOST, PAM_TTY};
+use crate::pam::constants::{PamFlag, PamItemType, PamResultCode};
+use crate::pam::items::{PamAuthTok, PamRHost, PamService, PamTty};
 
 /// Opaque type, used as a pointer when making pam API calls.
 ///
@@ -143,6 +144,25 @@ impl PamHandle {
         }
     }
 
+    pub fn get_item_string<T: PamItem>(&self) -> PamResult<Option<String>> {
+        let mut ptr: *const PamItemT = ptr::null();
+        let (res, item) = unsafe {
+            let r = pam_get_item(self, T::item_type(), &mut ptr);
+            let t = if PamResultCode::PAM_SUCCESS == r && !ptr.is_null() {
+                let typed_ptr: *const c_char = ptr as *const c_char;
+                Some(CStr::from_ptr(typed_ptr).to_string_lossy().into_owned())
+            } else {
+                None
+            };
+            (r, t)
+        };
+        if PamResultCode::PAM_SUCCESS == res {
+            Ok(item)
+        } else {
+            Err(res)
+        }
+    }
+
     /// Sets a value in the pam context. The value can be retrieved using
     /// `get_item`.
     ///
@@ -198,60 +218,19 @@ impl PamHandle {
     }
 
     pub fn get_authtok(&self) -> PamResult<Option<String>> {
-        let mut ptr: *const PamItemT = ptr::null();
-        let (res, item) = unsafe {
-            let r = pam_get_item(self, PAM_AUTHTOK, &mut ptr);
-            let t = if PamResultCode::PAM_SUCCESS == r && !ptr.is_null() {
-                let typed_ptr: *const c_char = ptr as *const c_char;
-                Some(CStr::from_ptr(typed_ptr).to_string_lossy().into_owned())
-            } else {
-                None
-            };
-            (r, t)
-        };
-        if PamResultCode::PAM_SUCCESS == res {
-            Ok(item)
-        } else {
-            Err(res)
-        }
+        self.get_item_string::<PamAuthTok>()
     }
 
     pub fn get_tty(&self) -> PamResult<Option<String>> {
-        let mut ptr: *const PamItemT = ptr::null();
-        let (res, item) = unsafe {
-            let r = pam_get_item(self, PAM_TTY, &mut ptr);
-            let t = if PamResultCode::PAM_SUCCESS == r && !ptr.is_null() {
-                let typed_ptr: *const c_char = ptr as *const c_char;
-                Some(CStr::from_ptr(typed_ptr).to_string_lossy().into_owned())
-            } else {
-                None
-            };
-            (r, t)
-        };
-        if PamResultCode::PAM_SUCCESS == res {
-            Ok(item)
-        } else {
-            Err(res)
-        }
+        self.get_item_string::<PamTty>()
     }
 
     pub fn get_rhost(&self) -> PamResult<Option<String>> {
-        let mut ptr: *const PamItemT = ptr::null();
-        let (res, item) = unsafe {
-            let r = pam_get_item(self, PAM_RHOST, &mut ptr);
-            let t = if PamResultCode::PAM_SUCCESS == r && !ptr.is_null() {
-                let typed_ptr: *const c_char = ptr as *const c_char;
-                Some(CStr::from_ptr(typed_ptr).to_string_lossy().into_owned())
-            } else {
-                None
-            };
-            (r, t)
-        };
-        if PamResultCode::PAM_SUCCESS == res {
-            Ok(item)
-        } else {
-            Err(res)
-        }
+        self.get_item_string::<PamRHost>()
+    }
+
+    pub fn get_service(&self) -> PamResult<Option<String>> {
+        self.get_item_string::<PamService>()
     }
 }