On Linux, ask for HTTPS password by invoking the app with a special argument

Author: gdevic

Diff for: ClassCommandLine.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
+using System.Windows.Forms;
 
 namespace GitForce
 {
@@ -97,6 +98,19 @@ public static bool Execute(Arguments commandLine)
                 Console.WriteLine("Logging: " + App.AppLog);
             }
 
+            // --passwd  This is not a user option. It is used when the app is called to provide password echoed on a command line.
+            if (commandLine["passwd"] == "true")
+            {
+                ReturnCode = -1;
+                FormHttpsAuth httpsAuth = new FormHttpsAuth(false);
+                if (httpsAuth.ShowDialog() == DialogResult.OK)
+                {
+                    Console.WriteLine(httpsAuth.Password);
+                    ReturnCode = 0;
+                }
+                runGitForce = false;
+            }
+
             // WAR: On Windows, detach the console when we are done. Mono does not need that to use Console class.
             if (!ClassUtils.IsMono())
                 NativeMethods.FreeConsole();

Diff for: ClassHttpsPasswd.cs

@@ -19,10 +19,16 @@ public ClassHttpsPasswd()
             string pathPasswordBatchHelper;
             if (ClassUtils.IsMono())
             {
-                // Mono: Use the Shell script
+                // Mono: Use the Shell script which tests if $PASSWORD is defined and echoes it,
+                // and if not defined, it calls GitForce application with a special argument that opens
+                // only password dialog
                 pathPasswordBatchHelper = Path.Combine(App.AppHome, "passwd.sh");
-                File.WriteAllText(pathPasswordBatchHelper, "echo $PASSWORD" + Environment.NewLine);
-
+                File.WriteAllText(pathPasswordBatchHelper, "#!/bin/sh" + Environment.NewLine +
+                    "if [ \"$PASSWORD\" = \"\" ]; then" + Environment.NewLine +
+                    App.AppPath + " --passwd" + Environment.NewLine +
+                    "else" + Environment.NewLine +
+                    "echo $PASSWORD" + Environment.NewLine +
+                    "fi" );
                 // Set the execute bit
                 if (Exec.Run("chmod", "+x " + pathPasswordBatchHelper).Success() == false)
                     App.PrintLogMessage("ClassHttpsPasswd: Unable to chmod +x on " + pathPasswordBatchHelper, MessageType.Error);

Diff for: FormHttps.cs

@@ -175,7 +175,7 @@ private void BtEditClick(object sender, EventArgs e)
         /// </summary>
         private void AddEdit(string machine)
         {
-            FormHttpsAuth formHttpsAuth = new FormHttpsAuth();
+            FormHttpsAuth formHttpsAuth = new FormHttpsAuth(true);
             if (netrc.ContainsKey(machine))
             {
                 formHttpsAuth.Username = netrc[machine].Item1;

Diff for: FormHttpsAuth.cs

@@ -22,10 +22,12 @@ public string Password
         /// <summary>
         /// Form constructor
         /// </summary>
-        public FormHttpsAuth()
+        public FormHttpsAuth(bool enableUsername)
         {
             InitializeComponent();
             ClassWinGeometry.Restore(this);
+
+            textUsername.Enabled = enableUsername;
         }
 
         /// <summary>
@@ -57,7 +59,7 @@ private void ValidateOk(object sender, System.EventArgs e)
             // We simply want to avoid some 'dangerous' characters, including spaces
             string password = textPassword.Text.Trim();
 
-            btOK.Enabled = r.IsMatch(username) && (password.Length > 0) && password.IndexOfAny(@" \/".ToCharArray()) == -1;
+            btOK.Enabled = (!textUsername.Enabled || r.IsMatch(username)) && (password.Length > 0) && password.IndexOfAny(@" \/".ToCharArray()) == -1;
         }
     }
 }