From: Anton Yuzhaninov <citrin+git@citrin.ru>
Date: Mon, 14 Dec 2020 19:31:22 +0000 (+0000)
Subject: [Minor] Update regexp for R_UNDISC_RCPT
X-Git-Tag: 2.7~66^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3576%2Fhead;p=thirdparty%2Frspamd.git

[Minor] Update regexp for R_UNDISC_RCPT

Match more variations for undisclosed-recipients, but don't match when
it is used as a lame real name.
---

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index b760b802e3..c47205fea9 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -106,9 +106,17 @@ reconf['MISSING_TO'] = {
 }
 
 -- Detects undisclosed recipients
-local undisc_rcpt = 'To=/^<?undisclosed[- ]recipient/Hi'
 reconf['R_UNDISC_RCPT'] = {
-  re = string.format('(%s)', undisc_rcpt),
+  -- match:
+  -- To: undisclosed-recipients:;
+  -- To: Undisclosed recipients:;
+  -- To: undisclosed-recipients: ;
+  -- To: <Undisclosed-Recipient:;>
+  -- To: "undisclosed-recipients (utajeni adresati)": ;
+  -- To: Undisclosed recipients:
+  -- but do not match:
+  -- Undisclosed Recipient <user@example.org>
+  re = [[To=/^[<"]?undisclosed[- ]recipients?\b.*:/i{header}]],
   score = 3.0,
   description = 'Recipients are absent or undisclosed',
   group = 'headers',