message.c: reject to parse MIME headers with NUL byte #5205
+75
−54
Conversation
This file contains 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
ksmurchison
approved these changes
Jan 9, 2025
wolfsage
reviewed
Jan 9, 2025
| @@ -4956,7 +4969,8 @@ static int body_foreach_section(struct body *body, struct message *message, | |||
| msg.len = body->header_size; | |||
| msg.offset = 0; | |||
| msg.encode = 0; | |||
| message_parse_headers(&msg, tmpbody, "text/plain", &boundaries, NULL); | |||
| message_parse_headers(&msg, tmpbody, "text/plain", &boundaries, | |||
There was a problem hiding this comment.
Kinda surprised we don't care about errors in parsing here
There was a problem hiding this comment.
Here, we parse the headers for on an already parsed body-part here, e.g. these headers already were validated otherwise that body part wouldn't exist. We didn't check for errors previously here, because message_parse_headers didn't check for any.
It might be good to check for message_parse_headers errors here, too, but in case of errors it's a very different situation we are in: it means that an already accepted email on disk could now not be read anymore. We would need to treat this differently and I'd prefer to keep the damage radius of this change small.
It does, but so far the test fails because of an IOERROR logged while parsing the message.
Before, the parse continued but set incorrect header and body offsets for the body part. This resulted in log spam noting the discrepancy between the file size and header+body offsets, as well as a bogus in-memory MIME body structure.
rsto
force-pushed
the
cyr-1302-message-c-parse-nul-mime-header
branch
from
aeebe14 to
f56c25f
Compare
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.
Before, the parse continued but set incorrect header and body offsets for the body part. This resulted in log spam noting the discrepancy between the file size and header+body offsets, as well as a bogus in-memory MIME body structure.