OneIdentity · gyorgykt · Dec 19, 2023 · Feb 16, 2023 · Jun 7, 2023 · Jun 7, 2023
diff --git a/Dockerfile b/Dockerfile
@@ -26,6 +26,7 @@ ARG ALPINE_BASE_IMAGE=latest
 FROM alpine:${ALPINE_BASE_IMAGE} AS builder
 
 # Install build dependencies
+RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing openssl1.1-compat-dev
 RUN apk add --no-cache                \
         autoconf                      \
         automake                      \
@@ -40,7 +41,6 @@ RUN apk add --no-cache                \
         libtool                       \
         libwebp-dev                   \
         make                          \
-        openssl1.1-compat-dev         \
         pango-dev                     \
         pulseaudio-dev                \
         util-linux-dev
@@ -167,6 +167,7 @@ ENV GUACD_LOG_LEVEL=info
 COPY --from=builder ${PREFIX_DIR} ${PREFIX_DIR}
 
 # Bring runtime environment up to date and install runtime dependencies
+RUN apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing libssl1.1 libcrypto1.1
 RUN apk add --no-cache                \
         ca-certificates               \
         ghostscript                   \

diff --git a/bin/guacctl b/bin/guacctl
@@ -117,7 +117,7 @@ error() {
 ##
 usage() {
     cat >&2 <<END
-guacctl 1.5.2, Apache Guacamole terminal session control utility.
+guacctl 1.5.4, Apache Guacamole terminal session control utility.
 Usage: guacctl [OPTION] [FILE or NAME]...
 
     -d, --download         download each of the files listed.

diff --git a/configure.ac b/configure.ac
@@ -18,7 +18,7 @@
 #
 
 AC_PREREQ([2.61])
-AC_INIT([guacamole-server], [1.5.2])
+AC_INIT([guacamole-server], [1.5.4])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AM_SILENT_RULES([yes])
@@ -1243,7 +1243,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
      freerdp2 ............ ${have_freerdp2}
      pango ............... ${have_pango}
      libavcodec .......... ${have_libavcodec}
-     libavformat.......... ${have_libavformat}
+     libavformat ......... ${have_libavformat}
      libavutil ........... ${have_libavutil}
      libssh2 ............. ${have_libssh2}
      libssl .............. ${have_ssl}

diff --git a/doc/libguac/Doxyfile.in b/doc/libguac/Doxyfile.in
@@ -50,7 +50,8 @@ SHOW_INCLUDE_FILES    = NO
 #
 
 CASE_SENSE_NAMES     = YES
-EXCLUDE_SYMBOLS      = __* guac_palette*
+EXCLUDE_SYMBOLS      = __* guac_palette* PRIV_*
+EXCLUDE_PATTERNS     = **/private/*.h
 FILE_PATTERNS        = *.h
 INPUT                = ../../src/libguac/guacamole
 JAVADOC_AUTOBRIEF    = YES

diff --git a/src/common-ssh/buffer.c b/src/common-ssh/buffer.c
@@ -22,6 +22,8 @@
 #include <openssl/bn.h>
 #include <openssl/ossl_typ.h>
 
+#include <guacamole/mem.h>
+
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
@@ -67,7 +69,7 @@ void guac_common_ssh_buffer_write_bignum(char** buffer, const BIGNUM* value) {
 
     /* Allocate output buffer, add padding byte */
     length = BN_num_bytes(value);
-    bn_buffer = malloc(length);
+    bn_buffer = guac_mem_alloc(length);
 
     /* Convert BIGNUM */
     BN_bn2bin(value, bn_buffer);
@@ -84,7 +86,7 @@ void guac_common_ssh_buffer_write_bignum(char** buffer, const BIGNUM* value) {
     memcpy(*buffer, bn_buffer, length);
     *buffer += length;
 
-    free(bn_buffer);
+    guac_mem_free(bn_buffer);
 
 }
 

diff --git a/src/common-ssh/common-ssh/ssh.h b/src/common-ssh/common-ssh/ssh.h
@@ -38,7 +38,7 @@
  * 
  * @return
  *     A newly-allocated string containing the credentials provided by
- *     the user, which must be freed by a call to free().
+ *     the user, which must be freed by a call to guac_mem_free().
  */
 typedef char* guac_ssh_credential_handler(guac_client* client, char* cred_name);
 

diff --git a/src/common-ssh/common-ssh/user.h b/src/common-ssh/common-ssh/user.h
@@ -44,6 +44,12 @@ typedef struct guac_common_ssh_user {
      */
     guac_common_ssh_key* private_key;
 
+    /**
+     * The public key which should be used to authenticate this user, if any,
+     * or NULL if a password or just a private key will be used instead.
+     */
+    char* public_key;
+
 } guac_common_ssh_user;
 
 /**
@@ -104,5 +110,23 @@ void guac_common_ssh_user_set_password(guac_common_ssh_user* user,
 int guac_common_ssh_user_import_key(guac_common_ssh_user* user,
         char* private_key, char* passphrase);
 
+/**
+ * Imports the given public key, associating that key with the given user.
+ * If the public key is imported successfully, it will be used for
+ * future authentication attempts.
+ *
+ * @param user
+ *     The user to associate with the given private key.
+ *
+ * @param public_key
+ *     The base64-encoded public key to import.
+ *
+ * @return
+ *     Zero if public key is successfully imported, or non-zero if the
+ *     public key could not be imported due to an error.
+ */
+int guac_common_ssh_user_import_public_key(guac_common_ssh_user* user,
+        char* public_key);
+
 #endif
 
diff --git a/src/common-ssh/key.c b/src/common-ssh/key.c
@@ -22,6 +22,7 @@
 #include "common-ssh/buffer.h"
 #include "common-ssh/key.h"
 
+#include <guacamole/mem.h>
 #include <guacamole/string.h>
 
 #include <openssl/bio.h>
@@ -137,13 +138,13 @@ guac_common_ssh_key* guac_common_ssh_key_alloc(char* data, int length,
     if (is_passphrase_needed(data, length) && (passphrase == NULL || *passphrase == '\0'))
         return NULL;
 
-    guac_common_ssh_key* key = malloc(sizeof(guac_common_ssh_key));
+    guac_common_ssh_key* key = guac_mem_alloc(sizeof(guac_common_ssh_key));
 
     /* Copy private key to structure */
     key->private_key_length = length;
-    key->private_key = malloc(length);
+    key->private_key = guac_mem_alloc(length);
     memcpy(key->private_key, data, length);
-    key->passphrase = strdup(passphrase);
+    key->passphrase = guac_strdup(passphrase);
 
     return key;
 
@@ -157,10 +158,9 @@ const char* guac_common_ssh_key_error() {
 }
 
 void guac_common_ssh_key_free(guac_common_ssh_key* key) {
-
-    free(key->private_key);
-    free(key->passphrase);
-    free(key);
+    guac_mem_free(key->private_key);
+    guac_mem_free(key->passphrase);
+    guac_mem_free(key);
 }
 
 int guac_common_ssh_verify_host_key(LIBSSH2_SESSION* session, guac_client* client,

diff --git a/src/common-ssh/sftp.c b/src/common-ssh/sftp.c
@@ -21,6 +21,7 @@
 #include "common-ssh/ssh.h"
 
 #include <guacamole/client.h>
+#include <guacamole/mem.h>
 #include <guacamole/object.h>
 #include <guacamole/protocol.h>
 #include <guacamole/socket.h>
@@ -622,7 +623,7 @@ static int guac_common_ssh_sftp_ls_ack_handler(guac_user* user,
     if (status != GUAC_PROTOCOL_STATUS_SUCCESS) {
         libssh2_sftp_closedir(list_state->directory);
         guac_user_free_stream(user, stream);
-        free(list_state);
+        guac_mem_free(list_state);
         return 0;
     }
 
@@ -674,7 +675,7 @@ static int guac_common_ssh_sftp_ls_ack_handler(guac_user* user,
 
         /* Clean up resources */
         libssh2_sftp_closedir(list_state->directory);
-        free(list_state);
+        guac_mem_free(list_state);
 
         /* Signal of stream */
         guac_protocol_send_end(user->socket, stream);
@@ -774,7 +775,7 @@ static int guac_common_ssh_sftp_get_handler(guac_user* user,
 
         /* Init directory listing state */
         guac_common_ssh_sftp_ls_state* list_state =
-            malloc(sizeof(guac_common_ssh_sftp_ls_state));
+            guac_mem_alloc(sizeof(guac_common_ssh_sftp_ls_state));
 
         list_state->directory = dir;
         list_state->filesystem = filesystem;
@@ -786,7 +787,7 @@ static int guac_common_ssh_sftp_get_handler(guac_user* user,
         if (length >= sizeof(list_state->directory_name)) {
             guac_user_log(user, GUAC_LOG_INFO, "Unable to read directory "
                     "\"%s\": Path too long", fullpath);
-            free(list_state);
+            guac_mem_free(list_state);
             return 0;
         }
 
@@ -969,7 +970,7 @@ guac_common_ssh_sftp_filesystem* guac_common_ssh_create_sftp_filesystem(
 
     /* Allocate data for SFTP session */
     guac_common_ssh_sftp_filesystem* filesystem =
-        malloc(sizeof(guac_common_ssh_sftp_filesystem));
+        guac_mem_alloc(sizeof(guac_common_ssh_sftp_filesystem));
 
     /* Associate SSH session with SFTP data and user */
     filesystem->ssh_session = session;
@@ -984,15 +985,15 @@ guac_common_ssh_sftp_filesystem* guac_common_ssh_create_sftp_filesystem(
                 root_path)) {
         guac_client_log(session->client, GUAC_LOG_WARNING, "Cannot create "
                 "SFTP filesystem - \"%s\" is not a valid path.", root_path);
-        free(filesystem);
+        guac_mem_free(filesystem);
         return NULL;
     }
 
     /* Generate filesystem name from root path if no name is provided */
     if (name != NULL)
-        filesystem->name = strdup(name);
+        filesystem->name = guac_strdup(name);
     else
-        filesystem->name = strdup(filesystem->root_path);
+        filesystem->name = guac_strdup(filesystem->root_path);
 
     /* Initially upload files to current directory */
     strcpy(filesystem->upload_path, ".");
@@ -1009,8 +1010,8 @@ void guac_common_ssh_destroy_sftp_filesystem(
     libssh2_sftp_shutdown(filesystem->sftp_session);
 
     /* Free associated memory */
-    free(filesystem->name);
-    free(filesystem);
+    guac_mem_free(filesystem->name);
+    guac_mem_free(filesystem);
 
 }
 
diff --git a/src/common-ssh/ssh.c b/src/common-ssh/ssh.c
@@ -23,6 +23,8 @@
 
 #include <guacamole/client.h>
 #include <guacamole/fips.h>
+#include <guacamole/mem.h>
+#include <guacamole/string.h>
 #include <libssh2.h>
 
 #ifdef LIBSSH2_USES_GCRYPT
@@ -120,7 +122,7 @@ static void guac_common_ssh_openssl_init_locks(int count) {
 
     /* Allocate required number of locks */
     guac_common_ssh_openssl_locks =
-        malloc(sizeof(pthread_mutex_t) * count);
+        guac_mem_alloc(sizeof(pthread_mutex_t), count);
 
     /* Initialize each lock */
     for (i=0; i < count; i++)
@@ -147,7 +149,7 @@ static void guac_common_ssh_openssl_free_locks(int count) {
         pthread_mutex_destroy(&(guac_common_ssh_openssl_locks[i]));
 
     /* Free lock array */
-    free(guac_common_ssh_openssl_locks);
+    guac_mem_free(guac_common_ssh_openssl_locks);
 
 }
 #endif
@@ -251,7 +253,7 @@ static void guac_common_ssh_kbd_callback(const char *name, int name_len,
     /* Send password if only one prompt */
     if (num_prompts == 1) {
         char* password = common_session->user->password;
-        responses[0].text = strdup(password);
+        responses[0].text = guac_strdup(password);
         responses[0].length = strlen(password);
     }
 
@@ -284,6 +286,8 @@ static int guac_common_ssh_authenticate(guac_common_ssh_session* common_session)
     /* Get user credentials */
     guac_common_ssh_key* key = user->private_key;
 
+    char* public_key = user->public_key;
+
     /* Validate username provided */
     if (user->username == NULL) {
         guac_client_abort(client, GUAC_PROTOCOL_STATUS_CLIENT_UNAUTHORIZED,
@@ -317,9 +321,11 @@ static int guac_common_ssh_authenticate(guac_common_ssh_session* common_session)
             return 1;
         }
 
+        int public_key_length = public_key == NULL ? 0 : strlen(public_key);
+
         /* Attempt public key auth */
         if (libssh2_userauth_publickey_frommemory(session, user->username,
-                    username_len, NULL, 0, key->private_key,
+                    username_len, public_key, public_key_length, key->private_key,
                     key->private_key_length, key->passphrase)) {
 
             /* Abort on failure */
@@ -488,15 +494,15 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
 
     /* Allocate new session */
     guac_common_ssh_session* common_session =
-        malloc(sizeof(guac_common_ssh_session));
+        guac_mem_alloc(sizeof(guac_common_ssh_session));
 
     /* Open SSH session */
     LIBSSH2_SESSION* session = libssh2_session_init_ex(NULL, NULL,
             NULL, common_session);
     if (session == NULL) {
         guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
                 "Session allocation failed.");
-        free(common_session);
+        guac_mem_free(common_session);
         close(fd);
         return NULL;
     }
@@ -516,7 +522,7 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
     if (libssh2_session_handshake(session, fd)) {
         guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_ERROR,
                 "SSH handshake failed.");
-        free(common_session);
+        guac_mem_free(common_session);
         close(fd);
         return NULL;
     }
@@ -529,7 +535,7 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
     if (!remote_hostkey) {
         guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
             "Failed to get host key for %s", hostname);
-        free(common_session);
+        guac_mem_free(common_session);
         close(fd);
         return NULL;
     }
@@ -552,7 +558,7 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
             guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
                 "Host key did not match any provided known host keys. %s", err_msg);
 
-        free(common_session);
+        guac_mem_free(common_session);
         close(fd);
         return NULL;
     }
@@ -566,7 +572,7 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
 
     /* Attempt authentication */
     if (guac_common_ssh_authenticate(common_session)) {
-        free(common_session);
+        guac_mem_free(common_session);
         close(fd);
         return NULL;
     }
@@ -597,6 +603,6 @@ void guac_common_ssh_destroy_session(guac_common_ssh_session* session) {
     libssh2_session_free(session->session);
 
     /* Free all other data */
-    free(session);
+    guac_mem_free(session);
 
 }
diff --git a/src/common-ssh/tests/Makefile.am b/src/common-ssh/tests/Makefile.am
@@ -45,7 +45,8 @@ test_common_ssh_CFLAGS =    \
 test_common_ssh_LDADD = \
     @CUNIT_LIBS@        \
     @COMMON_SSH_LTLIB@  \
-    @COMMON_LTLIB@
+    @COMMON_LTLIB@      \
+    @LIBGUAC_LTLIB@
 
 #
 # Autogenerate test runner