From: Alexander Moisseev Date: Fri, 5 Feb 2021 19:09:58 +0000 (+0300) Subject: [Fix] Fix Mozilla Message-ID detection X-Git-Tag: 3.0~700^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4aebb2b5de725a1dd68714ca3e93bdf47f3f892e;p=rspamd.git [Fix] Fix Mozilla Message-ID detection The left part of the Mozilla Message-ID is a hexadecimal timestamp. The regexp was mistakenly limited to 2021-01-14. --- diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua index 430c88fd3..f606778ba 100644 --- a/rules/regexp/headers.lua +++ b/rules/regexp/headers.lua @@ -445,7 +445,7 @@ local user_agent_mozilla = string.format('(%s) & !(%s) & !(%s) & !(%s)', user_ag -- Mozilla based common Message-ID template local mozilla_msgid_common = 'Message-ID=/^\\s*<[\\dA-F]{8}\\.\\d{1,7}\\@([^>\\.]+\\.)+[^>\\.]+>$/H' local mozilla_msgid_common_sec = 'Message-ID=/^\\s*<[\\da-f]{8}-([\\da-f]{4}-){3}[\\da-f]{12}\\@([^>\\.]+\\.)+[^>\\.]+>$/H' -local mozilla_msgid = 'Message-ID=/^\\s*<(3[3-9A-F]|4[\\dA-F]|5[\\dA-F])[\\dA-F]{6}\\.(\\d0){1,4}\\d\\@([^>\\.]+\\.)+[^>\\.]+>$/H' +local mozilla_msgid = 'Message-ID=/^\\s*<(3[3-9A-F]|[4-9A-F][\\dA-F])[\\dA-F]{6}\\.(\\d0){1,4}\\d\\@([^>\\.]+\\.)+[^>\\.]+>$/H' -- Summary rule for forged Mozilla Mail Message-ID header reconf['FORGED_MUA_MOZILLA_MAIL_MSGID'] = { re = string.format('(%s) & (%s) & !(%s) & !(%s)', user_agent_mozilla, mozilla_msgid_common, mozilla_msgid, unusable_msgid),