From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 5 Nov 2017 12:46:15 +0000 (+0000)
Subject: [Feature] Check groups sanity
X-Git-Tag: 1.7.0~472
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f438ac755c623f92745fd6e86465c189ca21432e;p=thirdparty%2Frspamd.git

[Feature] Check groups sanity
---

diff --git a/lualib/rspamd_config_transform.lua b/lualib/rspamd_config_transform.lua
index 750862a8cd..cf19ca3eda 100644
--- a/lualib/rspamd_config_transform.lua
+++ b/lualib/rspamd_config_transform.lua
@@ -140,6 +140,24 @@ local function symbol_transform(cfg, k, v)
   logger.warnx("adding symbol %s to the group 'ungrouped'", k)
 end
 
+local function test_groups(groups)
+  local all_symbols = {}
+  for gr_name, gr in pairs(groups) do
+    if not gr.symbols then
+      logger.errx('group %s has no symbols', gr_name)
+    else
+      for sn,_ in pairs(gr.symbols) do
+        if all_symbols[sn] then
+          logger.errx('symbol %s has registered in multiple groups: %s and %s',
+              sn, all_symbols[sn], gr_name)
+        else
+          all_symbols[sn] = gr_name
+        end
+      end
+    end
+  end
+end
+
 local function convert_metric(cfg, metric)
   if type(metric[1]) == 'table' then
     logger.warnx("multiple metrics have never been supported")
@@ -170,12 +188,26 @@ local function convert_metric(cfg, metric)
     end
   end
 
-  return true, cfg
+  return cfg
 end
 
 return function(cfg)
+  local ret = false
+
   if cfg['metric'] then
-    return convert_metric(cfg, cfg.metric)
+    cfg = convert_metric(cfg, cfg.metric)
+    ret = true
+  end
+
+  if not cfg.actions then
+    logger.errx('no actions defined')
   end
-  return false, nil
+
+  if not cfg.group then
+    logger.errx('no symbol groups defined')
+  else
+    test_groups(cfg.group)
+  end
+
+  return ret, cfg
 end