mirrors
/
macssh
mirror of https://github.com/macssh/macssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle NULL userauth list

This commit is contained in:
Brendan Shanks 2017-08-05 18:17:15 -07:00
parent db22002b7f
commit 9db4db74bc
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
macssh/source/ssh/ssh2.c
View File

@ -1492,8 +1492,17 @@ void *ssh2_thread(WindRec*w)
password[w->sshdata.password[0]] = '\0'; password[w->sshdata.password[0]] = '\0';
userauthlist = libssh2_userauth_list(session, username, w->sshdata.login[0]); userauthlist = libssh2_userauth_list(session, username, w->sshdata.login[0]);
syslog( 0, "Authentication methods; %s\n", userauthlist); if (userauthlist == NULL) {
// TODO: handle NULL userauthlist by checking libssh2_userauth_authenticated() if (libssh2_userauth_authenticated(session)) {
syslog(0, "\'none\' userauth succeeded\n");
goto success;
} else {
syslog(0, "Failed to retrieve authentication methods\n");
goto closesocket;
}
} else {
syslog( 0, "Authentication methods: %s\n", userauthlist);
}
// TODO: public key // TODO: public key
@ -1503,8 +1512,12 @@ void *ssh2_thread(WindRec*w)
} }
if (strstr(userauthlist, "password") != NULL) { if (strstr(userauthlist, "password") != NULL) {
//SSH2LoginDialog(theScreen->sshdata.host, theScreen->sshdata.login, theScreen->sshdata.password); //SSH2LoginDialog(theScreen->sshdata.host, theScreen->sshdata.login, theScreen->sshdata.password);
libssh2_userauth_password(session, username, password); if (libssh2_userauth_password(session, username, password) == 0)
goto success;
// TODO: allow re-entering password on LIBSSH2_ERROR_AUTHENTICATION_FAILED
} }
syslog( 0, "No supported authentication method found\n");
goto closesocket;
} }
success: success:
{ {