Skip to content

Fix Variable Len Headers with Empty Value #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 5, 2024
Merged

Fix Variable Len Headers with Empty Value #108

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b8076b
add an empty buffer header test
waahm7 Nov 24, 2023
bc3d0b4
reset unintended changes
waahm7 Nov 24, 2023
d818256
fix formatting
waahm7 Nov 24, 2023
23c0b2e
add fix
waahm7 Nov 24, 2023
512e54c
check string header as well
waahm7 Nov 24, 2023
6ce5cc0
Merge branch 'main' into fix-empty-buff
waahm7 Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/event_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ static int s_add_variable_len_header(

memcpy((void *)header->header_name, (void *)name, (size_t)name_len);

if (copy) {
if (value_len != 0 && copy) {
header->header_value.variable_len_val = aws_mem_acquire(headers->alloc, value_len);
header->value_owned = 1;
memcpy((void *)header->header_value.variable_len_val, (void *)value, value_len);
Expand Down
1 change: 1 addition & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ add_test_case(test_streaming_decoder_incoming_no_op_valid_single_message)
add_test_case(test_streaming_decoder_incoming_application_no_headers)
add_test_case(test_streaming_decoder_incoming_application_one_compressed_header_pair_valid)
add_test_case(test_streaming_decoder_incoming_application_one_int32_header_pair_valid)
add_test_case(test_streaming_decoder_incoming_application_variable_headers_with_empty_length_pair_valid)
add_test_case(test_streaming_decoder_incoming_application_one_bool_header_pair_valid)
add_test_case(test_streaming_decoder_incoming_multiple_messages)

Expand Down
72 changes: 72 additions & 0 deletions tests/message_streaming_decoder_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,78 @@ AWS_TEST_CASE(
test_streaming_decoder_incoming_application_one_int32_header_pair_valid,
s_test_streaming_decoder_incoming_application_one_int32_header_pair_valid_fn)

static int s_test_streaming_decoder_incoming_application_variable_headers_with_empty_length_pair_valid_fn(
struct aws_allocator *allocator,
void *ctx) {
(void)ctx;
/* clang-format off */
uint8_t test_data[] = {
0x00, 0x00, 0x00, 0x22, /* total length */
0x00, 0x00, 0x00, 0x12, /* headers length */
0x2D, 0x9A, 0xD2, 0x45, /* prelude crc */
0x04, /* header name length */
'b', 'u', 'f', 'f', /* header name */
0x06, /* header value type (BYTE ARRAY)*/
0x00, 0x00, /* header value length */
0x06, /* header name length */
's', 't', 'r', 'i','n','g', /* header name */
0x07, /* header value type (String)*/
0x00, 0x00, /* header value length */
0xC8, 0x4C, 0xF8, 0x53 /* message crc */
};
/* clang-format on */
struct test_decoder_data decoder_data = {
.latest_payload = 0,
.written = 0,
.alloc = allocator,
.latest_error = 0,
};
aws_event_stream_headers_list_init(&decoder_data.headers_list, allocator);
struct aws_event_stream_streaming_decoder_options decoder_options = {
.on_payload_segment = s_decoder_test_on_payload_segment,
.on_prelude = s_decoder_test_on_prelude_received,
.on_header = s_decoder_test_header_received,
.on_complete = s_decoder_test_on_complete,
.on_error = s_decoder_test_on_error,
.user_data = &decoder_data};

struct aws_event_stream_streaming_decoder decoder;
aws_event_stream_streaming_decoder_init_from_options(&decoder, allocator, &decoder_options);

struct aws_byte_buf test_buf = aws_byte_buf_from_array(test_data, sizeof(test_data));
ASSERT_SUCCESS(
aws_event_stream_streaming_decoder_pump(&decoder, &test_buf), "Message validation should have succeeded");
ASSERT_SUCCESS(decoder_data.latest_error, "No Error callback shouldn't have been called");

ASSERT_INT_EQUALS(0x00000022, decoder_data.latest_prelude.total_len);
ASSERT_INT_EQUALS(0x00000012, decoder_data.latest_prelude.headers_len);
ASSERT_INT_EQUALS(0x2D9AD245, decoder_data.latest_prelude.prelude_crc);
ASSERT_UINT_EQUALS(0xC84CF853, decoder_data.message_crc);

const char *expected_header_name = "buff";
struct aws_event_stream_header_value_pair latest_header;
aws_array_list_get_at(&decoder_data.headers_list, &latest_header, 0);

ASSERT_BIN_ARRAYS_EQUALS(
expected_header_name,
strlen(expected_header_name),
latest_header.header_name,
latest_header.header_name_len,
"header name should have been %s",
expected_header_name);

struct aws_byte_buf latest_header_value = aws_event_stream_header_value_as_bytebuf(&latest_header);
ASSERT_INT_EQUALS(0, latest_header_value.len);
ASSERT_NULL(latest_header_value.buffer);

aws_event_stream_headers_list_cleanup(&decoder_data.headers_list);
return 0;
}

AWS_TEST_CASE(
test_streaming_decoder_incoming_application_variable_headers_with_empty_length_pair_valid,
s_test_streaming_decoder_incoming_application_variable_headers_with_empty_length_pair_valid_fn)

static int s_test_streaming_decoder_incoming_application_one_bool_header_pair_valid_fn(
struct aws_allocator *allocator,
void *ctx) {
Expand Down