github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2701 from akallabeth/upn_syntax_support

Browse Source 
Allowing UPN syntax for user argument.
This commit is contained in:
Marc-André Moreau 2015-06-22 09:31:38 -04:00
commit 86bf5a91c4
2 changed files with 69 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/Windows/wf_client.c
View File

@ -492,8 +492,6 @@ BOOL wf_post_connect(freerdp* instance)
return TRUE; return TRUE;
} }
static const char wfTargetName[] = "TARGET";
static CREDUI_INFOA wfUiInfo = static CREDUI_INFOA wfUiInfo =
{ {
sizeof(CREDUI_INFOA), sizeof(CREDUI_INFOA),
@ -518,7 +516,9 @@ BOOL wf_authenticate(freerdp* instance, char** username, char** password, char**
ZeroMemory(Password, sizeof(Password)); ZeroMemory(Password, sizeof(Password));
dwFlags = CREDUI_FLAGS_DO_NOT_PERSIST | CREDUI_FLAGS_EXCLUDE_CERTIFICATES; dwFlags = CREDUI_FLAGS_DO_NOT_PERSIST | CREDUI_FLAGS_EXCLUDE_CERTIFICATES;
status = CredUIPromptForCredentialsA(&wfUiInfo, wfTargetName, NULL, 0, status = CredUIPromptForCredentialsA(&wfUiInfo,
instance->settings->ServerHostname,
NULL, 0,
UserName, CREDUI_MAX_USERNAME_LENGTH + 1, UserName, CREDUI_MAX_USERNAME_LENGTH + 1,
Password, CREDUI_MAX_PASSWORD_LENGTH + 1, &fSave, dwFlags); Password, CREDUI_MAX_PASSWORD_LENGTH + 1, &fSave, dwFlags);
@ -537,6 +537,8 @@ BOOL wf_authenticate(freerdp* instance, char** username, char** password, char**
if (strlen(Domain) > 0) if (strlen(Domain) > 0)
*domain = _strdup(Domain); *domain = _strdup(Domain);
else
*domain = _strdup("\0");
*password = _strdup(Password); *password = _strdup(Password);

91
client/common/cmdline.c
View File

@ -553,7 +553,7 @@ static char** freerdp_command_line_parse_comma_separated_values_offset(char* lis
return NULL; return NULL;
p = t; p = t;
if (count > 0) if (count > 0)
MoveMemory(&p[1], p, sizeof(char*) * *count); MoveMemory(&p[1], p, sizeof(char*) * *count);
(*count)++; (*count)++;
return p; return p;
@ -795,27 +795,58 @@ int freerdp_client_command_line_post_filter(void* context, COMMAND_LINE_ARGUMENT
int freerdp_parse_username(char* username, char** user, char** domain) int freerdp_parse_username(char* username, char** user, char** domain)
{ {
char* p; char* p;
int length; char* u;
int length = 0;
p = strchr(username, '\\'); p = strchr(username, '\\');
u = strrchr(username, '@');
*user = NULL;
*domain = NULL;
if (p) if (p)
{ {
length = (int) (p - username); length = (int) (p - username);
*user = _strdup(&p[1]);
if (!*user)
return -1;
*domain = (char*) calloc(length + 1UL, sizeof(char)); *domain = (char*) calloc(length + 1UL, sizeof(char));
if (!*domain)
{
free (*user);
*user = NULL;
return -1;
}
strncpy(*domain, username, length); strncpy(*domain, username, length);
(*domain)[length] = '\0'; (*domain)[length] = '\0';
*user = _strdup(&p[1]);
} }
else else if (username)
{ {
/* Do not break up the name for '@'; both credSSP and the /* Do not break up the name for '@'; both credSSP and the
* ClientInfo PDU expect 'user@corp.net' to be transmitted * ClientInfo PDU expect 'user@corp.net' to be transmitted
* as username 'user@corp.net', domain empty. * as username 'user@corp.net', domain empty (not NULL!).
*/ */
*user = _strdup(username); *user = _strdup(username);
*domain = NULL; if (!*user)
return -1;
/* If only username is given, prefix that with 'TARGET'
* otherwise set the domain to an empty string.
* NOTE: Domain NULL will result in undefined behavior.
*/
*domain = _strdup("\0");
if (!*domain)
{
free(*user);
*user = NULL;
return -1;
}
} }
else
return -1;
return 0; return 0;
} }
@ -1198,6 +1229,8 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
int argc, char** argv, BOOL allowUnknown) int argc, char** argv, BOOL allowUnknown)
{ {
char* p; char* p;
char* user = NULL;
char* gwUser = NULL;
char* str; char* str;
int length; int length;
int status; int status;
@ -1209,7 +1242,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
if (compatibility) if (compatibility)
{ {
WLog_WARN(TAG, "Using deprecated command-line interface!"); WLog_WARN(TAG, "Using deprecated command-line interface!");
return freerdp_client_parse_old_command_line_arguments(argc, argv, settings); return freerdp_client_parse_old_command_line_arguments(argc, argv, settings);
} }
else else
@ -1439,7 +1472,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
if (!id) if (!id)
{ {
WLog_ERR(TAG, "Could not identify keyboard layout: %s", arg->Value); WLog_ERR(TAG, "Could not identify keyboard layout: %s", arg->Value);
} }
} }
@ -1459,13 +1492,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
} }
CommandLineSwitchCase(arg, "u") CommandLineSwitchCase(arg, "u")
{ {
char* user; user = _strdup(arg->Value);
char* domain;
freerdp_parse_username(arg->Value, &user, &domain);
settings->Username = user;
settings->Domain = domain;
} }
CommandLineSwitchCase(arg, "d") CommandLineSwitchCase(arg, "d")
{ {
@ -1506,14 +1533,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
} }
CommandLineSwitchCase(arg, "gu") CommandLineSwitchCase(arg, "gu")
{ {
char* user; gwUser = _strdup(arg->Value);
char* domain;
freerdp_parse_username(arg->Value, &user, &domain);
settings->GatewayUsername = user;
settings->GatewayDomain = domain;
settings->GatewayUseSameCredentials = FALSE; settings->GatewayUseSameCredentials = FALSE;
} }
CommandLineSwitchCase(arg, "gd") CommandLineSwitchCase(arg, "gd")
@ -1818,7 +1838,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
} }
else else
{ {
WLog_ERR(TAG, "unknown protocol security: %s", arg->Value); WLog_ERR(TAG, "unknown protocol security: %s", arg->Value);
} }
} }
CommandLineSwitchCase(arg, "encryption-methods") CommandLineSwitchCase(arg, "encryption-methods")
@ -1842,7 +1862,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
else if (!strcmp(p[i], "FIPS")) else if (!strcmp(p[i], "FIPS"))
settings->EncryptionMethods |= ENCRYPTION_METHOD_FIPS; settings->EncryptionMethods |= ENCRYPTION_METHOD_FIPS;
else else
WLog_ERR(TAG, "unknown encryption method '%s'", p[i]); WLog_ERR(TAG, "unknown encryption method '%s'", p[i]);
} }
free(p); free(p);
@ -1998,7 +2018,7 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
} }
else else
{ {
WLog_ERR(TAG, "reconnect-cookie: invalid base64 '%s'", arg->Value); WLog_ERR(TAG, "reconnect-cookie: invalid base64 '%s'", arg->Value);
} }
} }
CommandLineSwitchCase(arg, "print-reconnect-cookie") CommandLineSwitchCase(arg, "print-reconnect-cookie")
@ -2018,6 +2038,23 @@ int freerdp_client_settings_parse_command_line_arguments(rdpSettings* settings,
} }
while ((arg = CommandLineFindNextArgumentA(arg)) != NULL); while ((arg = CommandLineFindNextArgumentA(arg)) != NULL);
if (!settings->Domain && user)
{
freerdp_parse_username(user, &settings->Username, &settings->Domain);
free(user);
}
else
settings->Username = user;
if (!settings->GatewayDomain && gwUser)
{
freerdp_parse_username(gwUser, &settings->GatewayUsername,
&settings->GatewayDomain);
free(gwUser);
}
else
settings->GatewayUsername = gwUser;
freerdp_performance_flags_make(settings); freerdp_performance_flags_make(settings);
if (settings->SupportGraphicsPipeline) if (settings->SupportGraphicsPipeline)
@ -2062,7 +2099,7 @@ int freerdp_client_load_static_channel_addin(rdpChannels* channels, rdpSettings*
{ {
if (freerdp_channels_client_load(channels, settings, entry, data) == 0) if (freerdp_channels_client_load(channels, settings, entry, data) == 0)
{ {
WLog_INFO(TAG, "loading channel %s", name); WLog_INFO(TAG, "loading channel %s", name);
return 0; return 0;
} }
} }