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

GUAC-763: Fix comments. Do not continue searching for username after password has been found.

Browse Source
This commit is contained in:
Michael Jumper 2014-07-17 12:39:19 -07:00
parent 1e5fbba64e
commit d5c0c611bf
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/protocols/telnet/telnet_client.c
View File

@ -122,16 +122,17 @@ static bool __guac_telnet_regex_search(guac_client* client, regex_t* regex, char
length += size; length += size;
line_buffer[length] = '\0'; line_buffer[length] = '\0';
/* Send password upon match */ /* Send value upon match */
if (regexec(regex, line_buffer, 0, NULL, 0) == 0) { if (regexec(regex, line_buffer, 0, NULL, 0) == 0) {
/* Send password */ /* Send value */
guac_terminal_send_string(client_data->term, value); guac_terminal_send_string(client_data->term, value);
guac_terminal_send_key(client_data->term, 0xFF0D, 1); guac_terminal_send_key(client_data->term, 0xFF0D, 1);
guac_terminal_send_key(client_data->term, 0xFF0D, 0); guac_terminal_send_key(client_data->term, 0xFF0D, 0);
/* Stop searching for password */ /* Stop searching for prompt */
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -167,6 +168,14 @@ static void __guac_telnet_event_handler(telnet_t* telnet, telnet_event_t* event,
if (client_data->password_regex != NULL) { if (client_data->password_regex != NULL) {
if (__guac_telnet_regex_search(client, client_data->password_regex, client_data->password, if (__guac_telnet_regex_search(client, client_data->password_regex, client_data->password,
event->data.buffer, event->data.size)) { event->data.buffer, event->data.size)) {
/* Do not continue searching for username once password is sent */
if (client_data->username_regex != NULL) {
regfree(client_data->username_regex);
free(client_data->username_regex);
client_data->username_regex = NULL;
}
regfree(client_data->password_regex); regfree(client_data->password_regex);
free(client_data->password_regex); free(client_data->password_regex);
client_data->password_regex = NULL; client_data->password_regex = NULL;