From: gami <tatsu.gami2573@gmail.com>
Date: Tue, 14 May 2024 12:15:34 +0000 (+0900)
Subject: [Minor] Exclude User-Agent: Mozilla Thunderbird from XM_UA_NO_VERSION
X-Git-Tag: 3.9.0~36^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0351e767fb76ccc8af9f09804b9a974469f7e52f;p=thirdparty%2Frspamd.git

[Minor] Exclude User-Agent: Mozilla Thunderbird from XM_UA_NO_VERSION
---

diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index d07d697ded..571ce0b713 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -967,11 +967,12 @@ reconf['HAS_FILE_URL'] = {
 }
 
 reconf['XM_UA_NO_VERSION'] = {
-  re = string.format('(!%s && !%s) && (%s || %s)',
+  re = string.format('(!%s && !%s) && (%s || %s) !%s',
       'X-Mailer=/https?:/H',
       'User-Agent=/https?:/H',
       'X-Mailer=/^[^0-9]+$/H',
-      'User-Agent=/^[^0-9]+$/H'),
+      'User-Agent=/^[^0-9]+$/H'
+      'User-Agent=/^\\s*Mozilla Thunderbird/H'),
   description = 'X-Mailer/User-Agent header has no version number',
   score = 0.01,
   group = 'experimental'