Base64 backports 6.0.x/v2 #9292
Merged
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
(cherry picked from commit 85ae1d2)
RFC 2045 states that any invalid character should be skipped over, this is the RFC used by mime handler in Suricata code to deal with base64 encoded data. So far, only spaces were skipped as a part of implementation of this RFC, extend it to also skip over any other invalid character. Add corresponding test. (cherry picked from commit e46b033)
Padding bytes for the last remainder data should be as follows: Case | Remainder bytes | Padding ---------------------------------------------- I | 1 | 3 II | 2 | 2 III | 3 | 1 However, we calculate the decoded_bytes with the formula: decoded_bytes = ASCII_BLOCK - padding this means for Case I when padding is 3 bytes, the decoded_bytes would be 0. This is incorrect for any trailing data. In any of the above cases, if the parsing was successful, there should at least be 1 decoded byte. (cherry picked from commit 095c335)
Just like the check for destination buffer size done previously for complete data, it should also be done for the trailing data to avoid goind out of bounds. (cherry picked from commit 0e8b451)
The destination buffer should be able to hold at least 3 Bytes during the processing of the last block of data. If it cannot hold at least 3 Bytes, then that may lead to dynamic buffer overflow while decoding. (cherry picked from commit 62d7821)
(cherry picked from commit c2ae87e)
(cherry picked from commit 49ad383)
For certain edge case handling for spaces, spaces were handled particularly in the remainder processing functions. Make sure that now that as per RFC 2045, util-base64 would skip over any invalid char, the edge cases in MIME processor also be handled the same way. This completes the work done in e46b033. Ticket 6135 Ticket 6207 (cherry picked from commit 789353b)
|
WARNING:
Pipeline 15396 |
victorjulien
approved these changes
Jul 27, 2023
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.
Link to redmine ticket: https://redmine.openinfosecfoundation.org/issues/6224
SV_BRANCH=OISF/suricata-verify#1332
Previous PR: #9289
Changes since v1: