summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@rspamd.com>2023-02-19 23:19:50 +0000
committerGitHub <noreply@github.com>2023-02-19 23:19:50 +0000
commit5684ffe1779ab4f8675cd13e969ab2357509a8e3 (patch)
tree90cb958b41a5660b6bf137f4a266f00b005b80e1
parent01a20aa2ed551d0c8ae275caccb3046841aad62b (diff)
parentc18f0561bffa769e7fd5eb418adf399173a8db22 (diff)
downloadrspamd-5684ffe1779ab4f8675cd13e969ab2357509a8e3.tar.gz
rspamd-5684ffe1779ab4f8675cd13e969ab2357509a8e3.zip
Merge pull request #4404 from georglauterbach/add-betterbird-to-header-rules
addition: add Betterbird to `user_agent_thunderbird`
-rw-r--r--rules/regexp/headers.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua
index 8734c8cb4..a2b95c2c7 100644
--- a/rules/regexp/headers.lua
+++ b/rules/regexp/headers.lua
@@ -439,7 +439,7 @@ reconf['FORGED_MUA_OPERA_MSGID'] = {
-- Detect forged Mozilla Mail/Thunderbird/Seamonkey/Postbox headers
-- Mozilla based X-Mailer
local user_agent_mozilla5 = 'User-Agent=/^\\s*Mozilla\\/5\\.0/H'
-local user_agent_thunderbird = 'User-Agent=/^\\s*(Thunderbird|Mozilla Thunderbird|Mozilla\\/.*Gecko\\/.*(Thunderbird|Icedove)\\/)/H'
+local user_agent_thunderbird = 'User-Agent=/^\\s*(Thunderbird|Mozilla Thunderbird|Mozilla\\/.*Gecko\\/.*(Thunderbird|Betterbird|Icedove)\\/)/H'
local user_agent_seamonkey = 'User-Agent=/^\\s*Mozilla\\/5\\.0\\s.+\\sSeaMonkey\\/\\d+\\.\\d+/H'
local user_agent_postbox = [[User-Agent=/^\s*Mozilla\/5\.0\s\([^)]+\)\sGecko\/\d+\sPostboxApp\/\d+(?:\.\d+){2,3}$/H]]
local user_agent_mozilla = string.format('(%s) & !(%s) & !(%s) & !(%s)', user_agent_mozilla5, user_agent_thunderbird, user_agent_seamonkey, user_agent_postbox)