Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: GPG signing 

by adjusting `sender_header_filter.pcre` and related tests

Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
This commit is contained in:
Georg Lauterbach 2025-03-23 22:58:45 +01:00
parent 70d645d863
commit cee6e116f5
No known key found for this signature in database
GPG Key ID: D84CD4AA46D7F099
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/postfix/sender_header_filter.pcre
View File

@ -1,11 +1,10 @@
/^\s*Received:.*with ESMTPSA/ IGNORE /^\s*Message-ID:/i PREPEND X-MS-Reactions: disallow
/^\s*Mime-Version: 1.0.*/i REPLACE MIME-Version: 1.0
/^\s*Received: from.*127.0.0.1/ IGNORE
/^\s*Received:.*amavisd-new/ IGNORE /^\s*Received:.*amavisd-new/ IGNORE
/^\s*X-Originating-IP:/ IGNORE /^\s*Received:.*with ESMTPSA/ IGNORE
/^\s*X-Mailer:/ IGNORE
/^\s*Mime-Version: 1.0.*/ REPLACE MIME-Version: 1.0
/^\s*User-Agent/ IGNORE /^\s*User-Agent/ IGNORE
/^\s*X-Enigmail/ IGNORE /^\s*X-Enigmail/ IGNORE
/^\s*X-Mailer/ IGNORE /^\s*X-Mailer/ IGNORE
/^\s*X-MS-Reactions/ IGNORE
/^\s*X-Originating-IP/ IGNORE /^\s*X-Originating-IP/ IGNORE
/^\s*Received: from.*127.0.0.1/ IGNORE
/^Content-Type:/i PREPEND X-MS-Reactions: disallow

5
test/tests/parallel/set3/container_configuration/hostname.bats
View File

@ -234,8 +234,9 @@ function _should_have_correct_mail_headers() {
# but Amavis is changing that. It also changes protocol from SMTP to ESMTP. # but Amavis is changing that. It also changes protocol from SMTP to ESMTP.
assert_line --index 7 --partial 'Received: from localhost (localhost [127.0.0.1])' assert_line --index 7 --partial 'Received: from localhost (localhost [127.0.0.1])'
assert_line --index 8 --partial "by ${EXPECTED_FQDN} (Postfix) with ESMTP id" assert_line --index 8 --partial "by ${EXPECTED_FQDN} (Postfix) with ESMTP id"
assert_line --index 14 --partial 'Message-Id:' assert_line --index 14 'X-MS-Reactions: disallow'
assert_line --index 14 --partial "@${EXPECTED_FQDN}>" assert_line --index 15 --partial 'Message-Id:'
assert_line --index 15 --partial "@${EXPECTED_FQDN}>"
# Mail contents example: # Mail contents example:
# #