From: Carsten Rosenberg <c.rosenberg@heinlein-support.de>
Date: Thu, 24 May 2018 12:42:34 +0000 (+0200)
Subject: [FIX] Ratelimit - fix set symbol only
X-Git-Tag: 1.7.6~107^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=449a579a29ddd706550b763211f7f5aed850d364;p=rspamd.git

[FIX] Ratelimit - fix set symbol only
---

diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua
index e060fe084..a9fc7930f 100644
--- a/src/plugins/lua/ratelimit.lua
+++ b/src/plugins/lua/ratelimit.lua
@@ -377,7 +377,15 @@ local function ratelimit_cb(task)
       if err then
         rspamd_logger.errx('cannot check limit %s: %s %s', prefix, err, data)
       elseif type(data) == 'table' and data[1] and data[1] == 1 then
-        if settings.info_symbol then
+        -- set symbol only and do NOT soft reject
+        if settings.symbol then
+          task:insert_result(settings.symbol, 0.0, prefix)
+          rspamd_logger.infox(task,
+                  'set_symbol_only: ratelimit "%s(%s)" exceeded, (%s / %s): %s (%s:%s dyn)',
+                  lim_name, prefix, bucket[2], bucket[1], data[2], data[3], data[4])
+          return
+        -- set INFO symbol and soft reject
+        elseif settings.info_symbol then
           task:insert_result(settings.info_symbol, 1.0, prefix)
         end
         rspamd_logger.infox(task,