[#7877] Fix uuencoding attachment processing #7900
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
1. Replace output body_without_headers with original_body 2. Use inject with accumulator when mapping over attachments These changes will make it easier to add additional processing into this method in the coming commits.
gbp
force-pushed
the
7877-uuencoding-attachment-processing
branch
2 times, most recently
from
0fb77c8
to
e4464fb
Compare
Move Unix-to-Unix encoding [1] into the `MailHandler` as this will allow us to extract uuencoded attachments attributes without initialising `FoiAttachment` instances. [1] https://en.wikipedia.org/wiki/Uuencoding
For attachments which are encoded with Unix-to-Unix encoding we are unable process some attachments in order to apply masks or censor rules to them. This is down to when the attachments are extracted and saved into the database. It happens outside of our `MailHandler` library which we're using to retrieve the original unmasked attachment body for processing. This change fixes this by checking plain text attachments for begin/end markers and calculating the relevant hexdigest for comparison. Fixes #7877
gbp
force-pushed
the
7877-uuencoding-attachment-processing
branch
from
e4464fb
to
f98545a
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.
Relevant issue(s)
Fixes #7877
What does this do?
Fixes uuencoding attachment processing by moving the decoding of these attachments from
IncomingMessageintoMailHandlerWhy was this needed?
So attachments can be have censor rules and masks applied using the original raw attachment as a starting point.