diff options
| author | Steve Freegard <steve@stevefreegard.com> | 2017-03-28 23:46:35 +0100 |
|---|---|---|
| committer | Steve Freegard <steve@stevefreegard.com> | 2017-03-29 15:08:00 +0100 |
| commit | 785481f6d52470adcbea18858ce66f01679ce622 (patch) | |
| tree | d0c6c0da807330ea23b8b68a4df00be3de2c385e /rules | |
| parent | aae8be4c65669d6f3a5ac5825d696d5a4ac6dbad (diff) | |
| download | rspamd-785481f6d52470adcbea18858ce66f01679ce622.tar.gz rspamd-785481f6d52470adcbea18858ce66f01679ce622.zip | |
Rules updates
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/headers_checks.lua | 20 | ||||
| -rw-r--r-- | rules/misc.lua | 11 | ||||
| -rw-r--r-- | rules/regexp/misc.lua | 2 |
3 files changed, 32 insertions, 1 deletions
diff --git a/rules/headers_checks.lua b/rules/headers_checks.lua index a4e202f5e..1ff27ce2f 100644 --- a/rules/headers_checks.lua +++ b/rules/headers_checks.lua @@ -881,3 +881,23 @@ rspamd_config:register_symbol{ type = 'virtual', description = 'Some of the recipients match the envelope', } + +rspamd_config.CTYPE_MISSING_DISPOSITION = { + callback = function(task) + local parts = task:get_parts() + if (not parts) or (parts and #parts < 1) then return false end + for _,p in ipairs(parts) do + local ct = p:get_header('Content-Type') + if (ct and ct:lower():match('^application/octet%-stream') ~= nil) then + local cd = p:get_header('Content-Disposition') + if (not cd) or (cd and cd:lower():find('^attachment') == nil) then + return true + end + end + end + return false + end, + description = 'Binary content-type not specified as an attachment', + score = 4.0, + group = 'header' +} diff --git a/rules/misc.lua b/rules/misc.lua index 07af50c12..0d83fa02a 100644 --- a/rules/misc.lua +++ b/rules/misc.lua @@ -204,6 +204,8 @@ local check_rcvd = rspamd_config:register_symbol{ local rcvd = rcvds[1] if rcvd.flags and rcvd.flags['ssl'] then task:insert_result('RCVD_TLS_LAST', 1.0) + else + task:insert_result('RCVD_NO_TLS_LAST', 1.0) end end @@ -238,6 +240,15 @@ rspamd_config:register_symbol{ rspamd_config:register_symbol{ type = 'virtual', parent = check_rcvd, + name = 'RCVD_NO_TLS_LAST', + description = 'Last hop did not use encrypted transports', + score = 0.0, + group = 'encryption' +} + +rspamd_config:register_symbol{ + type = 'virtual', + parent = check_rcvd, name = 'RCVD_VIA_SMTP_AUTH', description = 'Message injected via SMTP AUTH', score = 0.0, diff --git a/rules/regexp/misc.lua b/rules/regexp/misc.lua index 2da59ef7f..1adfe98fd 100644 --- a/rules/regexp/misc.lua +++ b/rules/regexp/misc.lua @@ -19,7 +19,7 @@ local reconf = config['regexp'] reconf['HTML_META_REFRESH_URL'] = { -- Requires options { check_attachements = true; } - re = '/<meta\\s+http-equiv="refresh"\\s+content="\\d+;url=/{sa_raw_body}i', + re = '/<meta\\s+http-equiv="refresh"\\s+content="\\d+\\s*;\\s*url=/{sa_raw_body}i', description = "Has HTML Meta refresh URL", score = 5.0, group = 'HTML' |