lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-06-05 01:42:10 +03:00
Code

[#48/T22] Added missing server reply on auth-agent-req when a reply was requested by the client. PuTTY for Windows chokes without this reply if "Allow agent forwarding" is enabled. Reply will be successful if channel_auth_agent_req_function callback is defined. Based on an unmerged patch by Jon Simons.

Browse Source 
Signed-off-by: Jeremy Cross <jcross@beyondtrust.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Jeremy Cross 2021-05-19 14:39:25 -07:00 committed by Jakub Jelen
parent 0bee5d5e97
commit d1abe26be3
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/channels.c
View File

@ -717,7 +717,7 @@ SSH_PACKET_CALLBACK(channel_rcv_close) {
SSH_PACKET_CALLBACK(channel_rcv_request) { SSH_PACKET_CALLBACK(channel_rcv_request) {
ssh_channel channel; ssh_channel channel;
char *request=NULL; char *request=NULL;
uint8_t status; uint8_t want_reply;
int rc; int rc;
(void)user; (void)user;
(void)type; (void)type;
@ -730,7 +730,7 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
rc = ssh_buffer_unpack(packet, "sb", rc = ssh_buffer_unpack(packet, "sb",
&request, &request,
&status); &want_reply);
if (rc != SSH_OK) { if (rc != SSH_OK) {
SSH_LOG(SSH_LOG_PACKET, "Invalid MSG_CHANNEL_REQUEST"); SSH_LOG(SSH_LOG_PACKET, "Invalid MSG_CHANNEL_REQUEST");
return SSH_PACKET_USED; return SSH_PACKET_USED;
@ -838,13 +838,34 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
} }
if (strcmp(request, "auth-agent-req@openssh.com") == 0) { if (strcmp(request, "auth-agent-req@openssh.com") == 0) {
int status;
SAFE_FREE(request); SAFE_FREE(request);
SSH_LOG(SSH_LOG_PROTOCOL, "Received an auth-agent-req request"); SSH_LOG(SSH_LOG_PROTOCOL, "Received an auth-agent-req request");
ssh_callbacks_execute_list(channel->callbacks,
status = SSH2_MSG_CHANNEL_FAILURE;
ssh_callbacks_iterate(channel->callbacks,
ssh_channel_callbacks, ssh_channel_callbacks,
channel_auth_agent_req_function, channel_auth_agent_req_function) {
ssh_callbacks_iterate_exec(channel_auth_agent_req_function,
channel->session, channel->session,
channel); channel);
/* in lieu of a return value, if the callback exists it's supported */
status = SSH2_MSG_CHANNEL_SUCCESS;
break;
}
ssh_callbacks_iterate_end();
if (want_reply) {
rc = ssh_buffer_pack(session->out_buffer,
"bd",
status,
channel->remote_channel);
if (rc != SSH_OK) {
return SSH_PACKET_USED;
}
ssh_packet_send(session);
}
return SSH_PACKET_USED; return SSH_PACKET_USED;
} }
@ -853,7 +874,7 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
* client requests. That means we need to create a ssh message to be passed * client requests. That means we need to create a ssh message to be passed
* to the user code handling ssh messages * to the user code handling ssh messages
*/ */
ssh_message_handle_channel_request(session,channel,packet,request,status); ssh_message_handle_channel_request(session,channel,packet,request,want_reply);
#else #else
SSH_LOG(SSH_LOG_WARNING, "Unhandled channel request %s", request); SSH_LOG(SSH_LOG_WARNING, "Unhandled channel request %s", request);
#endif #endif