see if this makes a difference on windows (#386)

Author: Byron

git-sec/src/lib.rs

@@ -52,8 +52,8 @@ pub mod identity {
         use std::borrow::Cow;
         use std::path::Path;
 
-        fn err(msg: &str) -> std::io::Error {
-            std::io::Error::new(std::io::ErrorKind::Other, msg)
+        fn err(msg: impl Into<String>) -> std::io::Error {
+            std::io::Error::new(std::io::ErrorKind::Other, msg.into())
         }
 
         pub fn is_path_owned_by_current_user(path: Cow<'_, Path>) -> std::io::Result<bool> {
@@ -75,54 +75,46 @@ pub mod identity {
                     .map_err(|_| err("Failed to open process token"))?;
 
                 let mut len = 0_u32;
-                if Security::GetTokenInformation(&handle, Security::TokenUser, std::ptr::null_mut(), 0, &mut len)
-                    .as_bool()
+                let mut info = Security::TOKEN_USER::default();
+                if Security::GetTokenInformation(
+                    handle,
+                    Security::TokenUser,
+                    &mut info as *mut _ as *mut std::ffi::c_void,
+                    std::mem::size_of_val(&info) as u32,
+                    &mut len,
+                )
+                .as_bool()
                 {
-                    let mut token_user = Security::TOKEN_USER::default();
-                    if Security::GetTokenInformation(
-                        &handle,
-                        Security::TokenUser,
-                        &mut token_user as *mut _ as *mut std::ffi::c_void,
-                        len,
-                        &mut len,
-                    )
-                    .as_bool()
-                    {
-                        // NOTE: we avoid to copy the sid or cache it in any way for now, even though it should be possible
-                        //       with a custom allocation/vec/box and it's just very raw. Can the `windows` crate do better?
-                        //       When/If yes, then let's improve this.
-                        if Security::IsValidSid(token_user.User.Sid).as_bool() {
-                            use std::os::windows::ffi::OsStrExt;
-                            let mut wide_path: Vec<_> = path.as_ref().as_os_str().encode_wide().collect();
-                            // err = GetNamedSecurityInfoW(wpath, SE_FILE_OBJECT,
-                            //                             OWNER_SECURITY_INFORMATION |
-                            //                                 DACL_SECURITY_INFORMATION,
-                            //                             &sid, NULL, NULL, NULL, &descriptor);
-                            let mut path_sid = PSID::default();
-                            let res = Security::Authorization::GetNamedSecurityInfoW(
-                                windows::core::PCWSTR(wide_path.as_mut_ptr()),
-                                SE_FILE_OBJECT,
-                                Security::OWNER_SECURITY_INFORMATION | Security::DACL_SECURITY_INFORMATION,
-                                &mut path_sid,
-                                std::ptr::null_mut(),
-                                std::ptr::null_mut(),
-                                std::ptr::null_mut(),
-                                &mut descriptor,
-                            );
+                    // NOTE: we avoid to copy the sid or cache it in any way for now, even though it should be possible
+                    //       with a custom allocation/vec/box and it's just very raw. Can the `windows` crate do better?
+                    //       When/If yes, then let's improve this.
+                    if Security::IsValidSid(info.User.Sid).as_bool() {
+                        use std::os::windows::ffi::OsStrExt;
+                        let mut wide_path: Vec<_> = path.as_ref().as_os_str().encode_wide().collect();
+                        wide_path.push(0);
+                        let mut path_sid = PSID::default();
+                        let res = Security::Authorization::GetNamedSecurityInfoW(
+                            windows::core::PCWSTR(wide_path.as_ptr()),
+                            SE_FILE_OBJECT,
+                            Security::OWNER_SECURITY_INFORMATION | Security::DACL_SECURITY_INFORMATION,
+                            &mut path_sid,
+                            std::ptr::null_mut(),
+                            std::ptr::null_mut(),
+                            std::ptr::null_mut(),
+                            &mut descriptor,
+                        );
 
-                            if res == ERROR_SUCCESS.0 && Security::IsValidSid(path_sid).as_bool() {
-                                is_owned = Security::EqualSid(path_sid, token_user.User.Sid).as_bool();
-                            } else {
-                                err_msg = "couldn't get owner for path or it wasn't valid".into();
-                            }
+                        if res == ERROR_SUCCESS.0 && Security::IsValidSid(path_sid).as_bool() {
+                            is_owned = Security::EqualSid(path_sid, info.User.Sid).as_bool();
+                            dbg!(is_owned, path.as_ref());
                         } else {
-                            err_msg = "owner id of current process wasn't set or valid".into();
+                            err_msg = format!("couldn't get owner for path or it wasn't valid: {}", res).into();
                         }
                     } else {
-                        err_msg = "Could not get information about the token user".into();
+                        err_msg = String::from("owner id of current process wasn't set or valid").into();
                     }
                 } else {
-                    err_msg = "Could not get token information for length of token user".into();
+                    err_msg = String::from("Could not get information about the token user").into();
                 }
                 CloseHandle(handle);
                 if !descriptor.is_invalid() {

git-sec/tests/identity/mod.rs

@@ -2,6 +2,9 @@ mod uid {
     #[test]
     fn from_path() -> crate::Result {
         let dir = tempfile::tempdir()?;
+        let file = dir.path().join("file");
+        std::fs::write(&file, &[])?;
+        assert!(git_sec::identity::is_path_owned_by_current_user(file.into())?);
         assert!(git_sec::identity::is_path_owned_by_current_user(dir.path().into())?);
         Ok(())
     }