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

Move SFTP to own SSH session - does not work when combined with terminal session.

Browse Source
This commit is contained in:
Michael Jumper 2013-10-18 22:05:03 -07:00
parent b7e1e898c9
commit b9d9a9d324
4 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/protocols/ssh/client.c
View File

@ -148,6 +148,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Parse SFTP enable */
client_data->enable_sftp = strcmp(argv[IDX_ENABLE_SFTP], "true") == 0;
client_data->sftp_session = NULL;
client_data->sftp_ssh_session = NULL;
/* Read port */
if (argv[IDX_PORT][0] != 0)

5
src/protocols/ssh/client.h
View File

@ -96,6 +96,11 @@ typedef struct ssh_guac_client_data {
*/
ssh_session session;
/**
* The distinct SSH session used for SFTP.
*/
ssh_session sftp_ssh_session;
/**
* SFTP session, used for file transfers.
*/

3
src/protocols/ssh/guac_handlers.c
View File

@ -437,6 +437,9 @@ int ssh_guac_client_free_handler(guac_client* client) {
if (guac_client_data->sftp_session)
sftp_free(guac_client_data->sftp_session);
if (guac_client_data->sftp_ssh_session)
ssh_free(guac_client_data->sftp_ssh_session);
/* Free session */
ssh_free(guac_client_data->session);

64
src/protocols/ssh/ssh_client.c
View File

@ -128,6 +128,42 @@ void* ssh_input_thread(void* data) {
}
static ssh_session __guac_ssh_create_session(guac_client* client) {
ssh_guac_client_data* client_data = (ssh_guac_client_data*) client->data;
/* Open SSH session */
ssh_session session = ssh_new();
if (session == NULL) {
guac_client_log_error(client, "Session allocation failed",
ssh_get_error(session));
return NULL;
}
/* Set session options */
ssh_options_set(session, SSH_OPTIONS_HOST, client_data->hostname);
ssh_options_set(session, SSH_OPTIONS_PORT, &(client_data->port));
ssh_options_set(session, SSH_OPTIONS_USER, client_data->username);
/* Connect */
if (ssh_connect(session) != SSH_OK) {
guac_client_log_error(client, "Unable to connect via SSH: %s",
ssh_get_error(session));
return NULL;
}
/* Authenticate */
if (ssh_userauth_password(session, NULL, client_data->password)
!= SSH_AUTH_SUCCESS) {
guac_client_log_error(client, "Authentication failed: %s",
ssh_get_error(session));
return NULL;
}
return session;
}
void* ssh_client_thread(void* data) {
guac_client* client = (guac_client*) data;
@ -162,7 +198,7 @@ void* ssh_client_thread(void* data) {
guac_terminal_write_all(stdout_fd, "\x1B[H\x1B[J", 6);
/* Open SSH session */
client_data->session = ssh_new();
client_data->session = __guac_ssh_create_session(client);
if (client_data->session == NULL) {
guac_protocol_send_error(socket, "Unable to create SSH session.",
GUAC_PROTOCOL_STATUS_INTERNAL_ERROR);
@ -170,27 +206,6 @@ void* ssh_client_thread(void* data) {
return NULL;
}
/* Set session options */
ssh_options_set(client_data->session, SSH_OPTIONS_HOST, client_data->hostname);
ssh_options_set(client_data->session, SSH_OPTIONS_PORT, &(client_data->port));
ssh_options_set(client_data->session, SSH_OPTIONS_USER, client_data->username);
/* Connect */
if (ssh_connect(client_data->session) != SSH_OK) {
guac_protocol_send_error(socket, "Unable to connect via SSH.",
GUAC_PROTOCOL_STATUS_INTERNAL_ERROR);
guac_socket_flush(socket);
return NULL;
}
/* Authenticate */
if (ssh_userauth_password(client_data->session, NULL, client_data->password) != SSH_AUTH_SUCCESS) {
guac_protocol_send_error(socket, "SSH auth failed.",
GUAC_PROTOCOL_STATUS_PERMISSION_DENIED);
guac_socket_flush(socket);
return NULL;
}
/* Open channel for terminal */
client_data->term_channel = channel_new(client_data->session);
if (client_data->term_channel == NULL) {
@ -211,8 +226,11 @@ void* ssh_client_thread(void* data) {
/* Start SFTP session as well, if enabled */
if (client_data->enable_sftp) {
/* Create SSH session specific for SFTP */
client_data->sftp_ssh_session = __guac_ssh_create_session(client);
/* Request SFTP */
client_data->sftp_session = sftp_new(client_data->session);
client_data->sftp_session = sftp_new(client_data->sftp_ssh_session);
if (client_data->sftp_session == NULL) {
guac_protocol_send_error(socket, "Unable to start SFTP session..",
GUAC_PROTOCOL_STATUS_INTERNAL_ERROR);