From 8838199f5c00e7bc855a90e7a3b86efdc1ed2c53 Mon Sep 17 00:00:00 2001 From: Tomer Gabel Date: Thu, 23 Apr 2020 16:53:17 +0300 Subject: [PATCH] GUACAMOLE-1047: Notify connecting client on unrecognized connection ID --- src/guacd/connection.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/guacd/connection.c b/src/guacd/connection.c index ef767acb..2cf3d291 100644 --- a/src/guacd/connection.c +++ b/src/guacd/connection.c @@ -278,10 +278,18 @@ static int guacd_route_connection(guacd_proc_map* map, guac_socket* socket) { proc = guacd_proc_map_retrieve(map, identifier); new_process = 0; - /* Warn if requested connection does not exist */ - if (proc == NULL) - guacd_log(GUAC_LOG_INFO, "Connection \"%s\" does not exist.", - identifier); + /* Warn and ward off client if requested connection does not exist */ + if (proc == NULL) { + char message[2048]; + + snprintf(message, sizeof(message), + "Connection \"%s\" does not exist", identifier); + + guacd_log(GUAC_LOG_INFO, message); + guac_protocol_send_error(socket, message, + GUAC_PROTOCOL_STATUS_CLIENT_BAD_REQUEST); + } + else guacd_log(GUAC_LOG_INFO, "Joining existing connection \"%s\"", identifier);