mirror of https://github.com/winsw/winsw
Enhance console prompting (#759)
parent
8b06b6157d
commit
2c86e14dec
|
@ -1,5 +1,6 @@
|
||||||
#pragma warning disable SA1310 // Field names should not contain underscore
|
#pragma warning disable SA1310 // Field names should not contain underscore
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
namespace WinSW.Native
|
namespace WinSW.Native
|
||||||
|
@ -10,6 +11,11 @@ namespace WinSW.Native
|
||||||
|
|
||||||
internal const uint CP_UTF8 = 65001;
|
internal const uint CP_UTF8 = 65001;
|
||||||
|
|
||||||
|
internal const uint ENABLE_PROCESSED_INPUT = 0x0001;
|
||||||
|
internal const uint ENABLE_LINE_INPUT = 0x0002;
|
||||||
|
internal const uint ENABLE_ECHO_INPUT = 0x0004;
|
||||||
|
internal const uint ENABLE_MOUSE_INPUT = 0x0010;
|
||||||
|
|
||||||
[DllImport(Libraries.Kernel32, SetLastError = true)]
|
[DllImport(Libraries.Kernel32, SetLastError = true)]
|
||||||
internal static extern bool AttachConsole(int processId);
|
internal static extern bool AttachConsole(int processId);
|
||||||
|
|
||||||
|
@ -19,12 +25,24 @@ namespace WinSW.Native
|
||||||
[DllImport(Libraries.Kernel32)]
|
[DllImport(Libraries.Kernel32)]
|
||||||
internal static extern bool GenerateConsoleCtrlEvent(CtrlEvents ctrlEvent, uint processGroupId);
|
internal static extern bool GenerateConsoleCtrlEvent(CtrlEvents ctrlEvent, uint processGroupId);
|
||||||
|
|
||||||
|
[DllImport(Libraries.Kernel32, SetLastError = true)]
|
||||||
|
internal static extern bool GetConsoleMode(IntPtr consoleHandle, out uint mode);
|
||||||
|
|
||||||
|
[DllImport(Libraries.Kernel32, SetLastError = true, CharSet = CharSet.Unicode)]
|
||||||
|
internal static extern bool ReadConsoleW(IntPtr consoleInput, out char buffer, int numberOfCharsToRead, out int numberOfCharsRead, IntPtr inputControl);
|
||||||
|
|
||||||
[DllImport(Libraries.Kernel32)]
|
[DllImport(Libraries.Kernel32)]
|
||||||
internal static extern bool SetConsoleCtrlHandler(ConsoleCtrlHandlerRoutine? handlerRoutine, bool add);
|
internal static extern bool SetConsoleCtrlHandler(ConsoleCtrlHandlerRoutine? handlerRoutine, bool add);
|
||||||
|
|
||||||
|
[DllImport(Libraries.Kernel32, SetLastError = true)]
|
||||||
|
internal static extern bool SetConsoleMode(IntPtr consoleHandle, uint mode);
|
||||||
|
|
||||||
[DllImport(Libraries.Kernel32)]
|
[DllImport(Libraries.Kernel32)]
|
||||||
internal static extern bool SetConsoleOutputCP(uint codePageID);
|
internal static extern bool SetConsoleOutputCP(uint codePageID);
|
||||||
|
|
||||||
|
[DllImport(Libraries.Kernel32, SetLastError = true, CharSet = CharSet.Unicode)]
|
||||||
|
internal static extern bool WriteConsoleW(IntPtr consoleOutput, string buffer, int numberOfCharsToWrite, out int numberOfCharsWritten, IntPtr reserved);
|
||||||
|
|
||||||
internal delegate bool ConsoleCtrlHandlerRoutine(CtrlEvents ctrlType);
|
internal delegate bool ConsoleCtrlHandlerRoutine(CtrlEvents ctrlType);
|
||||||
|
|
||||||
internal enum CtrlEvents : uint
|
internal enum CtrlEvents : uint
|
||||||
|
|
|
@ -0,0 +1,117 @@
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Text;
|
||||||
|
using static WinSW.Native.ConsoleApis;
|
||||||
|
|
||||||
|
namespace WinSW.Native
|
||||||
|
{
|
||||||
|
internal static class ConsoleEx
|
||||||
|
{
|
||||||
|
internal static Handle OpenConsoleInput()
|
||||||
|
{
|
||||||
|
return FileApis.CreateFileW(
|
||||||
|
"CONIN$",
|
||||||
|
FileApis.GenericAccess.Read | FileApis.GenericAccess.Write,
|
||||||
|
FileShare.Read | FileShare.Write,
|
||||||
|
IntPtr.Zero,
|
||||||
|
FileMode.Open,
|
||||||
|
0,
|
||||||
|
IntPtr.Zero);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static Handle OpenConsoleOutput()
|
||||||
|
{
|
||||||
|
return FileApis.CreateFileW(
|
||||||
|
"CONOUT$",
|
||||||
|
FileApis.GenericAccess.Write,
|
||||||
|
FileShare.Write,
|
||||||
|
IntPtr.Zero,
|
||||||
|
FileMode.Open,
|
||||||
|
0,
|
||||||
|
IntPtr.Zero);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static string ReadPassword()
|
||||||
|
{
|
||||||
|
using var consoleInput = OpenConsoleInput();
|
||||||
|
using var consoleOutput = OpenConsoleOutput();
|
||||||
|
|
||||||
|
if (!GetConsoleMode(consoleInput, out uint mode))
|
||||||
|
{
|
||||||
|
Throw.Command.Win32Exception("Failed to get console mode.");
|
||||||
|
}
|
||||||
|
|
||||||
|
uint newMode = mode;
|
||||||
|
newMode &= ~ENABLE_PROCESSED_INPUT;
|
||||||
|
newMode &= ~ENABLE_LINE_INPUT;
|
||||||
|
newMode &= ~ENABLE_ECHO_INPUT;
|
||||||
|
newMode &= ~ENABLE_MOUSE_INPUT;
|
||||||
|
|
||||||
|
if (newMode != mode)
|
||||||
|
{
|
||||||
|
if (!SetConsoleMode(consoleInput, newMode))
|
||||||
|
{
|
||||||
|
Throw.Command.Win32Exception("Failed to set console mode.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var buffer = new StringBuilder();
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
if (!ReadConsoleW(consoleInput, out char key, 1, out _, IntPtr.Zero))
|
||||||
|
{
|
||||||
|
Throw.Command.Win32Exception("Failed to read console.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key == (char)3)
|
||||||
|
{
|
||||||
|
// Ctrl+C
|
||||||
|
Write(consoleOutput, Environment.NewLine);
|
||||||
|
Throw.Command.Win32Exception(Errors.ERROR_CANCELLED);
|
||||||
|
}
|
||||||
|
else if (key == '\r')
|
||||||
|
{
|
||||||
|
Write(consoleOutput, Environment.NewLine);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else if (key == '\b')
|
||||||
|
{
|
||||||
|
if (buffer.Length > 0)
|
||||||
|
{
|
||||||
|
buffer.Remove(buffer.Length - 1, 1);
|
||||||
|
Write(consoleOutput, "\b \b");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
buffer.Append(key);
|
||||||
|
Write(consoleOutput, "*");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return buffer.ToString();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
if (newMode != mode)
|
||||||
|
{
|
||||||
|
if (!SetConsoleMode(consoleInput, mode))
|
||||||
|
{
|
||||||
|
Throw.Command.Win32Exception("Failed to set console mode.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static void Write(Handle consoleOutput, string value)
|
||||||
|
{
|
||||||
|
if (!WriteConsoleW(consoleOutput, value, value.Length, out _, IntPtr.Zero))
|
||||||
|
{
|
||||||
|
Throw.Command.Win32Exception("Failed to write console.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace WinSW.Native
|
||||||
|
{
|
||||||
|
internal static class Credentials
|
||||||
|
{
|
||||||
|
internal static void PromptForCredentialsConsole(ref string? userName, ref string? password)
|
||||||
|
{
|
||||||
|
using var consoleOutput = ConsoleEx.OpenConsoleOutput();
|
||||||
|
|
||||||
|
if (userName is null)
|
||||||
|
{
|
||||||
|
ConsoleEx.Write(consoleOutput, "Username: ");
|
||||||
|
userName = Console.ReadLine()!;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (password is null && !Security.IsSpecialAccount(userName))
|
||||||
|
{
|
||||||
|
ConsoleEx.Write(consoleOutput, "Password: ");
|
||||||
|
password = ConsoleEx.ReadPassword();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
|
namespace WinSW.Native
|
||||||
|
{
|
||||||
|
internal static class FileApis
|
||||||
|
{
|
||||||
|
[DllImport(Libraries.Kernel32, SetLastError = true, CharSet = CharSet.Unicode)]
|
||||||
|
internal static extern Handle CreateFileW(
|
||||||
|
string fileName,
|
||||||
|
GenericAccess desiredAccess,
|
||||||
|
FileShare shareMode,
|
||||||
|
IntPtr securityAttributes,
|
||||||
|
FileMode creationDisposition,
|
||||||
|
uint flagsAndAttributes,
|
||||||
|
IntPtr templateFile);
|
||||||
|
|
||||||
|
internal enum GenericAccess : uint
|
||||||
|
{
|
||||||
|
Read = 0x80000000,
|
||||||
|
Write = 0x40000000,
|
||||||
|
Execute = 0x20000000,
|
||||||
|
All = 0x10000000,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,18 @@
|
||||||
|
using System;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using static WinSW.Native.HandleApis;
|
||||||
|
|
||||||
|
namespace WinSW.Native
|
||||||
|
{
|
||||||
|
[StructLayout(LayoutKind.Sequential)]
|
||||||
|
internal readonly ref struct Handle
|
||||||
|
{
|
||||||
|
private readonly IntPtr handle;
|
||||||
|
|
||||||
|
internal Handle(IntPtr handle) => this.handle = handle;
|
||||||
|
|
||||||
|
public void Dispose() => CloseHandle(this.handle);
|
||||||
|
|
||||||
|
public static implicit operator IntPtr(Handle value) => value.handle;
|
||||||
|
}
|
||||||
|
}
|
|
@ -38,7 +38,7 @@ namespace WinSW.Native
|
||||||
internal static extern bool OpenProcessToken(
|
internal static extern bool OpenProcessToken(
|
||||||
IntPtr processHandle,
|
IntPtr processHandle,
|
||||||
TokenAccessLevels desiredAccess,
|
TokenAccessLevels desiredAccess,
|
||||||
out IntPtr tokenHandle);
|
out Handle tokenHandle);
|
||||||
|
|
||||||
internal enum PROCESSINFOCLASS
|
internal enum PROCESSINFOCLASS
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,5 +80,15 @@ namespace WinSW.Native
|
||||||
_ = LsaClose(policyHandle);
|
_ = LsaClose(policyHandle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal static bool IsSpecialAccount(string accountName) => accountName switch
|
||||||
|
{
|
||||||
|
@"LocalSystem" => true,
|
||||||
|
@".\LocalSystem" => true,
|
||||||
|
@"NT AUTHORITY\LocalService" => true,
|
||||||
|
@"NT AUTHORITY\NetworkService" => true,
|
||||||
|
string name when name == $@"{Environment.MachineName}\LocalSystem" => true,
|
||||||
|
_ => false
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@ using System.Reflection;
|
||||||
using System.Security.AccessControl;
|
using System.Security.AccessControl;
|
||||||
using System.Security.Principal;
|
using System.Security.Principal;
|
||||||
using System.ServiceProcess;
|
using System.ServiceProcess;
|
||||||
using System.Text;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using log4net;
|
using log4net;
|
||||||
using log4net.Appender;
|
using log4net.Appender;
|
||||||
|
@ -261,11 +260,7 @@ namespace WinSW
|
||||||
bool allowServiceLogonRight = false;
|
bool allowServiceLogonRight = false;
|
||||||
if (args.Count > 1 && args[1] == "/p")
|
if (args.Count > 1 && args[1] == "/p")
|
||||||
{
|
{
|
||||||
Console.Write("Username: ");
|
Credentials.PromptForCredentialsConsole(ref username, ref password);
|
||||||
username = Console.ReadLine();
|
|
||||||
Console.Write("Password: ");
|
|
||||||
password = ReadPassword();
|
|
||||||
Console.WriteLine();
|
|
||||||
Console.Write("Set Account rights to allow log on as a service (y/n)?: ");
|
Console.Write("Set Account rights to allow log on as a service (y/n)?: ");
|
||||||
var keypressed = Console.ReadKey();
|
var keypressed = Console.ReadKey();
|
||||||
Console.WriteLine();
|
Console.WriteLine();
|
||||||
|
@ -760,29 +755,6 @@ namespace WinSW
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ReadPassword()
|
|
||||||
{
|
|
||||||
var buf = new StringBuilder();
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
var key = Console.ReadKey(true);
|
|
||||||
if (key.Key == ConsoleKey.Enter)
|
|
||||||
{
|
|
||||||
return buf.ToString();
|
|
||||||
}
|
|
||||||
else if (key.Key == ConsoleKey.Backspace)
|
|
||||||
{
|
|
||||||
_ = buf.Remove(buf.Length - 1, 1);
|
|
||||||
Console.Write("\b \b");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Console.Write('*');
|
|
||||||
_ = buf.Append(key.KeyChar);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void PrintHelp()
|
private static void PrintHelp()
|
||||||
{
|
{
|
||||||
Console.WriteLine("A wrapper binary that can be used to host executables as Windows services");
|
Console.WriteLine("A wrapper binary that can be used to host executables as Windows services");
|
||||||
|
|
Loading…
Reference in New Issue