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

Init libssh2 and libssl. Log success.

Browse Source
This commit is contained in:
Michael Jumper 2013-12-01 16:56:36 -08:00
parent 18d9cae183
commit 66b5e704b7
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,7 @@
#include "common.h" #include "common.h"
#include "guac_handlers.h" #include "guac_handlers.h"
#include "sftp.h" #include "sftp.h"
#include "ssh_key.h"
/** /**
* Reads a single line from STDIN. * Reads a single line from STDIN.
@ -289,6 +290,8 @@ void* ssh_client_thread(void* data) {
pthread_t input_thread; pthread_t input_thread;
libssh2_init(0);
/* Get username */ /* Get username */
if (client_data->username[0] == 0 && if (client_data->username[0] == 0 &&
prompt(client, "Login as: ", client_data->username, sizeof(client_data->username), true) == NULL) prompt(client, "Login as: ", client_data->username, sizeof(client_data->username), true) == NULL)
@ -298,17 +301,15 @@ void* ssh_client_thread(void* data) {
snprintf(name, sizeof(name)-1, "%s@%s", client_data->username, client_data->hostname); snprintf(name, sizeof(name)-1, "%s@%s", client_data->username, client_data->hostname);
guac_protocol_send_name(socket, name); guac_protocol_send_name(socket, name);
#if 0
/* If key specified, import */ /* If key specified, import */
if (client_data->key_base64[0] != 0) { if (client_data->key_base64[0] != 0) {
/* Attempt to read key without passphrase */ /* Attempt to read key without passphrase */
if (ssh_pki_import_privkey_base64(client_data->key_base64, NULL, client_data->key = ssh_key_alloc(client_data->key_base64,
NULL, NULL, &client_data->key) == SSH_OK) strlen(client_data->key_base64), "");
guac_client_log_info(client, "Auth key successfully imported.");
/* On failure, attempt with passphrase */ /* On failure, attempt with passphrase */
else { if (client_data->key == NULL) {
/* Prompt for passphrase if missing */ /* Prompt for passphrase if missing */
if (client_data->key_passphrase[0] == 0) { if (client_data->key_passphrase[0] == 0) {
@ -319,15 +320,21 @@ void* ssh_client_thread(void* data) {
} }
/* Import key with passphrase */ /* Import key with passphrase */
if (ssh_pki_import_privkey_base64(client_data->key_base64, client_data->key = ssh_key_alloc(client_data->key_base64,
client_data->key_passphrase, strlen(client_data->key_base64),
NULL, NULL, &client_data->key) != SSH_OK) { client_data->key_passphrase);
/* If still failing, give up */
if (client_data->key == NULL) {
guac_client_log_error(client, "Auth key import failed."); guac_client_log_error(client, "Auth key import failed.");
return NULL; return NULL;
} }
} /* end decrypt key with passphrase */ } /* end decrypt key with passphrase */
/* Success */
guac_client_log_info(client, "Auth key successfully imported.");
} /* end if key given */ } /* end if key given */
/* Otherwise, get password if not provided */ /* Otherwise, get password if not provided */
@ -336,7 +343,6 @@ void* ssh_client_thread(void* data) {
sizeof(client_data->password), false) == NULL) sizeof(client_data->password), false) == NULL)
return NULL; return NULL;
} }
#endif
/* Clear screen */ /* Clear screen */
guac_terminal_write_all(stdout_fd, "\x1B[H\x1B[J", 6); guac_terminal_write_all(stdout_fd, "\x1B[H\x1B[J", 6);