fix: Ignore protected headers in outer message part (#6357) #6370
Conversation
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
link2xt
reviewed
Dec 28, 2024
iequidoo
force-pushed
the
iequidoo/outer-protected-hdrs
branch
from
3ff41b4 to
5445310
Compare
iequidoo
force-pushed
the
iequidoo/outer-protected-hdrs
branch
from
5445310 to
92a4af4
Compare
iequidoo
force-pushed
the
iequidoo/outer-protected-hdrs
branch
from
92a4af4 to
4638c12
Compare
iequidoo
force-pushed
the
iequidoo/outer-protected-hdrs
branch
from
4638c12 to
4d718ed
Compare
iequidoo
force-pushed
the
iequidoo/outer-protected-hdrs
branch
from
4d718ed to
bbf9f2b
Compare
Delta Chat always adds protected headers to the inner encrypted or signed message, so if a protected header is only present in the outer part, it should be ignored because it's probably added by the server or somebody else. The exceptions are Subject and List-ID because there are known cases when they are only present in the outer message part. Also treat any Chat-* headers as protected. This fixes e.g. a case when the server injects a "Chat-Version" IMF header tricking Delta Chat into thinking that it's a chat message. Also handle "Auto-Submitted" and "Autocrypt-Setup-Message" as protected headers on the receiver side, this was apparently forgotten.
iequidoo
force-pushed
the
iequidoo/outer-protected-hdrs
branch
from
bbf9f2b to
ff411b6
Compare
link2xt
reviewed
Jul 14, 2025
| @@ -2005,6 +2002,31 @@ pub(crate) fn parse_message_id(ids: &str) -> Result<String> { | |||
| } | |||
| } | |||
|
|
|||
| /// Returns true if the header overwrites outer header | |||
There was a problem hiding this comment.
The comment is now outdated, all headers overwrite outer header when they come from protected headers.
Also the only place the function is used we make exception for list-id and subject. Maybe make this function ignore them in the first place and say that this function returns whether we don't expect the header to appear unprotected without protection in encrypted messages.
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.
No description provided.