Rework Proc command to Exec

Author: ethanhann

src/InEngine.Core/Commands/CommandsPlugin.cs

@@ -7,7 +7,7 @@ public class CommandPlugin : AbstractPlugin
         [VerbOption("echo", HelpText= "Echo some text to the console. Useful for end-to-end testing.")]
         public Echo Echo { get; set; }
 
-        [VerbOption("proc", HelpText = "Launch an arbitrary process.")]
-        public SystemProcess SystemProcess { get; set; }
+        [VerbOption("exec", HelpText = "Execute an external program.")]
+        public Exec Exec { get; set; }
     }
 }

src/InEngine.Core/Commands/SystemProcess.cs renamed to src/InEngine.Core/Commands/Exec.cs

@@ -1,35 +1,43 @@
-using System.Diagnostics;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using CommandLine;
 using InEngine.Core.Exceptions;
 
 namespace InEngine.Core.Commands
 {
-    public class SystemProcess : AbstractCommand
+    public class Exec : AbstractCommand
     {
-        [Option('c', "command", Required = true, HelpText = "The name of the CLI program/command to run.")]
-        public string Command { get; set; }
+        [Option('e', "executable", Required = true, HelpText = "The name of the CLI program/command to run.")]
+        public string Executable { get; set; }
 
         [Option('a', "args", HelpText = "Arguments for the CLI program/command.")]
         public string Arguments { get; set; }
 
-        [Option('t', "timeout", DefaultValue = 900, HelpText = "The number of seconds to wait before killing the runnin process.")]
+        [Option('t', "timeout", DefaultValue = 900, HelpText = "The number of seconds to wait before killing the running process.")]
         public int Timeout { get; set; }
 
+        public IDictionary<string, string> ExecWhitelist { get; set; }
+
         public override void Run()
         {
-            if (!File.Exists(Command))
-                throw new CommandFailedException($"Cannot run {Command}. It either does not exist or is inaccessible. Exiting...");
+            if (ExecWhitelist == null)
+                ExecWhitelist = InEngineSettings.Make().ExecWhitelist;
+            if (!ExecWhitelist.ContainsKey(Executable))
+                throw new CommandFailedException("Executable is not whitelisted.");
+            var fileName = ExecWhitelist[Executable];
+            if (!File.Exists(fileName))
+                throw new CommandFailedException($"Cannot run {fileName}. It either does not exist or is inaccessible. Exiting...");
             var process = new Process() { 
-                StartInfo = new ProcessStartInfo(Command, Arguments) {
+                StartInfo = new ProcessStartInfo(fileName, Arguments) {
                     UseShellExecute = false,
                     ErrorDialog = false,
                     RedirectStandardError = false,
                     RedirectStandardInput = false,
                     RedirectStandardOutput = false,
                 } 
             };
-            var commandWithArguments = $"{Command} {Arguments}";
+            var commandWithArguments = $"{fileName} {Arguments}";
             process.Start();
             if (process.WaitForExit(Timeout * 1000)) {
                 return;

src/InEngine.Core/InEngineSettings.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using InEngine.Core.Commands;
 using InEngine.Core.IO;
 using InEngine.Core.Queuing;
 using Microsoft.Extensions.Configuration;
@@ -14,6 +15,7 @@ public class InEngineSettings
         public List<string> Plugins { get; set; } = new List<string>();
         public QueueSettings Queue { get; set; } = new QueueSettings();
         public MailSettings Mail { get; set; } = new MailSettings();
+        public IDictionary<string, string> ExecWhitelist { get; set; } = new Dictionary<string, string>();
 
         public static InEngineSettings Make()
         {

src/InEngine/appsettings.json

@@ -3,6 +3,8 @@
     "Plugins": [
       "InEngine.Commands"
     ],
+    "ExecWhitelist": {
+    },
     "Mail": {
       "Host": "localhost",
       "Port": 1025,