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

Merge pull request #12353 from akallabeth/rdg-channel-response-optional

Browse Source 
[core,gateway] parse [MS-TSGU] 2.2.10.5 HTTP_CHANNEL_RESPONSE_OPTIONA…
This commit is contained in:
akallabeth
2026-02-23 12:09:58 +01:00
committed by GitHub
parent eef3e85be1 55f6827f6d
commit 3bbd8497e6
2 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/common/client.c
View File

@@ -1364,8 +1364,20 @@ BOOL client_auto_reconnect_ex(freerdp* instance, BOOL (*window_events)(freerdp*
return FALSE;
}
switch (freerdp_get_last_error(instance->context))
const UINT err = freerdp_get_last_error(instance->context);
switch (err)
{
case FREERDP_ERROR_CONNECT_LOGON_FAILURE:
case FREERDP_ERROR_CONNECT_CLIENT_REVOKED:
case FREERDP_ERROR_CONNECT_WRONG_PASSWORD:
case FREERDP_ERROR_CONNECT_ACCESS_DENIED:
case FREERDP_ERROR_CONNECT_ACCOUNT_RESTRICTION:
case FREERDP_ERROR_CONNECT_ACCOUNT_LOCKED_OUT:
case FREERDP_ERROR_CONNECT_ACCOUNT_EXPIRED:
case FREERDP_ERROR_CONNECT_NO_OR_MISSING_CREDENTIALS:
WLog_WARN(TAG, "Connection aborted: credentials do not work [%s]",
freerdp_get_last_error_name(err));
return FALSE;
case FREERDP_ERROR_CONNECT_CANCELLED:
WLog_WARN(TAG, "Connection aborted by user");
return FALSE;

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

@@ -53,7 +53,7 @@
/* HTTP channel response fields present flags. */
#define HTTP_CHANNEL_RESPONSE_FIELD_CHANNELID 0x1
#define HTTP_CHANNEL_RESPONSE_OPTIONAL 0x2
#define HTTP_CHANNEL_RESPONSE_FIELD_AUTHNCOOKIE 0x2
#define HTTP_CHANNEL_RESPONSE_FIELD_UDPPORT 0x4
/* HTTP extended auth. */
@@ -181,7 +181,7 @@ static const t_flag_mapping tunnel_response_fields_present[] = {
static const t_flag_mapping channel_response_fields_present[] = {
{ HTTP_CHANNEL_RESPONSE_FIELD_CHANNELID, "HTTP_CHANNEL_RESPONSE_FIELD_CHANNELID" },
{ HTTP_CHANNEL_RESPONSE_OPTIONAL, "HTTP_CHANNEL_RESPONSE_OPTIONAL" },
{ HTTP_CHANNEL_RESPONSE_FIELD_AUTHNCOOKIE, "HTTP_CHANNEL_RESPONSE_FIELD_AUTHNCOOKIE" },
{ HTTP_CHANNEL_RESPONSE_FIELD_UDPPORT, "HTTP_CHANNEL_RESPONSE_FIELD_UDPPORT" }
};
@@ -213,7 +213,7 @@ static const char* rdg_pkt_type_to_string(int type)
{
#define ENTRY(x) \
case x: \
return "#x"
return #x
switch (type)
{
@@ -1063,6 +1063,37 @@ static BOOL rdg_process_extauth_sspi(rdpRdg* rdg, wStream* s)
return FALSE;
}
static BOOL rdg_process_channel_response_optional(rdpRdg* rdg, wStream* s, UINT16 fieldsPresent)
{
if ((fieldsPresent & HTTP_CHANNEL_RESPONSE_FIELD_CHANNELID) != 0)
{
if (!Stream_CheckAndLogRequiredCapacityWLog(rdg->log, s, 4))
return FALSE;
const UINT32 channelId = Stream_Get_UINT32(s);
WLog_Print(rdg->log, WLOG_DEBUG, "TODO: Got channelId=%" PRIu32, channelId);
}
if ((fieldsPresent & HTTP_CHANNEL_RESPONSE_FIELD_UDPPORT) != 0)
{
if (!Stream_CheckAndLogRequiredCapacityWLog(rdg->log, s, 2))
return FALSE;
const UINT16 udpPort = Stream_Get_UINT16(s);
WLog_Print(rdg->log, WLOG_DEBUG, "TODO: Got udpPort=%" PRIu32, udpPort);
}
if ((fieldsPresent & HTTP_CHANNEL_RESPONSE_FIELD_AUTHNCOOKIE) != 0)
{
if (!Stream_CheckAndLogRequiredCapacityWLog(rdg->log, s, 2))
return FALSE;
const UINT16 blobLen = Stream_Get_UINT16(s);
if (!Stream_CheckAndLogRequiredCapacityWLog(rdg->log, s, blobLen))
return FALSE;
WLog_Print(rdg->log, WLOG_DEBUG, "TODO: Got UDP auth blob=%" PRIu32, blobLen);
if (!Stream_SafeSeek(s, blobLen))
return FALSE;
}
return TRUE;
}
static BOOL rdg_process_channel_response(rdpRdg* rdg, wStream* s)
{
UINT16 fieldsPresent = 0;
@@ -1093,6 +1124,9 @@ static BOOL rdg_process_channel_response(rdpRdg* rdg, wStream* s)
return FALSE;
}
if (!rdg_process_channel_response_optional(rdg, s, fieldsPresent))
return FALSE;
rdg->state = RDG_CLIENT_STATE_OPENED;
return TRUE;
}