diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2023-02-20 21:36:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 21:36:50 +0000 |
| commit | 4dfb85f4610c47dc356762b5d4fa7ec3609d79b2 (patch) | |
| tree | 26f4ca7c79ddec20bdad80920d44230cb3cf5fcf /rules/regexp | |
| parent | 2a9abee4cbb8307d97b369337dc1072fad075d33 (diff) | |
| parent | c60d2fb077122aeec9122bdca23448a2250390f7 (diff) | |
| download | rspamd-4dfb85f4610c47dc356762b5d4fa7ec3609d79b2.tar.gz rspamd-4dfb85f4610c47dc356762b5d4fa7ec3609d79b2.zip | |
Merge branch 'master' into temp-add-ipfs-heuristics
Diffstat (limited to 'rules/regexp')
| -rw-r--r-- | rules/regexp/compromised_hosts.lua | 1 | ||||
| -rw-r--r-- | rules/regexp/headers.lua | 17 |
2 files changed, 12 insertions, 6 deletions
diff --git a/rules/regexp/compromised_hosts.lua b/rules/regexp/compromised_hosts.lua index 0a9a9f0aa..cfd560bc2 100644 --- a/rules/regexp/compromised_hosts.lua +++ b/rules/regexp/compromised_hosts.lua @@ -211,4 +211,3 @@ reconf['WWW_DOT_DOMAIN'] = { score = 0.5, group = "compromised_hosts" } - diff --git a/rules/regexp/headers.lua b/rules/regexp/headers.lua index 9a01426fc..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) @@ -865,7 +865,7 @@ reconf['SUBJECT_HAS_QUESTION'] = { } reconf['SUBJECT_HAS_CURRENCY'] = { - re = 'Subject=/[$€$¢¥₽]/Hu', + re = 'Subject=/\\p{Sc}/Hu', description = 'Subject contains currency', score = 1.0, group = 'headers' @@ -908,14 +908,21 @@ reconf['HAS_LIST_UNSUB'] = { reconf['HAS_GUC_PROXY_URI'] = { re = '/\\.googleusercontent\\.com\\/proxy/{url}i', - description = 'Has googleusercontent.com proxy URI', - score = 0.01, - group = 'experimental' + description = 'Has googleusercontent.com proxy URL', + score = 1.0, + group = 'url' } reconf['HAS_GOOGLE_REDIR'] = { re = '/\\.google\\.com\\/url\\?/{url}i', description = 'Has google.com/url redirection', + score = 1.0, + group = 'url' +} + +reconf['HAS_GOOGLE_FIREBASE_URL'] = { + re = '/\\.firebasestorage\\.googleapis\\.com\\//{url}i', + description = 'Contains firebasestorage.googleapis.com URL', score = 0.01, group = 'experimental' } |