Use Console.ReadLine when stdin redirected

masaeedu · Jan 29, 2018 · 49040e4 · 49040e4
1 parent afa09b0
commit 49040e4
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/Sshfs/SSHFS.CLI/Program.cs b/Sshfs/SSHFS.CLI/Program.cs
@@ -100,7 +100,7 @@ static void Start(Options options)
             else if (options.Password)
             {
                 Console.WriteLine("No SSH key file selected, using password auth instead.");
-                var pass = ReadLine.ReadPassword("Please enter password: ");
+                var pass = ReadPassword("Please enter password: ");
 
                 auths.AddRange(new(string, ConnectionInfo)[]
                 {
@@ -122,12 +122,21 @@ static PrivateKeyConnectionInfo PrivateKeyConnectionInfo(Options options)
         {
             var pkFiles = options.Keys.Select(k =>
                 options.Password
-                    ? new PrivateKeyFile(k, ReadLine.ReadPassword($"Enter passphrase for {k}: "))
+                    ? new PrivateKeyFile(k, ReadPassword($"Enter passphrase for {k}: "))
                     : new PrivateKeyFile(k));
 
             return new PrivateKeyConnectionInfo(options.Host, options.Port, options.Username, pkFiles.ToArray());
         }
 
+        static string ReadPassword(string prompt)
+        {
+            if (!Console.IsInputRedirected)
+                return ReadLine.ReadPassword(prompt);
+
+            Console.WriteLine(prompt);
+            return Console.ReadLine();
+        }
+
         static KeyboardInteractiveConnectionInfo KeyboardInteractiveConnectionInfo(Options options, string pass)
         {
             var auth = new KeyboardInteractiveConnectionInfo(options.Host, options.Port, options.Username);