Remove DKIM-Signature from incoming mail after checking #747
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
|
Check out the page preview at https://staging.chatmail.at/doc/relay/747/ |
j4n
force-pushed
the
j4n/remove-dkim-header
branch
from
4d22f5d to
72a3da4
Compare
j4n
force-pushed
the
j4n/remove-dkim-header
branch
from
72a3da4 to
954bcbe
Compare
hpk42
reviewed
Dec 3, 2025
hpk42
reviewed
Dec 3, 2025
Comment on lines
27
to
37
| if not valid then | ||
| odkim.set_reply(ctx, "554", "5.7.1", "No valid DKIM signature found") | ||
| odkim.set_result(ctx, SMFIS_REJECT) | ||
| return nil | ||
| end | ||
|
|
||
| -- Valid signature found. Strip all DKIM-Signature headers | ||
| -- Delete in reverse order to avoid index shifting. | ||
| for i = nsigs, 1, -1 do | ||
| odkim.del_header(ctx, "DKIM-Signature", i) | ||
| end |
Contributor
There was a problem hiding this comment.
this would read clearer to me (i don't know much lua) if it were a "if valid-else" construct and at the end a single "return nil". given there is no automated tests any gain in readability is good :)
hpk42
approved these changes
Dec 3, 2025
Contributor
hpk42
left a comment
hpk42
left a comment
There was a problem hiding this comment.
looks good to me, just minor nitpicks.
It's missing a changelog.md entry (we still do them with the PR, but soon we want to change to probably git-cliff like chatmail core)
Co-authored-by: holger krekel <holger@merlinux.eu>
Refactor DKIM-Header-Pruning into a "if valid-else" construct with a single "return nil" at the end
j4n
force-pushed
the
j4n/remove-dkim-header
branch
from
78b9ebe to
c5e927d
Compare
Contributor
Author
|
Implemented your feedback. |
missytake
pushed a commit
that referenced
this pull request
Dec 6, 2025
The original #533 attempted to remove the header through postfix, but that is too early. Instead, remove the headers in the OpenDKIM `final.lua` script after the validation.
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.
The original #533 attempted to remove the header through postfix, but that is too early. Instead, remove the headers in the OpenDKIM
final.luascript after the validation.