Upgrade ClamAV/1.0.5, enable DMARC check

Dockerfile

@@ -30,6 +30,7 @@ RUN apt-get install -y --no-install-recommends \
     libgeo-ip-perl \
     libio-socket-ssl-perl \
     libnet-patricia-perl \
+    libmail-dmarc-perl \
     razor \
     pyzor
 
@@ -42,7 +43,7 @@ RUN apt-get install -y --no-install-recommends \
 # Amavis-new
 ENV AV_VERSION="1:2.13"
 ENV AV_REVISION="0"
-ENV AV_PACKAGE="1:2.13.0-3"
+ENV AV_PACKAGE="1:2.13.0-3+deb12u1"
 RUN apt-get install -y --no-install-recommends \
     amavisd-new=${AV_PACKAGE} \
     && rm -rf /var/lib/apt/lists/*

README.md

@@ -15,11 +15,11 @@ Related images:
 # Tags
 The following versions are available from DockerHub. The image tag matches the Amavisd-new version.
 
-* [2.13.0.0, 2.13.0, 2.13, 2, latest](https://hub.docker.com/repository/docker/technicalguru/mailserver-amavis/tree/v2.13.0.0) - [Dockerfile](https://github.com/technicalguru/docker-mailserver-amavis/blob/2.13.0.0/Dockerfile)
+* [2.13.0.1, 2.13.0, 2.13, 2, latest](https://hub.docker.com/repository/docker/technicalguru/mailserver-amavis/tree/v2.13.0.0) - [Dockerfile](https://github.com/technicalguru/docker-mailserver-amavis/blob/2.13.0.1/Dockerfile)
 
 # Features
 * [Amavis Checker](https://www.amavis.org/) v2.13.0
-* Virus detection using [ClamAV](https://www.clamav.net/) v1.0.3
+* Virus detection using [ClamAV](https://www.clamav.net/) v1.0.5
 * Spam detection using [SpamAssassin](https://spamassassin.apache.org/) v4.0.0
 * Seamless integration in any SMTP mail chain
 
@@ -70,11 +70,7 @@ You can further customize Amavis, ClamAV and SpamAssassin configuration files. P
 1. (Re)Start the container. If you configuration was not copied correctly then log into the container (bash is available) and delete the changed files from the corresponding `/etc` folders. Then restart the container.
 
 # Issues
-This Docker image is mature and provides scanning for my mailserver in production. However, several issues are still unresolved:
-
-* [#2](https://github.com/technicalguru/docker-mailserver-amavis/issues/2) - DKIM support is missing
-* [#3](https://github.com/technicalguru/docker-mailserver-amavis/issues/3) - SPF support is missing
-* [#4](https://github.com/technicalguru/docker-mailserver-amavis/issues/4) - Add automatic SA and ClamAV rules refresh
+This Docker image is mature and provides scanning for my mailserver in production. No issues known right now.
 
 # Contribution
 Report a bug, request an enhancement or pull request at the [GitHub Issue Tracker](https://github.com/technicalguru/docker-mailserver-amavis/issues). Make sure you have checked out the [Contribution Guideline](CONTRIBUTING.md)

etc/spamassassin/local.cf

@@ -116,3 +116,37 @@ ifplugin Mail::SpamAssassin::Plugin::Shortcircuit
 # shortcircuit BAYES_00                ham
 
 endif # Mail::SpamAssassin::Plugin::Shortcircuit
+
+ifplugin Mail::SpamAssassin::Plugin::DMARC
+  ifplugin Mail::SpamAssassin::Plugin::DKIM
+    ifplugin Mail::SpamAssassin::Plugin::SPF
+      dmarc_save_reports 0
+
+      header DMARC_REJECT eval:check_dmarc_reject()
+      priority DMARC_REJECT 500
+      describe DMARC_REJECT DMARC fail with reject policy
+      score DMARC_REJECT 10
+
+      header DMARC_QUAR eval:check_dmarc_quarantine()
+      priority DMARC_QUAR 500
+      describe DMARC_QUAR DMARC fail with quarantine policy
+      score DMARC_QUAR 6
+
+      header DMARC_NONE eval:check_dmarc_none()
+      priority DMARC_NONE 500
+      describe DMARC_NONE DMARC fail with none policy
+      score DMARC_NONE 0.1
+
+      header DMARC_MISSING eval:check_dmarc_missing()
+      priority DMARC_MISSING 500
+      describe DMARC_MISSING DMARC policy missing
+      score DMARC_MISSING 0.0
+
+      header DMARC_PASS eval:check_dmarc_pass()
+      priority DMARC_PASS 500
+      describe DMARC_PASS DMARC tests pass
+      score DMARC_PASS -0.1
+    endif
+  endif
+endif
+