feat(native-rust): message body framing (framed and non-framed)#918
Merged
lucasmcdonald3 merged 28 commits intoMay 27, 2026
Conversation
added 13 commits
May 21, 2026 11:52
There was a problem hiding this comment.
Pull request overview
Implements Rust-native message body framing per the spec, covering framed-body encryption/serialization, framed/non-framed deserialization, and a large set of format- and client-API-aligned tests.
Changes:
- Added message body module surface plus framed-body encrypt/serialize and decrypt/deserialize implementations.
- Implemented non-framed body deserialization path (write-path intentionally not implemented).
- Added extensive spec-citation tests covering field ordering, sizes, bounds, and tamper cases for body frames and header/body boundary expectations.
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
esdk/src/message/body/mod.rs |
Introduces the message body module surface and re-exports body submodules. |
esdk/src/message/body/body_encrypt.rs |
Implements framed body encryption and on-wire frame serialization. |
esdk/src/message/body/body_decrypt.rs |
Implements framed body parsing/decryption and non-framed body parsing/decryption. |
esdk/tests/test_message_body_format.rs |
Adds spec-driven tests for framed and non-framed body format requirements and ordering. |
esdk/tests/test_construct_the_body.rs |
Adds tests for encrypt API “construct the body” behavior and plaintext length bound enforcement. |
esdk/tests/test_construct_a_frame.rs |
Adds tests for encrypt API “construct a frame” requirements (AAD/IV/seq/content length). |
esdk/tests/test_authentication_tag.rs |
Adds tests validating header authentication tag layout and tamper failures. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
lucasmcdonald3
pushed a commit
that referenced
this pull request
May 21, 2026
…ngth zeros Found by Copilot review on PR #918. In read_and_decrypt_framed_message_body, the final-frame branch's empty-content case (`enc_content.is_empty()`) was originally written for the exact-multiple case where an empty final frame follows one or more regular frames; the comment 'final frame is empty, so return last full frame' captures that intent. The preallocated `result` buffer (vec![0; frame_length_usize]) holds the last regular frame's plaintext at that point, so returning it unchanged is correct. But when the entire plaintext is empty (encrypt produces a single empty final frame, no prior regular frames), `result` is still the initial zero-filled buffer. Returning it leaks frame_length zero bytes to the caller — empty plaintext round-trips to (e.g.) 4096 zero bytes. Minimal fix: when the empty final frame is also the FIRST frame (expected_frame == START_SEQUENCE_NUMBER), call result.clear() so an empty Vec is returned. The exact-multiple case is unchanged. Tests: - test_empty_plaintext_round_trip_returns_empty: regression test for the fixed empty-plaintext path. - test_exact_multiple_round_trip_preserves_last_frame: confirms the original exact-multiple behavior (last regular frame returned for empty final) still round-trips correctly.
added 8 commits
May 21, 2026 14:53
Re-do of the deletion in c823f44, which dropped 6 type=test annotations without preserving them. This pass keeps every spec quote alive: - 2 AAD-input quotes moved into the existing AEAD-inputs round-trip test. - 9 'MUST be interpreted as bytes' source-side annotations on body_decrypt.rs are upgraded from implementation+reason to type=implication. - 1 deletion (test_exact_multiple_round_trip_preserves_last_frame) was already redundant with a sibling test in the same file.
josecorella
reviewed
May 26, 2026
Contributor
josecorella
left a comment
josecorella
left a comment
There was a problem hiding this comment.
have to still review source and test_message_body_format
but this is is a pattern I saw throughout the other test files, what do you think?
added 2 commits
May 26, 2026 12:07
josecorella
reviewed
May 27, 2026
josecorella
reviewed
May 27, 2026
Contributor
josecorella
left a comment
josecorella
left a comment
There was a problem hiding this comment.
just need to review decrypt but there's a potential error on 186, lmk
josecorella
reviewed
May 27, 2026
Contributor
josecorella
left a comment
josecorella
left a comment
There was a problem hiding this comment.
decrypt looks good - only outstanding issue is the comment i left on encrypt
added 2 commits
May 27, 2026 12:48
josecorella
approved these changes
May 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implements message body framing — both framed and non-framed body serialization and deserialization — per message-body.md.
Scope:
esdk/src/message/body/mod.rs— body module surface and shared body types.esdk/src/message/body/body_encrypt.rs— body serialization (framed and non-framed).esdk/src/message/body/body_decrypt.rs— body deserialization (framed and non-framed).esdk/tests/test_message_body_format.rs,esdk/tests/test_construct_the_body.rs,esdk/tests/test_construct_a_frame.rs,esdk/tests/test_authentication_tag.rs.Body AAD construction is reviewed separately in #900 (
message-body-aad). Headers and footer that bracket the body are reviewed in #909 / #901 / #898 respectively.Note: CI does not run on this PR. This branch is scoped for focused review and intentionally omits test helpers, scaffolding, and other supporting code. Full code — including helpers, test infrastructure, and working tests — lives on the
aws-crypto-rust/unreviewedbranch.If you want more context or to actually run the tests, see
aws-crypto-rust/unreviewed.Related spec: data-format/message-body.md