Ma/mscp
1
0
Fork 0
mirror of https://github.com/upa/mscp.git synced 2026-02-28 03:24:41 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

overwrite auth_bit_mask to avoid unnecessary auth failures

Browse Source
This commit is contained in:
Ryo Nakamura
2025-11-10 16:06:03 +09:00
parent 1313853d7d
commit 7b5a97092a
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ssh.c
View File

@@ -123,14 +123,21 @@ static int ssh_authenticate(ssh_session ssh, struct mscp_ssh_opts *opts)
if (ssh_userauth_none(ssh, NULL) == SSH_AUTH_SUCCESS) if (ssh_userauth_none(ssh, NULL) == SSH_AUTH_SUCCESS)
return 0; return 0;
/* save auth_bit_mask for further authentications */ /* save auth_bit_mask for further authentications.
* when an authentication succeeds, auth_bit_mask is
* overwritten with the suceeded authentication method
* to avoid authentication failures by other methods.
*/
auth_bit_mask = ssh_userauth_list(ssh, NULL); auth_bit_mask = ssh_userauth_list(ssh, NULL);
} }
if (auth_bit_mask & SSH_AUTH_METHOD_PUBLICKEY) { if (auth_bit_mask & SSH_AUTH_METHOD_PUBLICKEY) {
char *p = opts->passphrase ? opts->passphrase : NULL; char *p = opts->passphrase ? opts->passphrase : NULL;
if (ssh_userauth_publickey_auto(ssh, NULL, p) == SSH_AUTH_SUCCESS) if (ssh_userauth_publickey_auto(ssh, NULL, p) == SSH_AUTH_SUCCESS) {
auth_bit_mask = SSH_AUTH_METHOD_PUBLICKEY;
return 0; return 0;
}
} }
if (auth_bit_mask & SSH_AUTH_METHOD_PASSWORD) { if (auth_bit_mask & SSH_AUTH_METHOD_PASSWORD) {
@@ -146,14 +153,17 @@ static int ssh_authenticate(ssh_session ssh, struct mscp_ssh_opts *opts)
} }
} }
if (ssh_userauth_password(ssh, NULL, opts->password) == SSH_AUTH_SUCCESS) if (ssh_userauth_password(ssh, NULL, opts->password) == SSH_AUTH_SUCCESS) {
return 0; auth_bit_mask = SSH_AUTH_METHOD_PASSWORD;
return 0;
}
} }
auth_bit_mask = ssh_userauth_list(ssh, NULL);
if (auth_bit_mask & SSH_AUTH_METHOD_INTERACTIVE) { if (auth_bit_mask & SSH_AUTH_METHOD_INTERACTIVE) {
if (ssh_authenticate_kbdint(ssh) == SSH_AUTH_SUCCESS) if (ssh_authenticate_kbdint(ssh) == SSH_AUTH_SUCCESS) {
return 0; auth_bit_mask = SSH_AUTH_METHOD_INTERACTIVE;
return 0;
}
} }
return -1; return -1;