From: Bernhard Frauendienst <rspamd@nospam.obeliks.de>
Date: Mon, 30 Apr 2018 12:34:51 +0000 (+0200)
Subject: Add optional status prefix to X-Virus header
X-Git-Tag: 1.7.4~9^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4c4ce6dc468b105e6e52edeb126a9f39f58fd92a;p=rspamd.git

Add optional status prefix to X-Virus header

Adds two options to X-Virus milter header routine that prefix the header
value with a configured string when a virus was found (or not). This is
useful for sieve implementations (like pidgeonhole) that require a fixed
value part to match against.
---

diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index 0eb92ff27..5e7fb21ed 100644
--- a/src/plugins/lua/milter_headers.lua
+++ b/src/plugins/lua/milter_headers.lua
@@ -71,6 +71,8 @@ local settings = {
     ['x-virus'] = {
       header = 'X-Virus',
       remove = 1,
+      status_clean = nil,
+      status_infected = nil,
       symbols = {}, -- needs config
     },
     ['x-spamd-bar'] = {
@@ -344,7 +346,13 @@ local function milter_headers(task)
       end
     end
     if #virii > 0 then
-      add_header('x-virus', table.concat(virii, ','))
+      local virusstatus = table.concat(virii, ',')
+      if settings.routines['x-virus'].status_infected then
+        virusstatus = settings.routines['x-virus'].status_infected .. ', ' .. virusstatus
+      end
+      add_header('x-virus', virusstatus)
+    elseif settings.routines['x-virus'].status_clean then
+      add_header('x-virus', settings.routines['x-virus'].status_clean)
     end
   end