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

GUACAMOLE-249: Add "nla-ext" option for extended NLA mode.

Browse Source
This commit is contained in:
Michael Jumper 2019-09-29 14:34:35 -07:00
parent 2ed0d042a3
commit 7332e633dc
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/protocols/rdp/rdp_settings.c
View File

@ -576,6 +576,12 @@ guac_rdp_settings* guac_rdp_parse_args(guac_user* user,
settings->security_mode = GUAC_SECURITY_NLA; settings->security_mode = GUAC_SECURITY_NLA;
} }
/* Extended NLA security */
else if (strcmp(argv[IDX_SECURITY], "nla-ext") == 0) {
guac_user_log(user, GUAC_LOG_INFO, "Security mode: Extended NLA");
settings->security_mode = GUAC_SECURITY_EXTENDED_NLA;
}
/* TLS security */ /* TLS security */
else if (strcmp(argv[IDX_SECURITY], "tls") == 0) { else if (strcmp(argv[IDX_SECURITY], "tls") == 0) {
guac_user_log(user, GUAC_LOG_INFO, "Security mode: TLS"); guac_user_log(user, GUAC_LOG_INFO, "Security mode: TLS");
@ -1208,6 +1214,7 @@ void guac_rdp_push_settings(guac_client* client,
rdp_settings->RdpSecurity = TRUE; rdp_settings->RdpSecurity = TRUE;
rdp_settings->TlsSecurity = FALSE; rdp_settings->TlsSecurity = FALSE;
rdp_settings->NlaSecurity = FALSE; rdp_settings->NlaSecurity = FALSE;
rdp_settings->ExtSecurity = FALSE;
rdp_settings->UseRdpSecurityLayer = TRUE; rdp_settings->UseRdpSecurityLayer = TRUE;
rdp_settings->EncryptionLevel = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE; rdp_settings->EncryptionLevel = ENCRYPTION_LEVEL_CLIENT_COMPATIBLE;
rdp_settings->EncryptionMethods = rdp_settings->EncryptionMethods =
@ -1221,6 +1228,7 @@ void guac_rdp_push_settings(guac_client* client,
rdp_settings->RdpSecurity = FALSE; rdp_settings->RdpSecurity = FALSE;
rdp_settings->TlsSecurity = TRUE; rdp_settings->TlsSecurity = TRUE;
rdp_settings->NlaSecurity = FALSE; rdp_settings->NlaSecurity = FALSE;
rdp_settings->ExtSecurity = FALSE;
break; break;
/* Network level authentication */ /* Network level authentication */
@ -1228,6 +1236,15 @@ void guac_rdp_push_settings(guac_client* client,
rdp_settings->RdpSecurity = FALSE; rdp_settings->RdpSecurity = FALSE;
rdp_settings->TlsSecurity = FALSE; rdp_settings->TlsSecurity = FALSE;
rdp_settings->NlaSecurity = TRUE; rdp_settings->NlaSecurity = TRUE;
rdp_settings->ExtSecurity = FALSE;
break;
/* Extended network level authentication */
case GUAC_SECURITY_EXTENDED_NLA:
rdp_settings->RdpSecurity = FALSE;
rdp_settings->TlsSecurity = FALSE;
rdp_settings->NlaSecurity = FALSE;
rdp_settings->ExtSecurity = TRUE;
break; break;
/* All security types */ /* All security types */
@ -1235,6 +1252,7 @@ void guac_rdp_push_settings(guac_client* client,
rdp_settings->RdpSecurity = TRUE; rdp_settings->RdpSecurity = TRUE;
rdp_settings->TlsSecurity = TRUE; rdp_settings->TlsSecurity = TRUE;
rdp_settings->NlaSecurity = TRUE; rdp_settings->NlaSecurity = TRUE;
rdp_settings->ExtSecurity = TRUE;
break; break;
} }

5
src/protocols/rdp/rdp_settings.h
View File

@ -78,6 +78,11 @@ typedef enum guac_rdp_security {
*/ */
GUAC_SECURITY_NLA, GUAC_SECURITY_NLA,
/**
* Extended network level authentication.
*/
GUAC_SECURITY_EXTENDED_NLA,
/** /**
* Negotiate a security method supported by both server and client. * Negotiate a security method supported by both server and client.
*/ */