GUACAMOLE-623: Handle data received from Kubernetes.

This commit is contained in:
Michael Jumper 2018-09-09 23:50:30 -07:00
parent 7165fa949d
commit f72877bf0d
2 changed files with 81 additions and 15 deletions

View File

@ -38,10 +38,44 @@
#include <unistd.h> #include <unistd.h>
/** /**
* The name of the WebSocket protocol specific to Kubernetes which should be * Handles data received from Kubernetes over WebSocket, decoding the channel
* sent to the Kubernetes server when attaching to a pod. * index of the received data and forwarding that data accordingly.
*
* @param client
* The guac_client associated with the connection to Kubernetes.
*
* @param buffer
* The data received from Kubernetes.
*
* @param length
* The size of the data received from Kubernetes, in bytes.
*/ */
#define GUAC_KUBERNETES_LWS_PROTOCOL "v4.channel.k8s.io" static void guac_kubernetes_receive_data(guac_client* client,
const char* buffer, size_t length) {
guac_kubernetes_client* kubernetes_client =
(guac_kubernetes_client*) client->data;
/* Strip channel index from beginning of buffer */
int channel = *(buffer++);
length--;
switch (channel) {
/* Write STDOUT / STDERR directly to terminal as output */
case GUAC_KUBERNETES_CHANNEL_STDOUT:
case GUAC_KUBERNETES_CHANNEL_STDERR:
guac_terminal_write(kubernetes_client->term, buffer, length);
break;
/* Ignore data on other channels */
default:
guac_client_log(client, GUAC_LOG_DEBUG, "Received %i bytes along "
"channel %i.", length, channel);
}
}
/** /**
* Callback invoked by libwebsockets for events related to a WebSocket being * Callback invoked by libwebsockets for events related to a WebSocket being
@ -71,16 +105,15 @@ static int guac_kubernetes_lws_callback(struct lws* wsi,
enum lws_callback_reasons reason, void* user, enum lws_callback_reasons reason, void* user,
void* in, size_t length) { void* in, size_t length) {
/* Request connection closure if client is stopped (note that the user
* pointer passed by libwebsockets may be NULL for some events) */
guac_client* client = (guac_client*) user; guac_client* client = (guac_client*) user;
/*guac_kubernetes_client* kubernetes_client = if (client != NULL && client->state != GUAC_CLIENT_RUNNING)
(guac_kubernetes_client*) client->data;*/
/* Request connection closure if client is stopped */
if (client->state != GUAC_CLIENT_RUNNING)
return -1; return -1;
switch (reason) { switch (reason) {
/* Failed to connect */
case LWS_CALLBACK_CLIENT_CONNECTION_ERROR: case LWS_CALLBACK_CLIENT_CONNECTION_ERROR:
guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_NOT_FOUND, guac_client_abort(client, GUAC_PROTOCOL_STATUS_UPSTREAM_NOT_FOUND,
"Error connecting to Kubernetes server: %s", "Error connecting to Kubernetes server: %s",
@ -88,23 +121,29 @@ static int guac_kubernetes_lws_callback(struct lws* wsi,
"available)"); "available)");
break; break;
/* Logged in */ /* Connected / logged in */
case LWS_CALLBACK_CLIENT_ESTABLISHED: case LWS_CALLBACK_CLIENT_ESTABLISHED:
guac_client_log(client, GUAC_LOG_INFO, guac_client_log(client, GUAC_LOG_INFO,
"Kubernetes connection successful."); "Kubernetes connection successful.");
break; break;
/* Data received via WebSocket */
case LWS_CALLBACK_CLIENT_RECEIVE: case LWS_CALLBACK_CLIENT_RECEIVE:
guac_client_log(client, GUAC_LOG_DEBUG, "Received: %s", guac_kubernetes_receive_data(client, (const char*) in, length);
(const char*) in);
break; break;
/* TODO: Only send data here. Request callback for writing via lws_callback_on_writable(some struct lws*) */ /* TODO: Only send data here. Request callback for writing via lws_callback_on_writable(some struct lws*) */
case LWS_CALLBACK_CLIENT_WRITEABLE: case LWS_CALLBACK_CLIENT_WRITEABLE:
break; break;
/* TODO: Add configure test */
#ifdef HAVE_LWS_CALLBACK_CLIENT_CLOSED
/* Connection closed (client-specific) */
case LWS_CALLBACK_CLIENT_CLOSED:
#endif
/* Connection closed */
case LWS_CALLBACK_CLOSED: case LWS_CALLBACK_CLOSED:
/* TODO: case LWS_CALLBACK_CLIENT_CLOSED: <-- Needs test and #ifdef */
guac_client_stop(client); guac_client_stop(client);
guac_client_log(client, GUAC_LOG_DEBUG, "WebSocket connection to " guac_client_log(client, GUAC_LOG_DEBUG, "WebSocket connection to "
"Kubernetes server closed."); "Kubernetes server closed.");
@ -112,8 +151,6 @@ static int guac_kubernetes_lws_callback(struct lws* wsi,
/* No other event types are applicable */ /* No other event types are applicable */
default: default:
guac_client_log(client, GUAC_LOG_DEBUG, "Unexpected libwebsockets "
"reason: %i", reason);
break; break;
} }
@ -213,7 +250,10 @@ void* guac_kubernetes_client_thread(void* data) {
/* Init libwebsockets context creation parameters */ /* Init libwebsockets context creation parameters */
struct lws_context_creation_info context_info = { struct lws_context_creation_info context_info = {
.port = CONTEXT_PORT_NO_LISTEN, /* We are not a WebSocket server */ .port = CONTEXT_PORT_NO_LISTEN, /* We are not a WebSocket server */
.protocols = guac_kubernetes_lws_protocols .uid = -1,
.gid = -1,
.protocols = guac_kubernetes_lws_protocols,
.user = client
}; };
/* Init WebSocket connection parameters which do not vary by Guacmaole /* Init WebSocket connection parameters which do not vary by Guacmaole

View File

@ -29,6 +29,32 @@
#include <libwebsockets.h> #include <libwebsockets.h>
#include <stdint.h> #include <stdint.h>
/**
* The name of the WebSocket protocol specific to Kubernetes which should be
* sent to the Kubernetes server when attaching to a pod.
*/
#define GUAC_KUBERNETES_LWS_PROTOCOL "v4.channel.k8s.io"
/**
* The index of the Kubernetes channel used for STDIN.
*/
#define GUAC_KUBERNETES_CHANNEL_STDIN 0
/**
* The index of the Kubernetes channel used for STDOUT.
*/
#define GUAC_KUBERNETES_CHANNEL_STDOUT 1
/**
* The index of the Kubernetes channel used for STDERR.
*/
#define GUAC_KUBERNETES_CHANNEL_STDERR 2
/**
* The index of the Kubernetes channel used for terminal resize messages.
*/
#define GUAC_KUBERNETES_CHANNEL_RESIZE 4
/** /**
* Kubernetes-specific client data. * Kubernetes-specific client data.
*/ */