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

GUACAMOLE-527: Check either provided key or key file, if it exists.

Browse Source
This commit is contained in:
Nick Couchman 2018-05-27 16:46:36 -04:00 committed by Nick Couchman
parent aec2be6da2
commit ac2b4f8d12
1 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/common-ssh/ssh.c
View File

@ -520,17 +520,16 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
return NULL; return NULL;
} }
/* Check known_hosts, start by getting known_hosts file of user running guacd */ /* SSH known host key checking. */
struct passwd *pw = getpwuid(getuid());
const char *known_hosts = strcat(pw->pw_dir, "/.ssh/known_hosts");
LIBSSH2_KNOWNHOSTS *ssh_known_hosts = libssh2_knownhost_init(session); LIBSSH2_KNOWNHOSTS *ssh_known_hosts = libssh2_knownhost_init(session);
libssh2_knownhost_readfile(ssh_known_hosts, known_hosts, LIBSSH2_KNOWNHOST_FILE_OPENSSH); int num_known_hosts = 0;
/* Add host key provided from settings */ /* Add host key provided from settings */
if (host_key && strcmp(host_key, "") > 0) { if (host_key && strcmp(host_key, "") != 0) {
int kh_add = libssh2_knownhost_readline(ssh_known_hosts, host_key, strlen(host_key), int kh_add = libssh2_knownhost_readline(ssh_known_hosts, host_key, strlen(host_key),
LIBSSH2_KNOWNHOST_FILE_OPENSSH); LIBSSH2_KNOWNHOST_FILE_OPENSSH);
num_known_hosts++;
if (kh_add) if (kh_add)
guac_client_log(client, GUAC_LOG_WARNING, "Failed to add provided host key" guac_client_log(client, GUAC_LOG_WARNING, "Failed to add provided host key"
@ -538,43 +537,52 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
} }
/* Get fingerprint of host we're connecting to */ /* Otherwise, we look for a ssh_known_hosts file within GUACAMOLE_HOME and read that in. */
size_t fp_len; else {
int fp_type; const char *known_hosts = "/etc/guacamole/ssh_known_hosts";
const char *fingerprint = libssh2_session_hostkey(session, &fp_len, &fp_type); num_known_hosts = libssh2_knownhost_readfile(ssh_known_hosts, known_hosts, LIBSSH2_KNOWNHOST_FILE_OPENSSH);
}
if (!fingerprint) /* If we've found a provided set of host keys, check against them. */
guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, if (num_known_hosts > 0) {
"Failed to get fingerprint for host %s", hostname); /* Get fingerprint of host we're connecting to */
size_t fp_len;
int fp_type;
const char *fingerprint = libssh2_session_hostkey(session, &fp_len, &fp_type);
/* Check fingerprint against known hosts */ if (!fingerprint)
struct libssh2_knownhost *host;
int kh_check = libssh2_knownhost_checkp(ssh_known_hosts, hostname, atoi(port),
fingerprint, fp_len,
LIBSSH2_KNOWNHOST_TYPE_PLAIN|
LIBSSH2_KNOWNHOST_KEYENC_RAW,
&host);
libssh2_knownhost_free(ssh_known_hosts);
switch (kh_check) {
case LIBSSH2_KNOWNHOST_CHECK_MATCH:
guac_client_log(client, GUAC_LOG_DEBUG,
"Host key match found for %s", hostname);
break;
case LIBSSH2_KNOWNHOST_CHECK_NOTFOUND:
guac_client_log(client, GUAC_LOG_WARNING,
"Host key not found for %s.", hostname);
break;
case LIBSSH2_KNOWNHOST_CHECK_MISMATCH:
guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
"Host key does not match host entry for %s", hostname); "Failed to get fingerprint for host %s", hostname);
break;
case LIBSSH2_KNOWNHOST_CHECK_FAILURE: /* Check fingerprint against known hosts */
default: struct libssh2_knownhost *host;
guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR, int kh_check = libssh2_knownhost_checkp(ssh_known_hosts, hostname, atoi(port),
"Host %s could not be checked against known hosts.", fingerprint, fp_len,
hostname); LIBSSH2_KNOWNHOST_TYPE_PLAIN|
LIBSSH2_KNOWNHOST_KEYENC_RAW,
&host);
libssh2_knownhost_free(ssh_known_hosts);
switch (kh_check) {
case LIBSSH2_KNOWNHOST_CHECK_MATCH:
guac_client_log(client, GUAC_LOG_DEBUG,
"Host key match found for %s", hostname);
break;
case LIBSSH2_KNOWNHOST_CHECK_NOTFOUND:
guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
"Host key not found for %s.", hostname);
break;
case LIBSSH2_KNOWNHOST_CHECK_MISMATCH:
guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
"Host key does not match known hosts entry for %s", hostname);
break;
case LIBSSH2_KNOWNHOST_CHECK_FAILURE:
default:
guac_client_abort(client, GUAC_PROTOCOL_STATUS_SERVER_ERROR,
"Host %s could not be checked against known hosts.",
hostname);
}
} }
/* Store basic session data */ /* Store basic session data */