Merge branch 'contour-terminal:master' into master

Author: saliaku

metainfo.xml

@@ -115,6 +115,8 @@
           <li>Fixes missing dependencies for release .deb packages (#1397).</li>
           <li>Fixes legacy keyboard input protocol not reporting non-Alt modifier (#1411).</li>
           <li>Digitally sign MacOS release binaries using a valid Apple ID.</li>
+          <li>Add support for authenticating to SSH servers with a private key without a password and without requesting for one - also allow password retry (#1425).</li>
+          <li>Default history limit is now 1000 lines rather than 0 lines.</li>
         </ul>
       </description>
     </release>

src/contour/Config.cpp

@@ -1770,14 +1770,16 @@ namespace
             logger()("Invalid render_mode \"{}\" in configuration.", strValue);
 
         auto intValue = LineCount();
-        tryLoadChildRelative(usedKeys, profile, basePath, "history.limit", intValue, logger);
-        // value -1 is used for infinite grid
-        if (unbox(intValue) == -1)
-            terminalProfile.maxHistoryLineCount = Infinite();
-        else if (unbox(intValue) > -1)
-            terminalProfile.maxHistoryLineCount = LineCount(intValue);
-        else
-            terminalProfile.maxHistoryLineCount = LineCount(0);
+        if (tryLoadChildRelative(usedKeys, profile, basePath, "history.limit", intValue, logger))
+        {
+            // value -1 is used for infinite grid
+            if (unbox(intValue) == -1)
+                terminalProfile.maxHistoryLineCount = Infinite();
+            else if (unbox(intValue) > -1)
+                terminalProfile.maxHistoryLineCount = LineCount(intValue);
+            else
+                terminalProfile.maxHistoryLineCount = LineCount(0);
+        }
 
         tryLoadChildRelative(
             usedKeys, profile, basePath, "option_as_alt", terminalProfile.optionKeyAsAlt, logger);

src/contour/Config.h

@@ -173,7 +173,7 @@ struct TerminalProfile
     vtbackend::PageSize terminalSize = { vtbackend::LineCount(10), vtbackend::ColumnCount(40) };
     vtbackend::VTType terminalId = vtbackend::VTType::VT525;
 
-    vtbackend::MaxHistoryLineCount maxHistoryLineCount;
+    vtbackend::MaxHistoryLineCount maxHistoryLineCount = vtbackend::LineCount(1000);
     vtbackend::LineCount historyScrollMultiplier = vtbackend::LineCount(3);
     ScrollBarPosition scrollbarPosition = ScrollBarPosition::Right;
     vtbackend::StatusDisplayPosition statusDisplayPosition = vtbackend::StatusDisplayPosition::Bottom;

src/vtpty/SshSession.cpp

@@ -431,9 +431,16 @@ void SshSession::processState()
                 break;
             }
             case State::AuthenticatePrivateKeyStart:
+                _walkIndex = 0;
+                // authenticateWithPrivateKey() is taking the password from _injectedWrite
+                _injectedWrite = "";
+                authenticateWithPrivateKey();
+                break;
+            case State::AuthenticatePrivateKeyRequest: {
                 setState(State::AuthenticatePrivateKeyWaitForInput);
                 injectRead("\U0001F511 Private key password: ");
                 [[fallthrough]];
+            }
             case State::AuthenticatePrivateKeyWaitForInput:
                 // See handlePreAuthenticationPasswordInput()
                 return;
@@ -1172,7 +1179,17 @@ void SshSession::authenticateWithPrivateKey()
 
     if (rc != LIBSSH2_ERROR_NONE)
     {
-        logError("Private key based authentication failed. {}", libssl2ErrorString(rc));
+        // Only log error if we havee tried to authenticate with password,
+        // as the first attempt is always with an empty password.
+        if (_walkIndex != 0)
+            logError("Private key based authentication failed. {}", libssl2ErrorString(rc));
+
+        if (_walkIndex <= MaxPasswordTries)
+        {
+            setState(State::AuthenticatePrivateKeyRequest);
+            ++_walkIndex;
+            return;
+        }
         setState(State::AuthenticatePasswordStart);
         _walkIndex = 0;
         return;

src/vtpty/SshSession.h

@@ -80,6 +80,7 @@ class SshSession final: public Pty
         VerifyHostKey,                      // verify host key against known_hosts file
         AuthenticateAgent,                  // authenticate with SSH agent
         AuthenticatePrivateKeyStart,        // start private key authentication
+        AuthenticatePrivateKeyRequest,      // request private key's password
         AuthenticatePrivateKeyWaitForInput, // wait for private key's password (user input))
         AuthenticatePrivateKey,             // authenticate with private key
         AuthenticatePasswordStart,          // start password authentication
@@ -173,6 +174,7 @@ struct fmt::formatter<vtpty::SshSession::State>: fmt::formatter<std::string_view
             case vtpty::SshSession::State::VerifyHostKey: name = "VerifyHostKey"; break;
             case vtpty::SshSession::State::AuthenticateAgent: name = "AuthenticateAgent"; break;
             case vtpty::SshSession::State::AuthenticatePrivateKeyStart: name = "AuthenticatePrivateKeyStart"; break;
+            case vtpty::SshSession::State::AuthenticatePrivateKeyRequest: name = "AuthenticatePrivateKeyRequest"; break;
             case vtpty::SshSession::State::AuthenticatePrivateKeyWaitForInput: name = "AuthenticatePrivateKeyWaitForInput"; break;
             case vtpty::SshSession::State::AuthenticatePrivateKey: name = "AuthenticatePrivateKey"; break;
             case vtpty::SshSession::State::AuthenticatePasswordStart: name = "AuthenticatePasswordStart"; break;