[Project] Allow to set allowed and forbidden ids for symbols

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 8af34a63eedf022788f1e369686d2ef918e61fa5..985fd00d7d0d2831871b1d22fc8e41de4a413db0 100644 (file)
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -745,6 +745,14 @@ void rspamd_config_register_settings_id (struct rspamd_config *cfg,
                                                                                 ucl_object_t *symbols_enabled,
                                                                                 ucl_object_t *symbols_disabled);
 
+/**
+ * Convert settings name to settings id
+ * @param name
+ * @param namelen
+ * @return
+ */
+guint32 rspamd_config_name_to_id (const gchar *name, gsize namelen);
+
 /**
  * Finds settings id element and obtain reference count (must be unrefed by caller)
  * @param cfg

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 3761d08619d0473bfe2df858fbf7bc63baf4c34d..10c5b5092fd43077dcc8a9fe071614095cb090e0 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -2358,7 +2358,7 @@ rspamd_config_settings_elt_dtor (struct rspamd_config_settings_elt *e)
        }
 }
 
-static inline guint32
+guint32
 rspamd_config_name_to_id (const gchar *name, gsize namelen)
 {
        guint64 h;

diff --git a/src/libserver/rspamd_symcache.c b/src/libserver/rspamd_symcache.c
index d1d56ec1185bbee167e1e4bfaeb972ef2f575d73..3560957afaa950fd8eb38cd15289e477ea634c81 100644 (file)
--- a/src/libserver/rspamd_symcache.c
+++ b/src/libserver/rspamd_symcache.c
@@ -3026,7 +3026,7 @@ rspamd_symcache_set_allowed_settings_ids (struct rspamd_symcache *cache,
 {
        struct rspamd_symcache_item *item;
 
-       item = rspamd_symcache_find_filter (cache, symbol, true);
+       item = rspamd_symcache_find_filter (cache, symbol, false);
 
        if (item == NULL) {
                return false;
@@ -3066,7 +3066,7 @@ rspamd_symcache_set_forbidden_settings_ids (struct rspamd_symcache *cache,
 {
        struct rspamd_symcache_item *item;
 
-       item = rspamd_symcache_find_filter (cache, symbol, true);
+       item = rspamd_symcache_find_filter (cache, symbol, false);
 
        if (item == NULL) {
                return false;
@@ -3108,7 +3108,7 @@ rspamd_symcache_get_allowed_settings_ids (struct rspamd_symcache *cache,
        struct rspamd_symcache_item *item;
        guint cnt = 0;
 
-       item = rspamd_symcache_find_filter (cache, symbol, true);
+       item = rspamd_symcache_find_filter (cache, symbol, false);
 
        if (item == NULL) {
                return NULL;
@@ -3142,7 +3142,7 @@ rspamd_symcache_get_forbidden_settings_ids (struct rspamd_symcache *cache,
        struct rspamd_symcache_item *item;
        guint cnt = 0;
 
-       item = rspamd_symcache_find_filter (cache, symbol, true);
+       item = rspamd_symcache_find_filter (cache, symbol, false);
 
        if (item == NULL) {
                return NULL;

diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index 537a44bb68e4056ac57f65f37ee943b9eaa1b885..9f1c7a12b02834275ff2bc7605aa1ff9658ac802 100644 (file)
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -1396,6 +1396,27 @@ lua_metric_symbol_callback_return (struct thread_entry *thread_entry, int ret)
        rspamd_symcache_item_async_dec_check (task, cd->item, "lua coro symbol");
 }
 
+static guint32*
+rspamd_process_id_list (const gchar *entries, guint32 *plen)
+{
+       gchar **sym_elts;
+       guint32 *ids, nids;
+
+       sym_elts = g_strsplit_set (entries, ",;", -1);
+       nids = g_strv_length (sym_elts);
+
+       ids = g_malloc (nids * sizeof (guint32));
+
+       for (guint i = 0; i < nids; i ++) {
+               ids[i] = rspamd_config_name_to_id (sym_elts[i], strlen (sym_elts[i]));
+       }
+
+       *plen = nids;
+       g_strfreev (sym_elts);
+
+       return ids;
+}
+
 static gint
 rspamd_register_symbol_fromlua (lua_State *L,
                struct rspamd_config *cfg,
@@ -1405,10 +1426,13 @@ rspamd_register_symbol_fromlua (lua_State *L,
                gint priority,
                enum rspamd_symbol_type type,
                gint parent,
+               const gchar *allowed_ids,
+               const gchar *forbidden_ids,
                gboolean optional)
 {
        struct lua_callback_data *cd;
        gint ret = -1;
+       guint32 *ids, nids;
 
        if (priority == 0 && weight < 0) {
                priority = 1;
@@ -1427,6 +1451,13 @@ rspamd_register_symbol_fromlua (lua_State *L,
                }
        }
 
+       if (allowed_ids && !(type & SYMBOL_TYPE_EXPLICIT_DISABLE)) {
+               /* Mark symbol as explicit allow */
+               msg_info_config ("mark symbol %s as explicit enable as its execution is"
+                                  "allowed merely on specific settings ids", name);
+               type |= SYMBOL_TYPE_EXPLICIT_ENABLE;
+       }
+
        if (ref != -1) {
                cd = rspamd_mempool_alloc0 (cfg->cfg_pool,
                                sizeof (struct lua_callback_data));
@@ -1472,6 +1503,28 @@ rspamd_register_symbol_fromlua (lua_State *L,
                                parent);
        }
 
+       if (allowed_ids) {
+               ids = rspamd_process_id_list (allowed_ids, &nids);
+
+               if (nids > 0) {
+                       rspamd_symcache_set_allowed_settings_ids (cfg->cache, name,
+                                       ids, nids);
+
+                       g_free (ids);
+               }
+       }
+
+       if (forbidden_ids) {
+               ids = rspamd_process_id_list (forbidden_ids, &nids);
+
+               if (nids > 0) {
+                       rspamd_symcache_set_forbidden_settings_ids (cfg->cache, name,
+                                       ids, nids);
+
+                       g_free (ids);
+               }
+       }
+
        return ret;
 }
 
@@ -1508,6 +1561,7 @@ lua_config_register_post_filter (lua_State *L)
                                order,
                                SYMBOL_TYPE_POSTFILTER|SYMBOL_TYPE_CALLBACK,
                                -1,
+                               NULL, NULL,
                                FALSE);
 
                lua_pushboolean (L, ret);
@@ -1552,6 +1606,7 @@ lua_config_register_pre_filter (lua_State *L)
                                order,
                                SYMBOL_TYPE_PREFILTER|SYMBOL_TYPE_CALLBACK,
                                -1,
+                               NULL, NULL,
                                FALSE);
 
                lua_pushboolean (L, ret);
@@ -1810,7 +1865,8 @@ lua_config_register_symbol (lua_State * L)
        LUA_TRACE_POINT;
        struct rspamd_config *cfg = lua_check_config (L, 1);
        const gchar *name = NULL, *flags_str = NULL, *type_str = NULL,
-                       *description = NULL, *group = NULL;
+                       *description = NULL, *group = NULL, *allowed_ids = NULL,
+                       *forbidden_ids = NULL;
        double weight = 0, score = NAN, parent_float = NAN;
        gboolean one_shot = FALSE;
        gint ret = -1, cbref = -1, type, flags = 0;
@@ -1820,10 +1876,12 @@ lua_config_register_symbol (lua_State * L)
        if (cfg) {
                if (!rspamd_lua_parse_table_arguments (L, 2, &err,
                                "name=S;weight=N;callback=F;flags=S;type=S;priority=I;parent=D;"
-                               "score=D;description=S;group=S;one_shot=B;nshots=I",
+                               "score=D;description=S;group=S;one_shot=B;nshots=I;"
+                               "allowed_ids=S;forbidden_ids=S",
                                &name, &weight, &cbref, &flags_str, &type_str,
                                &priority, &parent_float,
-                               &score, &description, &group, &one_shot, &nshots)) {
+                               &score, &description, &group, &one_shot, &nshots,
+                               &allowed_ids, &forbidden_ids)) {
                        msg_err_config ("bad arguments: %e", err);
                        g_error_free (err);
 
@@ -1862,6 +1920,7 @@ lua_config_register_symbol (lua_State * L)
                                priority,
                                type,
                                parent,
+                               allowed_ids, forbidden_ids,
                                FALSE);
 
                if (!isnan (score) || group) {
@@ -1950,6 +2009,7 @@ lua_config_register_symbols (lua_State *L)
                                0,
                                SYMBOL_TYPE_CALLBACK,
                                -1,
+                               NULL, NULL,
                                FALSE);
 
                for (i = top; i <= lua_gettop (L); i++) {
@@ -2041,6 +2101,7 @@ lua_config_register_callback_symbol (lua_State * L)
                                0,
                                SYMBOL_TYPE_CALLBACK,
                                -1,
+                               NULL, NULL,
                                FALSE);
        }
 
@@ -2083,6 +2144,7 @@ lua_config_register_callback_symbol_priority (lua_State * L)
                                priority,
                                SYMBOL_TYPE_CALLBACK,
                                -1,
+                               NULL, NULL,
                                FALSE);
        }
 
@@ -2462,7 +2524,7 @@ lua_config_newindex (lua_State *L)
 {
        LUA_TRACE_POINT;
        struct rspamd_config *cfg = lua_check_config (L, 1);
-       const gchar *name;
+       const gchar *name, *allowed_ids = NULL, *forbidden_ids = NULL;
        gint id, nshots, flags = 0;
        gboolean optional = FALSE;
 
@@ -2481,6 +2543,7 @@ lua_config_newindex (lua_State *L)
                                        0,
                                        SYMBOL_TYPE_NORMAL,
                                        -1,
+                                       NULL, NULL,
                                        FALSE);
                }
                else if (lua_type (L, 3) == LUA_TTABLE) {
@@ -2556,6 +2619,22 @@ lua_config_newindex (lua_State *L)
                        }
                        lua_pop (L, 1);
 
+                       lua_pushstring (L, "allowed_ids");
+                       lua_gettable (L, -2);
+
+                       if (lua_type (L, -1) == LUA_TSTRING) {
+                               allowed_ids = lua_tostring (L, -1);
+                       }
+                       lua_pop (L, 1);
+
+                       lua_pushstring (L, "forbidden_ids");
+                       lua_gettable (L, -2);
+
+                       if (lua_type (L, -1) == LUA_TSTRING) {
+                               forbidden_ids = lua_tostring (L, -1);
+                       }
+                       lua_pop (L, 1);
+
                        id = rspamd_register_symbol_fromlua (L,
                                        cfg,
                                        name,
@@ -2564,6 +2643,7 @@ lua_config_newindex (lua_State *L)
                                        priority,
                                        type,
                                        -1,
+                                       allowed_ids, forbidden_ids,
                                        optional);
 
                        if (id != -1) {