Skip to content

Added hardened boundary condition checks. #71

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 13 commits into from
Mar 17, 2022
Merged

Added hardened boundary condition checks. #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6c90d24
Added hardened boundary condition checks.
JonathanHenson Jan 5, 2022
83c9836
Fix tests and overly aggressive assertions.
JonathanHenson Jan 5, 2022
21c007c
thanks msvc for catching that
JonathanHenson Jan 5, 2022
a0b0c63
Missed another one. stupid regexes.
JonathanHenson Jan 5, 2022
d3e1a9f
Fix the server while we're at it.
JonathanHenson Jan 5, 2022
b45bb2f
Merge branch 'main' into boundary_hardening
JonathanHenson Feb 18, 2022
36b169e
Rewrote several parsers to use byte_cursor, applied cr feedback.
JonathanHenson Feb 21, 2022
0c05caa
Fixed bug in header length calculation.
JonathanHenson Feb 21, 2022
48eac35
Fix type warning for msvc.
JonathanHenson Feb 21, 2022
2546543
printf debugging statements.
JonathanHenson Mar 14, 2022
380167e
hopefully resolve condition race.
JonathanHenson Mar 15, 2022
97a8319
Pessmimize the wakeup routines.
JonathanHenson Mar 15, 2022
290833b
Add new define for max header name length.
JonathanHenson Mar 15, 2022
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
23 changes: 21 additions & 2 deletions include/aws/event-stream/event_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
/* max header size is 128kb */
#define AWS_EVENT_STREAM_MAX_HEADERS_SIZE (128 * 1024)

/* Max header name length is 127 bytes */
#define AWS_EVENT_STREAM_HEADER_NAME_LEN_MAX (INT8_MAX)

enum aws_event_stream_errors {
AWS_ERROR_EVENT_STREAM_BUFFER_LENGTH_MISMATCH = AWS_ERROR_ENUM_BEGIN_RANGE(AWS_C_EVENT_STREAM_PACKAGE_ID),
AWS_ERROR_EVENT_STREAM_INSUFFICIENT_BUFFER_LEN,
Expand Down Expand Up @@ -54,8 +57,7 @@ struct aws_event_stream_message_prelude {

struct aws_event_stream_message {
struct aws_allocator *alloc;
uint8_t *message_buffer;
uint8_t owns_buffer;
struct aws_byte_buf message_buffer;
};

#define AWS_EVENT_STREAM_PRELUDE_LENGTH (uint32_t)(sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t))
Expand All @@ -76,6 +78,7 @@ enum aws_event_stream_header_value_type {
AWS_EVENT_STREAM_HEADER_UUID
};

static const uint16_t UUID_LEN = 16U;
struct aws_event_stream_header_value_pair {
uint8_t header_name_len;
char header_name[INT8_MAX];
Expand Down Expand Up @@ -244,6 +247,22 @@ AWS_EVENT_STREAM_API const uint8_t *aws_event_stream_message_buffer(const struct
AWS_EVENT_STREAM_API uint32_t
aws_event_stream_compute_headers_required_buffer_len(const struct aws_array_list *headers);

/**
* Writes headers to buf assuming buf is large enough to hold the data. Prefer this function over the unsafe variant
* 'aws_event_stream_write_headers_to_buffer'.
*
* Returns AWS_OP_SUCCESS if the headers were successfully and completely written and AWS_OP_ERR otherwise.
*/
AWS_EVENT_STREAM_API int aws_event_stream_write_headers_to_buffer_safe(
const struct aws_array_list *headers,
struct aws_byte_buf *buf);

/**
* Deprecated in favor of 'aws_event_stream_write_headers_to_buffer_safe' as this API is unsafe.
*
* Writes headers to buffer and returns the length of bytes written to buffer. Assumes buffer is large enough to
* store the headers.
*/
AWS_EVENT_STREAM_API size_t
aws_event_stream_write_headers_to_buffer(const struct aws_array_list *headers, uint8_t *buffer);

Expand Down
Loading