#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"
#include "folder.h"
#include "prefs.h"
#include "prefs_gtk.h"
+#include "intl.h"
#include "libspamc.h"
#include "spamassassin.h"
#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;
NULL, NULL, NULL},
{"hostname", "localhost", &config.hostname, P_STRING,
NULL, NULL, NULL},
- {"port", "783", &config.port, P_USHORT,
+ {"port", "783", &config.port, P_INT,
NULL, NULL, NULL},
- {"max_size", "250", &config.max_size, P_USHORT,
+ {"max_size", "250", &config.max_size, P_INT,
NULL, NULL, NULL},
{"receive_spam", "TRUE", &config.receive_spam, P_BOOL,
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;
+ 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;
+}
- /* remember old locale and set it to C */
- Xstrdup_a(oldlocale, setlocale(LC_ALL, NULL), return FALSE);
- setlocale(LC_ALL, "C");
+static gboolean msg_is_spam(FILE *fp)
+{
+ struct sockaddr addr;
+ struct message m;
+ gboolean is_spam = FALSE;
if (lookup_host(config.hostname, config.port, &addr) != EX_OK) {
- debug_print("failed to look up spamd host");
+ debug_print("failed to look up spamd host\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");
+ if (message_read(fileno(fp), flags, &m) != EX_OK) {
+ debug_print("failed to read message\n");
+ message_cleanup(&m);
return FALSE;
}
- if (message_read(fileno(fp), flags, &m) != EX_OK) {
- debug_print("failed to read message");
- fclose(fp);
+ if (message_filter(&addr, username, flags, &m) != EX_OK) {
+ debug_print("filtering the message failed\n");
message_cleanup(&m);
return FALSE;
}
- if ((message_filter(&addr, username, flags, &m) == EX_OK) && (m.is_spam == EX_ISSPAM))
+ if (m.is_spam == EX_ISSPAM)
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");
+
if (config.receive_spam) {
FolderItem *save_folder;
- debug_print("message is spam\n");
-
if ((!config.save_folder) ||
(config.save_folder[0] == '\0') ||
((save_folder = folder_find_item_from_identifier(config.save_folder)) == NULL))
return FALSE;
}
-SpamAssassinConfig *spamassassin_get_config()
+SpamAssassinConfig *spamassassin_get_config(void)
{
return &config;
}
-void spamassassin_save_config()
+void spamassassin_save_config(void)
{
PrefFile *pfile;
gchar *rcpath;
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");
}
-void plugin_done()
+void plugin_done(void)
{
hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
g_free(config.hostname);
debug_print("Spamassassin plugin unloaded\n");
}
-const gchar *plugin_name()
+const gchar *plugin_name(void)
{
- return "SpamAssassin";
+ return _("SpamAssassin");
}
-const gchar *plugin_desc()
+const gchar *plugin_desc(void)
{
- return "This plugin checks all messages that are received from a POP "
- "account for spam using a SpamAssassin server. You will need "
- "a SpamAssassin Server (spamd) running somewhere.\n"
- "\n"
- "When a message is identified as spam it can be deleted or "
- "saved into a special folder.\n"
- "\n"
- "This plugin only contains the actual function for filtering "
- "and deleting or moving the message. You probably want to load "
- "a User Interface plugin too, otherwise you will have to "
- "manually write the plugin configuration.\n";
+ return _("This plugin checks all messages that are received from a POP "
+ "account for spam using a SpamAssassin server. You will need "
+ "a SpamAssassin Server (spamd) running somewhere.\n"
+ "\n"
+ "When a message is identified as spam it can be deleted or "
+ "saved into a special folder.\n"
+ "\n"
+ "This plugin only contains the actual function for filtering "
+ "and deleting or moving the message. You probably want to load "
+ "a User Interface plugin too, otherwise you will have to "
+ "manually write the plugin configuration.\n");
}
-const gchar *plugin_type()
+const gchar *plugin_type(void)
{
return "Common";
}
projects / claws.git / blobdiff