From 9b71f7e99669afcca32dfc6728241152bb0d69a1 Mon Sep 17 00:00:00 2001 From: Andrew Savinykh <658865+AndrewSav@users.noreply.github.com> Date: Sat, 16 Dec 2023 14:04:00 +1300 Subject: [PATCH 1/5] Updated base image to https://github.com/mailserver2/debian-mail-overlay/releases/tag/v1.0.13 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e13d58a..b8dd177 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mailserver2/debian-mail-overlay:1.0.12 +FROM mailserver2/debian-mail-overlay:1.0.13 LABEL description="Simple and full-featured mail server using Docker" From ecd23bb811c703ac7a34ef210a7189aca9224775 Mon Sep 17 00:00:00 2001 From: Andrew Savinykh <658865+AndrewSav@users.noreply.github.com> Date: Fri, 29 Dec 2023 08:05:21 +1300 Subject: [PATCH 2/5] update dmo to 1.0.14 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b8dd177..18b6d51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mailserver2/debian-mail-overlay:1.0.13 +FROM mailserver2/debian-mail-overlay:1.0.14 LABEL description="Simple and full-featured mail server using Docker" From 339f9b3a5c5375aead7fbfb75fe891c350012f6a Mon Sep 17 00:00:00 2001 From: diroots <30463065+diroots@users.noreply.github.com> Date: Tue, 9 Jan 2024 08:05:42 +0100 Subject: [PATCH 3/5] Update rsyslog.conf to ignore some rspamd warnings for tests (#61) --- rootfs/etc/rsyslog/rsyslog.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rootfs/etc/rsyslog/rsyslog.conf b/rootfs/etc/rsyslog/rsyslog.conf index b9ddf54..ab95cfa 100644 --- a/rootfs/etc/rsyslog/rsyslog.conf +++ b/rootfs/etc/rsyslog/rsyslog.conf @@ -7,6 +7,9 @@ $IncludeConfig /etc/rsyslog.d/*.conf # https://github.com/vstakhov/rspamd/issues/1693 :msg,contains,"map file is unavailable for reading" ~ :msg,contains,"cannot load controller stats from /var/mail/rspamd/stats.ucl" ~ +:msg,contains,"rspamd_register_symbol_fromlua: duplicate symbol" ~ +:msg,contains,"trying to add virtual symbol MID" ~ +:msg,contains,"init of /usr/share/rspamd/lualib/lua_ffi/spf.lua failed" ~ :msg,contains,"database is locked" ~ :msg,contains,"http error occurred: IO read error: unexpected EOF" ~ :msg,contains,"http error occurred: Not found" ~ From 9bb7df6fd885b815aaba21b3a1211994c36f97b1 Mon Sep 17 00:00:00 2001 From: Andrew Savinykh <658865+AndrewSav@users.noreply.github.com> Date: Wed, 10 Jan 2024 08:35:40 +1300 Subject: [PATCH 4/5] add smtp smuggling mitigation --- rootfs/etc/postfix/main.cf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/rootfs/etc/postfix/main.cf b/rootfs/etc/postfix/main.cf index beac1cd..eb425c9 100644 --- a/rootfs/etc/postfix/main.cf +++ b/rootfs/etc/postfix/main.cf @@ -25,6 +25,18 @@ mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 {{ .RELAY_NETWORKS alias_maps = hash:/etc/aliases + +################################ +## SMTP smuggling mitigation ## +################################ +smtpd_forbid_bare_newline = yes +smtpd_forbid_bare_newline_exclusions = $mynetworks + +# https://www.postfix.org/smtp-smuggling.html#long +# Optionally disconnect remote SMTP clients that send bare newlines, +# but allow local clients with non-standard SMTP implementations +# such as netcat, fax machines, or load balancer health checks. + ############### ## SMTP/UTF8 ## ############### From 58ab252fce8a8423f47b006ceedaa278e84a0705 Mon Sep 17 00:00:00 2001 From: Andrew Savinykh <658865+AndrewSav@users.noreply.github.com> Date: Wed, 10 Jan 2024 08:45:37 +1300 Subject: [PATCH 5/5] update checkout action from v2 to v3 --- .github/workflows/default.yml | 2 +- .github/workflows/ecdsa.yml | 2 +- .github/workflows/ldap.yml | 2 +- .github/workflows/ldap2.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/reverse.yml | 2 +- .github/workflows/sieve.yml | 2 +- .github/workflows/traefik_acmev1.yml | 2 +- .github/workflows/traefik_acmev2.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 5c56a46..6c23273 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/ecdsa.yml b/.github/workflows/ecdsa.yml index 231a730..ae6d8b2 100644 --- a/.github/workflows/ecdsa.yml +++ b/.github/workflows/ecdsa.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/ldap.yml b/.github/workflows/ldap.yml index 5162ae7..910a18a 100644 --- a/.github/workflows/ldap.yml +++ b/.github/workflows/ldap.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/ldap2.yml b/.github/workflows/ldap2.yml index 5ffd807..89acc85 100644 --- a/.github/workflows/ldap2.yml +++ b/.github/workflows/ldap2.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7eadc88..cc2102a 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/reverse.yml b/.github/workflows/reverse.yml index 5a7e045..9ce33da 100644 --- a/.github/workflows/reverse.yml +++ b/.github/workflows/reverse.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/sieve.yml b/.github/workflows/sieve.yml index 51c5e3b..0109f01 100644 --- a/.github/workflows/sieve.yml +++ b/.github/workflows/sieve.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/traefik_acmev1.yml b/.github/workflows/traefik_acmev1.yml index 0532d09..fb64984 100644 --- a/.github/workflows/traefik_acmev1.yml +++ b/.github/workflows/traefik_acmev1.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive diff --git a/.github/workflows/traefik_acmev2.yml b/.github/workflows/traefik_acmev2.yml index d7ea87b..802642b 100644 --- a/.github/workflows/traefik_acmev2.yml +++ b/.github/workflows/traefik_acmev2.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout repository and submodules - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: recursive