Repository: incubator-guacamole-server Updated Branches: refs/heads/master c7bf4f78a -> 055aa1b05
GUACAMOLE-34: Ensure guac_client_stop() or guac_client_abort() are called in ALL cases where the client thread terminates. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/a64c3e01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/a64c3e01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/a64c3e01 Branch: refs/heads/master Commit: a64c3e017907712ed23e902d7843a5653a26bba7 Parents: 7e3c28a Author: Michael Jumper <[email protected]> Authored: Mon Apr 18 18:15:32 2016 -0700 Committer: Michael Jumper <[email protected]> Committed: Mon May 23 13:58:01 2016 -0700 ---------------------------------------------------------------------- src/protocols/rdp/rdp.c | 19 ++++++++++++++++--- src/protocols/ssh/ssh.c | 5 ++++- src/protocols/vnc/vnc.c | 13 +++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/a64c3e01/src/protocols/rdp/rdp.c ---------------------------------------------------------------------- diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c index 753312b..cd3ee23 100644 --- a/src/protocols/rdp/rdp.c +++ b/src/protocols/rdp/rdp.c @@ -800,7 +800,8 @@ static int guac_rdp_handle_connection(guac_client* client) { /* Check the libfreerdp fds */ if (!freerdp_check_fds(rdp_inst)) { - guac_client_log(client, GUAC_LOG_DEBUG, + guac_client_abort(client, + GUAC_PROTOCOL_STATUS_SERVER_ERROR, "Error handling RDP file descriptors"); pthread_mutex_unlock(&(rdp_client->rdp_lock)); return 1; @@ -808,7 +809,8 @@ static int guac_rdp_handle_connection(guac_client* client) { /* Check channel fds */ if (!freerdp_channels_check_fds(channels, rdp_inst)) { - guac_client_log(client, GUAC_LOG_DEBUG, + guac_client_abort(client, + GUAC_PROTOCOL_STATUS_SERVER_ERROR, "Error handling RDP channel file descriptors"); pthread_mutex_unlock(&(rdp_client->rdp_lock)); return 1; @@ -837,6 +839,7 @@ static int guac_rdp_handle_connection(guac_client* client) { /* Handle RDP disconnect */ if (freerdp_shall_disconnect(rdp_inst)) { + guac_client_stop(client); guac_client_log(client, GUAC_LOG_INFO, "RDP server closed connection"); pthread_mutex_unlock(&(rdp_client->rdp_lock)); @@ -884,6 +887,8 @@ static int guac_rdp_handle_connection(guac_client* client) { } + /* Kill client and finish connection */ + guac_client_stop(client); guac_client_log(client, GUAC_LOG_INFO, "Internal RDP client disconnected"); pthread_mutex_lock(&(rdp_client->rdp_lock)); @@ -953,8 +958,12 @@ void* guac_rdp_client_thread(void* data) { if (settings->enable_sftp) { /* Abort if username is missing */ - if (settings->sftp_username == NULL) + if (settings->sftp_username == NULL) { + guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, + "A username or SFTP-specific username is required if " + "SFTP is enabled."); return NULL; + } guac_client_log(client, GUAC_LOG_DEBUG, "Connecting via SSH for SFTP filesystem access."); @@ -973,6 +982,8 @@ void* guac_rdp_client_thread(void* data) { settings->sftp_private_key, settings->sftp_passphrase)) { guac_common_ssh_destroy_user(rdp_client->sftp_user); + guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, + "Private key unreadable."); return NULL; } @@ -1015,6 +1026,8 @@ void* guac_rdp_client_thread(void* data) { if (rdp_client->sftp_filesystem == NULL) { guac_common_ssh_destroy_session(rdp_client->sftp_session); guac_common_ssh_destroy_user(rdp_client->sftp_user); + guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, + "SFTP connection failed."); return NULL; } http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/a64c3e01/src/protocols/ssh/ssh.c ---------------------------------------------------------------------- diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c index 24494c7..f887cc2 100644 --- a/src/protocols/ssh/ssh.c +++ b/src/protocols/ssh/ssh.c @@ -178,8 +178,11 @@ void* ssh_client_thread(void* data) { pthread_t input_thread; /* Init SSH base libraries */ - if (guac_common_ssh_init(client)) + if (guac_common_ssh_init(client)) { + guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, + "SSH library initialization failed"); return NULL; + } /* Set up screen recording, if requested */ if (settings->recording_path != NULL) { http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/a64c3e01/src/protocols/vnc/vnc.c ---------------------------------------------------------------------- diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c index 5eb6b87..f9ab687 100644 --- a/src/protocols/vnc/vnc.c +++ b/src/protocols/vnc/vnc.c @@ -241,6 +241,13 @@ void* guac_vnc_client_thread(void* data) { /* Connect via SSH if SFTP is enabled */ if (settings->enable_sftp) { + /* Abort if username is missing */ + if (settings->sftp_username == NULL) { + guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, + "SFTP username is required if SFTP is enabled."); + return NULL; + } + guac_client_log(client, GUAC_LOG_DEBUG, "Connecting via SSH for SFTP filesystem access."); @@ -258,6 +265,8 @@ void* guac_vnc_client_thread(void* data) { settings->sftp_private_key, settings->sftp_passphrase)) { guac_common_ssh_destroy_user(vnc_client->sftp_user); + guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, + "Private key unreadable."); return NULL; } @@ -297,6 +306,8 @@ void* guac_vnc_client_thread(void* data) { if (vnc_client->sftp_filesystem == NULL) { guac_common_ssh_destroy_session(vnc_client->sftp_session); guac_common_ssh_destroy_user(vnc_client->sftp_user); + guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR, + "SFTP connection failed."); return NULL; } @@ -407,6 +418,8 @@ void* guac_vnc_client_thread(void* data) { } + /* Kill client and finish connection */ + guac_client_stop(client); guac_client_log(client, GUAC_LOG_INFO, "Internal VNC client disconnected"); return NULL;
