[Feature] Allow to store messages in files

diff --git a/src/libserver/task.c b/src/libserver/task.c
index 76d9639b3652c1a61d554da4b1a5f94ca67baf74..e6666cd475ee1f2f912c5ff876fb9795b3f81c35 100644 (file)
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -415,7 +415,6 @@ rspamd_task_load_message (struct rspamd_task *task,
 
                task->msg.begin = ((guchar *)map) + offset;
                task->msg.len = shmem_size;
-               task->flags |= RSPAMD_TASK_FLAG_FILE;
                m = rspamd_mempool_alloc (task->task_pool, sizeof (*m));
                m->begin = map;
                m->len = st.st_size;
@@ -479,6 +478,7 @@ rspamd_task_load_message (struct rspamd_task *task,
                close (fd);
                task->msg.begin = map;
                task->msg.len = st.st_size;
+               task->msg.fpath = rspamd_mempool_strdup (task->task_pool, fp);
                task->flags |= RSPAMD_TASK_FLAG_FILE;
 
                msg_info_task ("loaded message from file %s", fp);

diff --git a/src/libserver/task.h b/src/libserver/task.h
index c6dff0ebc9f559a627a3bbd9a3daca2cff9ea500..ba03d88195711af6a1e6f6ec1d214e3357cc74c5 100644 (file)
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -138,7 +138,11 @@ struct rspamd_task {
        gchar *hostname;                                                                /**< hostname reported by MTA                                           */
        GHashTable *request_headers;                                    /**< HTTP headers in a request                                          */
        GHashTable *reply_headers;                                              /**< Custom reply headers                                                       */
-       rspamd_ftok_t msg;                                                              /**< message buffer                                                                     */
+       struct {
+               const gchar *begin;
+               gsize len;
+               gchar *fpath;
+       } msg;                                                                                  /**< message buffer                                                                     */
        struct rspamd_http_connection *http_conn;               /**< HTTP server connection                                                     */
        struct rspamd_async_session * s;                                /**< async session object                                                       */
        GPtrArray *parts;                                                               /**< list of parsed parts                                                       */

diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index 17f55b8b238095812b136106bc27ba015e0b9e51..adbb36adbc5a1995b890b1652f0c07e518981449 100644 (file)
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -705,6 +705,19 @@ LUA_FUNCTION_DEF (task, get_flags);
  */
 LUA_FUNCTION_DEF (task, get_digest);
 
+/***
+ * @method task:store_in_file([mode])
+ * If task was loaded using file scan, then this method just returns its name,
+ * otherwise, a fresh temporary file is created and its name is returned. Default
+ * mode is 0600. To convert lua number to the octal mode you can use the following
+ * trick: `tonumber("0644", 8)`. The file is automatically removed when task is
+ * destroyed.
+ *
+ * @param {number} mode mode for new file
+ * @return {string} file name with task content
+ */
+LUA_FUNCTION_DEF (task, store_in_file);
+
 static const struct luaL_reg tasklib_f[] = {
        {NULL, NULL}
 };
@@ -785,6 +798,7 @@ static const struct luaL_reg tasklib_m[] = {
        LUA_INTERFACE_DEF (task, has_flag),
        LUA_INTERFACE_DEF (task, set_rmilter_reply),
        LUA_INTERFACE_DEF (task, get_digest),
+       LUA_INTERFACE_DEF (task, store_in_file),
        {"__tostring", rspamd_lua_class_tostring},
        {NULL, NULL}
 };
@@ -3223,6 +3237,75 @@ lua_task_cache_set (lua_State *L)
        return 0;
 }
 
+struct lua_file_cbdata {
+       gchar *fname;
+       gint fd;
+};
+
+static void
+lua_tmp_file_dtor (gpointer p)
+{
+       struct lua_file_cbdata *cbdata = p;
+
+       unlink (cbdata->fname);
+       close (cbdata->fd);
+}
+
+static gint
+lua_task_store_in_file (lua_State *L)
+{
+       struct rspamd_task *task = lua_check_task (L, 1);
+       gchar fpath[PATH_MAX];
+       guint mode = 00600;
+       gint fd;
+       struct lua_file_cbdata *cbdata;
+
+       if (task) {
+               if ((task->flags & RSPAMD_TASK_FLAG_FILE) && task->msg.fpath) {
+                       lua_pushstring (L, task->msg.fpath);
+               }
+               else {
+                       if (lua_isnumber (L, 2)) {
+                               mode = lua_tonumber (L, 2);
+                       }
+
+                       rspamd_snprintf (fpath, sizeof (fpath), "%s%c%s", task->cfg->temp_dir,
+                                       G_DIR_SEPARATOR, "rmsg-XXXXXXXXXX");
+                       fd = mkstemp (fpath);
+
+                       if (fd == -1) {
+                               msg_err_task ("cannot save file: %s", strerror (errno));
+                               lua_pushnil (L);
+                       }
+                       else {
+                               fchmod (fd, mode);
+
+                               if (write (fd, task->msg.begin, task->msg.len) == -1) {
+                                       msg_err_task ("cannot write file %s: %s", fpath,
+                                                       strerror (errno));
+                                       unlink (fpath);
+                                       close (fd);
+                                       lua_pushnil (L);
+
+                                       return 1;
+                               }
+
+                               cbdata = rspamd_mempool_alloc (task->task_pool, sizeof (*cbdata));
+                               cbdata->fd = fd;
+                               cbdata->fname = rspamd_mempool_strdup (task->task_pool, fpath);
+                               lua_pushstring (L, cbdata->fname);
+                               rspamd_mempool_add_destructor (task->task_pool,
+                                               lua_tmp_file_dtor, cbdata);
+                       }
+               }
+       }
+       else {
+               luaL_error (L, "invalid arguments");
+       }
+
+       return 1;
+}
+
 static gint
 lua_task_process_regexp (lua_State *L)
 {