Compare commits

...

4 Commits

Author SHA1 Message Date
Georg Lauterbach 82939961ea
Update sender_header_filter.pcre 2025-03-24 09:59:20 +01:00
Georg Lauterbach 2ad8d2e098
chore: fix CHANGELOG
Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
2025-03-23 23:05:06 +01:00
Georg Lauterbach 8ace34e45e
chore: update `CHANGELOG.md`
Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
2025-03-23 23:03:28 +01:00
Georg Lauterbach cee6e116f5
fix: GPG signing
by adjusting `sender_header_filter.pcre` and related tests

Signed-off-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com>
2025-03-23 22:58:45 +01:00
3 changed files with 14 additions and 8 deletions

View File

@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file. The format
> **Note**: Changes and additions listed here are contained in the `:edge` image tag. These changes may not be as stable as released changes. > **Note**: Changes and additions listed here are contained in the `:edge` image tag. These changes may not be as stable as released changes.
### Fixes
- **Postfix**
- ensure message content is not modified by header filter ([#4427](https://github.com/docker-mailserver/docker-mailserver/pull/4427))
## [v15.0.1](https://github.com/docker-mailserver/docker-mailserver/releases/tag/v15.0.1) ## [v15.0.1](https://github.com/docker-mailserver/docker-mailserver/releases/tag/v15.0.1)
### Added ### Added

View File

@ -1,11 +1,11 @@
/^\s*Received:.*with ESMTPSA/ IGNORE /^\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 /^\s*Message-ID:/i PREPEND X-MS-Reactions: disallow
/^\s*Mime-Version: 1.0.*/i REPLACE MIME-Version: 1.0

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:
# #