Change -x option to flag, read password from stdin

Author: masaeedu

Sshfs/SSHFS.CLI/Program.cs

@@ -11,6 +11,8 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using CommandLine.Text;
+using DokanNet.Logging;
 
 namespace SSHFS.CLI
 {
@@ -21,6 +23,7 @@ class Options
             Required = true,
             HelpText = "Drive letter to mount the remote SFTP path under")]
         public char DriveLetter { get; set; }
+
         [Option('r', "path",
             Required = true,
             HelpText = "Absolute path of directory to be mounted from remote system")]
@@ -31,8 +34,9 @@ class Options
             Required = true,
             HelpText = "IP or hostname of remote host")]
         public string Host { get; set; }
+
         [Option('p', "port",
-            Required = false, DefaultValue = 22,
+            Required = false, Default = 22,
             HelpText = "SSH service port on remote server")]
         public int Port { get; set; }
 
@@ -41,31 +45,37 @@ class Options
             Required = true,
             HelpText = "Name of SSH user on remote system")]
         public string Username { get; set; }
+
         [Option('x', "password",
             Required = false,
-            HelpText = "INSECURE: SSH user's password, if password-based or keyboard-interactive auth should be attempted. Note that the security model for this is equivalent to sshpass's -p option, and exposes your password to any process on the machine that cares to run ps")]
-        public string Password { get; set; }
-        [OptionArray('k', "private-keys",
+            HelpText = "Read password from stdin")]
+        public bool Password { get; set; }
+
+        [Option('k', "private-keys",
             Required = false,
             HelpText = "Path to SSH user's private key(s), if key-based auth should be attempted")]
-        public string[] Keys { get; set; }
+        public IEnumerable<string> Keys { get; set; }
     }
 
     class Program
     {
         static void Main(string[] args)
         {
-            var options = new Options();
-            Parser.Default.ParseArgumentsStrict(args, options);
+            Parser.Default.ParseArguments<Options>(args)
+                .WithParsed(Start);
+        }
 
+        static void Start(Options options)
+        {
             var auths = GetAuthMechanisms(options);
 
             var fs = auths
                 .Select(auth => AttemptConnection(auth.Item1, auth.Item2, options.Path))
                 .FirstOrDefault(result => result != null);
 
             if (fs == null)
-                throw new InvalidOperationException("Could not connect to server with any known authentication mechanism");
+                throw new InvalidOperationException(
+                    "Could not connect to server with any known authentication mechanism");
 
             fs.Mount($"{options.DriveLetter}");
         }
@@ -76,37 +86,43 @@ static void Main(string[] args)
 
             if (options.Keys != null)
             {
-                auths.AddRange(new(string, ConnectionInfo)[] {
+                auths.AddRange(new(string, ConnectionInfo)[]
+                {
                     ("private key", PrivateKeyConnectionInfo(options))
                 });
             }
-
-            if (options.Password != null)
+            else if (options.Password)
             {
-                auths.AddRange(new(string, ConnectionInfo)[] {
-                    ("password", new PasswordConnectionInfo(options.Host, options.Port, options.Username, options.Password)),
-                    ("keyboard-interactive", KeyboardInteractiveConnectionInfo(options))
+                Console.WriteLine("No SSH key file selected, using password auth instead.");
+                var pass = ReadLine.ReadPassword("Please enter password: ");
+
+                auths.AddRange(new(string, ConnectionInfo)[]
+                {
+                    ("password", new PasswordConnectionInfo(options.Host, options.Port, options.Username, pass)),
+                    ("keyboard-interactive", KeyboardInteractiveConnectionInfo(options, pass))
                 });
             }
+            else
+            {
+                Console.WriteLine(
+                    "No key files specified, and password auth not enabled (win-sshfs does not search for private keys). Aborting...");
+                Environment.Exit(1);
+            }
 
             return auths;
         }
 
         static PrivateKeyConnectionInfo PrivateKeyConnectionInfo(Options options)
         {
             var pkFiles = options.Keys.Select(k =>
-            {
-                var match = Regex.Match(k, @"(?<keyfile>\S+)(:?\s+ (?<passphrase>\S+))?");
-                var keyfile = match.Groups["keyfile"];
-                var passphrase = match.Groups["passphrase"];
-
-                return passphrase.Success ? new PrivateKeyFile(keyfile.Value, passphrase.Value) : new PrivateKeyFile(keyfile.Value);
-            });
+                options.Password
+                    ? new PrivateKeyFile(k, ReadLine.ReadPassword($"Enter passphrase for {k}: "))
+                    : new PrivateKeyFile(k));
 
             return new PrivateKeyConnectionInfo(options.Host, options.Port, options.Username, pkFiles.ToArray());
         }
 
-        static KeyboardInteractiveConnectionInfo KeyboardInteractiveConnectionInfo(Options options)
+        static KeyboardInteractiveConnectionInfo KeyboardInteractiveConnectionInfo(Options options, string pass)
         {
             var auth = new KeyboardInteractiveConnectionInfo(options.Host, options.Port, options.Username);
 
@@ -115,7 +131,7 @@ static KeyboardInteractiveConnectionInfo KeyboardInteractiveConnectionInfo(Optio
                 var passPrompts = e.Prompts
                     .Where(p => p.Request.StartsWith("Password:"));
                 foreach (var p in passPrompts)
-                    p.Response = options.Password;
+                    p.Response = pass;
             };
 
             return auth;
@@ -132,9 +148,10 @@ static SftpFilesystem AttemptConnection(string authType, ConnectionInfo connInfo
             }
             catch (SshAuthenticationException)
             {
-                Console.WriteLine($"Failed to authenticate using {authType}, falling back to next auth mechanism if available.");
+                Console.WriteLine(
+                    $"Failed to authenticate using {authType}, falling back to next auth mechanism if available.");
                 return null;
             }
         }
     }
-}
+}

Sshfs/SSHFS.CLI/SSHFS.CLI.csproj

@@ -60,11 +60,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommandLineParser">
-      <Version>1.9.71</Version>
+      <Version>2.2.1</Version>
     </PackageReference>
     <PackageReference Include="DokanNet">
       <Version>1.1.1</Version>
     </PackageReference>
+    <PackageReference Include="ReadLine">
+      <Version>2.0.0</Version>
+    </PackageReference>
     <PackageReference Include="System.ValueTuple">
       <Version>4.3.1</Version>
     </PackageReference>

appveyor.yml

@@ -1,5 +1,6 @@
-version: 1.0.{build}
+version: 2.0.{build}
 skip_tags: true
+skip_branch_with_pr: true
 image: Visual Studio 2017
 configuration: Release
 install: