- Accept --chdir {directory} or uppercase -D {directory} argument…

… for compat with MS-SUDO.

- Included new ms-sudo compatible options aliases (`--preserve-env`, `--new-window`).

src/gsudo/Commands/RunCommand.cs

@@ -41,7 +41,7 @@ public async Task<int> Execute()
  if (isElevationRequired & SecurityHelper.GetCurrentIntegrityLevel() < (int)IntegrityLevel.Medium)
  throw new ApplicationException("Sorry, gsudo doesn't allow to elevate from low integrity level."); // This message is not a security feature, but a nicer error message. It would have failed anyway since the named pipe's ACL restricts it.
 
- if (isRunningAsDesiredUser && isShellElevation && !InputArguments.NewWindow)
+ if (isRunningAsDesiredUser && isShellElevation && !InputArguments.NewWindow && !InputArguments.Direct && InputArguments.StartingDirectory == null)
  throw new ApplicationException("Already running as the specified user/permission-level (and no command specified). Exiting...");
 
  var elevationMode = GetElevationMode();
@@ -58,7 +58,7 @@ public async Task<int> Execute()
  {
  FileName = commandBuilder.GetExeName(),
  Arguments = commandBuilder.GetArgumentsAsString(),
- StartFolder = Environment.CurrentDirectory,
+ StartFolder = InputArguments.StartingDirectory ?? Environment.CurrentDirectory,
  NewWindow = InputArguments.NewWindow,
  Wait = (!commandBuilder.IsWindowsApp && !InputArguments.NewWindow) || InputArguments.Wait,
  Mode = elevationMode,

src/gsudo/Helpers/CommandLineParser.cs

@@ -1,8 +1,10 @@
 using gsudo.AppSettings;
 using gsudo.Commands;
+using gsudo.Native;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Security.Principal;
 
@@ -132,7 +134,6 @@ ICommand ParseOption(string argChar, string argWord, out bool skipRemainingChars
  else if (match(null, "--close")) { InputArguments.CloseNewWindow = true; InputArguments.KeepWindowOpen = false; InputArguments.KeepShellOpen = false; }
 
  else if (match("s", "--system")) { InputArguments.RunAsSystem = true; }
- else if (match("d", "--direct")) { InputArguments.Direct = true; }
  else if (match("k", "--reset-timestamp")) { InputArguments.KillCache = true; }
  else if (match(null, "--global")) { InputArguments.Global = true; }
  else if (match(null, "--ti")) { InputArguments.TrustedInstaller = InputArguments.RunAsSystem = true; }
@@ -145,6 +146,15 @@ ICommand ParseOption(string argChar, string argWord, out bool skipRemainingChars
  else if (match(null, "--debug")) { Settings.LogLevel.Value = LogLevel.All; InputArguments.Debug = true; }
  else if (match("v", "--version")) { return new ShowVersionHelpCommand(); }
  else if (match("h", "--help")) return new HelpCommand();
+
+ // ms-sudo compat:
+ else if (match(null, "--preserve-env")) { Settings.CopyEnvironmentVariables.Value = true; }
+ else if (match(null, "--new-window")) { InputArguments.NewWindow = true; }
+ else if (argChar == "D" && argWord == "-D" && FileApi.PathExists(args.FirstOrDefault())) { InputArguments.StartingDirectory = DeQueueArg(); }
+ else if (match(null, "--chdir")) { InputArguments.StartingDirectory = DeQueueArg(); }
+
+ // rest
+ else if (match("d", "--direct")) { InputArguments.Direct = true; }
  else if (argWord.StartsWith("-", StringComparison.Ordinal))
  {
  if (argChar != null)

src/gsudo/InputParameters.cs

@@ -42,6 +42,9 @@ public static class InputArguments
  // SID of User to Impersonate
  public static string UserSid { get; private set; }
 
+ // Starting Directory for the new process
+ public static string StartingDirectory { get; internal set; }
+
  public static IntegrityLevel GetIntegrityLevel() => (RunAsSystem ? gsudo.IntegrityLevel.System : IntegrityLevel ?? gsudo.IntegrityLevel.High);
 
  internal static void Clear() // added for tests repeatability

src/gsudo/Native/FileApi.cs

@@ -78,6 +78,9 @@ public struct WIN32_FIND_DATA
  [DllImport("kernel32.dll", SetLastError = true)]
  public static extern bool FindClose(IntPtr hFindFile);
 
+ [DllImport("shlwapi", EntryPoint = "PathFileExists", CharSet = CharSet.Unicode)]
+ public static extern bool PathExists(string path);
+
  #endregion
 
  #region Network Drives

src/gsudo/ProcessHosts/AttachedConsoleHost.cs

@@ -40,7 +40,7 @@ public async Task Start(Connection connection, ElevationRequest elevationRequest
  }
  catch (UnauthorizedAccessException ex)
  {
- throw new ApplicationException($"User \"{WindowsIdentity.GetCurrent().Name}\" can not access current directory \"{elevationRequest.StartFolder}\"");
+ throw new ApplicationException($"User \"{WindowsIdentity.GetCurrent().Name}\" can not access directory \"{elevationRequest.StartFolder}\"");
  }
 
  var process = Helpers.ProcessFactory.StartAttached(elevationRequest.FileName, elevationRequest.Arguments);

src/gsudo/ProcessRenderers/TokenSwitchRenderer.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -55,6 +56,15 @@ internal TokenSwitchRenderer(Connection connection, ElevationRequest elevationRe
  // Hack not needed if we are already calling CMD
  exeName = elevationRequest.FileName;
  args = elevationRequest.Arguments;
+ }
+
+ try
+ {
+ System.Environment.CurrentDirectory = elevationRequest.StartFolder;
+ }
+ catch (UnauthorizedAccessException ex)
+ {
+ throw new ApplicationException($"User \"{WindowsIdentity.GetCurrent().Name}\" can not access directory \"{elevationRequest.StartFolder}\"");
  }
 
  ProcessFactory.CreateProcessForTokenReplacement(exeName, args, dwCreationFlags, out _processHandle, out _threadHandle, out int processId);