[Project] Rework grow factor as it is currently broken

diff --git a/src/libmime/scan_result.c b/src/libmime/scan_result.c
index b9660071bf9ab2c2f5baf6ecc5b17faf10974e3d..54d6d58417df44e92423cab5ff865cb5cae6430a 100644 (file)
--- a/src/libmime/scan_result.c
+++ b/src/libmime/scan_result.c
@@ -231,7 +231,7 @@ insert_metric_result(struct rspamd_task *task,
                                         bool *new_sym)
 {
        struct rspamd_symbol_result *symbol_result = NULL;
-       double final_score, *gr_score = NULL, next_gf = 1.0, diff;
+       double final_score, *gr_score = NULL, diff;
        struct rspamd_symbol *sdef;
        struct rspamd_symbols_group *gr = NULL;
        const ucl_object_t *mobj, *sobj;
@@ -368,17 +368,6 @@ insert_metric_result(struct rspamd_task *task,
                }
 
                if (diff) {
-                       /* Handle grow factor */
-                       if (metric_res->grow_factor && diff > 0) {
-                               diff *= metric_res->grow_factor;
-                               next_gf *= task->cfg->grow_factor;
-                       }
-                       else if (diff > 0) {
-                               next_gf = task->cfg->grow_factor;
-                       }
-
-                       msg_debug_metric("adjust grow factor to %.2f for symbol %s (%.2f final)",
-                                                        next_gf, symbol, diff);
 
                        if (sdef) {
                                PTR_ARRAY_FOREACH(sdef->groups, i, gr)
@@ -418,8 +407,6 @@ insert_metric_result(struct rspamd_task *task,
                        }
 
                        if (!isnan(diff)) {
-                               metric_res->score += diff;
-                               metric_res->grow_factor = next_gf;
 
                                if (single) {
                                        msg_debug_metric("final score for single symbol %s = %.2f; %.2f diff",
@@ -447,18 +434,6 @@ insert_metric_result(struct rspamd_task *task,
                symbol_result = rspamd_mempool_alloc0(task->task_pool, sizeof(*symbol_result));
                kh_value(metric_res->symbols, k) = symbol_result;
 
-               /* Handle grow factor */
-               if (metric_res->grow_factor && final_score > 0) {
-                       final_score *= metric_res->grow_factor;
-                       next_gf *= task->cfg->grow_factor;
-               }
-               else if (final_score > 0) {
-                       next_gf = task->cfg->grow_factor;
-               }
-
-               msg_debug_metric("adjust grow factor to %.2f for symbol %s (%.2f final)",
-                                                next_gf, symbol, final_score);
-
                symbol_result->name = sym_cpy;
                symbol_result->sym = sdef;
                symbol_result->nshots = 1;
@@ -503,7 +478,6 @@ insert_metric_result(struct rspamd_task *task,
                        const double epsilon = DBL_EPSILON;
 
                        metric_res->score += final_score;
-                       metric_res->grow_factor = next_gf;
                        symbol_result->score = final_score;
 
                        if (final_score > epsilon) {

diff --git a/src/libmime/scan_result.h b/src/libmime/scan_result.h
index d4572e1d868af62b1cf33253f7d15fa9430f13c7..12fdb94599f81b58fc23742ef46269125b6a2c74 100644 (file)
--- a/src/libmime/scan_result.h
+++ b/src/libmime/scan_result.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Vsevolod Stakhov
+ * Copyright 2024 Vsevolod Stakhov
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,8 +99,7 @@ struct kh_rspamd_symbols_group_hash_s;
 
 
 struct rspamd_scan_result {
-       double score;       /**< total score                                                    */
-       double grow_factor; /**< current grow factor                                    */
+       double score; /**< total score                                                  */
        struct rspamd_passthrough_result *passthrough_result;
        double positive_score;
        double negative_score;
@@ -220,16 +219,11 @@ void rspamd_task_symbol_result_foreach(struct rspamd_task *task,
                                                                           gpointer ud);
 
 /**
- * Default consolidation function for metric, it get all symbols and multiply symbol
- * weight by some factor that is specified in config. Default factor is 1.
- * @param task worker's task that present message from user
- * @param metric_name name of metric
- * @return result metric weight
+ * Adjust symbol results to the grow factor for a specific task; should be called after postfilters
  */
-double rspamd_factor_consolidation_func(struct rspamd_task *task,
-                                                                               const char *metric_name,
-                                                                               const char *unused);
-
+void rspamd_task_result_adjust_grow_factor(struct rspamd_task *task,
+                                                                                  struct rspamd_scan_result *result,
+                                                                                  double grow_factor);
 
 /**
  * Check thresholds and return action for a task

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 8da246bdb9c98a75eb8fa0bd374e6d2a410f029b..5de980352b4301ee0cfca771953d06c0ae45c10b 100644 (file)
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -1322,15 +1322,13 @@ rspamd_scan_result_ucl(struct rspamd_task *task,
                        sobj = rspamd_metric_symbol_ucl(task, sym);
                        ucl_object_insert_key(obj, sobj, sym->name, 0, false);
                }
-       })
+       });
 
-               if (task->cmd != CMD_CHECK)
-       {
+       if (task->cmd != CMD_CHECK) {
                /* For checkv2 we insert symbols as a separate object */
                ucl_object_insert_key(top, obj, "symbols", 0, false);
        }
-       else
-       {
+       else {
                /* For legacy check we just insert it as "default" all together */
                ucl_object_insert_key(top, obj, DEFAULT_METRIC, 0, false);
        }