From: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Sun, 27 Oct 2019 20:03:01 +0000 (+0000)
Subject: eximconf: reject messages that the sender says are spam
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=73b92ffb4919e98dfced223ec2557a6095ade491;p=mirror%2Fdsa-puppet.git

eximconf: reject messages that the sender says are spam

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
---

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 7fe1b6d38..da1b73f55 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1020,6 +1020,10 @@ check_message:
   # header.  Take their crack pipe away.
   drop   condition = ${if match{${lc:$h_From:}}{\Npostmaster@([^.]+\.)?debian\.org\N}}
 
+  # If the sending system says the mail is spam, believe them
+  deny    condition = ${if eqi {$h_X-Spam-Status:}{YES}}
+          message   = Incoming spam flags
+
 <%- if @is_rtmaster -%>
   deny    condition = ${if eq {$acl_m_prf}{RTMail}}
           condition = ${if and{{!match {${lc:$rh_Subject:}} {debian rt}} \