From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 15 Jun 2020 10:24:21 +0000 (+0100)
Subject: [Minor] Add more default scores :(
X-Git-Tag: 2.6~321
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6541d1c6925d3cda8b2f1751445b409fde28c768;p=thirdparty%2Frspamd.git

[Minor] Add more default scores :(
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index f82a4fb38e..1ef2dbe12b 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -1260,7 +1260,8 @@ if opts and type(opts) == 'table' then
         rspamd_config:register_symbol({
           type = 'virtual',
           name = s,
-          parent = id
+          parent = id,
+          score = 0, -- Default score
         })
         rule['symbols_set'][s] = 1
       end, rule['symbols'])
diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua
index 4ebe588b42..f69c5aa668 100644
--- a/src/plugins/lua/spamassassin.lua
+++ b/src/plugins/lua/spamassassin.lua
@@ -1532,6 +1532,7 @@ local function post_process()
       if not expression then
         rspamd_logger.errx(rspamd_config, 'Cannot parse expression ' .. r['meta'])
       else
+
         if r['score'] then
           rspamd_config:set_metric_symbol{
             name = k, score = r['score'],
@@ -1540,14 +1541,21 @@ local function post_process()
             one_shot = true
           }
           scores_added[k] = 1
+          rspamd_config:register_symbol{
+            name = k,
+            weight = calculate_score(k, r),
+            callback = meta_cb
+          }
+        else
+          -- Add 0 score to avoid issues
+          rspamd_config:register_symbol{
+            name = k,
+            weight = calculate_score(k, r),
+            callback = meta_cb,
+            score = 0,
+          }
         end
 
-        rspamd_config:register_symbol{
-          name = k,
-          weight = calculate_score(k, r),
-          callback = meta_cb
-        }
-
         r['expression'] = expression
 
         if not atoms[k] then