From 61df2956b322a01a777c8169cbbd2b2a2877d696 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 11 Sep 2018 03:17:00 -0700 Subject: [PATCH] GUACAMOLE-623: Clean up logging (libwebsockets adds newline characters). --- src/protocols/kubernetes/client.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/src/protocols/kubernetes/client.c b/src/protocols/kubernetes/client.c index 331e03d7..1a1eb3a7 100644 --- a/src/protocols/kubernetes/client.c +++ b/src/protocols/kubernetes/client.c @@ -48,9 +48,32 @@ guac_client* guac_kubernetes_lws_current_client = NULL; * The line of logging output to log. */ static void guac_kubernetes_log(int level, const char* line) { - if (guac_kubernetes_lws_current_client != NULL) - guac_client_log(guac_kubernetes_lws_current_client, GUAC_LOG_DEBUG, - "libwebsockets: %s", line); + + char buffer[1024]; + + /* Drop log message if there's nowhere to log yet */ + if (guac_kubernetes_lws_current_client == NULL) + return; + + /* Trim length of line to fit buffer (plus null terminator) */ + int length = strlen(line); + if (length > sizeof(buffer) - 1) + length = sizeof(buffer) - 1; + + /* Copy as much of the received line as will fit in the buffer */ + memcpy(buffer, line, length); + + /* If the line ends with a newline character, trim the character */ + if (length > 0 && buffer[length - 1] == '\n') + length--; + + /* Null-terminate the trimmed string */ + buffer[length] = '\0'; + + /* Log using guacd's own log facilities */ + guac_client_log(guac_kubernetes_lws_current_client, GUAC_LOG_DEBUG, + "libwebsockets: %s", buffer); + } int guac_client_init(guac_client* client) {