GUACAMOLE-859: Merge correct Caps Lock keysym sent via RDP
diff --git a/src/protocols/kubernetes/argv.c b/src/protocols/kubernetes/argv.c
index 0bff314..c37595d 100644
--- a/src/protocols/kubernetes/argv.c
+++ b/src/protocols/kubernetes/argv.c
@@ -125,11 +125,15 @@
/* Update color scheme */
case GUAC_KUBERNETES_ARGV_SETTING_COLOR_SCHEME:
guac_terminal_apply_color_scheme(terminal, argv->buffer);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "color-scheme", argv->buffer);
break;
/* Update font name */
case GUAC_KUBERNETES_ARGV_SETTING_FONT_NAME:
guac_terminal_apply_font(terminal, argv->buffer, -1, 0);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "font-name", argv->buffer);
break;
/* Update font size */
@@ -140,6 +144,8 @@
if (size > 0) {
guac_terminal_apply_font(terminal, NULL, size,
kubernetes_client->settings->resolution);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "font-size", argv->buffer);
}
break;
@@ -193,3 +199,26 @@
}
+void* guac_kubernetes_send_current_argv(guac_user* user, void* data) {
+
+ guac_kubernetes_client* kubernetes_client = (guac_kubernetes_client*) data;
+ guac_terminal* terminal = kubernetes_client->term;
+
+ /* Send current color scheme */
+ guac_user_stream_argv(user, user->socket, "text/plain", "color-scheme",
+ terminal->color_scheme);
+
+ /* Send current font name */
+ guac_user_stream_argv(user, user->socket, "text/plain", "font-name",
+ terminal->font_name);
+
+ /* Send current font size */
+ char font_size[64];
+ sprintf(font_size, "%i", terminal->font_size);
+ guac_user_stream_argv(user, user->socket, "text/plain", "font-size",
+ font_size);
+
+ return NULL;
+
+}
+
diff --git a/src/protocols/kubernetes/argv.h b/src/protocols/kubernetes/argv.h
index da9e11b..2fc6c1b 100644
--- a/src/protocols/kubernetes/argv.h
+++ b/src/protocols/kubernetes/argv.h
@@ -37,5 +37,25 @@
*/
guac_user_argv_handler guac_kubernetes_argv_handler;
+/**
+ * Sends the current values of all non-sensitive parameters which may be set
+ * while the connection is running to the given user. Note that the user
+ * receiving these values will not necessarily be able to set new values
+ * themselves if their connection is read-only. This function can be used as
+ * the callback for guac_client_foreach_user() and guac_client_for_owner()
+ *
+ * @param user
+ * The user that should receive the values of all non-sensitive parameters
+ * which may be set while the connection is running.
+ *
+ * @param data
+ * The guac_kubernetes_client instance associated with the current
+ * connection.
+ *
+ * @return
+ * Always NULL.
+ */
+void* guac_kubernetes_send_current_argv(guac_user* user, void* data);
+
#endif
diff --git a/src/protocols/kubernetes/kubernetes.c b/src/protocols/kubernetes/kubernetes.c
index 931f8ca..7158a98 100644
--- a/src/protocols/kubernetes/kubernetes.c
+++ b/src/protocols/kubernetes/kubernetes.c
@@ -18,6 +18,8 @@
*/
#include "config.h"
+
+#include "argv.h"
#include "client.h"
#include "common/recording.h"
#include "io.h"
@@ -249,6 +251,10 @@
goto fail;
}
+ /* Send current values of exposed arguments to owner only */
+ guac_client_for_owner(client, guac_kubernetes_send_current_argv,
+ kubernetes_client);
+
/* Set up typescript, if requested */
if (settings->typescript_path != NULL) {
guac_terminal_create_typescript(kubernetes_client->term,
diff --git a/src/protocols/kubernetes/user.c b/src/protocols/kubernetes/user.c
index d1b79a3..d1fcd5d 100644
--- a/src/protocols/kubernetes/user.c
+++ b/src/protocols/kubernetes/user.c
@@ -74,6 +74,7 @@
/* If not owner, synchronize with current display */
else {
guac_terminal_dup(kubernetes_client->term, user, user->socket);
+ guac_kubernetes_send_current_argv(user, kubernetes_client);
guac_socket_flush(user->socket);
}
diff --git a/src/protocols/ssh/argv.c b/src/protocols/ssh/argv.c
index 8db2b24..d9ce1e7 100644
--- a/src/protocols/ssh/argv.c
+++ b/src/protocols/ssh/argv.c
@@ -126,11 +126,15 @@
/* Update color scheme */
case GUAC_SSH_ARGV_SETTING_COLOR_SCHEME:
guac_terminal_apply_color_scheme(terminal, argv->buffer);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "color-scheme", argv->buffer);
break;
/* Update font name */
case GUAC_SSH_ARGV_SETTING_FONT_NAME:
guac_terminal_apply_font(terminal, argv->buffer, -1, 0);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "font-name", argv->buffer);
break;
/* Update font size */
@@ -141,6 +145,8 @@
if (size > 0) {
guac_terminal_apply_font(terminal, NULL, size,
ssh_client->settings->resolution);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "font-size", argv->buffer);
}
break;
@@ -198,3 +204,26 @@
}
+void* guac_ssh_send_current_argv(guac_user* user, void* data) {
+
+ guac_ssh_client* ssh_client = (guac_ssh_client*) data;
+ guac_terminal* terminal = ssh_client->term;
+
+ /* Send current color scheme */
+ guac_user_stream_argv(user, user->socket, "text/plain", "color-scheme",
+ terminal->color_scheme);
+
+ /* Send current font name */
+ guac_user_stream_argv(user, user->socket, "text/plain", "font-name",
+ terminal->font_name);
+
+ /* Send current font size */
+ char font_size[64];
+ sprintf(font_size, "%i", terminal->font_size);
+ guac_user_stream_argv(user, user->socket, "text/plain", "font-size",
+ font_size);
+
+ return NULL;
+
+}
+
diff --git a/src/protocols/ssh/argv.h b/src/protocols/ssh/argv.h
index 88cf8e9..186e0b5 100644
--- a/src/protocols/ssh/argv.h
+++ b/src/protocols/ssh/argv.h
@@ -37,5 +37,24 @@
*/
guac_user_argv_handler guac_ssh_argv_handler;
+/**
+ * Sends the current values of all non-sensitive parameters which may be set
+ * while the connection is running to the given user. Note that the user
+ * receiving these values will not necessarily be able to set new values
+ * themselves if their connection is read-only. This function can be used as
+ * the callback for guac_client_foreach_user() and guac_client_for_owner()
+ *
+ * @param user
+ * The user that should receive the values of all non-sensitive parameters
+ * which may be set while the connection is running.
+ *
+ * @param data
+ * The guac_ssh_client instance associated with the current connection.
+ *
+ * @return
+ * Always NULL.
+ */
+void* guac_ssh_send_current_argv(guac_user* user, void* data);
+
#endif
diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c
index 138de6b..8957205 100644
--- a/src/protocols/ssh/ssh.c
+++ b/src/protocols/ssh/ssh.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include "argv.h"
#include "common/recording.h"
#include "common-ssh/sftp.h"
#include "common-ssh/ssh.h"
@@ -234,6 +235,9 @@
return NULL;
}
+ /* Send current values of exposed arguments to owner only */
+ guac_client_for_owner(client, guac_ssh_send_current_argv, ssh_client);
+
/* Set up typescript, if requested */
if (settings->typescript_path != NULL) {
guac_terminal_create_typescript(ssh_client->term,
diff --git a/src/protocols/ssh/user.c b/src/protocols/ssh/user.c
index 76a2a96..8ea30a4 100644
--- a/src/protocols/ssh/user.c
+++ b/src/protocols/ssh/user.c
@@ -74,6 +74,7 @@
/* If not owner, synchronize with current display */
else {
guac_terminal_dup(ssh_client->term, user, user->socket);
+ guac_ssh_send_current_argv(user, ssh_client);
guac_socket_flush(user->socket);
}
diff --git a/src/protocols/telnet/argv.c b/src/protocols/telnet/argv.c
index 450c7f3..37564a6 100644
--- a/src/protocols/telnet/argv.c
+++ b/src/protocols/telnet/argv.c
@@ -125,11 +125,15 @@
/* Update color scheme */
case GUAC_TELNET_ARGV_SETTING_COLOR_SCHEME:
guac_terminal_apply_color_scheme(terminal, argv->buffer);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "color-scheme", argv->buffer);
break;
/* Update font name */
case GUAC_TELNET_ARGV_SETTING_FONT_NAME:
guac_terminal_apply_font(terminal, argv->buffer, -1, 0);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "font-name", argv->buffer);
break;
/* Update font size */
@@ -140,6 +144,8 @@
if (size > 0) {
guac_terminal_apply_font(terminal, NULL, size,
telnet_client->settings->resolution);
+ guac_client_stream_argv(client, client->socket, "text/plain",
+ "font-size", argv->buffer);
}
break;
@@ -194,3 +200,26 @@
}
+void* guac_telnet_send_current_argv(guac_user* user, void* data) {
+
+ guac_telnet_client* telnet_client = (guac_telnet_client*) data;
+ guac_terminal* terminal = telnet_client->term;
+
+ /* Send current color scheme */
+ guac_user_stream_argv(user, user->socket, "text/plain", "color-scheme",
+ terminal->color_scheme);
+
+ /* Send current font name */
+ guac_user_stream_argv(user, user->socket, "text/plain", "font-name",
+ terminal->font_name);
+
+ /* Send current font size */
+ char font_size[64];
+ sprintf(font_size, "%i", terminal->font_size);
+ guac_user_stream_argv(user, user->socket, "text/plain", "font-size",
+ font_size);
+
+ return NULL;
+
+}
+
diff --git a/src/protocols/telnet/argv.h b/src/protocols/telnet/argv.h
index aa13dda..e362e14 100644
--- a/src/protocols/telnet/argv.h
+++ b/src/protocols/telnet/argv.h
@@ -37,5 +37,24 @@
*/
guac_user_argv_handler guac_telnet_argv_handler;
+/**
+ * Sends the current values of all non-sensitive parameters which may be set
+ * while the connection is running to the given user. Note that the user
+ * receiving these values will not necessarily be able to set new values
+ * themselves if their connection is read-only. This function can be used as
+ * the callback for guac_client_foreach_user() and guac_client_for_owner()
+ *
+ * @param user
+ * The user that should receive the values of all non-sensitive parameters
+ * which may be set while the connection is running.
+ *
+ * @param data
+ * The guac_telnet_client instance associated with the current connection.
+ *
+ * @return
+ * Always NULL.
+ */
+void* guac_telnet_send_current_argv(guac_user* user, void* data);
+
#endif
diff --git a/src/protocols/telnet/telnet.c b/src/protocols/telnet/telnet.c
index d8fc5e0..5a5ca30 100644
--- a/src/protocols/telnet/telnet.c
+++ b/src/protocols/telnet/telnet.c
@@ -18,6 +18,8 @@
*/
#include "config.h"
+
+#include "argv.h"
#include "common/recording.h"
#include "telnet.h"
#include "terminal/terminal.h"
@@ -580,6 +582,10 @@
return NULL;
}
+ /* Send current values of exposed arguments to owner only */
+ guac_client_for_owner(client, guac_telnet_send_current_argv,
+ telnet_client);
+
/* Set up typescript, if requested */
if (settings->typescript_path != NULL) {
guac_terminal_create_typescript(telnet_client->term,
diff --git a/src/protocols/telnet/user.c b/src/protocols/telnet/user.c
index 5c15283..63408cc 100644
--- a/src/protocols/telnet/user.c
+++ b/src/protocols/telnet/user.c
@@ -73,6 +73,7 @@
/* If not owner, synchronize with current display */
else {
guac_terminal_dup(telnet_client->term, user, user->socket);
+ guac_telnet_send_current_argv(user, telnet_client);
guac_socket_flush(user->socket);
}
diff --git a/src/protocols/vnc/auth.c b/src/protocols/vnc/auth.c
index e93dbc6..8cc6b1d 100644
--- a/src/protocols/vnc/auth.c
+++ b/src/protocols/vnc/auth.c
@@ -31,3 +31,22 @@
return ((guac_vnc_client*) gc->data)->settings->password;
}
+rfbCredential* guac_vnc_get_credentials(rfbClient* client, int credentialType) {
+ guac_client* gc = rfbClientGetClientData(client, GUAC_VNC_CLIENT_KEY);
+ guac_vnc_settings* settings = ((guac_vnc_client*) gc->data)->settings;
+
+ if (credentialType == rfbCredentialTypeUser) {
+ rfbCredential *creds = malloc(sizeof(rfbCredential));
+ creds->userCredential.username = settings->username;
+ creds->userCredential.password = settings->password;
+ return creds;
+ }
+
+ guac_client_abort(gc, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
+ "Unsupported credential type requested.");
+ guac_client_log(gc, GUAC_LOG_DEBUG,
+ "Unable to provide requested type of credential: %d.",
+ credentialType);
+ return NULL;
+
+}
diff --git a/src/protocols/vnc/auth.h b/src/protocols/vnc/auth.h
index 615d80a..155a48d 100644
--- a/src/protocols/vnc/auth.h
+++ b/src/protocols/vnc/auth.h
@@ -27,7 +27,7 @@
/**
* Callback which is invoked by libVNCServer when it needs to read the user's
- * VNC password. As ths user's password, if any, will be stored in the
+ * VNC password. As this user's password, if any, will be stored in the
* connection settings, this function does nothing more than return that value.
*
* @param client
@@ -38,5 +38,23 @@
*/
char* guac_vnc_get_password(rfbClient* client);
+/**
+ * Callback which is invoked by libVNCServer when it needs to read the user's
+ * VNC credentials. The credentials are stored in the connection settings,
+ * so they will be retrieved from that.
+ *
+ * @param client
+ * The rfbClient associated with the VNC connection requiring the
+ * authentication.
+ *
+ * @param credentialType
+ * The credential type being requested, as defined by the libVNCclient
+ * code in the rfbclient.h header.
+ *
+ * @return
+ * The rfbCredential object that contains the required credentials.
+ */
+rfbCredential* guac_vnc_get_credentials(rfbClient* client, int credentialType);
+
#endif
diff --git a/src/protocols/vnc/settings.c b/src/protocols/vnc/settings.c
index a21aea8..21f6405 100644
--- a/src/protocols/vnc/settings.c
+++ b/src/protocols/vnc/settings.c
@@ -35,6 +35,7 @@
"port",
"read-only",
"encodings",
+ "username",
"password",
"swap-red-blue",
"color-depth",
@@ -109,6 +110,11 @@
IDX_ENCODINGS,
/**
+ * The username to send to the VNC server if authentication is requested.
+ */
+ IDX_USERNAME,
+
+ /**
* The password to send to the VNC server if authentication is requested.
*/
IDX_PASSWORD,
@@ -337,10 +343,14 @@
guac_user_parse_args_int(user, GUAC_VNC_CLIENT_ARGS, argv,
IDX_PORT, 0);
+ settings->username =
+ guac_user_parse_args_string(user, GUAC_VNC_CLIENT_ARGS, argv,
+ IDX_USERNAME, ""); /* NOTE: freed by libvncclient */
+
settings->password =
guac_user_parse_args_string(user, GUAC_VNC_CLIENT_ARGS, argv,
IDX_PASSWORD, ""); /* NOTE: freed by libvncclient */
-
+
/* Remote cursor */
if (strcmp(argv[IDX_CURSOR], "remote") == 0) {
guac_user_log(user, GUAC_LOG_INFO, "Cursor rendering: remote");
diff --git a/src/protocols/vnc/settings.h b/src/protocols/vnc/settings.h
index 13a3d87..34c08ec 100644
--- a/src/protocols/vnc/settings.h
+++ b/src/protocols/vnc/settings.h
@@ -46,6 +46,11 @@
int port;
/**
+ * The username given in the arguments.
+ */
+ char* username;
+
+ /**
* The password given in the arguments.
*/
char* password;
diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c
index 17033a6..f33b267 100644
--- a/src/protocols/vnc/vnc.c
+++ b/src/protocols/vnc/vnc.c
@@ -153,6 +153,9 @@
}
+ /* Authentication */
+ rfb_client->GetCredential = guac_vnc_get_credentials;
+
/* Password */
rfb_client->GetPassword = guac_vnc_get_password;
diff --git a/src/terminal/color-scheme.c b/src/terminal/color-scheme.c
index f430019..5df181f 100644
--- a/src/terminal/color-scheme.c
+++ b/src/terminal/color-scheme.c
@@ -196,6 +196,23 @@
guac_terminal_color* background,
guac_terminal_color (*palette)[256]) {
+ /* Special cases. */
+ if (color_scheme[0] == '\0') {
+ /* guac_terminal_parse_color_scheme defaults to gray-black */
+ }
+ else if (strcmp(color_scheme, GUAC_TERMINAL_SCHEME_GRAY_BLACK) == 0) {
+ color_scheme = "foreground:color7;background:color0";
+ }
+ else if (strcmp(color_scheme, GUAC_TERMINAL_SCHEME_BLACK_WHITE) == 0) {
+ color_scheme = "foreground:color0;background:color15";
+ }
+ else if (strcmp(color_scheme, GUAC_TERMINAL_SCHEME_GREEN_BLACK) == 0) {
+ color_scheme = "foreground:color2;background:color0";
+ }
+ else if (strcmp(color_scheme, GUAC_TERMINAL_SCHEME_WHITE_BLACK) == 0) {
+ color_scheme = "foreground:color15;background:color0";
+ }
+
/* Set default gray-black color scheme and initial palette. */
*foreground = GUAC_TERMINAL_INITIAL_PALETTE[GUAC_TERMINAL_COLOR_GRAY];
*background = GUAC_TERMINAL_INITIAL_PALETTE[GUAC_TERMINAL_COLOR_BLACK];
diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c
index 7ddcb2f..b76a6ea 100644
--- a/src/terminal/terminal.c
+++ b/src/terminal/terminal.c
@@ -327,23 +327,6 @@
guac_terminal_color (*default_palette)[256] = (guac_terminal_color(*)[256])
malloc(sizeof(guac_terminal_color[256]));
- /* Special cases. */
- if (color_scheme == NULL || color_scheme[0] == '\0') {
- /* guac_terminal_parse_color_scheme defaults to gray-black */
- }
- else if (strcmp(color_scheme, GUAC_TERMINAL_SCHEME_GRAY_BLACK) == 0) {
- color_scheme = "foreground:color7;background:color0";
- }
- else if (strcmp(color_scheme, GUAC_TERMINAL_SCHEME_BLACK_WHITE) == 0) {
- color_scheme = "foreground:color0;background:color15";
- }
- else if (strcmp(color_scheme, GUAC_TERMINAL_SCHEME_GREEN_BLACK) == 0) {
- color_scheme = "foreground:color2;background:color0";
- }
- else if (strcmp(color_scheme, GUAC_TERMINAL_SCHEME_WHITE_BLACK) == 0) {
- color_scheme = "foreground:color15;background:color0";
- }
-
guac_terminal_parse_color_scheme(client, color_scheme,
&default_char.attributes.foreground,
&default_char.attributes.background,
@@ -360,6 +343,11 @@
term->upload_path_handler = NULL;
term->file_download_handler = NULL;
+ /* Copy initially-provided color scheme and font details */
+ term->color_scheme = strdup(color_scheme);
+ term->font_name = strdup(font_name);
+ term->font_size = font_size;
+
/* Set size of available screen area */
term->outer_width = width;
term->outer_height = height;
@@ -529,6 +517,10 @@
/* Free scrollbar */
guac_terminal_scrollbar_free(term->scrollbar);
+ /* Free copies of font and color scheme information */
+ free((char*) term->color_scheme);
+ free((char*) term->font_name);
+
/* Free the terminal itself */
free(term);
@@ -1973,6 +1965,16 @@
terminal->term_height - 1,
terminal->term_width - 1);
+ /* Acquire exclusive access to terminal */
+ guac_terminal_lock(terminal);
+
+ /* Update stored copy of color scheme */
+ free((char*) terminal->color_scheme);
+ terminal->color_scheme = strdup(color_scheme);
+
+ /* Release terminal */
+ guac_terminal_unlock(terminal);
+
guac_terminal_notify(terminal);
}
@@ -1997,6 +1999,20 @@
terminal->term_height - 1,
terminal->term_width - 1);
+ /* Acquire exclusive access to terminal */
+ guac_terminal_lock(terminal);
+
+ /* Update stored copy of font name, if changed */
+ if (font_name != NULL)
+ terminal->font_name = strdup(font_name);
+
+ /* Update stored copy of font size, if changed */
+ if (font_size != -1)
+ terminal->font_size = font_size;
+
+ /* Release terminal */
+ guac_terminal_unlock(terminal);
+
guac_terminal_notify(terminal);
}
diff --git a/src/terminal/terminal/color-scheme.h b/src/terminal/terminal/color-scheme.h
index 962d820..5417ce1 100644
--- a/src/terminal/terminal/color-scheme.h
+++ b/src/terminal/terminal/color-scheme.h
@@ -72,9 +72,15 @@
* The client that the terminal is connected to.
*
* @param color_scheme
- * A semicolon-separated list of name-value pairs, i.e.
- * "<name>: <value> [; <name>: <value> [; ...]]".
- * For example, "color2: rgb:cc/33/22; background: color5".
+ * The name of a pre-defined color scheme (one of the
+ * names defined by the GUAC_TERMINAL_SCHEME_* constants), or
+ * semicolon-separated list of name-value pairs, i.e. "<name>: <value> [;
+ * <name>: <value> [; ...]]". For example, "color2: rgb:cc/33/22;
+ * background: color5".
+ *
+ * If blank, the default scheme of GUAC_TERMINAL_SCHEME_GRAY_BLACK will be
+ * used. If invalid, a warning will be logged, and
+ * GUAC_TERMINAL_SCHEME_GRAY_BLACK will be used.
*
* @param[out] foreground
* Parsed foreground color.
diff --git a/src/terminal/terminal/terminal.h b/src/terminal/terminal/terminal.h
index 28e6935..4185837 100644
--- a/src/terminal/terminal/terminal.h
+++ b/src/terminal/terminal/terminal.h
@@ -507,6 +507,25 @@
guac_common_clipboard* clipboard;
/**
+ * The name of the font to use when rendering glyphs, as requested at
+ * creation time or via guac_terminal_apply_font().
+ */
+ const char* font_name;
+
+ /**
+ * The size of each glyph, in points, as requested at creation time or via
+ * guac_terminal_apply_font().
+ */
+ int font_size;
+
+ /**
+ * The name of the color scheme to use, as requested at creation time or
+ * via guac_terminal_apply_color_scheme(). This string must be in the
+ * format accepted by guac_terminal_parse_color_scheme().
+ */
+ const char* color_scheme;
+
+ /**
* ASCII character to send when backspace is pressed.
*/
char backspace;
@@ -574,11 +593,8 @@
* The height of the terminal, in pixels.
*
* @param color_scheme
- * The name of the color scheme to use. This string must be one of the
- * names defined by the GUAC_TERMINAL_SCHEME_* constants. If blank or NULL,
- * the default scheme of GUAC_TERMINAL_SCHEME_GRAY_BLACK will be used. If
- * invalid, a warning will be logged, and the terminal will fall back on
- * GUAC_TERMINAL_SCHEME_GRAY_BLACK.
+ * The name of the color scheme to use. This string must be in the format
+ * accepted by guac_terminal_parse_color_scheme().
*
* @param backspace
* The integer ASCII code to send when backspace is pressed in
