From c01f7bf658d8412d8885275a30abea0b6ea3909f Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 9 Jan 2017 13:33:47 +0000 Subject: [PATCH] [Minor] Be more strict about bad mime structure --- rules/misc.lua | 11 +++-------- src/libmime/mime_parser.c | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rules/misc.lua b/rules/misc.lua index f3a2ab7d95..6a1eec4fc7 100644 --- a/rules/misc.lua +++ b/rules/misc.lua @@ -174,13 +174,9 @@ rspamd_config.R_SUSPICIOUS_URL = { rspamd_config.BROKEN_HEADERS = { callback = function(task) - if task:has_flag('broken_headers') then - return true - end - - return false + return task:has_flag('broken_headers') end, - score = 1.0, + score = 10.0, group = 'header', description = 'Headers structure is likely broken' } @@ -760,5 +756,4 @@ local freemail_reply_neq_from_id = rspamd_config:register_symbol({ score = 3.0 }) rspamd_config:register_dependency(freemail_reply_neq_from_id, 'FREEMAIL_REPLYTO') -rspamd_config:register_dependency(freemail_reply_neq_from_id, 'FREEMAIL_FROM') - +rspamd_config:register_dependency(freemail_reply_neq_from_id, 'FREEMAIL_FROM') \ No newline at end of file diff --git a/src/libmime/mime_parser.c b/src/libmime/mime_parser.c index ac0e90b057..e535a6d566 100644 --- a/src/libmime/mime_parser.c +++ b/src/libmime/mime_parser.c @@ -945,7 +945,7 @@ rspamd_mime_parse_message (struct rspamd_task *task, hdrs = rspamd_message_get_header_from_hash (task->raw_headers, task->task_pool, "Content-Type", FALSE); - task->flags |= RSPAMD_TASK_FLAG_BROKEN_HEADERS|RSPAMD_TASK_FLAG_EMPTY; + task->flags |= RSPAMD_TASK_FLAG_BROKEN_HEADERS; } else { body_pos = 0; -- 2.47.3