lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-11 17:22:40 +03:00
Code Activity

handle no-more-sessions in server

Browse Source 
Signed-off-by: Ahsen Kamal <itsahsenkamal@gmail.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Ahsen Kamal
2023-03-20 11:54:47 +05:30
committed by Jakub Jelen
parent 9741054422
commit 08a6996103
3 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/libssh/libssh.h
View File

@@ -191,7 +191,8 @@ enum ssh_global_requests_e {
SSH_GLOBAL_REQUEST_UNKNOWN=0, SSH_GLOBAL_REQUEST_UNKNOWN=0,
SSH_GLOBAL_REQUEST_TCPIP_FORWARD, SSH_GLOBAL_REQUEST_TCPIP_FORWARD,
SSH_GLOBAL_REQUEST_CANCEL_TCPIP_FORWARD, SSH_GLOBAL_REQUEST_CANCEL_TCPIP_FORWARD,
SSH_GLOBAL_REQUEST_KEEPALIVE SSH_GLOBAL_REQUEST_KEEPALIVE,
SSH_GLOBAL_REQUEST_NO_MORE_SESSIONS
}; };
enum ssh_publickey_state_e { enum ssh_publickey_state_e {

7
include/libssh/session.h
View File

@@ -71,10 +71,13 @@ enum ssh_pending_call_e {
}; };
/* libssh calls may block an undefined amount of time */ /* libssh calls may block an undefined amount of time */
#define SSH_SESSION_FLAG_BLOCKING 1 #define SSH_SESSION_FLAG_BLOCKING 0x0001
/* Client successfully authenticated */ /* Client successfully authenticated */
#define SSH_SESSION_FLAG_AUTHENTICATED 2 #define SSH_SESSION_FLAG_AUTHENTICATED 0x0002
/* Do not accept new session channels (no-more-sessions@openssh.com) */
#define SSH_SESSION_FLAG_NO_MORE_SESSIONS 0x0004
/* codes to use with ssh_handle_packets*() */ /* codes to use with ssh_handle_packets*() */
/* Infinite timeout */ /* Infinite timeout */

25
src/messages.c
View File

@@ -1177,7 +1177,15 @@ SSH_PACKET_CALLBACK(ssh_packet_channel_open){
goto error; goto error;
} }
if (strcmp(type_c,"session") == 0) { if (strcmp(type_c, "session") == 0) {
if (session->flags & SSH_SESSION_FLAG_NO_MORE_SESSIONS) {
ssh_session_set_disconnect_message(session, "No more sessions allowed!");
ssh_set_error(session, SSH_FATAL, "No more sessions allowed!");
session->session_state = SSH_SESSION_STATE_ERROR;
ssh_disconnect(session);
goto error;
}
msg->channel_request_open.type = SSH_CHANNEL_SESSION; msg->channel_request_open.type = SSH_CHANNEL_SESSION;
SAFE_FREE(type_c); SAFE_FREE(type_c);
goto end; goto end;
@@ -1190,9 +1198,9 @@ SSH_PACKET_CALLBACK(ssh_packet_channel_open){
&destination_port, &destination_port,
&msg->channel_request_open.originator, &msg->channel_request_open.originator,
&originator_port); &originator_port);
if (rc != SSH_OK) { if (rc != SSH_OK) {
goto error; goto error;
} }
msg->channel_request_open.destination_port = (uint16_t) destination_port; msg->channel_request_open.destination_port = (uint16_t) destination_port;
msg->channel_request_open.originator_port = (uint16_t) originator_port; msg->channel_request_open.originator_port = (uint16_t) originator_port;
@@ -1593,6 +1601,15 @@ SSH_PACKET_CALLBACK(ssh_packet_global_request){
} else { } else {
ssh_message_global_request_reply_success(msg, 0); ssh_message_global_request_reply_success(msg, 0);
} }
} else if (strcmp(request, "no-more-sessions@openssh.com") == 0) {
msg->global_request.type = SSH_GLOBAL_REQUEST_NO_MORE_SESSIONS;
msg->global_request.want_reply = want_reply;
SSH_LOG(SSH_LOG_PROTOCOL, "Received no-more-sessions@openssh.com %d", want_reply);
ssh_message_global_request_reply_success(msg, 0);
session->flags |= SSH_SESSION_FLAG_NO_MORE_SESSIONS;
} else { } else {
SSH_LOG(SSH_LOG_DEBUG, "UNKNOWN SSH_MSG_GLOBAL_REQUEST %s, " SSH_LOG(SSH_LOG_DEBUG, "UNKNOWN SSH_MSG_GLOBAL_REQUEST %s, "
"want_reply = %d", request, want_reply); "want_reply = %d", request, want_reply);