morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

expose last NLA/CredSSP SSPI error code (freerdp_get_nla_sspi_error)

Browse Source
This commit is contained in:
Marc-André Moreau
2023-02-24 11:34:14 -05:00
parent 3c160ff8b1
commit 3a8dce07ea
6 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/freerdp/freerdp.h
View File

@@ -631,6 +631,8 @@ owned by rdpRdp */
FREERDP_API BOOL freerdp_nla_impersonate(rdpContext* context);
FREERDP_API BOOL freerdp_nla_revert_to_self(rdpContext* context);
FREERDP_API UINT32 freerdp_get_nla_sspi_error(rdpContext* context);
FREERDP_API void clearChannelError(rdpContext* context);
FREERDP_API HANDLE getChannelErrorEventHandle(rdpContext* context);
FREERDP_API UINT getChannelError(rdpContext* context);

8
libfreerdp/core/credssp_auth.c
View File

@@ -65,6 +65,7 @@ struct rdp_credssp_auth
SecBuffer output_buffer;
ULONG flags;
SecPkgContext_Sizes sizes;
SECURITY_STATUS sspi_error;
enum AUTH_STATE state;
#ifdef UNICODE
char* pkgNameA;
@@ -441,6 +442,7 @@ int credssp_auth_authenticate(rdpCredsspAuth* auth)
WLog_ERR(TAG, "%s failed with %s [0x%08X]",
auth->server ? "AcceptSecurityContext" : "InitializeSecurityContext",
GetSecurityStatusString(status), status);
auth->sspi_error = status;
return -1;
}
}
@@ -653,6 +655,12 @@ const char* credssp_auth_pkg_name(rdpCredsspAuth* auth)
#endif
}
UINT32 credssp_auth_sspi_error(rdpCredsspAuth* auth)
{
WINPR_ASSERT(auth);
return (UINT32)auth->sspi_error;
}
void credssp_auth_free(rdpCredsspAuth* auth)
{
SEC_WINPR_KERBEROS_SETTINGS* krb_settings;

1
libfreerdp/core/credssp_auth.h
View File

@@ -56,6 +56,7 @@ FREERDP_LOCAL BOOL credssp_auth_have_output_token(rdpCredsspAuth* auth);
FREERDP_LOCAL BOOL credssp_auth_is_complete(rdpCredsspAuth* auth);
FREERDP_LOCAL const char* credssp_auth_pkg_name(rdpCredsspAuth* auth);
FREERDP_LOCAL size_t credssp_auth_trailer_size(rdpCredsspAuth* auth);
FREERDP_LOCAL UINT32 credssp_auth_sspi_error(rdpCredsspAuth* auth);
FREERDP_LOCAL void credssp_auth_free(rdpCredsspAuth* auth);
#endif /* FREERDP_LIB_CORE_CREDSSP_AUTH_H */

13
libfreerdp/core/freerdp.c
View File

@@ -1131,6 +1131,19 @@ BOOL freerdp_nla_revert_to_self(rdpContext* context)
return nla_revert_to_self(nla);
}
UINT32 freerdp_get_nla_sspi_error(rdpContext* context)
{
rdpNla* nla;
WINPR_ASSERT(context);
WINPR_ASSERT(context->rdp);
WINPR_ASSERT(context->rdp->transport);
nla = transport_get_nla(context->rdp->transport);
return nla_get_sspi_error(nla);
}
HANDLE getChannelErrorEventHandle(rdpContext* context)
{
WINPR_ASSERT(context);

6
libfreerdp/core/nla.c
View File

@@ -1790,3 +1790,9 @@ DWORD nla_get_error(rdpNla* nla)
return ERROR_INTERNAL_ERROR;
return nla->errorCode;
}
UINT32 nla_get_sspi_error(rdpNla* nla)
{
WINPR_ASSERT(nla);
return credssp_auth_sspi_error(nla->auth);
}

1
libfreerdp/core/nla.h
View File

@@ -57,6 +57,7 @@ FREERDP_LOCAL BOOL nla_set_state(rdpNla* nla, NLA_STATE state);
FREERDP_LOCAL const char* nla_get_state_str(NLA_STATE state);
FREERDP_LOCAL DWORD nla_get_error(rdpNla* nla);
FREERDP_LOCAL UINT32 nla_get_sspi_error(rdpNla* nla);
FREERDP_LOCAL BOOL nla_set_service_principal(rdpNla* nla, const char* service,
const char* hostname);