mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core,nla] unify identity creation

Browse Source
This commit is contained in:
Armin Novak 2023-04-04 15:32:19 +02:00 committed by akallabeth
parent 4408521421
commit 9b498efa79
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libfreerdp/core/nla.c
View File

@ -277,30 +277,45 @@ static void zfree(WCHAR* str, size_t len)
free(str);
}
static BOOL nla_set_identity_from_settings(rdpNla* nla, const rdpSettings* settings, size_t UserId,
size_t DomainId, size_t PwdId)
static BOOL nla_set_identity_from_settings_with_pwd(rdpNla* nla, const rdpSettings* settings,
size_t UserId, size_t DomainId,
const WCHAR* Password, size_t pwdLen)
{
WINPR_ASSERT(nla);
WINPR_ASSERT(settings);
size_t UserLen = 0;
size_t DomainLen = 0;
size_t PwdLen = 0;
WCHAR* Username = freerdp_settings_get_string_as_utf16(settings, UserId, &UserLen);
WCHAR* Domain = freerdp_settings_get_string_as_utf16(settings, DomainId, &DomainLen);
WCHAR* Password = freerdp_settings_get_string_as_utf16(settings, PwdId, &PwdLen);
sspi_FreeAuthIdentity(nla->identity);
const int rc = sspi_SetAuthIdentityW(nla->identity, Username, Domain, Password);
const int rc = sspi_SetAuthIdentityWithLengthW(nla->identity, Username, UserLen, Domain,
DomainLen, Password, pwdLen);
zfree(Username, UserLen);
zfree(Domain, DomainLen);
zfree(Password, PwdLen);
if (rc < 0)
return FALSE;
return TRUE;
}
static BOOL nla_set_identity_from_settings(rdpNla* nla, const rdpSettings* settings, size_t UserId,
size_t DomainId, size_t PwdId)
{
WINPR_ASSERT(nla);
WINPR_ASSERT(settings);
size_t PwdLen = 0;
WCHAR* Password = freerdp_settings_get_string_as_utf16(settings, PwdId, &PwdLen);
const BOOL rc =
nla_set_identity_from_settings_with_pwd(nla, settings, UserId, DomainId, Password, PwdLen);
zfree(Password, PwdLen);
return rc;
}
static BOOL nla_client_setup_identity(rdpNla* nla)
{
BOOL PromptPassword = FALSE;
@ -401,7 +416,9 @@ static BOOL nla_client_setup_identity(rdpNla* nla)
size_t pwdLen = 0;
WCHAR* Password = freerdp_settings_get_string_as_utf16(settings, FreeRDP_Password, &pwdLen);
const int rc = sspi_SetAuthIdentityW(nla->identity, marshalledCredentials, NULL, Password);
const int rc = sspi_SetAuthIdentityWithLengthW(nla->identity, marshalledCredentials,
_wcslen(marshalledCredentials), NULL, 0,
Password, pwdLen);
zfree(Password, pwdLen);
CredFree(marshalledCredentials);
if (rc < 0)
@ -419,19 +436,10 @@ static BOOL nla_client_setup_identity(rdpNla* nla)
if (settings->RedirectionPassword && (settings->RedirectionPasswordLength > 0))
{
size_t userLength = 0;
size_t domainLength = 0;
WCHAR* user =
freerdp_settings_get_string_as_utf16(settings, FreeRDP_Username, &userLength);
WCHAR* domain =
freerdp_settings_get_string_as_utf16(settings, FreeRDP_Domain, &domainLength);
const int rc = sspi_SetAuthIdentityWithLengthW(
nla->identity, user, userLength, domain, domainLength,
(const WCHAR*)settings->RedirectionPassword,
settings->RedirectionPasswordLength / sizeof(WCHAR) - 1);
free(user);
free(domain);
if (rc < 0)
if (!nla_set_identity_from_settings_with_pwd(
nla, settings, FreeRDP_Username, FreeRDP_Domain,
(const WCHAR*)settings->RedirectionPassword,
settings->RedirectionPasswordLength / sizeof(WCHAR)))
return FALSE;
usePassword = FALSE;