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

Merge branch 'testing-common-ssh'

Browse Source
This commit is contained in:
Michael Jumper 2015-07-14 11:08:39 -07:00
commit 0d8dad878c
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common-ssh/guac_sftp.h
View File

@ -94,7 +94,8 @@ typedef struct guac_common_ssh_sftp_ls_state {
* guac_common_ssh_destroy_sftp_filesystem().
*
* @param session
* The session to use to provide SFTP.
* The session to use to provide SFTP. This session will automatically be
* destroyed when this filesystem is destroyed.
*
* @param name
* The name to send as the name of the filesystem.

10
src/common-ssh/guac_ssh.c
View File

@ -22,6 +22,7 @@
#include "guac_ssh.h"
#include "guac_ssh_key.h"
#include "guac_ssh_user.h"
#include <guacamole/client.h>
#include <libssh2.h>
@ -477,8 +478,17 @@ guac_common_ssh_session* guac_common_ssh_create_session(guac_client* client,
}
void guac_common_ssh_destroy_session(guac_common_ssh_session* session) {
/* Disconnect and clean up libssh2 */
libssh2_session_disconnect(session->session, "Bye");
libssh2_session_free(session->session);
/* Destroy associated user */
if (session->user)
guac_common_ssh_destroy_user(session->user);
/* Free all other data */
free(session);
}

3
src/common-ssh/guac_ssh.h
View File

@ -91,7 +91,8 @@ void guac_common_ssh_uninit();
* The port to connect to on the given hostname.
*
* @param user
* The user to authenticate as, once connected.
* The user to authenticate as, once connected. This user will be
* automatically destroyed when this session is destroyed.
*
* @return
* A new SSH session if the connection and authentication succeed, or NULL

9
src/protocols/rdp/client.c
View File

@ -828,7 +828,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Parse username - use RDP username by default */
const char* sftp_username = argv[IDX_SFTP_USERNAME];
if (sftp_username[0] == '\0')
if (sftp_username[0] == '\0' && settings->username != NULL)
sftp_username = settings->username;
guac_common_ssh_user* user = guac_common_ssh_create_user(sftp_username);
@ -842,8 +842,10 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Abort if private key cannot be read */
if (guac_common_ssh_user_import_key(user,
argv[IDX_SFTP_PRIVATE_KEY],
argv[IDX_SFTP_PASSPHRASE]))
argv[IDX_SFTP_PASSPHRASE])) {
guac_common_ssh_destroy_user(user);
return 1;
}
}
@ -855,7 +857,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Parse password - use RDP password by default */
const char* sftp_password = argv[IDX_SFTP_USERNAME];
if (sftp_password[0] == '\0')
if (sftp_password[0] == '\0' && settings->password != NULL)
sftp_password = settings->password;
guac_common_ssh_user_set_password(user, sftp_password);
@ -880,6 +882,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Fail if SSH connection does not succeed */
if (session == NULL) {
/* Already aborted within guac_common_ssh_create_session() */
guac_common_ssh_destroy_user(user);
return 1;
}

5
src/protocols/vnc/client.c
View File

@ -384,8 +384,10 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Abort if private key cannot be read */
if (guac_common_ssh_user_import_key(user,
argv[IDX_SFTP_PRIVATE_KEY],
argv[IDX_SFTP_PASSPHRASE]))
argv[IDX_SFTP_PASSPHRASE])) {
guac_common_ssh_destroy_user(user);
return 1;
}
}
@ -414,6 +416,7 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
/* Fail if SSH connection does not succeed */
if (session == NULL) {
/* Already aborted within guac_common_ssh_create_session() */
guac_common_ssh_destroy_user(user);
return 1;
}