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

Merge pull request #11914 from akallabeth/rdstls

Browse Source 
[core,rdstls] improve logging
This commit is contained in:
akallabeth
2025-10-02 16:15:27 +02:00
committed by GitHub
parent 621e089768 9fc79f7e90
commit 11bd807c5c
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libfreerdp/core/rdstls.c
View File

@@ -303,6 +303,8 @@ static BOOL rdstls_write_authentication_request_with_password(rdpRdstls* rdstls,
WINPR_ASSERT(rdstls);
WINPR_ASSERT(rdstls->context);
WLog_Print(rdstls->log, WLOG_DEBUG, "Writing RDSTLS password authentication message");
rdpSettings* settings = rdstls->context->settings;
WINPR_ASSERT(settings);
@@ -333,6 +335,8 @@ static BOOL rdstls_write_authentication_request_with_cookie(WINPR_ATTR_UNUSED rd
WINPR_ASSERT(rdstls);
WINPR_ASSERT(rdstls->context);
WLog_Print(rdstls->log, WLOG_DEBUG, "Writing RDSTLS cookie authentication message");
rdpSettings* settings = rdstls->context->settings;
WINPR_ASSERT(settings);
@@ -365,7 +369,7 @@ static BOOL rdstls_write_authentication_response(rdpRdstls* rdstls, wStream* s)
static BOOL rdstls_process_capabilities(rdpRdstls* rdstls, wStream* s)
{
WINPR_ASSERT(rdstls);
if (Stream_GetRemainingLength(s) < 4)
if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 4))
return FALSE;
const UINT16 dataType = Stream_Get_UINT16(s);
@@ -393,12 +397,12 @@ static BOOL rdstls_read_unicode_string(WINPR_ATTR_UNUSED wLog* log, wStream* s,
{
WINPR_ASSERT(str);
if (Stream_GetRemainingLength(s) < 2)
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, 2))
return FALSE;
const UINT16 length = Stream_Get_UINT16(s);
if (Stream_GetRemainingLength(s) < length)
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, length))
return FALSE;
if (length <= 2)
@@ -422,12 +426,12 @@ static BOOL rdstls_read_data(WINPR_ATTR_UNUSED wLog* log, wStream* s, UINT16* pL
*pData = NULL;
*pLength = 0;
if (Stream_GetRemainingLength(s) < 2)
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, 2))
return FALSE;
const UINT16 length = Stream_Get_UINT16(s);
if (Stream_GetRemainingLength(s) < length)
if (!Stream_CheckAndLogRequiredLengthWLog(log, s, length))
return FALSE;
if (length <= 2)
@@ -549,12 +553,13 @@ static BOOL rdstls_process_authentication_request_with_cookie(WINPR_ATTR_UNUSED
WINPR_ATTR_UNUSED wStream* s)
{
// TODO
WLog_Print(rdstls->log, WLOG_ERROR, "TODO: RDSTLS Cookie authentication not implemented");
return FALSE;
}
static BOOL rdstls_process_authentication_request(rdpRdstls* rdstls, wStream* s)
{
if (Stream_GetRemainingLength(s) < 2)
if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 2))
return FALSE;
const UINT16 dataType = Stream_Get_UINT16(s);
@@ -582,7 +587,7 @@ static BOOL rdstls_process_authentication_request(rdpRdstls* rdstls, wStream* s)
static BOOL rdstls_process_authentication_response(rdpRdstls* rdstls, wStream* s)
{
if (Stream_GetRemainingLength(s) < 6)
if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 6))
return FALSE;
const UINT16 dataType = Stream_Get_UINT16(s);
@@ -706,8 +711,8 @@ static int rdstls_recv(WINPR_ATTR_UNUSED rdpTransport* transport, wStream* s, vo
WINPR_ASSERT(s);
WINPR_ASSERT(rdstls);
if (Stream_GetRemainingLength(s) < 4)
return FALSE;
if (!Stream_CheckAndLogRequiredLengthWLog(rdstls->log, s, 4))
return -1;
const UINT16 version = Stream_Get_UINT16(s);
if (version != RDSTLS_VERSION_1)