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

GUAC-974: Log reason for auth key failures. Add debug logging.

Browse Source
This commit is contained in:
Michael Jumper 2015-01-04 19:56:01 -08:00
parent 0b0c2aae93
commit 5fe8917bdc
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@
#include <guacamole/client.h>
#include <guacamole/protocol.h>
#include <guacamole/socket.h>
#include <openssl/err.h>
#include <openssl/ssl.h>
#ifdef LIBSSH2_USES_GCRYPT
@ -351,7 +352,9 @@ void* ssh_client_thread(void* data) {
CRYPTO_set_id_callback(__openssl_id_callback);
CRYPTO_set_locking_callback(__openssl_locking_callback);
/* Init OpenSSL */
SSL_library_init();
ERR_load_crypto_strings();
libssh2_init(0);
/* Get username */
@ -366,6 +369,9 @@ void* ssh_client_thread(void* data) {
/* If key specified, import */
if (client_data->key_base64[0] != 0) {
guac_client_log(client, GUAC_LOG_DEBUG,
"Attempting private key import (WITHOUT passphrase)");
/* Attempt to read key without passphrase */
client_data->key = ssh_key_alloc(client_data->key_base64,
strlen(client_data->key_base64), "");
@ -373,6 +379,13 @@ void* ssh_client_thread(void* data) {
/* On failure, attempt with passphrase */
if (client_data->key == NULL) {
/* Log failure of initial attempt */
guac_client_log(client, GUAC_LOG_DEBUG,
"Initial import failed: %s", ssh_key_error());
guac_client_log(client, GUAC_LOG_DEBUG,
"Re-attempting private key import (WITH passphrase)");
/* Prompt for passphrase if missing */
if (client_data->key_passphrase[0] == 0)
guac_terminal_prompt(client_data->term, "Key passphrase: ",
@ -387,7 +400,7 @@ void* ssh_client_thread(void* data) {
if (client_data->key == NULL) {
guac_client_abort(client,
GUAC_PROTOCOL_STATUS_CLIENT_UNAUTHORIZED,
"Auth key import failed.");
"Auth key import failed: %s", ssh_key_error());
return NULL;
}

8
src/protocols/ssh/ssh_key.c
View File

@ -28,6 +28,7 @@
#include <openssl/bio.h>
#include <openssl/bn.h>
#include <openssl/dsa.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/obj_mac.h>
#include <openssl/pem.h>
@ -133,6 +134,13 @@ ssh_key* ssh_key_alloc(char* data, int length, char* passphrase) {
}
const char* ssh_key_error() {
/* Return static error string */
return ERR_reason_error_string(ERR_get_error());
}
void ssh_key_free(ssh_key* key) {
/* Free key-specific data */

9
src/protocols/ssh/ssh_key.h
View File

@ -113,6 +113,15 @@ typedef struct ssh_key {
*/
ssh_key* ssh_key_alloc(char* data, int length, char* passphrase);
/**
* Returns a statically-allocated string describing the most recent SSH key
* error.
*
* @return
* A statically-allocated string describing the most recent SSH key error.
*/
const char* ssh_key_error();
/**
* Frees all memory associated with the given key.
*/