maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUACAMOLE-221: Switch VNC credentials to NULL when parameter is not passed

Browse Source
This commit is contained in:
Nick Couchman 2020-09-18 22:23:03 -04:00
parent 9e1dada14b
commit 3e19583b29
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/protocols/vnc/auth.c
View File

@ -27,6 +27,7 @@
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/protocol.h> #include <guacamole/protocol.h>
#include <guacamole/socket.h> #include <guacamole/socket.h>
#include <guacamole/string.h>
#include <rfb/rfbclient.h> #include <rfb/rfbclient.h>
#include <rfb/rfbproto.h> #include <rfb/rfbproto.h>
@ -41,10 +42,10 @@ char* guac_vnc_get_password(rfbClient* client) {
/* If the client does not support the "required" instruction, just return /* If the client does not support the "required" instruction, just return
the configuration data. */ the configuration data. */
if (!guac_client_owner_supports_required(gc)) if (!guac_client_owner_supports_required(gc))
return ((guac_vnc_client*) gc->data)->settings->password; return guac_strdup(settings->password);
/* If password isn't around, prompt for it. */ /* If password isn't around, prompt for it. */
if (settings->password == NULL || strcmp(settings->password, "") == 0) { if (settings->password == NULL) {
guac_argv_register(GUAC_VNC_ARGV_PASSWORD, guac_vnc_argv_callback, NULL, 0); guac_argv_register(GUAC_VNC_ARGV_PASSWORD, guac_vnc_argv_callback, NULL, 0);
@ -58,7 +59,7 @@ char* guac_vnc_get_password(rfbClient* client) {
} }
return settings->password; return guac_strdup(settings->password);
} }
@ -78,14 +79,14 @@ rfbCredential* guac_vnc_get_credentials(rfbClient* client, int credentialType) {
char* params[3] = {NULL}; char* params[3] = {NULL};
int i = 0; int i = 0;
/* Check if username is null or empty. */ /* Check if username is not provided. */
if (settings->username == NULL) { if (settings->username == NULL) {
guac_argv_register(GUAC_VNC_ARGV_USERNAME, guac_vnc_argv_callback, NULL, 0); guac_argv_register(GUAC_VNC_ARGV_USERNAME, guac_vnc_argv_callback, NULL, 0);
params[i] = GUAC_VNC_ARGV_USERNAME; params[i] = GUAC_VNC_ARGV_USERNAME;
i++; i++;
} }
/* Check if password is null or empty. */ /* Check if password is not provided. */
if (settings->password == NULL) { if (settings->password == NULL) {
guac_argv_register(GUAC_VNC_ARGV_PASSWORD, guac_vnc_argv_callback, NULL, 0); guac_argv_register(GUAC_VNC_ARGV_PASSWORD, guac_vnc_argv_callback, NULL, 0);
params[i] = GUAC_VNC_ARGV_PASSWORD; params[i] = GUAC_VNC_ARGV_PASSWORD;
@ -94,23 +95,16 @@ rfbCredential* guac_vnc_get_credentials(rfbClient* client, int credentialType) {
params[i] = NULL; params[i] = NULL;
/* If we have empty parameters, request them. */ /* If we have empty parameters, request them and await response. */
if (i > 0) { if (i > 0) {
/* Send required parameters to owner. */
guac_client_owner_send_required(gc, (const char**) params); guac_client_owner_send_required(gc, (const char**) params);
/* Wait for the parameters to be returned. */
guac_argv_await((const char**) params); guac_argv_await((const char**) params);
return creds;
} }
} }
/* Copy the values and return the credential set. */ /* Copy the values and return the credential set. */
creds->userCredential.username = strdup(settings->username); creds->userCredential.username = guac_strdup(settings->username);
creds->userCredential.password = strdup(settings->password); creds->userCredential.password = guac_strdup(settings->password);
return creds; return creds;
} }

6
src/protocols/vnc/settings.c
View File

@ -393,11 +393,11 @@ guac_vnc_settings* guac_vnc_parse_args(guac_user* user,
settings->username = settings->username =
guac_user_parse_args_string(user, GUAC_VNC_CLIENT_ARGS, argv, guac_user_parse_args_string(user, GUAC_VNC_CLIENT_ARGS, argv,
IDX_USERNAME, ""); /* NOTE: freed by libvncclient */ IDX_USERNAME, NULL);
settings->password = settings->password =
guac_user_parse_args_string(user, GUAC_VNC_CLIENT_ARGS, argv, guac_user_parse_args_string(user, GUAC_VNC_CLIENT_ARGS, argv,
IDX_PASSWORD, ""); /* NOTE: freed by libvncclient */ IDX_PASSWORD, NULL);
/* Remote cursor */ /* Remote cursor */
if (strcmp(argv[IDX_CURSOR], "remote") == 0) { if (strcmp(argv[IDX_CURSOR], "remote") == 0) {
@ -625,8 +625,10 @@ void guac_vnc_settings_free(guac_vnc_settings* settings) {
free(settings->clipboard_encoding); free(settings->clipboard_encoding);
free(settings->encodings); free(settings->encodings);
free(settings->hostname); free(settings->hostname);
free(settings->password);
free(settings->recording_name); free(settings->recording_name);
free(settings->recording_path); free(settings->recording_path);
free(settings->username);
#ifdef ENABLE_VNC_REPEATER #ifdef ENABLE_VNC_REPEATER
/* Free VNC repeater settings */ /* Free VNC repeater settings */