maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[WIP] Check all streams prior to reading.

Browse Source
This commit is contained in:
Nick Couchman 2020-04-05 15:10:42 -04:00
parent d26f497a9c
commit 4f1f1d71a6
9 changed files with 93 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages-file-info.c
View File

@ -135,6 +135,10 @@ void guac_rdpdr_fs_process_set_rename_info(guac_rdp_common_svc* svc,
wStream* output_stream;
char destination_path[GUAC_RDP_FS_MAX_PATH];
/* Check stream size prior to reading. */
if (Stream_GetRemainingLength(input_stream) < 6)
return;
/* Read structure */
Stream_Seek_UINT8(input_stream); /* ReplaceIfExists */
Stream_Seek_UINT8(input_stream); /* RootDirectory */

29
src/protocols/rdp/channels/rdpdr/rdpdr-fs-messages.c
View File

@ -48,6 +48,10 @@ void guac_rdpdr_fs_process_create(guac_rdp_common_svc* svc,
int create_disposition, create_options, path_length;
char path[GUAC_RDP_FS_MAX_PATH];
/* Check remaining stream data prior to reading. */
if (Stream_GetRemainingLength(input_stream) < 32)
return;
/* Read "create" information */
Stream_Read_UINT32(input_stream, desired_access);
Stream_Seek_UINT64(input_stream); /* allocation size */
@ -123,6 +127,10 @@ void guac_rdpdr_fs_process_read(guac_rdp_common_svc* svc,
wStream* output_stream;
/* Check remaining bytes before reading stream. */
if (Stream_GetRemainingLength(input_stream) < 12)
return;
/* Read packet */
Stream_Read_UINT32(input_stream, length);
Stream_Read_UINT64(input_stream, offset);
@ -172,6 +180,10 @@ void guac_rdpdr_fs_process_write(guac_rdp_common_svc* svc,
wStream* output_stream;
/* Check remaining length. */
if (Stream_GetRemainingLength(input_stream) < 32)
return;
/* Read packet */
Stream_Read_UINT32(input_stream, length);
Stream_Read_UINT64(input_stream, offset);
@ -244,6 +256,10 @@ void guac_rdpdr_fs_process_volume_info(guac_rdp_common_svc* svc,
int fs_information_class;
/* Check remaining length */
if (Stream_GetRemainingLength(input_stream) < 4)
return;
Stream_Read_UINT32(input_stream, fs_information_class);
/* Dispatch to appropriate class-specific handler */
@ -282,6 +298,10 @@ void guac_rdpdr_fs_process_file_info(guac_rdp_common_svc* svc,
int fs_information_class;
/* Check remaining length */
if (Stream_GetRemainingLength(input_stream) < 4)
return;
Stream_Read_UINT32(input_stream, fs_information_class);
/* Dispatch to appropriate class-specific handler */
@ -328,6 +348,10 @@ void guac_rdpdr_fs_process_set_file_info(guac_rdp_common_svc* svc,
int fs_information_class;
int length;
/* Check remaining length */
if (Stream_GetRemainingLength(input_stream) < 32)
return;
Stream_Read_UINT32(input_stream, fs_information_class);
Stream_Read_UINT32(input_stream, length); /* Length */
Stream_Seek(input_stream, 24); /* Padding */
@ -406,6 +430,9 @@ void guac_rdpdr_fs_process_query_directory(guac_rdp_common_svc* svc,
if (file == NULL)
return;
if (Stream_GetRemainingLength(input_stream) < 9)
return;
/* Read main header */
Stream_Read_UINT32(input_stream, fs_information_class);
Stream_Read_UINT8(input_stream, initial_query);
@ -414,6 +441,8 @@ void guac_rdpdr_fs_process_query_directory(guac_rdp_common_svc* svc,
/* If this is the first query, the path is included after padding */
if (initial_query) {
if (Stream_GetRemainingLength(input_stream) < 23);
Stream_Seek(input_stream, 23); /* Padding */
/* Convert path to UTF-8 */

18
src/protocols/rdp/channels/rdpdr/rdpdr-messages.c
View File

@ -212,6 +212,9 @@ void guac_rdpdr_process_server_announce(guac_rdp_common_svc* svc,
unsigned int major, minor, client_id;
if (Stream_GetRemainingLength(input_stream) < 8)
return;
Stream_Read_UINT16(input_stream, major);
Stream_Read_UINT16(input_stream, minor);
Stream_Read_UINT32(input_stream, client_id);
@ -243,6 +246,9 @@ void guac_rdpdr_process_device_reply(guac_rdp_common_svc* svc,
unsigned int device_id, ntstatus;
int severity, c, n, facility, code;
if (Stream_GetRemainingLength(input_stream) < 8)
return;
Stream_Read_UINT32(input_stream, device_id);
Stream_Read_UINT32(input_stream, ntstatus);
@ -278,6 +284,9 @@ void guac_rdpdr_process_device_iorequest(guac_rdp_common_svc* svc,
guac_rdpdr* rdpdr = (guac_rdpdr*) svc->data;
guac_rdpdr_iorequest iorequest;
if (Stream_GetRemainingLength(input_stream) < 20)
return;
/* Read header */
Stream_Read_UINT32(input_stream, iorequest.device_id);
Stream_Read_UINT32(input_stream, iorequest.file_id);
@ -306,6 +315,9 @@ void guac_rdpdr_process_server_capability(guac_rdp_common_svc* svc,
int count;
int i;
if (Stream_GetRemainingLength(input_stream) < 4)
return;
/* Read header */
Stream_Read_UINT16(input_stream, count);
Stream_Seek(input_stream, 2);
@ -316,9 +328,15 @@ void guac_rdpdr_process_server_capability(guac_rdp_common_svc* svc,
int type;
int length;
if (Stream_GetRemainingLength(input_stream) < 4)
break;
Stream_Read_UINT16(input_stream, type);
Stream_Read_UINT16(input_stream, length);
if (Stream_GetRemainingLength(input_stream) < (length - 4))
break;
/* Ignore all for now */
guac_client_log(svc->client, GUAC_LOG_DEBUG, "Ignoring server capability set type=0x%04x, length=%i", type, length);
Stream_Seek(input_stream, length - 4);

3
src/protocols/rdp/channels/rdpdr/rdpdr-printer.c
View File

@ -67,6 +67,9 @@ void guac_rdpdr_process_print_job_write(guac_rdp_common_svc* svc,
int length;
int status;
if (Stream_GetRemainingLength(input_stream) < 32)
return;
/* Read buffer of print data */
Stream_Read_UINT32(input_stream, length);
Stream_Seek(input_stream, 8); /* Offset */

3
src/protocols/rdp/channels/rdpdr/rdpdr.c
View File

@ -38,6 +38,9 @@ void guac_rdpdr_process_receive(guac_rdp_common_svc* svc,
int component;
int packet_id;
if (Stream_GetRemainingLength(input_stream) < 4)
return;
/* Read header */
Stream_Read_UINT16(input_stream, component);
Stream_Read_UINT16(input_stream, packet_id);

16
src/protocols/rdp/channels/rdpsnd/rdpsnd-messages.c
View File

@ -50,6 +50,9 @@ void guac_rdpsnd_formats_handler(guac_rdp_common_svc* svc,
/* Reset own format count */
rdpsnd->format_count = 0;
if (Stream_GetRemainingLength(input_stream) < 20)
return;
/* Format header */
Stream_Seek(input_stream, 14);
Stream_Read_UINT16(input_stream, server_format_count);
@ -96,6 +99,9 @@ void guac_rdpsnd_formats_handler(guac_rdp_common_svc* svc,
/* Remember position in stream */
Stream_GetPointer(input_stream, format_start);
if (Stream_GetRemainingLength(input_stream) < 18)
return;
/* Read format */
Stream_Read_UINT16(input_stream, format_tag);
Stream_Read_UINT16(input_stream, channels);
@ -106,6 +112,10 @@ void guac_rdpsnd_formats_handler(guac_rdp_common_svc* svc,
/* Skip past extra data */
Stream_Read_UINT16(input_stream, body_size);
if (Stream_GetRemainingLength(input_stream) < body_size)
return;
Stream_Seek(input_stream, body_size);
/* If PCM, accept */
@ -205,6 +215,9 @@ void guac_rdpsnd_training_handler(guac_rdp_common_svc* svc,
guac_rdpsnd* rdpsnd = (guac_rdpsnd*) svc->data;
if (Stream_GetRemainingLength(input_stream) < 4)
return;
/* Read timestamp and data size */
Stream_Read_UINT16(input_stream, rdpsnd->server_timestamp);
Stream_Read_UINT16(input_stream, data_size);
@ -232,6 +245,9 @@ void guac_rdpsnd_wave_info_handler(guac_rdp_common_svc* svc,
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data;
guac_audio_stream* audio = rdp_client->audio;
if (Stream_GetRemainingLength(input_stream) < 12)
return;
/* Read wave information */
Stream_Read_UINT16(input_stream, rdpsnd->server_timestamp);
Stream_Read_UINT16(input_stream, format);

14
src/protocols/rdp/channels/rdpsnd/rdpsnd.c
View File

@ -36,11 +36,8 @@ void guac_rdpsnd_process_receive(guac_rdp_common_svc* svc,
guac_rdpsnd_pdu_header header;
/* Check that we at least have a header. */
if (Stream_GetRemainingLength(input_stream) < sizeof(header)) {
guac_client_log(svc->client, GUAC_LOG_WARNING,
"Not enough bytes to process sound header.");
if (Stream_GetRemainingLength(input_stream) < 4)
return;
}
/* Read RDPSND PDU header */
Stream_Read_UINT8(input_stream, header.message_type);
@ -48,15 +45,8 @@ void guac_rdpsnd_process_receive(guac_rdp_common_svc* svc,
Stream_Read_UINT16(input_stream, header.body_size);
/* Check that the body_size actually exists in the input stream. */
if (Stream_GetRemainingLength(input_stream) < header.body_size) {
guac_client_log(svc->client, GUAC_LOG_WARNING,
"Not enough bytes to process sound body.");
guac_client_log(svc->client, GUAC_LOG_DEBUG,
"Input bytes: %d, Body size: %d",
Stream_GetRemainingLength(input_stream),
header.body_size);
if (Stream_GetRemainingLength(input_stream) < header.body_size)
return;
}
/*
* If next PDU is SNDWAVE (due to receiving WaveInfo PDU previously),

25
src/protocols/rdp/plugins/guacai/guacai-messages.c
View File

@ -39,8 +39,7 @@
static void guac_rdp_ai_read_format(wStream* stream,
guac_rdp_ai_format* format) {
/* Bail out if the stream doesn't contain enough data. */
if (Stream_GetRemainingLength(stream) < (18 + format->data_size))
if (Stream_GetRemainingLength(stream) < 18)
return;
/* Read audio format into structure */
@ -53,7 +52,8 @@ static void guac_rdp_ai_read_format(wStream* stream,
Stream_Read_UINT16(stream, format->data_size); /* cbSize */
/* Read arbitrary data block (if applicable) */
if (format->data_size != 0) {
if (format->data_size != 0
&& Stream_GetRemainingLength(stream) >= format->data_size) {
format->data = Stream_Pointer(stream); /* data */
Stream_Seek(stream, format->data_size);
}
@ -236,6 +236,12 @@ static void guac_rdp_ai_send_formatchange(IWTSVirtualChannel* channel,
void guac_rdp_ai_process_version(guac_client* client,
IWTSVirtualChannel* channel, wStream* stream) {
if (Stream_GetRemainingLength(stream) < 4) {
guac_client_log(client, GUAC_LOG_WARNING,
"Invalid value provided for AUDIO_INPUT version.");
return;
}
UINT32 version;
Stream_Read_UINT32(stream, version);
@ -262,16 +268,12 @@ void guac_rdp_ai_process_formats(guac_client* client,
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data;
guac_rdp_audio_buffer* audio_buffer = rdp_client->audio_input;
if (Stream_GetRemainingLength(stream) < 8)
return;
UINT32 num_formats;
Stream_Read_UINT32(stream, num_formats); /* NumFormats */
Stream_Seek_UINT32(stream); /* cbSizeFormatsPacket (MUST BE IGNORED) */
/* Check amount of data. */
if (Stream_GetRemainingLength(stream) < (8 + num_formats)) {
guac_client_log(client, GUAC_LOG_WARNING,
"Not enough bytes to process supported sound formats.");
return;
}
UINT32 index;
for (index = 0; index < num_formats; index++) {
@ -317,6 +319,9 @@ void guac_rdp_ai_process_open(guac_client* client,
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data;
guac_rdp_audio_buffer* audio_buffer = rdp_client->audio_input;
if (Stream_GetRemainingLength(stream) < 8)
return;
UINT32 packet_frames;
UINT32 initial_format;

10
src/protocols/rdp/plugins/guacai/guacai.c
View File

@ -52,16 +52,12 @@
static void guac_rdp_ai_handle_data(guac_client* client,
IWTSVirtualChannel* channel, wStream* stream) {
if (Stream_GetRemainingLength(stream) < 1)
return;
/* Read message ID from received PDU */
BYTE message_id;
Stream_Read_UINT8(stream, message_id);
/* If not enough data, bail out. */
if (Stream_GetRemainingLength(stream) < 1) {
guac_client_log(client, GUAC_LOG_WARNING,
"Not enough data in stream for incoming audio.");
return;
}
/* Invoke appropriate message processor based on ID */
switch (message_id) {