Fixed cacheable root process algorithm when invoked via Shim #237

gerardog · Mar 2, 2023 · 624c1b3 · 624c1b3
1 parent 1f4c272
commit 624c1b3
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/gsudo/Helpers/ProcessHelper.cs b/src/gsudo/Helpers/ProcessHelper.cs
@@ -97,7 +97,7 @@ public static int GetCacheableRootProcessId(this Process process)
             int pid = process.Id;
             Process p = null;
 
-            while (p == null)
+            while (p == null && pid > 0)
             {
                 pid = GetParentProcessId(pid);
                 try
@@ -114,7 +114,8 @@ public static int GetCacheableRootProcessId(this Process process)
 
                     if (filename != null && !IsShim(filename))
                         break;
-                }                
+                }
+                p = null;
             }
 
             return pid;
@@ -340,16 +341,21 @@ static internal int GetProcessIntegrityLevel(IntPtr processHandle)
         /// <returns></returns>
         private static bool IsShim(string fileName)
         {
+            Console.Write($"Is Shim {fileName} ");
             try
             {
                 if (!fileName.Equals(ProcessHelper.GetOwnExeName(), StringComparison.OrdinalIgnoreCase)
                     && (fileName.EndsWith("\\SUDO.EXE", StringComparison.OrdinalIgnoreCase) ||
                         fileName.EndsWith("\\GSUDO.EXE", StringComparison.OrdinalIgnoreCase)
-                        ))
+                        ))
+                {
+                    Console.WriteLine($"true");
                     return true;
+                }
             }
             catch { } // fails to get parent.MainModule if our parent process is elevated and we are not.
 
+            Console.WriteLine($"false");
             return false;
         }
     }