Recursively kill process + children. Fix #661 #662

ckieran · Jun 7, 2018 · bd99d05 · bd99d05
1 parent d37a890
commit bd99d05
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/ImageProcessor.Web.Plugins.PostProcessor/ImageProcessor.Web.Plugins.PostProcessor.csproj b/src/ImageProcessor.Web.Plugins.PostProcessor/ImageProcessor.Web.Plugins.PostProcessor.csproj
@@ -35,6 +35,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/src/ImageProcessor.Web.Plugins.PostProcessor/PostProcessor.cs b/src/ImageProcessor.Web.Plugins.PostProcessor/PostProcessor.cs
@@ -15,6 +15,7 @@ namespace ImageProcessor.Web.Plugins.PostProcessor
     using System.Diagnostics;
     using System.Globalization;
     using System.IO;
+    using System.Management;
     using System.Web;
 
     using ImageProcessor.Configuration;
@@ -120,11 +121,11 @@ private static PostProcessingResultEventArgs RunProcess(Uri url, string sourceFi
 
             ProcessStartInfo start = new ProcessStartInfo("cmd")
             {
-                WindowStyle = ProcessWindowStyle.Hidden,
+                //WindowStyle = ProcessWindowStyle.Hidden,
                 WorkingDirectory = PostProcessorBootstrapper.Instance.WorkingPath,
                 Arguments = arguments,
                 UseShellExecute = false,
-                CreateNoWindow = true
+                // CreateNoWindow = true
             };
 
             Process process = null;
@@ -144,18 +145,41 @@ private static PostProcessingResultEventArgs RunProcess(Uri url, string sourceFi
 
                 process.Start();
 
+                // Recursively kill all child processes.
+                void KillProcessAndChildren(int pid)
+                {
+                    using (var searcher = new ManagementObjectSearcher($"Select * From Win32_Process Where ParentProcessID={pid}"))
+                    {
+                        ManagementObjectCollection moc = searcher.Get();
+                        foreach (ManagementBaseObject mo in moc)
+                        {
+                            KillProcessAndChildren(Convert.ToInt32(mo["ProcessID"]));
+                        }
+
+                        try
+                        {
+                            Process proc = Process.GetProcessById(pid);
+                            proc.Kill();
+                        }
+                        catch
+                        {
+                            // Process already exited.
+                        }
+                    }
+                }
+
                 // Wait for processing to finish, but not more than our timeout.
                 if (!process.WaitForExit(timeout))
                 {
-                    process.Kill();
+                    KillProcessAndChildren(process.Id);
                     ImageProcessorBootstrapper.Instance.Logger.Log(
                         typeof(PostProcessor),
                         $"Unable to post process image for request {url} within {timeout}ms. Original image returned.");
                 }
             }
             catch (Exception ex)
             {
-                // Some security policies don't allow execution of programs in this way
+                // Some security policies don't allow execution of programs in this way.
                 ImageProcessorBootstrapper.Instance.Logger.Log(typeof(PostProcessor), ex.Message);
             }
             finally