From 8f65a08908b56ac66ab06614309729ae355ded67 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 17 Jan 2019 15:50:24 +0000
Subject: [PATCH] [Minor] External_services: Support `symbols` element

---
 src/plugins/lua/external_services.lua | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/plugins/lua/external_services.lua b/src/plugins/lua/external_services.lua
index 8e101ab9ad..f551abe273 100644
--- a/src/plugins/lua/external_services.lua
+++ b/src/plugins/lua/external_services.lua
@@ -157,7 +157,7 @@ local function add_scanner_rule(sym, opts)
     rule.whitelist = rspamd_config:add_hash_map(opts.whitelist)
   end
 
-  return function(task)
+  local function scan_cb(task)
     if rule.scan_mime_parts then
 
       fun.each(function(p)
@@ -171,6 +171,8 @@ local function add_scanner_rule(sym, opts)
       cfg.check(task, task:get_content(), task:get_digest(), rule)
     end
   end
+
+  return scan_cb, rule
 end
 
 -- Registration
@@ -182,11 +184,12 @@ if opts and type(opts) == 'table' then
     if type(m) == 'table' and m.servers then
       if not m.type then m.type = k end
       if not m.name then m.name = k end
-      local cb = add_scanner_rule(k, m)
+      local cb, nrule = add_scanner_rule(k, m)
 
       if not cb then
         rspamd_logger.errx(rspamd_config, 'cannot add rule: "' .. k .. '"')
       else
+        m = nrule
         local id = rspamd_config:register_symbol({
           type = 'normal',
           name = m['symbol'],
@@ -233,6 +236,26 @@ if opts and type(opts) == 'table' then
             end
           end
         end
+
+        if m.symbols then
+          local function reg_symbols(tbl)
+            for _,sym in pairs(tbl) do
+              if type(sym) == 'string' then
+                rspamd_config:register_symbol({
+                  type = 'virtual',
+                  name = sym,
+                  parent = id,
+                  group = N
+                })
+              elseif type(sym) == 'table' then
+                reg_symbols(sym)
+              end
+            end
+          end
+
+          reg_symbols(m.symbols)
+        end
+
         if m['score'] then
           -- Register metric symbol
           local description = 'external services symbol'
-- 
2.47.3