curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-14 16:12:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

libssh2: fix error message on failed pubkey-from-file

Browse Source 
- If libssh2_userauth_publickey_fromfile_ex returns -1 then show error
  message "SSH public key authentication failed: Reason unknown (-1)".

When libssh2_userauth_publickey_fromfile_ex returns -1 it does so as a
generic error and therefore doesn't set an error message. AFAICT that is
not documented behavior.

Prior to this change libcurl retrieved the last set error message which
would be from a previous function failing. That resulted in misleading
auth failed error messages in verbose mode.

Bug: https://github.com/curl/curl/issues/11837#issue-1891827355
Reported-by: consulion@users.noreply.github.com

Closes https://github.com/curl/curl/pull/11881
This commit is contained in:
Jay Satiro 2023-09-18 17:58:23 -04:00
parent 3d53f211e5
commit 80fc040e45
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vssh/libssh2.c
View File

@ -1178,8 +1178,16 @@ static CURLcode ssh_statemach_act(struct Curl_easy *data, bool *block)
} }
else { else {
char *err_msg = NULL; char *err_msg = NULL;
(void)libssh2_session_last_error(sshc->ssh_session, char unknown[] = "Reason unknown (-1)";
&err_msg, NULL, 0); if(rc == -1) {
/* No error message has been set and the last set error message, if
any, is from a previous error so ignore it. #11837 */
err_msg = unknown;
}
else {
(void)libssh2_session_last_error(sshc->ssh_session,
&err_msg, NULL, 0);
}
infof(data, "SSH public key authentication failed: %s", err_msg); infof(data, "SSH public key authentication failed: %s", err_msg);
state(data, SSH_AUTH_PASS_INIT); state(data, SSH_AUTH_PASS_INIT);
rc = 0; /* clear rc and continue */ rc = 0; /* clear rc and continue */