From ac9b48f9044ceb4040328a7378ce467cbf3cff9b Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 1 Mar 2018 14:49:52 +0000
Subject: [Minor] Add new methods to get data from the config

---
 src/lua/lua_config.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 67 insertions(+), 5 deletions(-)

diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index a4669ac80..935ee7806 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -253,7 +253,7 @@ rspamd_config:register_dependency('SYMBOL_FROM', 'SYMBOL_TO')
 LUA_FUNCTION_DEF (config, register_dependency);
 
 /**
- * @method rspamd_config:set_metric_symbol({table})
+ * @method rspamd_config:set_symbol({table})
  * Sets the value of a specified symbol in a metric. This function accepts table with the following elements:
  *
  * - `name`: name of symbol (string)
@@ -272,7 +272,7 @@ LUA_FUNCTION_DEF (config, register_dependency);
 LUA_FUNCTION_DEF (config, set_metric_symbol);
 
 /**
- * @method rspamd_config:set_metric_action({table})
+ * @method rspamd_config:set_action({table})
  * Sets the score of a specified action in a metric. This function accepts table with the following elements:
  *
  * - `action`: name of action (string)
@@ -283,7 +283,7 @@ LUA_FUNCTION_DEF (config, set_metric_symbol);
 LUA_FUNCTION_DEF (config, set_metric_action);
 
 /**
- * @method rspamd_config:get_metric_symbol(name)
+ * @method rspamd_config:get_symbol(name)
  * Gets metric data for a specific symbol identified by `name`:
  *
  * - `score`: score for symbol (number)
@@ -300,14 +300,21 @@ LUA_FUNCTION_DEF (config, set_metric_action);
 LUA_FUNCTION_DEF (config, get_metric_symbol);
 
 /**
- * @method rspamd_config:get_metric_action(name)
- * Gets data for a specific action in a metric. This function returns number reperesenting action's score
+ * @method rspamd_config:get_action(name)
+ * Gets data for a specific action in config. This function returns number reperesenting action's score
  *
  * @param {string} name name of action
  * @return {number} action's score or nil in case of undefined score or action
  */
 LUA_FUNCTION_DEF (config, get_metric_action);
 
+/**
+ * @method rspamd_config:get_all_actions()
+ * Gets data for all action in config
+ * @return {table|str->num} action's score or nil in case of undefined score or action
+ */
+LUA_FUNCTION_DEF (config, get_all_actions);
+
 /**
  * @method rspamd_config:add_composite(name, expression)
  * @param {string} name name of composite symbol
@@ -525,6 +532,13 @@ LUA_FUNCTION_DEF (config, get_symbols_count);
  */
 LUA_FUNCTION_DEF (config, get_symbols_cksum);
 
+/***
+ * @method rspamd_config:get_symbols_counters()
+ * Returns table of all counters in the cache (weights, frequencies etc)
+ * @return {table|tables} all symbols indexed by name
+ */
+LUA_FUNCTION_DEF (config, get_symbols_counters);
+
 /***
  * @method rspamd_config:get_symbol_callback(name)
  * Returns callback function for the specified symbol if it is a lua registered callback
@@ -673,9 +687,14 @@ static const struct luaL_reg configlib_m[] = {
 	LUA_INTERFACE_DEF (config, register_callback_symbol_priority),
 	LUA_INTERFACE_DEF (config, register_dependency),
 	LUA_INTERFACE_DEF (config, set_metric_symbol),
+	{"set_symbol", lua_config_set_metric_symbol},
 	LUA_INTERFACE_DEF (config, set_metric_action),
+	{"set_action", lua_config_set_metric_action},
 	LUA_INTERFACE_DEF (config, get_metric_symbol),
+	{"get_symbol", lua_config_get_metric_symbol},
 	LUA_INTERFACE_DEF (config, get_metric_action),
+	{"get_action", lua_config_get_metric_action},
+	LUA_INTERFACE_DEF (config, get_all_actions),
 	LUA_INTERFACE_DEF (config, add_composite),
 	LUA_INTERFACE_DEF (config, register_module_option),
 	LUA_INTERFACE_DEF (config, register_pre_filter),
@@ -692,6 +711,7 @@ static const struct luaL_reg configlib_m[] = {
 	LUA_INTERFACE_DEF (config, add_periodic),
 	LUA_INTERFACE_DEF (config, get_symbols_count),
 	LUA_INTERFACE_DEF (config, get_symbols_cksum),
+	LUA_INTERFACE_DEF (config, get_symbols_counters),
 	LUA_INTERFACE_DEF (config, get_symbol_callback),
 	LUA_INTERFACE_DEF (config, set_symbol_callback),
 	LUA_INTERFACE_DEF (config, get_symbol_stat),
@@ -1935,6 +1955,30 @@ lua_config_get_metric_action (lua_State * L)
 	return 1;
 }
 
+static gint
+lua_config_get_all_actions (lua_State * L)
+{
+	struct rspamd_config *cfg = lua_check_config (L, 1);
+	gint act = 0;
+
+	if (cfg) {
+		lua_newtable (L);
+
+		for (act = METRIC_ACTION_REJECT; act < METRIC_ACTION_MAX; act ++) {
+			if (!isnan (cfg->actions[act].score)) {
+				lua_pushstring (L, rspamd_action_to_str (act));
+				lua_pushnumber (L, cfg->actions[act].score);
+				lua_settable (L, -3);
+			}
+		}
+	}
+	else {
+		return luaL_error (L, "invalid arguments, rspamd_config expected");
+	}
+
+	return 1;
+}
+
 static gint
 lua_config_add_composite (lua_State * L)
 {
@@ -2555,6 +2599,24 @@ lua_config_get_symbols_cksum (lua_State *L)
 	return 1;
 }
 
+static gint
+lua_config_get_symbols_counters (lua_State *L)
+{
+	struct rspamd_config *cfg = lua_check_config (L, 1);
+	ucl_object_t *counters;
+
+	if (cfg != NULL) {
+		counters = rspamd_symbols_cache_counters (cfg->cache);
+		ucl_object_push_lua (L, counters, true);
+		ucl_object_unref (counters);
+	}
+	else {
+		return luaL_error (L, "invalid arguments");
+	}
+
+	return 1;
+}
+
 static gint
 lua_config_get_symbol_callback (lua_State *L)
 {
-- 
cgit v1.2.3