[Fix] Rewriting subjects via force actions module

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 6ccb832298501ad900cd7a4be3a58a82f87a3563..dc96704bd62c816a7f5637d27d8cfdc68326a93a 100644 (file)
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -747,7 +747,11 @@ make_rewritten_subject (struct rspamd_metric *metric, struct rspamd_task *task)
        const gchar *s, *c, *p;
        gsize slen = 0;
 
-       c = metric->subject;
+       c = rspamd_mempool_get_variable (task->task_pool, "metric_subject");
+
+       if (c == NULL) {
+               c = metric->subject;
+       }
 
        if (c == NULL) {
                c = SPAM_SUBJECT;

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 4c9c23a7524930292f1ec32fa52067aae6ee8ba5..5e1a6b9dbb7b8492fc9e0a776af4b0f75babedf0 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -3921,6 +3921,26 @@ lua_task_set_metric_action (lua_State *L)
        return 1;
 }
 
+static gint
+lua_task_set_metric_subject (lua_State *L)
+{
+       struct rspamd_task *task = lua_check_task (L, 1);
+       const gchar *subject;
+
+       subject = luaL_checkstring (L, 2);
+
+       if (task && subject) {
+               rspamd_mempool_set_variable (task->task_pool, "metric_subject",
+                       rspamd_mempool_strdup(task->task_pool, subject), NULL);
+               lua_pushboolean (L, true);
+       }
+       else {
+               return luaL_error (L, "invalid arguments");
+       }
+
+       return 1;
+}
+
 static gint
 lua_task_get_protocol_reply (lua_State *L)
 {