0.9.6claws4

[claws.git] / src / plugins / spamassassin / spamassassin.c

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index bbea649dee7952eb67b8205a02f65ed85f66a2fd..dde2a5616a1de8606c5dba68c19ab3a2bb7e07d0 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -23,12 +23,17 @@
 
 #include "defs.h"
 
+#include <sys/types.h>
+#include <sys/wait.h>
+
 #include <glib.h>
 
 #if HAVE_LOCALE_H
 #  include <locale.h>
 #endif
 
+#include "common/sylpheed.h"
+#include "common/version.h"
 #include "plugin.h"
 #include "common/utils.h"
 #include "hooks.h"
@@ -63,7 +68,12 @@
 #include <pwd.h>
 #endif
 
-static gint hook_id;
+enum {
+    CHILD_RUNNING = 1 << 0,
+    TIMEOUT_RUNNING = 1 << 1,
+};
+
+static guint hook_id;
 static int flags = SPAMC_RAW_MODE | SPAMC_SAFE_FALLBACK | SPAMC_CHECK_ONLY;
 static gchar *username = NULL;
 
@@ -76,60 +86,57 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"port", "783", &config.port, P_INT,
         NULL, NULL, NULL},
-       {"max_size", "250", &config.max_size, P_INT,
-        NULL, NULL, NULL},
        {"receive_spam", "TRUE", &config.receive_spam, P_BOOL,
         NULL, NULL, NULL},
        {"save_folder", NULL, &config.save_folder, P_STRING,
         NULL, NULL, NULL},
+       {"max_size", "250", &config.max_size, P_INT,
+        NULL, NULL, NULL},
+       {"timeout", "30", &config.timeout, P_INT,
+        NULL, NULL, NULL},
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
-static gboolean mail_filtering_hook(gpointer source, gpointer data)
+gboolean timeout_func(gpointer data)
 {
-       MailFilteringData *mail_filtering_data = (MailFilteringData *) source;
-       MsgInfo *msginfo = mail_filtering_data->msginfo;
-       gboolean is_spam = FALSE;
-       FILE *fp = NULL;
-       struct message m;
-       gchar *oldlocale = NULL;
-       struct sockaddr addr;
-       int ret;
+       gint *running = (gint *) data;
 
-       if (!config.enable)
-               return FALSE;
+       if (*running & CHILD_RUNNING)
+               return TRUE;
 
-       debug_print("Filtering message %d\n", msginfo->msgnum);
+       *running &= ~TIMEOUT_RUNNING;
+       return FALSE;
+}
+
+static gboolean msg_is_spam(FILE *fp)
+{
+       struct transport trans;
+       struct message m;
+       gboolean is_spam = FALSE;
 
-       /* remember old locale and set it to C */
-       Xstrdup_a(oldlocale, setlocale(LC_ALL, NULL), return FALSE);
-       setlocale(LC_ALL, "C");
+       transport_init(&trans);
+       trans.type = TRANSPORT_TCP;
+       trans.hostname = config.hostname;
+       trans.port = config.port;
 
-       if (lookup_host(config.hostname, config.port, &addr) != EX_OK) {
-               debug_print("failed to look up spamd host\n");
+       if (transport_setup(&trans, flags) != EX_OK) {
+               debug_print("failed to setup transport\n");
                return FALSE;
        }
 
        m.type = MESSAGE_NONE;
        m.max_len = config.max_size * 1024;
-       m.timeout = 30;
-
-       if ((fp = procmsg_open_message(msginfo)) == NULL) {
-               debug_print("failed to open message file\n");
-               return FALSE;
-       }
+       m.timeout = config.timeout;
 
        if (message_read(fileno(fp), flags, &m) != EX_OK) {
                debug_print("failed to read message\n");
-               fclose(fp);
                message_cleanup(&m);
                return FALSE;
        }
 
-       if ((ret = message_filter(&addr, username, flags, &m)) != EX_OK) {
+       if (message_filter(&trans, username, flags, &m) != EX_OK) {
                debug_print("filtering the message failed\n");
-               fclose(fp);
                message_cleanup(&m);
                return FALSE;
        }
@@ -138,8 +145,55 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                is_spam = TRUE;
 
        message_cleanup(&m);
+
+       return is_spam;
+}
+
+static gboolean mail_filtering_hook(gpointer source, gpointer data)
+{
+       MailFilteringData *mail_filtering_data = (MailFilteringData *) source;
+       MsgInfo *msginfo = mail_filtering_data->msginfo;
+       gboolean is_spam = FALSE;
+       FILE *fp = NULL;
+       int pid = 0;
+       int status;
+
+       if (!config.enable)
+               return FALSE;
+
+       debug_print("Filtering message %d\n", msginfo->msgnum);
+
+       if ((fp = procmsg_open_message(msginfo)) == NULL) {
+               debug_print("failed to open message file\n");
+               return FALSE;
+       }
+
+       pid = fork();
+       if (pid == 0) {
+               _exit(msg_is_spam(fp) ? 1 : 0);
+       } else {
+               gint running = 0;
+
+               running |= CHILD_RUNNING;
+
+               g_timeout_add(1000, timeout_func, &running);
+               running |= TIMEOUT_RUNNING;
+
+               while(running & CHILD_RUNNING) {
+                       waitpid(pid, &status, WNOHANG);
+                       if (WIFEXITED(status)) {
+                               running &= ~CHILD_RUNNING;
+                       }
+           
+                       g_main_iteration(TRUE);
+               }
+
+               while (running & TIMEOUT_RUNNING)
+                       g_main_iteration(TRUE);
+       }
+        is_spam = WEXITSTATUS(status) == 1 ? TRUE : FALSE;
+
        fclose(fp);
-       setlocale(LC_ALL, oldlocale);
 
        if (is_spam) {
                debug_print("message is spam\n");
@@ -194,6 +248,16 @@ void spamassassin_save_config(void)
 
 gint plugin_init(gchar **error)
 {
+       if ((sylpheed_get_version() > VERSION_NUMERIC)) {
+               *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+               return -1;
+       }
+
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
+               *error = g_strdup("Your sylpheed version is too old");
+               return -1;
+       }
+
        hook_id = hooks_register_hook(MAIL_FILTERING_HOOKLIST, mail_filtering_hook, NULL);
        if (hook_id == -1) {
                *error = g_strdup("Failed to register mail filtering hook");