fix(pem): clear line buffer after InvalidData and validate END label#239
Open
sumleo wants to merge 2 commits intorusticata:masterfrom
Open
fix(pem): clear line buffer after InvalidData and validate END label#239sumleo wants to merge 2 commits intorusticata:masterfrom
sumleo wants to merge 2 commits intorusticata:masterfrom
Conversation
Collaborator
|
Without weighing in on the fix or the diff yet this needs a reformat and I think should come with test coverage for both fixes. My preference would be one commit per fix + accompanying test. |
When `read_line` returns `ErrorKind::InvalidData` (invalid UTF-8), the line buffer was not cleared before `continue`, so stale data from a previous successful read could leak into the next iteration and corrupt the parsed result. Add `line.clear()` before `continue` to prevent stale data accumulation. Add test verifying PEM with invalid UTF-8 comment lines is handled correctly.
The PEM parser did not check that the END label matched the BEGIN label, silently accepting mismatched PEM blocks (e.g., BEGIN CERTIFICATE / END PRIVATE KEY). Add validation that rejects mismatched labels with InvalidHeader error. Convert `label` from `&str` to `String` to avoid lifetime issues with the END label comparison. Add test verifying mismatched labels produce an error.
sumleo
force-pushed
the
fix/pem-parsing
branch
from
2b63e49 to
cb621e3
Compare
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
2 participants
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.
Summary
Two fixes in PEM parsing:
Missing line buffer clear after InvalidData: After encountering an
InvalidDataerror (non-UTF-8 data in comment section), thelinebuffer was not cleared before continuing the loop. Sinceread_lineappends to the buffer, subsequent reads would accumulate partial data from the failed read, potentially corrupting the-----BEGINheader detection.END label not validated against BEGIN label: The END marker was accepted without verifying its label matches the BEGIN label. For example, a PEM block starting with
-----BEGIN CERTIFICATE-----would accept-----END PRIVATE KEY-----as its terminator. Now validates that the END label matches.Test plan
cargo test --all-features