shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-12 03:00:26 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add error checks to ssh_message_auth_reply_default().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@443 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-09 14:22:29 +00:00
parent 3fab89b22f
commit e5b7e8fdfc
1 changed files with 63 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
libssh/messages.c
View File

@@ -117,9 +117,9 @@ static SSH_MESSAGE *handle_userauth_request(SSH_SESSION *session){
STRING *method = NULL; STRING *method = NULL;
SSH_MESSAGE *msg = NULL; SSH_MESSAGE *msg = NULL;
char *service_c = NULL; char *service_c = NULL;
char *method_c = NULL char *method_c = NULL;
enter_function(); enter_function();
msg = message_new(session); msg = message_new(session);
if (msg == NULL) { if (msg == NULL) {
@@ -173,7 +173,7 @@ static SSH_MESSAGE *handle_userauth_request(SSH_SESSION *session){
} }
if (strcmp(method_c, "password") == 0) { if (strcmp(method_c, "password") == 0) {
STRING *pass == NULL; STRING *pass = NULL;
u8 tmp; u8 tmp;
msg->auth_request.method = SSH_AUTH_PASSWORD; msg->auth_request.method = SSH_AUTH_PASSWORD;
@@ -212,7 +212,7 @@ error:
} }
char *ssh_message_auth_user(SSH_MESSAGE *msg) { char *ssh_message_auth_user(SSH_MESSAGE *msg) {
if (msg == NULL || msg->auth_request == NULL) { if (msg == NULL) {
return NULL; return NULL;
} }
@@ -220,7 +220,7 @@ char *ssh_message_auth_user(SSH_MESSAGE *msg) {
} }
char *ssh_message_auth_password(SSH_MESSAGE *msg){ char *ssh_message_auth_password(SSH_MESSAGE *msg){
if (msg == NULL || msg->auth_request == NULL) { if (msg == NULL) {
return NULL; return NULL;
} }
@@ -237,38 +237,65 @@ int ssh_message_auth_set_methods(SSH_MESSAGE *msg, int methods) {
return 0; return 0;
} }
static int ssh_message_auth_reply_default(SSH_MESSAGE *msg,int partial){ static int ssh_message_auth_reply_default(SSH_MESSAGE *msg,int partial) {
char methods_c[128]=""; SSH_SESSION *session = msg->session;
STRING *methods; char methods_c[128] = {0};
SSH_SESSION *session=msg->session; STRING *methods = NULL;
int ret; int rc = SSH_ERROR;
enter_function();
buffer_add_u8(session->out_buffer,SSH2_MSG_USERAUTH_FAILURE); enter_function();
if(session->auth_methods==0){
session->auth_methods=SSH_AUTH_PUBLICKEY|SSH_AUTH_PASSWORD; if (buffer_add_u8(session->out_buffer, SSH2_MSG_USERAUTH_FAILURE) < 0) {
return rc;
}
if (session->auth_methods == 0) {
session->auth_methods = SSH_AUTH_PUBLICKEY | SSH_AUTH_PASSWORD;
}
if (session->auth_methods & SSH_AUTH_PUBLICKEY) {
strcat(methods_c, "publickey,");
}
if (session->auth_methods & SSH_AUTH_KEYBINT) {
strcat(methods_c, "keyboard-interactive,");
}
if (session->auth_methods & SSH_AUTH_PASSWORD) {
strcat(methods_c, "password,");
}
if (session->auth_methods & SSH_AUTH_HOSTBASED) {
strcat(methods_c, "hostbased,");
}
/* Strip the comma. */
methods_c[strlen(methods_c) - 1] = '\0'; // strip the comma. We are sure there is at
ssh_log(session, SSH_LOG_PACKET,
"Sending a auth failure. methods that can continue: %s", methods_c);
methods = string_from_char(methods_c);
if (methods == NULL) {
goto error;
}
if (buffer_add_ssh_string(msg->session->out_buffer, methods) < 0) {
goto error;
}
if (partial) {
if (buffer_add_u8(session->out_buffer, 1) < 0) {
goto error;
} }
if(session->auth_methods & SSH_AUTH_PUBLICKEY) } else {
strcat(methods_c,"publickey,"); if (buffer_add_u8(session->out_buffer, 0) < 0) {
if(session->auth_methods & SSH_AUTH_KEYBINT) goto error;
strcat(methods_c,"keyboard-interactive,"); }
if(session->auth_methods & SSH_AUTH_PASSWORD) }
strcat(methods_c,"password,");
if(session->auth_methods & SSH_AUTH_HOSTBASED) rc = packet_send(msg->session);
strcat(methods_c,"hostbased,"); error:
methods_c[strlen(methods_c)-1]=0; // strip the comma. We are sure there is at string_free(methods);
// least one word into the list
ssh_log(session, SSH_LOG_PACKET, leave_function();
"Sending a auth failure. methods that can continue: %s", methods_c); return rc;
methods=string_from_char(methods_c);
buffer_add_ssh_string(msg->session->out_buffer,methods);
free(methods);
if(partial)
buffer_add_u8(session->out_buffer,1);
else
buffer_add_u8(session->out_buffer,0); // no partial success
ret = packet_send(msg->session);
leave_function();
return ret;
} }
int ssh_message_auth_reply_success(SSH_MESSAGE *msg,int partial){ int ssh_message_auth_reply_success(SSH_MESSAGE *msg,int partial){