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

ssh_packet_userauth_request with new system

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-01-08 21:09:40 +01:00
parent 7f32558e08
commit db3ef37771
3 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/libssh/messages.h
View File

@@ -79,6 +79,7 @@ struct ssh_message_struct {
SSH_PACKET_CALLBACK(ssh_packet_channel_open); SSH_PACKET_CALLBACK(ssh_packet_channel_open);
SSH_PACKET_CALLBACK(ssh_packet_service_request); SSH_PACKET_CALLBACK(ssh_packet_service_request);
SSH_PACKET_CALLBACK(ssh_packet_userauth_request);
//void message_handle(ssh_session session, uint32_t type); //void message_handle(ssh_session session, uint32_t type);
int ssh_execute_message_callbacks(ssh_session session); int ssh_execute_message_callbacks(ssh_session session);

54
libssh/messages.c
View File

@@ -108,8 +108,12 @@ static int handle_unimplemented(ssh_session session) {
return 0; return 0;
} }
static ssh_message handle_userauth_request(ssh_session session){ /** @internal
ssh_string user = NULL; * @brief Handle a SSH_MSG_MSG_USERAUTH_REQUEST packet and queue a
* SSH Message
*/
SSH_PACKET_CALLBACK(ssh_packet_userauth_request){
ssh_string user_s = NULL;
ssh_string service = NULL; ssh_string service = NULL;
ssh_string method = NULL; ssh_string method = NULL;
ssh_message msg = NULL; ssh_message msg = NULL;
@@ -119,31 +123,34 @@ static ssh_message handle_userauth_request(ssh_session session){
enter_function(); enter_function();
(void)user;
(void)type;
msg = message_new(session); msg = message_new(session);
if (msg == NULL) { if (msg == NULL) {
return NULL; ssh_set_error_oom(session);
}
user = buffer_get_ssh_string(session->in_buffer);
if (user == NULL) {
goto error; goto error;
} }
service = buffer_get_ssh_string(session->in_buffer);
user_s = buffer_get_ssh_string(packet);
if (user_s == NULL) {
goto error;
}
service = buffer_get_ssh_string(packet);
if (service == NULL) { if (service == NULL) {
goto error; goto error;
} }
method = buffer_get_ssh_string(session->in_buffer); method = buffer_get_ssh_string(packet);
if (method == NULL) { if (method == NULL) {
goto error; goto error;
} }
msg->type = SSH_REQUEST_AUTH; msg->type = SSH_REQUEST_AUTH;
msg->auth_request.username = string_to_char(user); msg->auth_request.username = string_to_char(user_s);
if (msg->auth_request.username == NULL) { if (msg->auth_request.username == NULL) {
goto error; goto error;
} }
string_free(user); string_free(user_s);
user = NULL; user_s = NULL;
service_c = string_to_char(service); service_c = string_to_char(service);
if (service_c == NULL) { if (service_c == NULL) {
@@ -170,8 +177,7 @@ static ssh_message handle_userauth_request(ssh_session session){
msg->auth_request.method = SSH_AUTH_METHOD_NONE; msg->auth_request.method = SSH_AUTH_METHOD_NONE;
SAFE_FREE(service_c); SAFE_FREE(service_c);
SAFE_FREE(method_c); SAFE_FREE(method_c);
leave_function(); goto end;
return msg;
} }
if (strncmp(method_c, "password", method_size) == 0) { if (strncmp(method_c, "password", method_size) == 0) {
@@ -193,8 +199,7 @@ static ssh_message handle_userauth_request(ssh_session session){
if (msg->auth_request.password == NULL) { if (msg->auth_request.password == NULL) {
goto error; goto error;
} }
leave_function(); goto end;
return msg;
} }
if (strncmp(method_c, "publickey", method_size) == 0) { if (strncmp(method_c, "publickey", method_size) == 0) {
@@ -269,17 +274,14 @@ static ssh_message handle_userauth_request(ssh_session session){
msg->auth_request.signature_state = SSH_PUBLICKEY_STATE_VALID; msg->auth_request.signature_state = SSH_PUBLICKEY_STATE_VALID;
} }
SAFE_FREE(service_c); SAFE_FREE(service_c);
leave_function(); goto end;
return msg;
} }
msg->auth_request.method = SSH_AUTH_METHOD_UNKNOWN; msg->auth_request.method = SSH_AUTH_METHOD_UNKNOWN;
SAFE_FREE(method_c); SAFE_FREE(method_c);
goto end;
leave_function();
return msg;
error: error:
string_free(user); string_free(user_s);
string_free(service); string_free(service);
string_free(method); string_free(method);
@@ -289,7 +291,11 @@ error:
ssh_message_free(msg); ssh_message_free(msg);
leave_function(); leave_function();
return NULL; return SSH_PACKET_USED;
end:
message_queue(session,msg);
leave_function();
return SSH_PACKET_USED;
} }
SSH_PACKET_CALLBACK(ssh_packet_channel_open){ SSH_PACKET_CALLBACK(ssh_packet_channel_open){
@@ -754,7 +760,7 @@ ssh_message ssh_message_retrieve(ssh_session session, uint32_t packettype){
// msg=handle_service_request(session); // msg=handle_service_request(session);
break; break;
case SSH2_MSG_USERAUTH_REQUEST: case SSH2_MSG_USERAUTH_REQUEST:
msg = handle_userauth_request(session); // msg = handle_userauth_request(session);
break; break;
case SSH2_MSG_CHANNEL_OPEN: case SSH2_MSG_CHANNEL_OPEN:
// msg = handle_channel_request_open(session); // msg = handle_channel_request_open(session);

2
libssh/packet.c
View File

@@ -67,7 +67,7 @@ ssh_packet_callback default_packet_handlers[]= {
NULL, //#define SSH2_MSG_KEX_DH_GEX_REQUEST 34 NULL, //#define SSH2_MSG_KEX_DH_GEX_REQUEST 34
NULL, NULL, NULL, NULL, NULL, // 35-49 NULL, NULL, NULL, NULL, NULL, // 35-49
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, //#define SSH2_MSG_USERAUTH_REQUEST 50 ssh_packet_userauth_request, //#define SSH2_MSG_USERAUTH_REQUEST 50
ssh_packet_userauth_failure, //#define SSH2_MSG_USERAUTH_FAILURE 51 ssh_packet_userauth_failure, //#define SSH2_MSG_USERAUTH_FAILURE 51
ssh_packet_userauth_success, //#define SSH2_MSG_USERAUTH_SUCCESS 52 ssh_packet_userauth_success, //#define SSH2_MSG_USERAUTH_SUCCESS 52
ssh_packet_userauth_banner, //#define SSH2_MSG_USERAUTH_BANNER 53 ssh_packet_userauth_banner, //#define SSH2_MSG_USERAUTH_BANNER 53