*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <sys/wait.h>
#include <glib.h>
+#include <glib/gi18n.h>
#if HAVE_LOCALE_H
# include <locale.h>
#include "folder.h"
#include "prefs.h"
#include "prefs_gtk.h"
-#include "intl.h"
#include "libspamc.h"
#include "spamassassin.h"
static guint hook_id;
static int flags = SPAMC_RAW_MODE | SPAMC_SAFE_FALLBACK | SPAMC_CHECK_ONLY;
static gchar *username = NULL;
+static MessageCallback message_callback;
static SpamAssassinConfig config;
static PrefParam param[] = {
- {"enable", "FALSE", &config.enable, P_BOOL,
+ {"transport", "0", &config.transport, P_INT,
NULL, NULL, NULL},
{"hostname", "localhost", &config.hostname, P_STRING,
NULL, NULL, NULL},
{"port", "783", &config.port, P_INT,
NULL, NULL, NULL},
- {"max_size", "250", &config.max_size, P_INT,
+ {"socket", "", &config.socket, P_STRING,
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 msg_is_spam(FILE *fp)
{
- struct sockaddr addr;
+ struct transport trans;
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\n");
+ transport_init(&trans);
+ switch (config.transport) {
+ case SPAMASSASSIN_TRANSPORT_LOCALHOST:
+ trans.type = TRANSPORT_LOCALHOST;
+ trans.port = config.port;
+ break;
+ case SPAMASSASSIN_TRANSPORT_TCP:
+ trans.type = TRANSPORT_TCP;
+ trans.hostname = config.hostname;
+ trans.port = config.port;
+ break;
+ case SPAMASSASSIN_TRANSPORT_UNIX:
+ trans.type = TRANSPORT_UNIX;
+ trans.socketpath = config.socket;
+ break;
+ default:
+ return FALSE;
+ }
+
+ 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;
+ m.timeout = config.timeout;
if (message_read(fileno(fp), flags, &m) != EX_OK) {
debug_print("failed to read message\n");
return FALSE;
}
- if (message_filter(&addr, username, flags, &m) != EX_OK) {
+ if (message_filter(&trans, username, flags, &m) != EX_OK) {
debug_print("filtering the message failed\n");
message_cleanup(&m);
return FALSE;
int pid = 0;
int status;
- if (!config.enable)
+ if (config.transport == SPAMASSASSIN_DISABLED)
return FALSE;
debug_print("Filtering message %d\n", msginfo->msgnum);
+ if (message_callback != NULL)
+ message_callback(_("SpamAssassin: filtering message..."));
if ((fp = procmsg_open_message(msginfo)) == NULL) {
debug_print("failed to open message file\n");
running |= CHILD_RUNNING;
- g_timeout_add(1000, timeout_func, &running);
+ g_timeout_add(50, timeout_func, &running);
running |= TIMEOUT_RUNNING;
while(running & CHILD_RUNNING) {
- waitpid(pid, &status, WNOHANG);
- if (WIFEXITED(status)) {
+ int ret;
+
+ ret = waitpid(pid, &status, WNOHANG);
+ if (ret == pid) {
+ if (WIFEXITED(status)) {
+ running &= ~CHILD_RUNNING;
+ is_spam = WEXITSTATUS(status) == 1 ? TRUE : FALSE;
+ }
+ } if (ret < 0) {
running &= ~CHILD_RUNNING;
- }
+ } /* ret == 0 continue */
g_main_iteration(TRUE);
}
while (running & TIMEOUT_RUNNING)
g_main_iteration(TRUE);
}
- is_spam = WEXITSTATUS(status) == 1 ? TRUE : FALSE;
fclose(fp);
prefs_file_close(pfile);
}
+void spamassassin_set_message_callback(MessageCallback callback)
+{
+ message_callback = callback;
+}
+
gint plugin_init(gchar **error)
{
+ gchar *rcpath;
+
if ((sylpheed_get_version() > VERSION_NUMERIC)) {
- *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+ *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the SpamAssassin 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");
+ *error = g_strdup("Your version of Sylpheed-Claws is too old for the SpamAssassin plugin");
return -1;
}
return -1;
}
- username = g_get_user_name();
+ username = (gchar*)g_get_user_name();
if (username == NULL) {
+ hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
*error = g_strdup("Failed to get username");
return -1;
}
prefs_set_default(param);
- prefs_read_config(param, "SpamAssassin", COMMON_RC);
+ rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
+ prefs_read_config(param, "SpamAssassin", rcpath, NULL);
+ g_free(rcpath);
+ spamassassin_gtk_init();
debug_print("Spamassassin plugin loaded\n");
hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
g_free(config.hostname);
g_free(config.save_folder);
+ spamassassin_gtk_done();
debug_print("Spamassassin plugin unloaded\n");
}
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"
+ return _("This plugin checks all messages that are received from an "
+ "IMAP, LOCAL or 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");
+ "\n");
}
const gchar *plugin_type(void)
{
- return "Common";
+ return "GTK2";
}
projects / claws.git / blobdiff