diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-05-28 17:26:38 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2012-05-28 17:26:38 +0400 |
| commit | 00c7c629771af48e4bc0756ac9b2eb2bba26d583 (patch) | |
| tree | 5b0ea80dc745c868673663d53f668edb7b9f923c /src/plugins | |
| parent | 5a0ad4684967e746b71f635f397ea4c0ae373f69 (diff) | |
| download | rspamd-00c7c629771af48e4bc0756ac9b2eb2bba26d583.tar.gz rspamd-00c7c629771af48e4bc0756ac9b2eb2bba26d583.zip | |
* Avoid DoS while sending a message with a lot of recipients in 'To' header.
Fix possible deadlock in lua_redis.
Version is now 0.4.8 as there are enough changes.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/lua/ratelimit.lua | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua index 7b1ea3eff..39bac5534 100644 --- a/src/plugins/lua/ratelimit.lua +++ b/src/plugins/lua/ratelimit.lua @@ -21,6 +21,7 @@ local bounce_senders = {'postmaster', 'mailer-daemon', '', 'null', 'fetchmail-da -- Do not check ratelimits for these senders local whitelisted_rcpts = {'postmaster', 'mailer-daemon'} local whitelisted_ip = nil +local max_rcpt = 5 local upstreams = nil --- Parse atime and bucket of limit @@ -167,6 +168,11 @@ local function rate_test_set(task, func) rcpts = task:get_recipients_headers() end if rcpts then + if table.maxn(rcpts) > max_rcpt then + rspamd_logger.info(string.format('message <%s> contains %d recipients, maximum is %d', + task:get_message_id(), table.maxn(rcpts), max_rcpt)) + return + end for i,r in ipairs(rcpts) do rcpts_user[i] = get_local_part(r['addr']) end @@ -276,6 +282,7 @@ if rspamd_config:get_api_version() >= 9 then rspamd_config:register_module_option('ratelimit', 'whitelisted_rcpts', 'string') rspamd_config:register_module_option('ratelimit', 'whitelisted_ip', 'map') rspamd_config:register_module_option('ratelimit', 'limit', 'string') + rspamd_config:register_module_option('ratelimit', 'max_rcpt', 'uint') end local function parse_whitelisted_rcpts(str) @@ -301,6 +308,10 @@ if opts then whitelisted_ip = rspamd_config:add_hash_map (opts['whitelisted_ip']) end + if opts['max_rcpt'] then + max_rcpt = tonumber (opts['max_rcpt']) + end + if not opts['servers'] then rspamd_logger.err('no servers are specified') else @@ -312,4 +323,4 @@ if opts then rspamd_config:register_post_filter(rate_set) end end -end +end
\ No newline at end of file |