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

gateway: Allow authentication using a NULL (current user) identity

Browse Source
This commit is contained in:
Martin Fleisz 2023-07-26 15:43:12 +02:00 committed by akallabeth
parent 4f0ca73be6
commit bb9c32ed72
5 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp/core/gateway/ncacn_http.c
View File

@ -166,9 +166,8 @@ BOOL rpc_ncacn_http_auth_init(rdpContext* context, RpcChannel* channel)
freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED);
return FALSE;
case AUTH_NO_CREDENTIALS:
freerdp_set_last_error_log(instance->context,
FREERDP_ERROR_CONNECT_NO_OR_MISSING_CREDENTIALS);
return FALSE;
WLog_INFO(TAG, "No credentials provided - using NULL identity");
break;
case AUTH_FAILED:
default:
return FALSE;
@ -181,8 +180,9 @@ BOOL rpc_ncacn_http_auth_init(rdpContext* context, RpcChannel* channel)
FreeRDP_GatewayDomain, FreeRDP_GatewayPassword))
return FALSE;
SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : NULL);
const BOOL res =
credssp_auth_setup_client(auth, "HTTP", settings->GatewayHostname, &identity, NULL);
credssp_auth_setup_client(auth, "HTTP", settings->GatewayHostname, identityArg, NULL);
sspi_FreeAuthIdentity(&identity);

11
libfreerdp/core/gateway/rdg.c
View File

@ -1119,9 +1119,8 @@ static BOOL rdg_get_gateway_credentials(rdpContext* context, rdp_auth_reason rea
freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED);
return FALSE;
case AUTH_NO_CREDENTIALS:
freerdp_set_last_error_log(instance->context,
FREERDP_ERROR_CONNECT_NO_OR_MISSING_CREDENTIALS);
return FALSE;
WLog_INFO(TAG, "No credentials provided - using NULL identity");
return TRUE;
case AUTH_FAILED:
default:
return FALSE;
@ -1162,6 +1161,7 @@ static BOOL rdg_auth_init(rdpRdg* rdg, rdpTls* tls, TCHAR* authPkg)
return FALSE;
}
SEC_WINNT_AUTH_IDENTITY* identityArg = &identity;
if (doSCLogon)
{
if (!identity_set_from_smartcard_hash(&identity, settings, FreeRDP_GatewayUsername,
@ -1175,9 +1175,12 @@ static BOOL rdg_auth_init(rdpRdg* rdg, rdpTls* tls, TCHAR* authPkg)
if (!identity_set_from_settings(&identity, settings, FreeRDP_GatewayUsername,
FreeRDP_GatewayDomain, FreeRDP_GatewayPassword))
return FALSE;
if (!settings->GatewayUsername)
identityArg = NULL;
}
if (!credssp_auth_setup_client(rdg->auth, "HTTP", settings->GatewayHostname, &identity,
if (!credssp_auth_setup_client(rdg->auth, "HTTP", settings->GatewayHostname, identityArg,
rdg->smartcard ? rdg->smartcard->pkinitArgs : NULL))
{
sspi_FreeAuthIdentity(&identity);

7
libfreerdp/core/gateway/rpc_bind.c
View File

@ -141,8 +141,8 @@ static int rpc_bind_setup(rdpRpc* rpc)
freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED);
return -1;
case AUTH_NO_CREDENTIALS:
freerdp_set_last_error_log(context, FREERDP_ERROR_CONNECT_NO_OR_MISSING_CREDENTIALS);
return 0;
WLog_INFO(TAG, "No credentials provided - using NULL identity");
break;
case AUTH_FAILED:
default:
return -1;
@ -155,7 +155,8 @@ static int rpc_bind_setup(rdpRpc* rpc)
FreeRDP_GatewayDomain, FreeRDP_GatewayPassword))
return -1;
if (!credssp_auth_setup_client(rpc->auth, NULL, settings->GatewayHostname, &identity, NULL))
SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : NULL);
if (!credssp_auth_setup_client(rpc->auth, NULL, settings->GatewayHostname, identityArg, NULL))
{
sspi_FreeAuthIdentity(&identity);
return -1;

8
libfreerdp/core/gateway/wst.c
View File

@ -82,9 +82,8 @@ static BOOL wst_get_gateway_credentials(rdpContext* context, rdp_auth_reason rea
freerdp_set_last_error_log(instance->context, FREERDP_ERROR_CONNECT_CANCELLED);
return FALSE;
case AUTH_NO_CREDENTIALS:
freerdp_set_last_error_log(instance->context,
FREERDP_ERROR_CONNECT_NO_OR_MISSING_CREDENTIALS);
return FALSE;
WLog_INFO(TAG, "No credentials provided - using NULL identity");
return TRUE;
case AUTH_FAILED:
default:
return FALSE;
@ -113,7 +112,8 @@ static BOOL wst_auth_init(rdpWst* wst, rdpTls* tls, TCHAR* authPkg)
FreeRDP_GatewayDomain, FreeRDP_GatewayPassword))
return FALSE;
if (!credssp_auth_setup_client(wst->auth, "HTTP", wst->gwhostname, &identity, NULL))
SEC_WINNT_AUTH_IDENTITY* identityArg = (settings->GatewayUsername ? &identity : NULL);
if (!credssp_auth_setup_client(wst->auth, "HTTP", wst->gwhostname, identityArg, NULL))
{
sspi_FreeAuthIdentity(&identity);
return FALSE;

2
libfreerdp/core/utils.c
View File

@ -103,7 +103,7 @@ auth_status utils_authenticate_gateway(freerdp* instance, rdp_auth_reason reason
instance->GatewayAuthenticate(instance, &settings->GatewayUsername,
&settings->GatewayPassword, &settings->GatewayDomain);
if (!proceed)
return AUTH_NO_CREDENTIALS;
return AUTH_CANCELLED;
}
if (utils_str_is_empty(settings->GatewayUsername) ||